diff -Nru gthumb-3.0.2/ChangeLog gthumb-3.2.3/ChangeLog --- gthumb-3.0.2/ChangeLog 2012-08-20 20:25:29.000000000 +0000 +++ gthumb-3.2.3/ChangeLog 2013-07-10 13:37:01.000000000 +0000 @@ -1,21 +1,3075 @@ -commit 4da018e6ebb8a713b5611a403914f20976c88691 +commit 3ea5d24075cadb8e9721c5a9e8610e2fc541f489 Author: Paolo Bacchilega -Date: 2012-08-20 +Date: 2013-07-09 - distribute filmholes.png + updated for version 3.2.3 + +M NEWS +M configure.ac + +commit 2105f39b50b02e486dece2768adbb8b7910e6ac1 +Author: Paolo Bacchilega +Date: 2013-07-10 + + video screenshot: fixed setting of the default destination + + the default value is 'file://~'; use PICTURES as default + destination. + +M extensions/gstreamer_tools/actions.c + +commit 245d7e51497334936aa5371a012a2ba1ec6457b3 +Author: Paolo Bacchilega +Date: 2013-07-07 + + flickr: allow to use a facebook or google account + + [bug #703534] + +M extensions/oauth/oauth-ask-authorization-dialog.c + +commit 9810b6bdf76a6e776a0f59a3ee86671beb465770 +Author: Paolo Bacchilega +Date: 2013-07-07 + + web service: do not delete the previous account when creating a + new one + +M extensions/oauth/web-service.c + +commit 9f735dbf7d4529c17e46693c989bbd1bd17dab7b +Author: Paolo Bacchilega +Date: 2013-07-07 + + flickr: fixed crash + + ref and unref the account correctly + +M extensions/flicker_utils/flickr-service.c + +commit 455bae1fce12e932527dbb4a4fbbeed6b66f25e7 +Author: Paolo Bacchilega +Date: 2013-07-03 + + use the correct mothod to set the folder in the file chooser + +M extensions/contact_sheet/dlg-contact-sheet.c +M extensions/contact_sheet/dlg-image-wall.c +M extensions/file_manager/actions.c +M extensions/find_duplicates/dlg-find-duplicates.c +M extensions/webalbums/dlg-web-exporter.c +M gthumb/dlg-preferences.c + +commit 11200d29da438a996951422b88e89ecdcf550a67 +Author: Paolo Bacchilega +Date: 2013-07-03 + + slideshow: show the cursor again after stopping the slideshow + +M extensions/slideshow/gth-slideshow.c +M extensions/slideshow/gth-slideshow.h + +commit d8ab60a4e77cdbab403db60ec87af6c7141b4676 +Author: Paolo Bacchilega +Date: 2013-06-28 + + fixed the size of the toolbar in fullscreen mode + +M gthumb/gth-browser.c + +commit f9cdb9444d145ee1d5a46404bad3ca566130e2cf +Author: Paolo Bacchilega +Date: 2013-06-28 + + mark the cairo surface as dirty after changing it + +M gthumb/cairo-utils.c + +commit 3686fef47ae4ad634f3e1bfea9eba3301993356d +Author: Paolo Bacchilega +Date: 2013-06-28 + + jpeg loader: fixed possible multithread problem + + initialize the tables inside a mutex lock + +M extensions/cairo_io/cairo-image-surface-jpeg.c +M gthumb/cairo-scale.c + +commit 6f7dca0bf37243adf572185c72007b1a31cc08fe +Author: Paolo Bacchilega +Date: 2013-06-28 + + fixed saving of TGA images + + save the colors in little ending order + +M extensions/cairo_io/gth-image-saver-jpeg.c +M extensions/cairo_io/gth-image-saver-png.c +M extensions/cairo_io/gth-image-saver-tga.c +M extensions/cairo_io/gth-image-saver-tiff.c +M gthumb/cairo-utils.c +M gthumb/cairo-utils.h + +commit 36f56e1e68c363023ca61df5950fd47081678af0 +Author: Paolo Bacchilega +Date: 2013-06-24 + + unref the task when not needed anymore. + + this partially reverts commit 4a82897bff14d8e380532e0b26eda1ad2e1c4ddf + +M extensions/file_tools/gth-file-tool-adjust-contrast.c +M extensions/gstreamer_tools/actions.c + +commit c8bb39a025fc975cba882ded202270e028cca900 +Author: Paolo Bacchilega +Date: 2013-06-18 + + thumbnail list: images drawn with wrong offset + + [bug #702538] + +M gthumb/gth-grid-view.c + +commit 6514d9a561f26fc4640f0575cc506ec264d43aa6 +Author: Paolo Bacchilega +Date: 2013-06-18 + + video player: ignore the messages not directly related to the pipeline + +M extensions/gstreamer_tools/gth-media-viewer-page.c + +commit 9efc79d3d16e217c051c56cc64566cd49af757ea +Author: Paolo Bacchilega +Date: 2013-06-18 + + video player: use a modal dialog to choose the file name + +M extensions/gstreamer_tools/actions.c + +commit a9adf9a07826b423dd4c515a779bee65b6f63208 +Author: Paolo Bacchilega +Date: 2013-06-18 + + fixed the video player stopping after saving a screenshot + + Do not update the orientation if it didn't really changed, sometimes a + 'changed::viewer-thumbnails-orientation' signal is emitted even if + the user + didn't change anything, I'm not sure why. This caused the video + player to + be unrealized and relealized again. + +M gthumb/gth-browser.c + +commit 4a82897bff14d8e380532e0b26eda1ad2e1c4ddf +Author: Paolo Bacchilega +Date: 2013-06-18 + + unref the task after executing it + +M extensions/contact_sheet/dlg-contact-sheet.c +M extensions/contact_sheet/dlg-image-wall.c +M extensions/file_manager/actions.c +M extensions/file_tools/gth-file-tool-adjust-contrast.c +M extensions/gstreamer_tools/actions.c +M extensions/webalbums/dlg-web-exporter.c + +commit 554aafd692487fd78eb599de61d5858a0f11fc1f +Author: Yuri Myasoedov +Date: 2013-05-16 + + Updated Russian translation + +M po/ru.po + +commit 29ac47927073dcbf860cfbdd859827604e6c20f1 +Author: Paolo Bacchilega +Date: 2013-05-13 + + DOAP file: added download-page and bug-database + +M gthumb.doap + +commit 8457ae67954f199a658fc4c8aab92db4a667036e +Author: Paolo Bacchilega +Date: 2013-05-13 + + updated for version 3.2.2 + +M NEWS +M configure.ac + +commit 4ff465b4f6d8b00c0e1ba3d64153b14e3d0cc8c9 +Author: Paolo Bacchilega +Date: 2013-04-30 + + GthEmptyList: render the text following the widget state + +M gthumb/gth-empty-list.c + +commit 5b56bcc0d2c461ad2b72f5dfa800c08311899e08 +Author: Paolo Bacchilega +Date: 2013-04-30 + + empty list: draw the background correclty + +M gthumb/gth-empty-list.c + +commit 80c4fab126affdfeb12da8707fbc187dd70f4279 +Author: Paolo Bacchilega +Date: 2013-04-30 + + build: recompile when changing a resource + +M gthumb/Makefile.am + +commit aec3db5126890c8e9bd77a4d7b8cca1b183d35d1 +Author: Paolo Bacchilega +Date: 2013-04-30 + + resize, convert: correctly set the destination folder + +M extensions/convert_format/dlg-convert-format.c +M extensions/resize_images/dlg-resize-images.c +M gthumb/gtk-utils.c +M gthumb/gtk-utils.h + +commit 93ad1ac2ca351225933684d2066306162e67d191 +Author: Paolo Bacchilega +Date: 2013-04-15 + + updated for version 3.2.1 + +M NEWS +M configure.ac + +commit 8dcae4006795d86d1b27d949f0af83c457ffc40a +Author: Adrian Knoth +Date: 2013-04-14 + + Also use button 2 in gth-image-dragger + + GIMP and inkscape both allow to drag the image around while holding + down + button2 (mouse wheel). + + For the sake of convenience (users who are familiar with those other + tools), implement the same in gthumb. + + Button1 is not changed, so button1 and button2 now both allow to drag + the image. + + Signed-off-by: Adrian Knoth + +M gthumb/gth-image-dragger.c + +commit 31151439f259d74f91c0b848127e3c495228f659 +Author: Paolo Bacchilega +Date: 2013-04-14 + + bookmarks: fixed ability to modify the bookmarks + + Do not update the bookmark list while changing the name or the + location of the bookmark, wait for the user to press Enter. + +M extensions/bookmarks/dlg-bookmarks.c +M gthumb/gth-uri-list.c +M gthumb/gth-uri-list.h + +commit 6fd8b57ffbb00163399a56094e4f13345cd78fff +Author: Paolo Bacchilega +Date: 2013-04-04 + + filter-bar: fixed the spin button width for the file size control + +M gthumb/gth-filter.c + +commit cdfb9de0eabd889164d6cc12e1371b4c7e051ed2 +Author: Paolo Bacchilega +Date: 2013-03-31 + + facebook: fixed authentication + + updated the app_id and the redirect_uri; added 'state' verification + + [bug fixed] + +M extensions/facebook/facebook-service.c + +commit 8163fdee57da7700ba63986f133b2f6f81ad0a73 +Author: Paolo Bacchilega +Date: 2013-03-28 + + slideshow: fixed audio playback + +M extensions/gstreamer_utils/gstreamer-utils.c +M extensions/slideshow/gth-slideshow.c + +commit 3a1128457bd229abf51d48a660abc4b4458b518b +Author: Paolo Bacchilega +Date: 2013-03-28 + + configure: fixed unrecognized option --disable-libjson-glib + + [bug #696783] + +M configure.ac + +commit 979868c9c0d56a04f781b70759294f8ecd3c6fd5 +Author: Paolo Bacchilega +Date: 2013-03-28 + + configure: enable libwebp by default + +M configure.ac + +commit 012dd6d7330f36c2c8ee7469506eabeef337c351 +Author: Paolo Bacchilega +Date: 2013-03-27 + + updated for version 3.2.0 + +M NEWS +M configure.ac + +commit 01ce419357eb432e0a61b454707e0c5e44caec17 +Author: Paolo Bacchilega +Date: 2013-03-24 + + image viewer: always use a dark background + +M data/org.gnome.gthumb.image-viewer.gschema.xml.in +M extensions/image_viewer/gth-image-viewer-page.c +M extensions/image_viewer/preferences.h +M gthumb/gth-image-viewer.c + +commit 372931babd6864fe3ee77bf881632c96cddfdb66 +Author: Alexandre Franke +Date: 2013-03-23 + + Update French translation + +M help/fr/fr.po + +commit 8f800d8b0a4b8ebb488817de2d9a5f29b7f9eda6 +Author: Marek Černocký +Date: 2013-03-21 + + Fixed XML + +M help/cs/cs.po + +commit 86c4e14af55b3dff9c61107e45cbe05e56dfa1f3 +Author: Balázs Úr +Date: 2013-03-20 + + Updated Hungarian translation + +M po/hu.po + +commit a7d93680c0cdb5be2d88d8875763b32c3501dc4d +Author: Gianvito Cavasoli +Date: 2013-03-20 + + [l10n] Updated Italian translation. + +M po/it.po + +commit f071f7d250bede84656db5a7046d41407fe42c5e +Author: Paolo Bacchilega +Date: 2013-03-16 + + xcf loader: simplified the code removing the use of cairo to draw + layers + + implemented all the layer modes instead of using cairo operations + for some modes, this allows to remove some time-consuming functions + such as gimp_layer_apply_mask and _cairo_surface_data_post_production, + and allows to avoid some alpha channel multiplications. + +M extensions/cairo_io/cairo-image-surface-xcf.c + +commit 126dc51b357e854c218cb2e6b06df1b8cd2f244b +Author: Paolo Bacchilega +Date: 2013-03-15 + + xcf loader: do not read a byte at a time + +M extensions/cairo_io/cairo-image-surface-xcf.c + +commit 666484870e87256fc6a27b03296a75db4a371359 +Author: Paolo Bacchilega +Date: 2013-03-14 + + desktop background: set the style to 'wallpaper' + +M extensions/desktop_background/actions.c + +commit 0a18437462c8bc64a686228d34d309a6861eec22 +Author: Paolo Bacchilega +Date: 2013-03-14 + + desktop background: allow to set an xcf image as background image + + convert the image to jpeg if the mime type is not supported by + GdkPixbuf + +M extensions/desktop_background/actions.c +M gthumb/pixbuf-utils.c +M gthumb/pixbuf-utils.h + +commit f2d72bec06accae82297272f0899afb23c007823 +Author: Paolo Bacchilega +Date: 2013-03-13 + + added ability load xcf images + + [new feature] + +M extensions/cairo_io/Makefile.am +A extensions/cairo_io/cairo-image-surface-xcf.c +A extensions/cairo_io/cairo-image-surface-xcf.h +M extensions/cairo_io/main.c +M extensions/image_viewer/gth-metadata-provider-image.c +M po/POTFILES.in + +commit 9d18d2aafc3797bc03c4e7f7db5b9ffcada1ca7e +Author: Alexandre Franke +Date: 2013-03-10 + + Update French translation + +M po/fr.po + +commit bf4ff62cc56a2671daab25eba0ea344386902c2f +Author: Paolo Bacchilega +Date: 2013-03-08 + + require glib 2.34.0 or higher + +M configure.ac + +commit 425099054f634ca08c2d58e5a9d4f9c9193af08e +Author: Mario Blättermann +Date: 2013-03-06 + + [l10n] Updated German translation + +M po/de.po + +commit 09cdfb7d63a1ebe06c2c958446da55935be30241 +Author: Mario Blättermann +Date: 2013-03-06 + + [l10n] Updated German doc translation + +M help/de/de.po + +commit 7b7671b16ff605ba7c2b29e07ef2ff8673e862cc +Author: Paolo Bacchilega +Date: 2013-03-04 + + updated for version 3.1.4 + +M NEWS +M configure.ac + +commit e7ab554456088d0c712b25889ada7538eaf8c85a +Author: Aurimas Černius +Date: 2013-03-02 + + Updated Lithuanian translation + +M po/lt.po + +commit 60f3c9aaff2d6d51f1673284bd142466934fc7c1 +Author: Мирослав Николић +Date: 2013-02-20 + + Updated Serbian translation + +M po/sr.po +M po/sr@latin.po + +commit 72523b17f4e821f2ceee68f84269b50012098d10 +Author: Piotr Drąg +Date: 2013-02-17 + + Updated Polish translation + +M po/pl.po + +commit 3fe809b981e89b72357a299f5346da8e55b2cabc +Author: Paolo Bacchilega +Date: 2013-02-17 + + Fixed creation of blur thumbnails for jpeg images + +M extensions/cairo_io/cairo-image-surface-jpeg.c +M extensions/exiv2_tools/exiv2-utils.cpp + +commit 7aec51ac1c03e88b54890deb4b4fe0be06909c1f +Author: Rafael Ferreira +Date: 2013-02-16 + + Updated Brazilian Portuguese translation + +M po/pt_BR.po + +commit ad11ac7a5eae77e380f558282f85d4aca476068d +Author: Rafael Ferreira +Date: 2013-02-04 + + Updated Brazilian Portuguese translation + +M po/pt_BR.po + +commit cfd32962ed7bdc21f1aec27e621af3002e0448ed +Author: Matej Urbančič +Date: 2013-01-26 + + Updated Slovenian translation + +M po/sl.po + +commit 60262df17bcaeaf142c27470361873ac384a66e6 +Author: Daniel Mustieles +Date: 2013-01-24 + + Updated Spanish translation + +M po/es.po + +commit 3818f8fe6515be287ca6a48320873b1b79dd0716 +Author: Paolo Bacchilega +Date: 2013-01-22 + + updated for version 3.1.3 + +M NEWS +M configure.ac + +commit d5c5de0b3817ecdf58553a7c123cea7e3f1749d7 +Author: Paolo Bacchilega +Date: 2013-01-22 + + save task: use the file object to get the filename + +M gthumb/gth-save-image-task.c + +commit e08dea4115a607b0371e43b8917a6fb62d0604ca +Author: Paolo Bacchilega +Date: 2013-01-20 + + updated POTFILES.in + +M po/POTFILES.in + +commit c2adef0b1f3ff85c73d21305eb7010b4b51dba5f +Author: Paolo Bacchilega +Date: 2013-01-20 + + use a ui file to define the message dialog + +M gthumb/gthumb.gresource.xml +M gthumb/gtk-utils.c +M gthumb/gtk-utils.h +M gthumb/resources/Makefile.am +A gthumb/resources/message-dialog.ui + +commit 852a6a37bcf0f2b07c1b5b6096e6c77a584a6e9e +Author: Paolo Bacchilega +Date: 2013-01-20 + + do not show the delete confirmation dialog when no file is selected + +M extensions/file_manager/callbacks.c + +commit 8314cbefb03c3f71d37137de89b2bbe5eda88b5a +Author: Paolo Bacchilega +Date: 2013-01-20 + + added keybindings to delete files in catalog view + + control+delete => move to trash + shift+delete => delete from disk + +M extensions/file_manager/callbacks.c + +commit 36a910249217fd424693c95f154dff095ee1f632 +Author: Marek Černocký +Date: 2013-01-21 + + Updated Czech translation + +M po/cs.po + +commit 53513133cbd41c4326342ae4682bc55e44c78903 +Author: Marek Černocký +Date: 2013-01-21 + + Czech translation + +A help/cs/cs.po + +commit 42fc82f87903859a2f8c1c03fb8a97e92ce1a123 +Author: Marek Černocký +Date: 2013-01-21 + + Added Czech language + +M help/Makefile.am + +commit 0b6b326ffe011e5d6fc9afd6b5700e08f1949c88 +Author: Piotr Drąg +Date: 2013-01-20 + + Updated Polish translation + +M po/pl.po + +commit 8b05c94c7b2fe775a91695e5eab648d3b4509e9e +Author: Paolo Bacchilega +Date: 2013-01-19 + + fixed animations not running when zoommed out + +M gthumb/gth-image-dragger.c + +commit 498339ec6a89cc6e47cbfd4a39228956ac12ab93 +Author: Paolo Bacchilega +Date: 2013-01-19 + + fixed run-time warning about visible but unmapped children + +M gthumb/gth-browser.c + +commit 388887212c5b1be252604b0625a9f5aa113c0fc3 +Author: Paolo Bacchilega +Date: 2013-01-19 + + updated POTFILES.in + +M po/POTFILES.in + +commit 518d3c320179cb47e463a4195d3372f808538928 +Author: Paolo Bacchilega +Date: 2013-01-19 + + added a GthTask to save images asynchronously + +M extensions/desktop_background/actions.c +M extensions/gstreamer_tools/actions.c +M extensions/image_viewer/gth-image-viewer-page.c +M gthumb/Makefile.am +M gthumb/gth-image-saver.c +M gthumb/gth-image.h +M gthumb/gth-overwrite-dialog.h +A gthumb/gth-save-image-task.c +A gthumb/gth-save-image-task.h + +commit 7d256ccc309e9eab2f0db91a92667850482919f4 +Author: Paolo Bacchilega +Date: 2013-01-08 + + added a cancellable to the image saving function + +M extensions/cairo_io/gth-image-saver-jpeg.c +M extensions/cairo_io/gth-image-saver-png.c +M extensions/cairo_io/gth-image-saver-tga.c +M extensions/cairo_io/gth-image-saver-tiff.c +M extensions/cairo_io/gth-image-saver-webp.c +M extensions/contact_sheet/gth-contact-sheet-creator.c +M extensions/desktop_background/actions.c +M extensions/exiv2_tools/exiv2-utils.cpp +M extensions/facebook/facebook-service.c +M extensions/gstreamer_tools/actions.c +M extensions/image_rotation/rotation-utils.c +M extensions/image_viewer/gth-image-viewer-page.c +M extensions/webalbums/gth-web-exporter.c +M gthumb/gth-image-list-task.c +M gthumb/gth-image-saver.c +M gthumb/gth-image-saver.h +M gthumb/gth-image-utils.c + +commit c040259941253d34d78e7f3bef6e4ff8908425b9 +Author: Саша Петровић +Date: 2013-01-12 + + Added Serbian translation + +M po/LINGUAS +M po/sr.po +A po/sr@latin.po + +commit 88098687c1e86c037da22aff3982d56831d201a7 +Author: Matej Urbančič +Date: 2013-01-10 + + Updated Slovenian translation + +M po/sl.po + +commit e26be907a109725ca0803c3b3a56494fac5c1210 +Author: Dominique Leuenberger +Date: 2013-01-07 + + webp: Big-Endian: fix type. + + Fix bug 691309. + +M extensions/cairo_io/cairo-image-surface-webp.c + +commit 8f41dc6dfd2c870a9f31552ee6ec0245016adaa7 +Author: Paolo Bacchilega +Date: 2013-01-05 + + web album export produces invalid HTML + + removed a double " + + [bug #691123] + +M extensions/webalbums/data/albumthemes/Classic/image.gthtml +M extensions/webalbums/data/albumthemes/ClassicClips/image.gthtml +M extensions/webalbums/data/albumthemes/NeatRound/image.gthtml +M extensions/webalbums/data/albumthemes/Wiki/image.gthtml + +commit ce6aabd0c9372f22339866aa664df620fbcefb20 +Author: Paolo Bacchilega +Date: 2012-12-31 + + selections: pressing control-n again goes back to the previous view + +M extensions/selections/actions.c +M gthumb/gth-browser.c +M gthumb/gth-browser.h +M gthumb/gth-file-list.c +M gthumb/gth-file-list.h +M gthumb/gth-file-view.c +M gthumb/gth-file-view.h +M gthumb/gth-grid-view.c + +commit 27cf36cf6142a1ff3ef74a4d634a66fa5e4ddbae +Author: Paolo Bacchilega +Date: 2012-12-31 + + folder tree: update the locations to monitor after a timeout + + this reduces computation during a rapid series of node expansions and + collapses. + +M gthumb/gth-folder-tree.c + +commit a373166e5f5f2774656bd64dd73c9f6534d6ab8b +Author: Paolo Bacchilega +Date: 2012-12-31 + + folder tree: fixed some memory leak + +M gthumb/gth-folder-tree.c + +commit c72e78ea53894df02a8df0c46fb15cd4d56b1d28 +Author: Paolo Bacchilega +Date: 2012-12-31 + + folder tree: do not change the hash table while iterating through + the keys + +M gthumb/gth-folder-tree.c + +commit 899a22a80eabe4b74c55d0b1a4d7d0fc538837f5 +Author: Paolo Bacchilega +Date: 2012-12-30 + + folder tree: remove all the monitored location when finalizing + +M gthumb/gth-folder-tree.c + +commit 2a789bb1cdea71d89d194fef44b1f759fa61f276 +Author: Paolo Bacchilega +Date: 2012-12-30 + + monitor all the expanded locations in the folder tree + +M gthumb/gth-folder-tree.c + +commit dc2fd4093737bdd6e0ccc40f8d5389f895fdf8c5 +Author: Paolo Bacchilega +Date: 2012-12-29 + + browser: recalculate the available free space only after changing + location + +M gthumb/gth-browser.c + +commit 66f6ea5af48fd0b93128ca7779f20f88b27eb6b6 +Author: Paolo Bacchilega +Date: 2012-12-29 + + browser: update the sensitivity after expanding a folder + +M gthumb/gth-browser.c + +commit de9dbe72365017f6603542145475fb31bf349d47 +Author: Paolo Bacchilega +Date: 2012-12-29 + + folder tree: removed gth_folder_tree_construct + + moved the instruction into gth_folder_tree_init + +M gthumb/gth-folder-tree.c + +commit bcc0ed40c2bc05aef78b28ed73becb13196bc4d6 +Author: Paolo Bacchilega +Date: 2012-12-29 + + folder tree: do not allow to expand a duplicate of an entry point + +M gthumb/gth-folder-tree.c + +commit 63dc03001167271be3e223785bce7b6633070ccb +Author: Balázs Úr +Date: 2012-12-29 + + Updated Hungarian translation + +M po/hu.po + +commit e9aa520d1b0ef8fe9cc6b5d6ef33ef037826b7eb +Author: Paolo Bacchilega +Date: 2012-12-29 + + allow to delete the tags from the default tag list + + tags can be deleted using the delete key or from the context menu. + + [new feature] + +M gthumb/gth-tags-entry.c + +commit acd88d3f14ae8b8127e174d1b07e907e504ae018 +Author: Daniel Mustieles +Date: 2012-12-25 + + Updated Spanish translation + +M po/es.po + +commit 39a36a60c673e7ebc41672b5de3ff17b902564d1 +Author: Piotr Drąg +Date: 2012-12-23 + + Updated Polish translation + +M po/pl.po + +commit 420ba994a5b65b2aa048082eeafde33940bab902 +Author: Paolo Bacchilega +Date: 2012-12-23 + + updated POTFILES.in + +M po/POTFILES.in + +commit 852132c1d84fd8dde3f56ef27f5f0842deadb382 +Author: Paolo Bacchilega +Date: 2012-12-23 + + added oauth as a dependency for the extensions that require it + +M extensions/flicker_utils/Makefile.am +M extensions/flicker_utils/dlg-import-from-flickr.c +M extensions/flicker_utils/flicker_utils.extension.in.in +M extensions/picasaweb/Makefile.am +M extensions/picasaweb/picasaweb.extension.in.in + +commit e0500da093139cab277f2517b1021ac27148a35c +Author: Paolo Bacchilega +Date: 2012-12-23 + + web importers: use symbolic icons in the dialogs, removed the + help button + +M extensions/flicker_utils/data/ui/export-to-flickr.ui +M extensions/flicker_utils/data/ui/import-from-flickr.ui +M extensions/photobucket/data/ui/export-to-photobucket.ui +M extensions/picasaweb/data/ui/import-from-picasaweb.ui + +commit b6b75dbb075e423c787d3db343480340090310f2 +Author: Paolo Bacchilega +Date: 2012-12-23 + + facebook: added ability to import photos + + [new feature] + +M extensions/facebook/Makefile.am +M extensions/facebook/actions.c +M extensions/facebook/actions.h +M extensions/facebook/callbacks.c +M extensions/facebook/data/ui/Makefile.am +A extensions/facebook/data/ui/import-from-facebook.ui +A extensions/facebook/dlg-import-from-facebook.c +C074 extensions/facebook/actions.h +extensions/facebook/dlg-import-from-facebook.h +M extensions/facebook/facebook-photo.c +M extensions/facebook/facebook-photo.h +M extensions/facebook/facebook-service.c +M extensions/facebook/facebook-service.h +M extensions/facebook/facebook.extension.in.in +M gthumb/gth-time.c +M gthumb/gth-time.h + +commit 7a66f5e1a10b8987f5b6c599bcff47b2841060d8 +Author: Piotr Drąg +Date: 2012-12-23 + + Updated Polish translation + +M po/pl.po + +commit 8bf599bb44efe62702556d646980e28ccf8c88bd +Author: Paolo Bacchilega +Date: 2012-12-22 + + updated POTFILES.in + +M po/POTFILES.in + +commit 52f0b8b876447f1d3604116c96758fd95f4f2645 +Author: Paolo Bacchilega +Date: 2012-12-22 + + oauth dialog: no need to disconnect from the view + +M extensions/oauth/oauth-ask-authorization-dialog.c + +commit 62035da9e4d8d0f4e269738c78a4733a69e68be9 +Author: Paolo Bacchilega +Date: 2012-12-22 + + flickr: fixed signature + +M extensions/flicker_utils/flickr-service.c + +commit 3b6dc75d8bd722071e78f3c02400daffceec0b51 +Author: Paolo Bacchilega +Date: 2012-12-22 + + progress dialog: use a smoother pulse + +M gthumb/gth-progress-dialog.c + +commit 26a41dcfd5c43e6580c43c1e506cd97936822651 +Author: Paolo Bacchilega +Date: 2012-12-22 + + web services: set a void message before starting the photo upload + +M extensions/facebook/facebook-service.c +M extensions/photobucket/photobucket-service.c +M extensions/picasaweb/picasa-web-service.c + +commit 93093602c894af80f48e3e937114eb1ce8373eb8 +Author: Paolo Bacchilega +Date: 2012-12-22 + + 23hq.com: fixed authentication + +M extensions/23hq/actions.c +M extensions/flicker/actions.c +M extensions/flicker_utils/data/ui/Makefile.am +D extensions/flicker_utils/data/ui/flicker-ask-authorization.ui +R074 extensions/flicker_utils/data/ui/flicker-complete-authorization.ui +extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui +M extensions/flicker_utils/flickr-service.c +M extensions/flicker_utils/flickr-types.h +M extensions/oauth/data/ui/Makefile.am +D extensions/oauth/data/ui/oauth-complete-authorization.ui + +commit 6f88bc093e41ef80e1a40b55c79f2ac32aa2b2bb +Author: Paolo Bacchilega +Date: 2012-12-22 + + web services: hide the authorization dialog after receiving the + callback + +M extensions/oauth/oauth-service.c +M extensions/picasaweb/picasa-web-service.c + +commit 6259551ef903b8ed0c2239387d03c12f9f179923 +Author: Paolo Bacchilega +Date: 2012-12-22 + + oauth authorization dialog: show the loading activity + +M extensions/oauth/data/ui/oauth-ask-authorization.ui +M extensions/oauth/oauth-ask-authorization-dialog.c + +commit 7b3c7d5d5938e0ba616f1c8eb80632579f7b3299 +Author: Paolo Bacchilega +Date: 2012-12-20 + + facebook authorization: use a default width of 1024 pixels + +M extensions/facebook/facebook-service.c + +commit 1c2e118e41ec827e4aa3b4db2d6cad279adaf49e +Author: Paolo Bacchilega +Date: 2012-12-20 + + do not print a warning when the secret has a wrong format + +M extensions/oauth/web-service.c + +commit 44ae028a588c565776be6e3957300e0c130c0b8a +Author: Paolo Bacchilega +Date: 2012-12-20 + + photobucket: fixed authorization process + +M extensions/oauth/oauth-ask-authorization-dialog.c +M extensions/oauth/oauth-service.c +M extensions/photobucket/photobucket-consumer.c +M extensions/photobucket/photobucket-service.c + +commit 2f10ed46e7a4009aaf7f552702a8329d5e0c8e86 +Author: Paolo Bacchilega +Date: 2012-12-20 + + photobucket-account: added some properties to simplify the code + +M extensions/photobucket/photobucket-account.c +M extensions/photobucket/photobucket-consumer.c + +commit b21c2e6f8900eb5484e708305b7aa6c351e1ee5b +Author: Paolo Bacchilega +Date: 2012-12-20 + + moved some common code to oauth-service.c + +M extensions/flicker_utils/flickr-consumer.c +M extensions/oauth/oauth-consumer.c +M extensions/oauth/oauth-consumer.h +M extensions/oauth/oauth-service.c +M extensions/photobucket/photobucket-consumer.c + +commit 18bd7a0476783439c55afcfcfec054f2c48adb88 +Author: Paolo Bacchilega +Date: 2012-12-20 + + oauth service: removed debug code + +M extensions/oauth/oauth-service.c + +commit bf4847a637c75cf1c7ee75160b06b0db144c88a6 +Author: Paolo Bacchilega +Date: 2012-12-20 + + destroy the progress dialog when closing the export/import dialogs. + +M extensions/facebook/dlg-export-to-facebook.c +M extensions/flicker_utils/dlg-export-to-flickr.c +M extensions/flicker_utils/dlg-import-from-flickr.c +M extensions/photobucket/dlg-export-to-photobucket.c +M extensions/picasaweb/dlg-export-to-picasaweb.c +M extensions/picasaweb/dlg-import-from-picasaweb.c + +commit f98a2a00f90c855cb519458ef08663c5c7bccb1a +Author: Paolo Bacchilega +Date: 2012-12-20 + + web service: set the task description when asking for authorization + +M extensions/oauth/web-service.c + +commit 9b722df6ef109f54d58a99c4250f3ea421b3cf45 +Author: Paolo Bacchilega +Date: 2012-12-20 + + call gth_task_dialog when setting the authorization dialog + +M extensions/facebook/facebook-service.c +M extensions/oauth/oauth-service.c +M extensions/oauth/web-service.c +M extensions/picasaweb/picasa-web-service.c + +commit 92bd57a30ce3e8b3d8127b9c8cae0327c58c3cbb +Author: Paolo Bacchilega +Date: 2012-12-20 + + progress dialog: show an error dialog if a task fails + +M gthumb/gth-progress-dialog.c + +commit 85e14e86758f2a1248e155f05cda7dbf99e69c91 +Author: Paolo Bacchilega +Date: 2012-12-19 + + flickr: fixed FlickrSafety values + +M extensions/flicker_utils/flickr-types.h + +commit eae978899b73eafe08f9313fee7142f8b4c8c981 +Author: Paolo Bacchilega +Date: 2012-12-19 + + Flickr: use the OAuth based authentication process + +M extensions/23hq/actions.c +M extensions/facebook/facebook-service.c +M extensions/flicker/actions.c +M extensions/flicker_utils/Makefile.am +M extensions/flicker_utils/data/ui/Makefile.am +D extensions/flicker_utils/data/ui/flicker-account-chooser.ui +D extensions/flicker_utils/data/ui/flicker-account-manager.ui +M extensions/flicker_utils/dlg-export-to-flickr.c +M extensions/flicker_utils/dlg-import-from-flickr.c +D extensions/flicker_utils/flickr-account-chooser-dialog.c +D extensions/flicker_utils/flickr-account-chooser-dialog.h +D extensions/flicker_utils/flickr-account-manager-dialog.c +D extensions/flicker_utils/flickr-account-manager-dialog.h +M extensions/flicker_utils/flickr-account.c +M extensions/flicker_utils/flickr-account.h +D extensions/flicker_utils/flickr-authentication.c +D extensions/flicker_utils/flickr-authentication.h +D extensions/flicker_utils/flickr-connection.c +D extensions/flicker_utils/flickr-connection.h +A extensions/flicker_utils/flickr-consumer.c +C068 extensions/photobucket/photobucket-consumer.h +extensions/flicker_utils/flickr-consumer.h +M extensions/flicker_utils/flickr-service.c +M extensions/flicker_utils/flickr-service.h +M extensions/flicker_utils/flickr-types.h +D extensions/flicker_utils/flickr-user.c +D extensions/flicker_utils/flickr-user.h +M extensions/oauth/Makefile.am +M extensions/oauth/oauth-account.c +M extensions/oauth/oauth-account.h +R061 extensions/oauth/oauth2-ask-authorization-dialog.c +extensions/oauth/oauth-ask-authorization-dialog.c +A extensions/oauth/oauth-ask-authorization-dialog.h +D extensions/oauth/oauth-authentication.c +D extensions/oauth/oauth-authentication.h +D extensions/oauth/oauth-connection.c +D extensions/oauth/oauth-connection.h +C050 extensions/oauth/oauth.h extensions/oauth/oauth-consumer.c +A extensions/oauth/oauth-consumer.h +A extensions/oauth/oauth-service.c +A extensions/oauth/oauth-service.h +M extensions/oauth/oauth.h +D extensions/oauth/oauth2-ask-authorization-dialog.h +M extensions/oauth/web-service.c +M extensions/oauth/web-service.h +M extensions/photobucket/dlg-export-to-photobucket.c +M extensions/photobucket/photobucket-account.c +M extensions/photobucket/photobucket-consumer.c +M extensions/photobucket/photobucket-consumer.h +M extensions/photobucket/photobucket-service.c +M extensions/photobucket/photobucket-service.h +M extensions/picasaweb/picasa-web-service.c +M po/POTFILES.in + +commit 58879e533b6a006a097e994a46268b712ca41db5 +Author: Paolo Bacchilega +Date: 2012-12-16 + + picasa web: fixed dialog spacing + +M extensions/picasaweb/data/ui/export-to-picasaweb.ui +M extensions/picasaweb/data/ui/import-from-picasaweb.ui + +commit 3ce7c6a97312ab5b2649f44abe941d090c9f83e5 +Author: Paolo Bacchilega +Date: 2012-12-16 + + picasa web importer: fixed account list + +M extensions/picasaweb/data/ui/import-from-picasaweb.ui +M extensions/picasaweb/dlg-import-from-picasaweb.c + +commit fac9f435a899d9de9e0fa2d71f6e6a5675a9365c +Author: Paolo Bacchilega +Date: 2012-12-16 + + picasaweb: use the oauth2 authentication process + +M extensions/facebook/facebook-service.c +M extensions/oauth/oauth2-ask-authorization-dialog.c +M extensions/oauth/oauth2-ask-authorization-dialog.h +M extensions/oauth/web-service.c +M extensions/oauth/web-service.h +M extensions/picasaweb/Makefile.am +M extensions/picasaweb/data/ui/Makefile.am +M extensions/picasaweb/data/ui/export-to-picasaweb.ui +D extensions/picasaweb/data/ui/picasa-web-account-chooser.ui +D extensions/picasaweb/data/ui/picasa-web-account-manager.ui +D extensions/picasaweb/data/ui/picasa-web-account-properties.ui +M extensions/picasaweb/dlg-export-to-picasaweb.c +M extensions/picasaweb/dlg-import-from-picasaweb.c +D extensions/picasaweb/google-connection.c +D extensions/picasaweb/google-connection.h +D extensions/picasaweb/picasa-account-chooser-dialog.c +D extensions/picasaweb/picasa-account-chooser-dialog.h +D extensions/picasaweb/picasa-account-manager-dialog.c +D extensions/picasaweb/picasa-account-manager-dialog.h +D extensions/picasaweb/picasa-account-properties-dialog.c +D extensions/picasaweb/picasa-account-properties-dialog.h +M extensions/picasaweb/picasa-web-service.c +M extensions/picasaweb/picasa-web-service.h +D extensions/picasaweb/picasa-web-user.c +D extensions/picasaweb/picasa-web-user.h +M po/POTFILES.in + +commit ec2de88225c15427e8f2b553467f1ea79ff5115c +Author: Paolo Bacchilega +Date: 2012-12-15 + + web-service: use the service name when storing the secret + +M extensions/oauth/web-service.c + +commit bb868fe13165a3e97a042f893bb7973391f7f860 +Author: Paolo Bacchilega +Date: 2012-12-15 + + updated POTFILES.in + +M po/POTFILES.in + +commit f13f9079260645771fb15e849379e599cb5bf1fa +Author: Paolo Bacchilega +Date: 2012-12-15 + + facebook: moved some code to a generic WebService class + +M extensions/facebook/Makefile.am +M extensions/facebook/dlg-export-to-facebook.c +D extensions/facebook/facebook-authentication.c +D extensions/facebook/facebook-authentication.h +D extensions/facebook/facebook-connection.c +D extensions/facebook/facebook-connection.h +M extensions/facebook/facebook-service.c +M extensions/facebook/facebook-service.h +D extensions/facebook/facebook-user.c +D extensions/facebook/facebook-user.h +M extensions/oauth/Makefile.am +M extensions/oauth/oauth-account.c +M extensions/oauth/oauth.h +M extensions/oauth/oauth2-ask-authorization-dialog.c +M extensions/oauth/oauth2-ask-authorization-dialog.h +A extensions/oauth/web-service.c +A extensions/oauth/web-service.h + +commit 6d34533b3c68cd7659ba510b7c3c8e77135dd01f +Author: Paolo Bacchilega +Date: 2012-12-13 + + media viewer: wait for the state change to complete when setting a + new uri + +M extensions/gstreamer_tools/gth-media-viewer-page.c + +commit 52fa16bfc3bf6c4a5e05d3685478a8c0f13401ee +Author: Paolo Bacchilega +Date: 2012-12-13 + + media viewer: update the ui in an idle callback to avoid threading + problems + +M extensions/gstreamer_tools/gth-media-viewer-page.c + +commit ecb9b3f7142c8367a22ef1ea101672fea03d04e2 +Author: Paolo Bacchilega +Date: 2012-12-12 + + gstreamer: set the state to NULL before destroying the playbin + +M extensions/gstreamer_tools/gth-media-viewer-page.c + +commit 2b3a0492267d5b5bc4e0533ada01578f931e7cd7 +Author: Paolo Bacchilega +Date: 2012-12-12 + + facebook: use the common oauth account manager, instead of a + custom one + +M extensions/facebook/Makefile.am +M extensions/facebook/data/ui/Makefile.am +D extensions/facebook/data/ui/facebook-account-chooser.ui +D extensions/facebook/data/ui/facebook-account-manager.ui +M extensions/facebook/dlg-export-to-facebook.c +D extensions/facebook/facebook-account-chooser-dialog.c +D extensions/facebook/facebook-account-chooser-dialog.h +D extensions/facebook/facebook-account-manager-dialog.c +D extensions/facebook/facebook-account-manager-dialog.h +D extensions/facebook/facebook-account.c +D extensions/facebook/facebook-account.h +M extensions/facebook/facebook-authentication.c +M extensions/facebook/facebook-authentication.h +M extensions/facebook/facebook-service.c +M extensions/facebook/facebook-service.h +M extensions/oauth/Makefile.am +M extensions/oauth/data/ui/oauth-account-manager.ui +M extensions/oauth/oauth-account-manager-dialog.c +M extensions/oauth/oauth-account.c +M extensions/oauth/oauth-account.h +M extensions/oauth/oauth-authentication.c +A extensions/oauth/oauth.h +M extensions/oauth/oauth2-ask-authorization-dialog.c +M extensions/photobucket/photobucket-account.c +M extensions/photobucket/photobucket-consumer.c + +commit d5cbcc43120090b97c619c43f5a013e1d67351f9 +Author: Paolo Bacchilega +Date: 2012-12-11 + + facebook: use the OAuth2 authentication method and the Graph API + +M configure.ac +M extensions/facebook/Makefile.am +M extensions/facebook/data/ui/Makefile.am +M extensions/facebook/data/ui/export-to-facebook.ui +M extensions/facebook/data/ui/facebook-account-manager.ui +M extensions/facebook/data/ui/facebook-album-properties.ui +D extensions/facebook/data/ui/facebook-ask-authorization.ui +D extensions/facebook/data/ui/facebook-complete-authorization.ui +M extensions/facebook/dlg-export-to-facebook.c +M extensions/facebook/facebook-account.c +M extensions/facebook/facebook-account.h +M extensions/facebook/facebook-album-properties-dialog.c +M extensions/facebook/facebook-album-properties-dialog.h +M extensions/facebook/facebook-album.c +M extensions/facebook/facebook-album.h +M extensions/facebook/facebook-authentication.c +M extensions/facebook/facebook-authentication.h +M extensions/facebook/facebook-connection.c +M extensions/facebook/facebook-connection.h +M extensions/facebook/facebook-service.c +M extensions/facebook/facebook-service.h +M extensions/facebook/facebook-user.c +M extensions/facebook/facebook-user.h +M extensions/facebook/facebook.extension.in.in +M extensions/oauth/Makefile.am +M extensions/oauth/data/ui/Makefile.am +A extensions/oauth/oauth2-ask-authorization-dialog.c +A extensions/oauth/oauth2-ask-authorization-dialog.h +M gthumb/Makefile.am + +commit d101c61fe075fd363612013db0ec783588fe04dd +Author: Paolo Bacchilega +Date: 2012-12-09 + + check for json_glib and webkit2 + +M configure.ac +M gthumb/Makefile.am + +commit 39dc6a7b28044594da2ff01dfa9d51a6e7ab6a6c +Author: Paolo Bacchilega +Date: 2012-12-09 + + allow to change comment if the "Store metadata in files" option is + not active + + update the .comment metadata with the embedded metadata only when + the embedded metadata is read for + the first time and no .comment data is available. + +M extensions/Makefile.am +M extensions/comments/Makefile.am +M extensions/comments/gth-comment.c +M extensions/comments/gth-comment.h +M extensions/comments/gth-import-metadata-task.c +M extensions/comments/gth-metadata-provider-comment.c +M extensions/comments/main.c +M extensions/exiv2_tools/exiv2-utils.cpp +M extensions/exiv2_tools/exiv2-utils.h +M extensions/exiv2_tools/gth-metadata-provider-exiv2.c +M extensions/exiv2_tools/main.c +M extensions/importer/gth-import-task.c + +commit f9d7ad0b228031a7f143c7f199d11896af491b0a +Author: Paolo Bacchilega +Date: 2012-12-07 + + POTFILES.in updated + +M po/POTFILES.in + +commit c10105a26e978140cbb44348d93d1a7ea0851ba5 +Author: Paolo Bacchilega +Date: 2012-12-07 + + save and restore the thumbnail list size + + [new feature] + +M data/org.gnome.gthumb.gschema.xml.in +M gthumb/Makefile.am +M gthumb/gth-browser.c +A gthumb/gth-paned.c +A gthumb/gth-paned.h +M gthumb/gth-preferences.h +M gthumb/gtk-utils.c +M gthumb/gtk-utils.h + +commit 7a85ec3d180a4ccc6dcad344b60fb8ca1add7d18 +Author: Paolo Bacchilega +Date: 2012-12-07 + + fixed the GthAutoPaned macro names + +M gthumb/gth-auto-paned.c +M gthumb/gth-auto-paned.h + +commit f30c6d6c3cdf5a26061f8abd048fe6e55add59d0 +Author: Paolo Bacchilega +Date: 2012-12-07 + + added gth_file_list_get_mode renamed GthFileListType + +M extensions/catalogs/gth-organize-task.c +M extensions/facebook/dlg-export-to-facebook.c +M extensions/find_duplicates/gth-find-duplicates.c +M extensions/flicker_utils/dlg-export-to-flickr.c +M extensions/flicker_utils/dlg-import-from-flickr.c +M extensions/photo_importer/dlg-photo-importer.c +M extensions/photobucket/dlg-export-to-photobucket.c +M extensions/picasaweb/dlg-export-to-picasaweb.c +M extensions/picasaweb/dlg-import-from-picasaweb.c +M gthumb/gth-browser.c +M gthumb/gth-file-list.c +M gthumb/gth-file-list.h + +commit 7deaeefdf66e06d40cfa961cdaf85984c7e236fc +Author: Piotr Drąg +Date: 2012-12-02 + + Updated POTFILES.in + +M po/POTFILES.in + +commit 87b9db7956771aa25a009ab572efe3b1c24dee5c +Author: Paolo Bacchilega +Date: 2012-11-11 + + use a smaller max zoom factor to enhance the viewer zoom quality + +M gthumb/cairo-scale.h + +commit 77e472b305125af9744c9698c0904d7afc75d29a +Author: Paolo Bacchilega +Date: 2012-11-11 + + media viewer: set the state to READY instead of NULL when deactivating + +M extensions/gstreamer_tools/gth-media-viewer-page.c + +commit c928a684bcf8d055cc1e76ad8569d7a7846dc039 +Author: Paolo Bacchilega +Date: 2012-11-04 + + ported to libsecret + +M configure.ac +M extensions/23hq/Makefile.am +M extensions/facebook/Makefile.am +M extensions/facebook/facebook-account.c +M extensions/facebook/facebook-authentication.c +M extensions/flicker/Makefile.am +M extensions/flicker_utils/Makefile.am +M extensions/flicker_utils/flickr-account.c +M extensions/flicker_utils/flickr-authentication.c +M extensions/oauth/Makefile.am +M extensions/oauth/oauth-account.c +M extensions/oauth/oauth-authentication.c +M extensions/photobucket/Makefile.am +M extensions/picasaweb/Makefile.am +M extensions/picasaweb/dlg-export-to-picasaweb.c +M extensions/picasaweb/dlg-import-from-picasaweb.c +M gthumb/Makefile.am + +commit 4f59302781a36a781546d9f950caa8e9295f9510 +Author: Paolo Bacchilega +Date: 2012-11-04 + + do not include rsvg-cairo.h explictly + +M extensions/cairo_io/cairo-image-surface-svg.c + +commit dc7852a156014b3c147896aa55dcf67f01a17731 +Author: Paolo Bacchilega +Date: 2012-11-04 + + removed the us of GDK_THREADS_ENTER/LEAVE macros + +M extensions/file_manager/callbacks.c +M gthumb/gth-grid-view.c +M gthumb/gth-image-selector.c + +commit d8491068ede6ddd3c7777d2ce8d89b8d9cbac457 +Author: Paolo Bacchilega +Date: 2012-11-04 + + window layout: use a GtkGrid instead of a GtkTable + +M gthumb/gth-window.c + +commit e5043ecd3a4d35f707c02727aee441261d258679 +Author: Paolo Bacchilega +Date: 2012-11-04 + + use g_thread_new instead of g_thread_create + +M gthumb/gth-async-task.c + +commit 4a5a56af363a0145564059c20f43e65f91b5b357 +Author: Paolo Bacchilega +Date: 2012-11-04 + + use GdkRGBA instead of cairo_color_t + +M extensions/contact_sheet/dlg-image-wall.c +M extensions/file_tools/cairo-rotate.c +M extensions/file_tools/cairo-rotate.h +M extensions/file_tools/gth-file-tool-rotate.c +M extensions/file_tools/gth-image-rotator.c +M extensions/file_tools/gth-image-rotator.h +M extensions/file_tools/gth-preview-tool.c +M gthumb/cairo-utils.c +M gthumb/cairo-utils.h + +commit 742b8428b61db296a4119443857985744f573572 +Author: Paolo Bacchilega +Date: 2012-11-04 + + removed the use of g_mutex_new + +M extensions/selections/gth-selections-manager.c +M gthumb/gnome-desktop-thumbnail.c +M gthumb/gth-async-task.c +M gthumb/gth-hook.c + +commit db14af0b1ad02796a2ab50ca43ec948ed787d0f9 +Author: Paolo Bacchilega +Date: 2012-11-04 + + using GdkRGBA instead of GdkColor + +M extensions/contact_sheet/gth-contact-sheet-creator.c +M extensions/contact_sheet/gth-contact-sheet-theme-dialog.c +M extensions/contact_sheet/gth-contact-sheet-theme.c +M extensions/contact_sheet/gth-contact-sheet-theme.h +M gthumb/cairo-utils.c +M gthumb/cairo-utils.h + +commit 50f97dd3e8d25e2800992336acbd2f98482b3376 +Author: Paolo Bacchilega +Date: 2012-11-04 + + video viewer: fixed progress bar for gtk 3.6 + + when clicking on the progress bar jump to the specified + position directly + +M extensions/gstreamer_tools/gth-media-viewer-page.c + +commit e82783c21b6c51dd76f0845e51c9854cbf2ead66 +Author: Paolo Bacchilega +Date: 2012-11-04 + + ported to gstreamer 1.0 + +M configure.ac +M extensions/gstreamer_tools/gth-media-viewer-page.c +M extensions/gstreamer_utils/Makefile.am +M extensions/gstreamer_utils/gstreamer-utils.c +D extensions/gstreamer_utils/gstscreenshot.c +D extensions/gstreamer_utils/gstscreenshot.h + +commit b7933b3d7dc3a164df4fe699dbf285307d710def +Author: Paolo Bacchilega +Date: 2012-11-04 + + add GST_DISABLE_DEPRECATED to CFLAGS when using --disable-deprecated + +M configure.ac + +commit 7520dbd13b6ad98139dc981ab06db5d45cf33659 +Author: Piotr Drąg +Date: 2012-11-27 + + Updated Polish translation + +M po/pl.po + +commit e85acd4f54a33a778abab3507a0e4932448865df +Author: Paolo Bacchilega +Date: 2012-11-04 + + rename dialog: set the focus to the template field when renaming + multiple files + +M extensions/rename_series/dlg-rename-series.c + +commit f4db46b1d2eb050b03b4c8ed343182b2e6c0ed2c +Author: Paolo Bacchilega +Date: 2012-11-04 + + import preferences: removed dialog title + +M extensions/importer/data/ui/import-preferences.ui + +commit 342699666dde433cdeeb6ca1fdda19a45f357e63 +Author: Paolo Bacchilega +Date: 2012-11-04 + + import task: always read the image if the orientation adjustment + is requested + +M extensions/importer/gth-import-task.c + +commit 91be68f086f48ab6ef8de560bd827e4a509c3dc8 +Author: Paolo Bacchilega +Date: 2012-11-03 + + import task: rotate the image before saving + + Instead of saving the image and then rotating, rotate the + image in memory and then save. + +M extensions/importer/gth-import-task.c + +commit efa72ef92301cced06a5a8ad3f56fce4b5947faf +Author: Paolo Bacchilega +Date: 2012-11-03 + + do not use a shadow for the statusbar frames + +M gthumb/gth-statusbar.c + +commit aedc85a7948e98912fa6cf83f1836f4f8ce39a6e +Author: Paolo Bacchilega +Date: 2012-10-31 + + fixed the thumbnail color in gtk 3.6 + +M gthumb/resources/gthumb.css + +commit a6e43298d0dd2212d4210cb507c77d33318f14ae +Author: Paolo Bacchilega +Date: 2012-10-31 + + empty list: fix the widget style using the css + + using a scrolled window as parent causes some problems + +M gthumb/gth-empty-list.c +M gthumb/gth-empty-list.h +M gthumb/resources/gthumb.css + +commit 86beec3ace3a19299f10d14dfdb4c917c3290b66 +Author: Daniel Mustieles +Date: 2012-10-28 + + Updated Spanish translation + +M help/es/es.po + +commit c81f689a5ccec461045b4f2ca0ba0ec70fbf96c6 +Author: Paolo Bacchilega +Date: 2012-10-28 + + image rotation: read the orientation even when not using jpegtran + +M extensions/image_rotation/rotation-utils.c + +commit 286d6398d53e802becea0ab7decdcf475da59ecf +Author: Paolo Bacchilega +Date: 2012-10-28 + + added some generated files to MAINTAINERCLEANFILES + +M Makefile.am + +commit 8977ee6fb80b38da21346a5ff3dda8e6c47b9e15 +Author: Paolo Bacchilega +Date: 2012-10-28 + + album-theme-format.txt is not part of the help pages + +M help/Makefile.am + +commit a1d26aef2b54114b45248e5309e8b1446f921950 +Author: Oliver Propst +Date: 2012-09-30 + + Use new yelp-tools instead of gnome-doc-utils + +M Makefile.am +M autogen.sh +M configure.ac +M git.mk +M help/ChangeLog +M help/Makefile.am +M help/el/el.po +M help/es/es.po +M help/oc/oc.po +M help/sl/sl.po +M help/sv/sv.po + +commit 9550f5c218b445f66d411dc5ce9a5ae7de440772 +Author: Paolo Bacchilega +Date: 2012-10-21 + + fixed gth_pixbuf_new_from_file partially loading images + + there is no way to respect the requested_size option here, just + ignore it. + +M gthumb/pixbuf-io.c + +commit 8888d906037b57add45ed3bc488c82fec36769ee +Author: Paolo Bacchilega +Date: 2012-10-21 + + fixed thumbnail generation for rotated images + + prefer the internal loader for jpeg images to load rotated images + correctly. + +M gthumb/gnome-desktop-thumbnail.c +M gthumb/gth-thumb-loader.c + +commit e680ac55e0a71505e115c5871f46b3c9387f3c73 +Author: Taijuin +Date: 2012-10-16 + + Updated Traditional Chinese translation(Hong Kong and Taiwan) + +M po/zh_HK.po +M po/zh_TW.po + +commit ac40eb2593064dcf3851d61c6b4a84ee5ec1ab60 +Author: Paolo Bacchilega +Date: 2012-10-15 + + updated for version 3.1.2 + +M NEWS +M configure.ac + +commit 5c0f3ad16761967d7286d52337febc5703403a8f +Author: Rūdolfs Mazurs +Date: 2012-10-13 + + Updated Latvian translation + +M po/lv.po + +commit ddd9becf669d3ff3c6a57d17a4a69957e5776de9 +Author: Paolo Bacchilega +Date: 2012-10-08 + + configure: use gdk-3.0 to check the GDK target + + [bug #685674] + +M configure.ac + +commit 576322bf9ed6d3e27c96689fe1eb43afedcc1bdb +Author: Ihar Hrachyshka +Date: 2012-10-02 + + Deleted obsolete Belarusian translation. + +M po/LINGUAS +D po/be.po + +commit 43aa2431e15c42a1b591825e6fc3656c316755d4 +Author: Paolo Bacchilega +Date: 2012-09-30 + + cairo scale: use a bigger value as epsilon + +M gthumb/cairo-scale.c + +commit ac0cdd9b9e54f44609199633e6f40d2ad0de30aa +Author: Paolo Bacchilega +Date: 2012-09-30 + + fixed scaling producing a black image + + define gfixed as gint64 to make it work on 32 bit systems as well + +M gthumb/gfixed.h + +commit 485ab689d322fd17b987e141d7b68846b49f436a +Author: Paolo Bacchilega +Date: 2012-09-23 + + updated for version 3.1.1 + +M NEWS +M configure.ac + +commit fa9609cbf8558820a22a93e86f683ba6c094abed +Author: Paolo Bacchilega +Date: 2012-09-23 + + keep the Tools button always sensitive + +M extensions/image_viewer/gth-image-viewer-page.c +M gthumb/gth-browser.c + +commit 8519288adf2cf2d40a62b66c44ca4d3604ffb4f0 +Author: Paolo Bacchilega +Date: 2012-09-19 + + indentation and spaces + +M extensions/file_tools/gth-file-tool-grayscale.c +M extensions/file_tools/gth-file-tool-sharpen.c + +commit 14e88f1471a2fce5781c6d543ab99adb392e424c +Author: Paolo Bacchilega +Date: 2012-09-19 + + simplified the 'adjust contrast' icon + +M data/icons/hicolor/16x16/actions/tool-adjust-contrast.png +M data/icons/hicolor/22x22/actions/tool-adjust-contrast.png +M data/icons/hicolor/scalable/actions/tool-adjust-contrast.svg + +commit d3420d2b6b92280eab79a0005f4f1d7a9c30a5cf +Author: Paolo Bacchilega +Date: 2012-09-19 + + save the properties visibility when hiding the sidebar + +M gthumb/gth-browser.c + +commit eb9a0c80920c72dbfebc7957fb9d3e281be13fd1 +Author: Paolo Bacchilega +Date: 2012-09-19 + + save and restore the viewer sidebar state + + [new feature] + +M data/org.gnome.gthumb.gschema.xml.in +M extensions/file_tools/callbacks.c +M extensions/image_viewer/gth-image-viewer-page.c +M gthumb/gth-browser-actions-callbacks.c +M gthumb/gth-browser-actions-callbacks.h +M gthumb/gth-browser-actions-entries.h +M gthumb/gth-browser-ui.h +M gthumb/gth-browser.c +M gthumb/gth-browser.h +M gthumb/gth-preferences.h +M gthumb/gth-sidebar.h + +commit 408f95c98555e6f10c09c7a4a96ef5ee9289db3d +Author: Gianvito Cavasoli +Date: 2012-09-19 + + [l10n] Updated Italian translation. + +M po/it.po + +commit 7c19c625512252293562eef16d3d8256b8999ed7 +Author: Andika Triwidada +Date: 2012-09-17 + + Updated Indonesian translation + +M po/id.po + +commit e01685a03953a71fe17d0a267522320bbf7aa790 +Author: Paolo Bacchilega +Date: 2012-09-16 + + sharpen tool: center the preview after activation + +M extensions/file_tools/gth-file-tool-sharpen.c +M gthumb/gth-image-viewer.c +M gthumb/gth-image-viewer.h + +commit 449b580520ee3bd13d3a515cdc75a3b7d687891d +Author: Paolo Bacchilega +Date: 2012-09-16 + + updated the 'adjust contrast' icon + +M data/icons/hicolor/16x16/actions/tool-adjust-contrast.png +M data/icons/hicolor/22x22/actions/tool-adjust-contrast.png +M data/icons/hicolor/scalable/actions/tool-adjust-contrast.svg + +commit 9c05d30fdff449b14e9f830b3736599128e5c7ea +Author: Paolo Bacchilega +Date: 2012-09-15 + + use a smaller max zoom factor to enhance the quality + +M gthumb/cairo-scale.h + +commit fc1414ce62728f6abade6726bd2ecbb50e7de11f +Author: Aurimas Černius +Date: 2012-09-15 + + Updated Lithuanian translation + +M po/lt.po + +commit e50d1c3ddd1347062dcfdd33ee9a3c0e5783dfb6 +Author: Paolo Bacchilega +Date: 2012-09-15 + + jpeg loader: set the error if the operation was cancelled + +M extensions/cairo_io/cairo-image-surface-jpeg.c + +commit cacddf8fd37514422548e83e13c8e6d6c74f48a1 +Author: Paolo Bacchilega +Date: 2012-09-15 + + install the app menu only if there's the gnome-shell showing it + +M gthumb/main.c + +commit ac2f522f829443ac4ef22e6b781dccc78a7ba294 +Author: Paolo Bacchilega +Date: 2012-09-06 + + fixed svg images not displayed with the image viewer + + added an optional 'file' parameter to _g_content_type_get_from_stream + to get the mime type from the extension when the content type is + application/xml. + +M gthumb/glib-utils.c +M gthumb/glib-utils.h +M gthumb/gth-file-data.c +M gthumb/gth-image-loader.c +M gthumb/gth-image-utils.c +M gthumb/gth-thumb-loader.c +M gthumb/pixbuf-io.c + +commit 1a0cad0840605a03b3c9753ba4cc474fc4b9e296 +Author: Paolo Bacchilega +Date: 2012-09-06 + + media viewer: fixed the duration label not updated correctly + +M extensions/gstreamer_tools/gth-media-viewer-page.c + +commit e06fedf8a9217b06d2c3b7cdab332185094ec8a9 +Author: Marek Černocký +Date: 2012-09-06 + + Updated Czech translation + +M po/cs.po + +commit 8ca761d7ea28991ed7e6a67acda1612d18cc9703 +Author: Paolo Bacchilega +Date: 2012-09-04 + + updated POTFILES.in + +M po/POTFILES.in + +commit 9275aedc2380ea752dc98028e57b52d51ed51589 +Author: Paolo Bacchilega +Date: 2012-09-04 + + photobucket/facebook: use the same text used in flickr/picasaweb + + use "Resize if larger than" instead of "Resize to" + +M extensions/facebook/data/ui/export-to-facebook.ui +M extensions/photobucket/data/ui/export-to-photobucket.ui + +commit fbcb664cbb1a9b0580ec38b5bf3cd90b4abc6658 +Author: Paolo Bacchilega +Date: 2012-09-04 + + exiv2: change Exif.Image.Image[Width|Length] as well when saving + +M extensions/exiv2_tools/exiv2-utils.cpp + +commit 77d188854a80a0becf1f65eef586fafc95a1c1db +Author: Paolo Bacchilega +Date: 2012-09-04 + + fixed compiler warnings + +M gthumb/gth-image-utils.h +M gthumb/gth-thumb-loader.c + +commit 1e6daf8c9ac0895274a79e685e2542c4961ad71d +Author: Paolo Bacchilega +Date: 2012-09-04 + + _gtk_combo_box_add_image_sizes: add all the sizes + +M gthumb/gtk-utils.c + +commit fc07f91de0867eed143b0a253cfaf18fa942e383 +Author: Paolo Bacchilega +Date: 2012-09-04 + + flickr: allow to scale the images before uploading + +M data/Makefile.am +A data/org.gnome.gthumb.flickr.gschema.xml.in +M extensions/flicker_utils/Makefile.am +M extensions/flicker_utils/data/ui/export-to-flickr.ui +M extensions/flicker_utils/dlg-export-to-flickr.c +M extensions/flicker_utils/flickr-service.c +M extensions/flicker_utils/flickr-service.h +A extensions/flicker_utils/preferences.h + +commit 3e421ca7f4573af94309308145bc6eb2d2a4544e +Author: Paolo Bacchilega +Date: 2012-09-04 + + picasaweb: allow to resize the images before uploading + +M data/org.gnome.gthumb.picasaweb.gschema.xml.in +M extensions/picasaweb/data/ui/export-to-picasaweb.ui +M extensions/picasaweb/dlg-export-to-picasaweb.c +M extensions/picasaweb/picasa-web-service.c +M extensions/picasaweb/picasa-web-service.h +M extensions/picasaweb/preferences.h + +commit 5c5bc695def82efc5826d456f205d7619ff61a8c +Author: Paolo Bacchilega +Date: 2012-09-04 + + web exporter: use the resize utilities + +M extensions/webalbums/dlg-web-exporter.c + +commit ac805449d3308632f32cfad6b483af2722e5fc73 +Author: Paolo Bacchilega +Date: 2012-09-04 + + image loader: get the mime type from the input stream + + instead of opening the file again + +M gthumb/gth-image-loader.c + +commit 37098e3df820770ee0eb9ace868a4c9175a62054 +Author: Paolo Bacchilega +Date: 2012-09-04 + + allow to preserve the metadata when saving to a buffer + +M extensions/contact_sheet/gth-contact-sheet-creator.c +M extensions/exiv2_tools/exiv2-utils.cpp +M extensions/facebook/facebook-service.c +M gthumb/gth-image-saver.c +M gthumb/gth-image-saver.h + +commit 7d180a2862bddb5147c4c280707deb391fa41450 +Author: Paolo Bacchilega +Date: 2012-09-04 + + added some utilities to resize images + +M gthumb/Makefile.am +A gthumb/gth-image-utils.c +C059 gthumb/pixbuf-utils.h gthumb/gth-image-utils.h +M gthumb/gtk-utils.c +M gthumb/gtk-utils.h +M gthumb/pixbuf-io.c +M gthumb/pixbuf-utils.c +M gthumb/pixbuf-utils.h + +commit a7a9d6ae2019c64f5d72494a4e14df8d8bbe8618 +Author: Paolo Bacchilega +Date: 2012-09-02 + + file context menu: moved 'open with' before 'save' and 'print' + +M gthumb/gth-browser-ui.h + +commit 2b6b5401a0e1d1198499160ca779db6c0f2d2442 +Author: Paolo Bacchilega +Date: 2012-08-30 + + added 'Print' and 'Save As' to the file context menu + +M extensions/image_print/callbacks.c +M gthumb/gth-browser-ui.h + +commit 030f5bd2c50e883b8148c2bcdd55b6715ae5ae3d +Author: Paolo Bacchilega +Date: 2012-08-30 + + added the fullscreen command to the viewer toolbar + +M extensions/gstreamer_tools/gth-media-viewer-page.c +M gthumb/gth-browser-ui.h + +commit d425e8ca3d0a34bd99df3ce2719e3d9aad11b2e0 +Author: Piotr Drąg +Date: 2012-09-04 + + Updated Polish translation + +M po/pl.po + +commit b8908c7440e80b774ea9c5683ff914324615300c +Author: Gabor Kelemen +Date: 2012-09-03 + + Fixed Hungarian translation + +M po/hu.po + +commit 48e6d214d38a5eb21c73a72294e45f3b2170b9c2 +Author: Gabor Kelemen +Date: 2012-09-03 + + Updated Hungarian translation by Balazs Ur + +M po/hu.po + +commit eb1caf0a5c8459639ad6794a4c91ce1cc04f01e2 +Author: Matej Urbančič +Date: 2012-08-29 + + Updated Slovenian translation + +M po/sl.po + +commit e80f9376a1988d5334e2f7b92488a8aed865cf06 +Author: Paolo Bacchilega +Date: 2012-08-27 + + distribute preferences.h + +M extensions/cairo_io/Makefile.am + +commit 9d2f852e9f8026970b4e03fa5632be8b8a23c7f2 +Author: Paolo Bacchilega +Date: 2012-08-27 + + fixed distribution of filmholes.png M data/icons/Makefile.am -commit 29caaee5ece807d637fb89a9a9c14a17f65d5be4 +commit 51048aacc885f113a4bfe0c9f21d6bb6deb7914b +Author: Paolo Bacchilega +Date: 2012-08-27 + + fixed build error + + added 'resources' in SUBDIRS + +M gthumb/Makefile.am + +commit 7b39dc8dff1c2c00972c0c8dd04281649c445530 +Author: Daniel Mustieles +Date: 2012-08-27 + + Updated Spanish translation + +M po/es.po + +commit 2a71e4aaf0682029596f59d4c43944517cb61c4b +Author: Paolo Bacchilega +Date: 2012-08-27 + + updated POTFILES.in + +M po/POTFILES.in + +commit 1f402e26ecd6b0f188cf7ced4b40c6abb978ea21 +Author: Paolo Bacchilega +Date: 2012-08-27 + + updated the adjust contrast icon + +M data/icons/hicolor/16x16/actions/tool-adjust-contrast.png +M data/icons/hicolor/22x22/actions/tool-adjust-contrast.png +M data/icons/hicolor/scalable/actions/tool-adjust-contrast.svg + +commit c9db4eda2b194e8ba03f9841f47a5dffb7bf8e70 +Author: Paolo Bacchilega +Date: 2012-08-27 + + added a custom GtkScale for the color selectors + +M configure.ac +M extensions/file_tools/gth-file-tool-adjust-colors.c +M extensions/file_tools/gth-file-tool-rotate.c +M extensions/file_tools/gth-file-tool-sharpen.c +M gthumb/Makefile.am +A gthumb/gth-color-scale.c +A gthumb/gth-color-scale.h +M gthumb/gth-window.c +A gthumb/gthumb.gresource.xml +M gthumb/gtk-utils.c +M gthumb/gtk-utils.h +A gthumb/resources/Makefile.am +A gthumb/resources/gthumb.css + +commit 74b78fdf7356b3b31e2c6138dd81b6e813fe363e +Author: Paolo Bacchilega +Date: 2012-08-26 + + jpeg options: fixed run-time warning + +M extensions/cairo_io/data/ui/jpeg-options.ui + +commit e5183e74eef938bb6321a3361731f98621ee5c9e +Author: Paolo Bacchilega +Date: 2012-08-26 + + webp options: set lossless to false by default + +M data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in + +commit 73e53814b024140e413fd48c3c7fa0746404b56e +Author: Paolo Bacchilega +Date: 2012-08-26 + + allow to specify the format options when saving a file + +M data/org.gnome.gthumb.gschema.xml.in +M extensions/image_viewer/gth-image-viewer-page.c +M gthumb/gth-file-chooser-dialog.c +M gthumb/gth-preferences.h + +commit 7d7769eb8e5ae294d2ce2d7b14d01a8543129782 +Author: Paolo Bacchilega +Date: 2012-08-26 + + updated POTFILES.in + +M po/POTFILES.in + +commit ebbcf1a90e8580abc6f5685eacdb471d7656c53d +Author: Paolo Bacchilega +Date: 2012-08-26 + + added ability to save images as WebP + + [new feature] + +M data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in +M extensions/cairo_io/Makefile.am +M extensions/cairo_io/data/ui/Makefile.am +M extensions/cairo_io/data/ui/save-options-preferences.ui +M extensions/cairo_io/data/ui/tiff-options.ui +A extensions/cairo_io/data/ui/webp-options.ui +A extensions/cairo_io/gth-image-saver-webp.c +A extensions/cairo_io/gth-image-saver-webp.h +M extensions/cairo_io/main.c +M extensions/cairo_io/preferences.h +M gthumb/cairo-utils.c +M gthumb/glib-utils.c + +commit c30ebbf1fa9b62f01bacd469826c51b063430685 +Author: Paolo Bacchilega +Date: 2012-08-25 + + rotate options: removed unused widget + +M extensions/file_tools/data/ui/rotate-options.ui + +commit ffad81138ae0045b626b59117e81a2ae5219b547 +Author: Paolo Bacchilega +Date: 2012-08-25 + + rotate options: fixed spacing of the alignment options + +M extensions/file_tools/data/ui/rotate-options.ui + +commit 00d162db01edf5a66bdfc7c3b37a0dc73bd25dd3 +Author: Paolo Bacchilega +Date: 2012-08-25 + + added ability to load WebP images + + [new feature] + +M configure.ac +M extensions/cairo_io/Makefile.am +A extensions/cairo_io/cairo-image-surface-webp.c +A extensions/cairo_io/cairo-image-surface-webp.h +M extensions/cairo_io/main.c +M extensions/image_viewer/gth-metadata-provider-image.c +M gthumb/Makefile.am +M gthumb/glib-utils.c +M gthumb/glib-utils.h +M gthumb/gth-file-data.c +M gthumb/gth-metadata-provider.c + +commit a1e4b08a43323764e919efc876d1c51d84e2b092 +Author: Piotr Drąg +Date: 2012-08-25 + + Updated POTFILES.in + +M po/POTFILES.in + +commit da788ae21feffa755c0b95bbd1dbb9c74f801293 +Author: Paolo Bacchilega +Date: 2012-08-25 + + fixed icon extension + +M data/icons/hicolor/scalable/actions/Makefile.am + +commit 5bf78a021bf0a9b7f796cd75b8244bf904ab7b69 +Author: Paolo Bacchilega +Date: 2012-08-25 + + removed the format chooser from the file dialog + +M gthumb/Makefile.am +D gthumb/egg-macros.h +D gthumb/eggfileformatchooser.c +D gthumb/eggfileformatchooser.h +M gthumb/gth-file-chooser-dialog.c + +commit 558b893980e46edd7aafd86fe7dc353bbaa7ff06 +Author: Paolo Bacchilega +Date: 2012-08-25 + + adjust contrast: changed icon + +M data/icons/hicolor/16x16/actions/tool-adjust-contrast.png +M data/icons/hicolor/22x22/actions/tool-adjust-contrast.png +M data/icons/hicolor/scalable/actions/Makefile.am +A data/icons/hicolor/scalable/actions/tool-adjust-contrast.svg + +commit 7a9dd2bb81353cc217def5ab5c89590d0c485a21 +Author: Paolo Bacchilega +Date: 2012-08-25 + + adjust contrast: use a GthImageTask + +M extensions/file_tools/gth-file-tool-adjust-contrast.c + +commit 2c83684f9164b6f64847edfa99e970ff26b0fd63 +Author: Paolo Bacchilega +Date: 2012-08-25 + + grayscale: use 'brightness' as default method + +M extensions/file_tools/data/ui/grayscale-options.ui + +commit 0926230b335fdff75a2c5c098a555c14957cb904 +Author: Paolo Bacchilega +Date: 2012-08-25 + + desaturate tool: added ability to choose the method, renamed to + grayscale + +M data/icons/hicolor/16x16/actions/Makefile.am +R100 data/icons/hicolor/16x16/actions/tool-desaturate.png +data/icons/hicolor/16x16/actions/tool-grayscale.png +M data/icons/hicolor/22x22/actions/Makefile.am +R100 data/icons/hicolor/22x22/actions/tool-desaturate.png +data/icons/hicolor/22x22/actions/tool-grayscale.png +M extensions/file_tools/Makefile.am +M extensions/file_tools/data/ui/Makefile.am +A extensions/file_tools/data/ui/grayscale-options.ui +D extensions/file_tools/gth-file-tool-desaturate.c +D extensions/file_tools/gth-file-tool-desaturate.h +A extensions/file_tools/gth-file-tool-grayscale.c +A extensions/file_tools/gth-file-tool-grayscale.h +M extensions/file_tools/main.c + +commit bb899562e8123517e744dbba3402752130a7e4af +Author: Paolo Bacchilega +Date: 2012-08-24 + + equalize histogram: use a faster algorithm + +M extensions/file_tools/gth-file-tool-equalize.c + +commit 606e2cb2141e5140fb0a2bd6e995f635863ea2fa +Author: Paolo Bacchilega +Date: 2012-08-24 + + enhance colors: use a faster algorithm and rename to "adjust contrast" + +M data/icons/hicolor/16x16/actions/Makefile.am +R100 data/icons/hicolor/16x16/actions/tool-enhance.png +data/icons/hicolor/16x16/actions/tool-adjust-contrast.png +M data/icons/hicolor/22x22/actions/Makefile.am +R100 data/icons/hicolor/22x22/actions/tool-enhance.png +data/icons/hicolor/22x22/actions/tool-adjust-contrast.png +M extensions/file_tools/Makefile.am +M extensions/file_tools/callbacks.c +A extensions/file_tools/gth-file-tool-adjust-contrast.c +A extensions/file_tools/gth-file-tool-adjust-contrast.h +D extensions/file_tools/gth-file-tool-enhance.c +D extensions/file_tools/gth-file-tool-enhance.h +M extensions/file_tools/main.c +M gthumb/gth-histogram.c +M gthumb/gth-histogram.h +M po/POTFILES.in + +commit ed60c84db20179b408c70f7244b00d1ece7943f9 +Author: Paolo Bacchilega +Date: 2012-08-23 + + preloader: comapre the file objects instead of the pointers + +M gthumb/gth-image-preloader.c + +commit 25e75c13dd6243975e02c468d21f09d76c03df11 +Author: Paolo Bacchilega +Date: 2012-08-23 + + file tools: removed useless code + +M extensions/file_tools/gth-file-tool-resize.c +M extensions/file_tools/gth-file-tool-rotate.c + +commit 3e8f4995d3733a308a344abf79e80dc8a94a13f4 +Author: Paolo Bacchilega +Date: 2012-08-23 + + adjust colors: apply the changes to a scaled image for a faster + preview + +M extensions/file_tools/Makefile.am +M extensions/file_tools/gth-file-tool-adjust-colors.c +A extensions/file_tools/gth-preview-tool.c +A extensions/file_tools/gth-preview-tool.h + +commit bd70535925c053980ce1f927c16ac256fce577ed +Author: Paolo Bacchilega +Date: 2012-08-23 + + fixed spacing in the red-eye removal tool options + +M extensions/red_eye_removal/data/ui/red-eye-removal-options.ui + +commit 1370ce979f06ed3082ff16eefc2f4676b5b9685d +Author: Paolo Bacchilega +Date: 2012-08-23 + + rotate options: don't expand the background color button + +M extensions/file_tools/data/ui/rotate-options.ui + +commit 7c0b23f5949265e0cd8580d4d008e7b46f68c507 +Author: Paolo Bacchilega +Date: 2012-08-23 + + use the difference operator to draw the grid + +M extensions/file_tools/gth-image-rotator.c +M gthumb/cairo-utils.c +M gthumb/gth-image-selector.c + +commit 10ffb9e4eb0bbd68da53f834b450ffc8fb29964e +Author: Paolo Bacchilega +Date: 2012-08-22 + + select the file to load before loading the file + +M gthumb/gth-browser.c + +commit dc950661e2736225531bfbb79b563a551714cd25 +Author: Paolo Bacchilega +Date: 2012-08-22 + + preloader: start the next loader only after the current loader has + been stopped + +M gthumb/gth-image-preloader.c + +commit 0bda7a73bb55174e12bd9dce3931001b80a8a43b +Author: Paolo Bacchilega +Date: 2012-08-22 + + preloader: ignore the request if the operation was cancelled + +M gthumb/gth-image-preloader.c + +commit 512102b378d6177f7916228c644cdbf9a99ee63b +Author: Paolo Bacchilega +Date: 2012-08-22 + + Fixed generation of gthumb.h + + use 'mv' instead of 'cmp || cp' as explained in commit + e15ad6cac0bb91b3d9b4ee51f1fb37917a6423f1 + +M gthumb/Makefile.am + +commit 49be47215644ef7a8b7f5dfec971d28fb1826c9a +Author: Paolo Bacchilega +Date: 2012-08-22 + + histogram view: removed the channel icon + +M gthumb/gth-histogram-view.c + +commit 412ecf8cc22b347b7db957952563ce19377577d0 +Author: Paolo Bacchilega +Date: 2012-08-22 + + use the fast scale function when quality is not important + +M extensions/file_tools/gth-image-line-tool.c +M extensions/file_tools/gth-image-rotator.c +M gthumb/gth-image-navigator.c + +commit 8243dcd17000123d65cba42e8ec446a73eb7b650 +Author: Paolo Bacchilega +Date: 2012-08-22 + + cairo scale: use a generic value for the max scale factor to use + +M gthumb/cairo-scale.c +M gthumb/cairo-scale.h +M gthumb/gth-image-dragger.c + +commit 4f28c9874b13d49d5ef5b910ceb1f4eb246e9349 +Author: Paolo Bacchilega +Date: 2012-08-22 + + destroy the tool options widget when closing the options pane + +M gthumb/gth-toolbox.c + +commit cdc3faae1ce3c66d0da6120b8fa2d3b308185c5b +Author: Paolo Bacchilega +Date: 2012-08-22 + + rotation tool: fixed rotation mask when the image is smaller than + the original + +M extensions/file_tools/gth-image-rotator.c + +commit 33e9b77b86d57dd96f0326b5c9156f5b10d7e3e4 +Author: Paolo Bacchilega +Date: 2012-08-21 + + cairo scale: fixed white line at the bottom when scaling by some + factors + +M gthumb/cairo-scale.c + +commit 03caa7a3ad1d2f6f7d2fbaf9f3d8b231aeb0c3c2 +Author: Paolo Bacchilega +Date: 2012-08-21 + + No anti-aliasing on the viewer + + fixed image quality when the zoom factor is smaller then 0.5 + + [bug #674159] + +M gthumb/Makefile.am +M gthumb/cairo-scale.c +M gthumb/cairo-scale.h +M gthumb/cairo-utils.c +M gthumb/cairo-utils.h +C050 gthumb/cairo-scale.h gthumb/gfixed.h +M gthumb/gth-image-dragger.c + +commit 054992b70f2682953e4b49221805117c069406f5 +Author: Paolo Bacchilega +Date: 2012-08-21 + + fixed crash when no icon theme is provided to _g_icon_get_pixbuf + +M extensions/catalogs/gth-organize-task.c +M extensions/gstreamer_tools/gth-media-viewer-page.c +M extensions/image_viewer/gth-image-viewer-page.c +M gthumb/gth-overwrite-dialog.c +M gthumb/gtk-utils.c +M gthumb/gtk-utils.h + +commit b0a8bd2d783505f5c5d95d9f20ad872d14a08c7b +Author: Paolo Bacchilega +Date: 2012-08-21 + + resize tool: fixed problems when changing the size very fast + +M extensions/file_tools/gth-file-tool-resize.c +M gthumb/gth-async-task.c + +commit 1158c097016372b90e31db992b024d8824077852 +Author: Paolo Bacchilega +Date: 2012-08-21 + + exiv2: fixed crash if the metadata is NULL + +M extensions/exiv2_tools/exiv2-utils.cpp + +commit 2a8e05ba1e87030340dd8c224fd9ce150f8e16dd +Author: Paolo Bacchilega +Date: 2012-08-20 + + rotate options: make the options fit the space more easly + +M extensions/file_tools/data/ui/rotate-options.ui + +commit e23523675e05e0e6744051ca357d225582afa413 +Author: Paolo Bacchilega +Date: 2012-08-20 + + image rotator: use a unique background color and always show the + crop area + +M extensions/file_tools/gth-image-rotator.c + +commit c97305237a575efb6a240738ed6756b4248820b5 +Author: Paolo Bacchilega +Date: 2012-08-19 + + image viewer: use the black background by default + +M data/org.gnome.gthumb.image-viewer.gschema.xml.in + +commit 3bf723426caa36b9c4ec792ea83343d5e6d28a53 +Author: Paolo Bacchilega +Date: 2012-08-19 + + some changes to the high resolution icon + +M data/icons/hicolor/256x256/apps/gthumb.png +M data/icons/hicolor/scalable/apps/gthumb.svg + +commit 6f2ec5160776c3e68f8b6cfb42a03b30a5fafa75 +Author: Paolo Bacchilega +Date: 2012-08-19 + + added an high resolution application icon + +M configure.ac +A data/icons/hicolor/256x256/Makefile.am +A data/icons/hicolor/256x256/apps/Makefile.am +A data/icons/hicolor/256x256/apps/gthumb.png +M data/icons/hicolor/Makefile.am +M data/icons/hicolor/scalable/apps/gthumb.svg + +commit 740e55e89eac3320ad6d98414792935f1a6f5f54 +Author: Paolo Bacchilega +Date: 2012-08-19 + + don't use cairo_surface_create_similar_image + +M gthumb/cairo-scale.c + +commit 465a36493c89b068a209058415305ff6dca9139c +Author: Paolo Bacchilega +Date: 2012-08-19 + + added a description property to GthTask to simplify the code + +M extensions/file_tools/gth-file-tool-resize.c +M gthumb/gth-async-task.c +M gthumb/gth-image-list-task.c +M gthumb/gth-image-task.c +M gthumb/gth-image-task.h +M gthumb/gth-task.c + +commit 13d279886cc1937f4cd93b6162ef708fcfc71cc6 +Author: Paolo Bacchilega +Date: 2012-08-19 + + resize tool: show a progress dialog if the resizing takes a lot + of time + + and allow to cancel the operation + +M extensions/file_tools/gth-file-tool-resize.c + +commit 5131ef2f43a0d37ddaca8b3a44d0df03c181a64a +Author: Paolo Bacchilega +Date: 2012-08-19 + + update POTFILES.in + +M po/POTFILES.in + +commit d0091a6569707c5ca79cfceaa7642b4cf9b1a1c6 +Author: Paolo Bacchilega +Date: 2012-08-19 + + removed unused code + +M extensions/cairo_io/gth-image-saver-tga.c +M gthumb/gth-histogram.c +M gthumb/gth-histogram.h + +commit a8096040bc29fde5944531097c26df719689e5a7 Author: Paolo Bacchilega -Date: 2012-08-20 +Date: 2012-08-19 - updated for version 3.0.2 + always use _gdk_pixbuf_scale_simple_safe instead of + gdk_pixbuf_scale_simple + +M extensions/exiv2_tools/exiv2-utils.cpp +M gthumb/gth-thumb-loader.c + +commit 6c644dda954ef291d1471fbbb70c6e95a2ff4bc7 +Author: Paolo Bacchilega +Date: 2012-08-19 + + print: use cairo_surfaces only without converting to/from GdkPixbufs + +M extensions/image_print/actions.c +M extensions/image_print/gth-image-info.c +M extensions/image_print/gth-image-info.h +M extensions/image_print/gth-image-print-job.c +M extensions/image_print/gth-image-print-job.h +M extensions/image_print/gth-load-image-info-task.c +M gthumb/cairo-utils.c +M gthumb/cairo-utils.h +M gthumb/pixbuf-utils.c +M gthumb/pixbuf-utils.h + +commit f114b3f88ef5d6f6a36d25fb2a3289f9105d32c1 +Author: Paolo Bacchilega +Date: 2012-08-19 + + pixbuf utils: removed unused code, renamed a function + +M extensions/cairo_io/gth-image-saver-tga.c +M gthumb/pixbuf-io.c +M gthumb/pixbuf-io.h +M gthumb/pixbuf-utils.c +M gthumb/pixbuf-utils.h + +commit 274dde121ba806abfdcea45f53ef6d5ea4a62a77 +Author: Paolo Bacchilega +Date: 2012-08-18 + + pixbuf-utils: removed unused functions + +M gthumb/pixbuf-utils.c +M gthumb/pixbuf-utils.h + +commit d2f1258cade8e7637dccdae1a1933e6b9489e204 +Author: Paolo Bacchilega +Date: 2012-08-18 + + cairo-io: fixed crash when resizing a series of images + +M extensions/resize_images/dlg-resize-images.c +M gthumb/pixbuf-io.c + +commit 8b7cfe69e182e9dbe46779146e4d6d082be55a35 +Author: Paolo Bacchilega +Date: 2012-08-18 + + cairo-io: save png images without converting to a GdkPixbuf + +M extensions/cairo_io/cairo-image-surface-png.c +M extensions/cairo_io/gth-image-saver-jpeg.c +M extensions/cairo_io/gth-image-saver-png.c +M extensions/cairo_io/gth-image-saver-tga.c +M extensions/cairo_io/gth-image-saver-tiff.c +M gthumb/cairo-utils.c +M gthumb/cairo-utils.h + +commit 75676d4a9ff3d509c3f7e7a59ad6832af49ac68c +Author: Paolo Bacchilega +Date: 2012-08-18 + + cairo-io: use GthImage or cairo_surface_t instead of GdkPixbuf + + this reduces the convertions from cairo_surface_t to GdkPixbuf + abd vice + versa. + +M extensions/cairo_io/gth-image-saver-jpeg.c +M extensions/cairo_io/gth-image-saver-jpeg.h +M extensions/cairo_io/gth-image-saver-png.c +M extensions/cairo_io/gth-image-saver-png.h +M extensions/cairo_io/gth-image-saver-tga.c +M extensions/cairo_io/gth-image-saver-tga.h +M extensions/cairo_io/gth-image-saver-tiff.c +M extensions/cairo_io/gth-image-saver-tiff.h +M extensions/cairo_io/main.c +M extensions/cairo_io/preferences.c +M extensions/cairo_io/preferences.h +M extensions/contact_sheet/dlg-contact-sheet.c +M extensions/contact_sheet/dlg-image-wall.c +M extensions/contact_sheet/gth-contact-sheet-creator.c +M extensions/convert_format/dlg-convert-format.c +M extensions/desktop_background/actions.c +M extensions/exiv2_tools/exiv2-utils.cpp +M extensions/exiv2_tools/exiv2-utils.h +M extensions/exiv2_tools/main.c +M extensions/facebook/facebook-service.c +M extensions/file_tools/gth-file-tool-enhance.c +M extensions/file_tools/gth-file-tool-equalize.c +M extensions/gstreamer_tools/actions.c +M extensions/image_rotation/rotation-utils.c +M extensions/image_viewer/gth-image-viewer-page.c +M extensions/importer/gth-import-task.c +M extensions/resize_images/dlg-resize-images.c +M extensions/webalbums/gth-web-exporter.c +M gthumb/Makefile.am +M gthumb/cairo-scale.c +M gthumb/cairo-scale.h +M gthumb/cairo-utils.c +M gthumb/cairo-utils.h +M gthumb/gth-file-chooser-dialog.c +R070 gthumb/gth-pixbuf-list-task.c gthumb/gth-image-list-task.c +A gthumb/gth-image-list-task.h +M gthumb/gth-image-loader.c +M gthumb/gth-image-loader.h +A gthumb/gth-image-saver.c +A gthumb/gth-image-saver.h +A gthumb/gth-image-task.c +A gthumb/gth-image-task.h +M gthumb/gth-image.c +M gthumb/gth-image.h +M gthumb/gth-main-default-hooks.c +M gthumb/gth-main.c +M gthumb/gth-main.h +M gthumb/gth-overwrite-dialog.c +M gthumb/gth-overwrite-dialog.h +D gthumb/gth-pixbuf-list-task.h +D gthumb/gth-pixbuf-saver.c +D gthumb/gth-pixbuf-saver.h +D gthumb/gth-pixbuf-task.c +D gthumb/gth-pixbuf-task.h +M gthumb/pixbuf-io.c +M gthumb/pixbuf-io.h +M gthumb/typedefs.h + +commit b9ecf3f4b2fc4631e5c5c689abb3315c40914636 +Author: Paolo Bacchilega +Date: 2012-08-18 + + file list: fixed crash when the file icon is not available + +M gthumb/gth-file-list.c +M gthumb/gth-icon-cache.c + +commit d36f5fc8866ad506f3aff426c1d03c2481c64906 +Author: Paolo Bacchilega +Date: 2012-08-18 + + cairo_io: read images from a stream if possible + +M extensions/cairo_io/cairo-image-surface-jpeg.c +M extensions/cairo_io/cairo-image-surface-jpeg.h +M extensions/cairo_io/cairo-image-surface-png.c +M extensions/cairo_io/cairo-image-surface-png.h +M extensions/cairo_io/cairo-image-surface-svg.c +M extensions/cairo_io/cairo-image-surface-svg.h +M extensions/flicker_utils/dlg-import-from-flickr.c +M extensions/jpeg_utils/jmemorysrc.c +M extensions/picasaweb/dlg-import-from-picasaweb.c +M extensions/raw_files/main.c +M gthumb/gio-utils.c +M gthumb/gio-utils.h +M gthumb/glib-utils.c +M gthumb/glib-utils.h +M gthumb/gth-file-data.c +M gthumb/gth-image-loader.c +M gthumb/gth-image-loader.h +M gthumb/gth-image.h +M gthumb/gth-thumb-loader.c +M gthumb/pixbuf-io.c +M gthumb/pixbuf-io.h + +commit e0ccd3ecd10cc966dba42ad133e3b7104d931565 +Author: Paolo Bacchilega +Date: 2012-08-18 + + cairo_io: renamed the gth_image_saver_* objects + +M extensions/cairo_io/Makefile.am +R088 extensions/cairo_io/gth-jpeg-saver.c +extensions/cairo_io/gth-image-saver-jpeg.c +A extensions/cairo_io/gth-image-saver-jpeg.h +R063 extensions/cairo_io/gth-png-saver.c +extensions/cairo_io/gth-image-saver-png.c +A extensions/cairo_io/gth-image-saver-png.h +R083 extensions/cairo_io/gth-tga-saver.c +extensions/cairo_io/gth-image-saver-tga.c +A extensions/cairo_io/gth-image-saver-tga.h +R087 extensions/cairo_io/gth-tiff-saver.c +extensions/cairo_io/gth-image-saver-tiff.c +A extensions/cairo_io/gth-image-saver-tiff.h +D extensions/cairo_io/gth-jpeg-saver.h +D extensions/cairo_io/gth-png-saver.h +D extensions/cairo_io/gth-tga-saver.h +D extensions/cairo_io/gth-tiff-saver.h +M extensions/cairo_io/main.c + +commit 78b508caeed7c7e0cbd394927dd17ee1cef33786 +Author: Paolo Bacchilega +Date: 2012-08-17 + + cairo_io: fixed ui files not loading correctly + +M extensions/cairo_io/gth-jpeg-saver.c +M extensions/cairo_io/gth-png-saver.c +M extensions/cairo_io/gth-tga-saver.c +M extensions/cairo_io/gth-tiff-saver.c +M extensions/cairo_io/preferences.c + +commit 781ef8c158fc26867b54bd6dc265dc2c0cf7ed0a +Author: Paolo Bacchilega +Date: 2012-08-17 + + cairo_io: renamed some files to more meaningful names + +M extensions/cairo_io/Makefile.am +R099 extensions/cairo_io/cairo-io-jpeg.c +extensions/cairo_io/cairo-image-surface-jpeg.c +R091 extensions/cairo_io/cairo-io-jpeg.h +extensions/cairo_io/cairo-image-surface-jpeg.h +R099 extensions/cairo_io/cairo-io-png.c +extensions/cairo_io/cairo-image-surface-png.c +R091 extensions/cairo_io/cairo-io-png.h +extensions/cairo_io/cairo-image-surface-png.h +R099 extensions/cairo_io/cairo-io-svg.c +extensions/cairo_io/cairo-image-surface-svg.c +R091 extensions/cairo_io/cairo-io-svg.h +extensions/cairo_io/cairo-image-surface-svg.h +M extensions/cairo_io/main.c + +commit 628e19117179ba6dc476f2300c65b9d36aa43302 +Author: Paolo Bacchilega +Date: 2012-08-17 + + merged pixbuf-savers and cairo_io extensions -M NEWS M configure.ac +M extensions/Makefile.am +M extensions/cairo_io/Makefile.am +R100 extensions/pixbuf_savers/data/Makefile.am +extensions/cairo_io/data/Makefile.am +R100 extensions/pixbuf_savers/data/ui/Makefile.am +extensions/cairo_io/data/ui/Makefile.am +R100 extensions/pixbuf_savers/data/ui/jpeg-options.ui +extensions/cairo_io/data/ui/jpeg-options.ui +R100 extensions/pixbuf_savers/data/ui/png-options.ui +extensions/cairo_io/data/ui/png-options.ui +R100 extensions/pixbuf_savers/data/ui/save-options-preferences.ui +extensions/cairo_io/data/ui/save-options-preferences.ui +R100 extensions/pixbuf_savers/data/ui/tga-options.ui +extensions/cairo_io/data/ui/tga-options.ui +R100 extensions/pixbuf_savers/data/ui/tiff-options.ui +extensions/cairo_io/data/ui/tiff-options.ui +R100 extensions/pixbuf_savers/gth-jpeg-saver.c +extensions/cairo_io/gth-jpeg-saver.c +R100 extensions/pixbuf_savers/gth-jpeg-saver.h +extensions/cairo_io/gth-jpeg-saver.h +R100 extensions/pixbuf_savers/gth-png-saver.c +extensions/cairo_io/gth-png-saver.c +R100 extensions/pixbuf_savers/gth-png-saver.h +extensions/cairo_io/gth-png-saver.h +R100 extensions/pixbuf_savers/gth-tga-saver.c +extensions/cairo_io/gth-tga-saver.c +R100 extensions/pixbuf_savers/gth-tga-saver.h +extensions/cairo_io/gth-tga-saver.h +R100 extensions/pixbuf_savers/gth-tiff-saver.c +extensions/cairo_io/gth-tiff-saver.c +R100 extensions/pixbuf_savers/gth-tiff-saver.h +extensions/cairo_io/gth-tiff-saver.h +M extensions/cairo_io/main.c +R097 extensions/pixbuf_savers/preferences.c +extensions/cairo_io/preferences.c +R095 extensions/pixbuf_savers/preferences.h +extensions/cairo_io/preferences.h +D extensions/pixbuf_savers/Makefile.am +D extensions/pixbuf_savers/main.c +D extensions/pixbuf_savers/pixbuf_savers.extension.in.in +M gthumb/gth-main.c + +commit 3d073ff3056b2dbd2c3865221eb6ea74119965d7 +Author: Paolo Bacchilega +Date: 2012-08-17 + + cairo scale: moved cairo-scale.[ch] in gthumb + + and use it instead of _cairo_image_curface_scale_to that uses + the cairo + bilinear filter. + +M extensions/cairo_io/cairo-io-jpeg.c +M extensions/file_tools/Makefile.am +M extensions/file_tools/gth-file-tool-resize.c +M extensions/file_tools/gth-image-line-tool.c +M extensions/file_tools/gth-image-rotator.c +M gthumb/Makefile.am +R070 extensions/file_tools/cairo-scale.c gthumb/cairo-scale.c +R064 extensions/file_tools/cairo-scale.h gthumb/cairo-scale.h +M gthumb/cairo-utils.c +M gthumb/cairo-utils.h +M gthumb/gth-image-navigator.c + +commit 18f2c8b07c7200a9b43c55980bfa1cd61308d38c +Author: Paolo Bacchilega +Date: 2012-08-17 + + cairo scale: use fixed point instead of floating point -commit 294c1e6b36db65fb3f2943bf07d67892595fba52 +M extensions/file_tools/cairo-scale.c + +commit 5a494668070e9733ac5df59e2482246fe3b72a60 +Author: Paolo Bacchilega +Date: 2012-08-17 + + cairo-scale: removed the need for a vertical_scale function + + use an horizonal scale + transpose twice instead of an horizontal + + vertical + scale, this will allow to simplify speed optimization. + +M extensions/file_tools/cairo-scale.c + +commit 4c0527c927461bcddbd59a6a4f3e3bbefc41647e +Author: Paolo Bacchilega +Date: 2012-08-16 + + resize tool: activate the undo button after resizing the image + +M extensions/file_tools/gth-file-tool-resize.c +M gthumb/gth-toolbox.c + +commit 30d41839b16ec9e8c982ad331b2bc7eb3891446f +Author: Paolo Bacchilega +Date: 2012-08-16 + + cairo-scale: added a custom implementation of the scale function + +M extensions/file_tools/cairo-scale.c + +commit 804865ff4c958fce42e3a6b467ac175a6950cfb5 +Author: Paolo Bacchilega +Date: 2012-08-16 + + started work on a custom high quality scale function + + the cairo scale function quality is poor when downscaling by a factory + greater than 2. + +M extensions/file_tools/Makefile.am +A extensions/file_tools/cairo-scale.c +A extensions/file_tools/cairo-scale.h +M extensions/file_tools/gth-file-tool-resize.c + +commit e8284825e7ac78447cf277a29ff59bfb4c47f064 Author: Paolo Bacchilega Date: 2012-08-18 @@ -29,7 +3083,94 @@ M gthumb/Makefile.am M gthumb/gth-grid-view.c -commit 87e7e525fcab4d80da5791c0516595f604b9f27f +commit 76d87a6fe161446e00a4c579a5b25c9a2b30235f +Author: Paolo Bacchilega +Date: 2012-08-16 + + print: set a good default filename for the print-to-file operation + +M extensions/image_print/gth-image-print-job.c + +commit ba71df910b0749f41b34cf64a6032a3cc0b9302e +Author: Paolo Bacchilega +Date: 2012-08-15 + + rotator: fixed rotation when dragging the image + +M extensions/file_tools/gth-image-rotator.c + +commit 938c00503108ce49a70719e7c8f1dd89eeb1cf75 +Author: Paolo Bacchilega +Date: 2012-08-15 + + rotate tool: fixed crop region when the angle is greater than 90 + +M extensions/file_tools/cairo-rotate.c + +commit 5c3d797b6987b5e912a827a7d463e4a09605bd0c +Author: Paolo Bacchilega +Date: 2012-08-15 + + file tool options: use a consistent look + +M extensions/file_tools/data/ui/adjust-colors-options.ui +M extensions/file_tools/data/ui/crop-options.ui +M extensions/file_tools/data/ui/resize-options.ui +M extensions/file_tools/data/ui/rotate-options.ui +M extensions/file_tools/data/ui/sharpen-options.ui +M extensions/file_tools/gth-file-tool-crop.c +M extensions/file_tools/gth-file-tool-resize.c + +commit ea4af725c3bdecee5a61bae1fea37717e6ad1640 +Author: Paolo Bacchilega +Date: 2012-08-15 + + get the image type from the file content when loading the image + +M gthumb/gth-file-data.c +M gthumb/gth-file-data.h +M gthumb/gth-image-loader.c +M gthumb/gth-thumb-loader.c + +commit 42d57548361f4fbf33ec936a6b24ccdb4d2f7d34 +Author: Paolo Bacchilega +Date: 2012-08-14 + + change date: removed the "exif original date tag" option + + this option isn't supposed to be there, the 'exif original date tag' + is kept in + sync with the comment date, so it is changed whenever the user chooses + the 'comment date' option. + +M data/org.gnome.gthumb.change-date.gschema.xml.in +M extensions/change_date/data/ui/change-date.ui +M extensions/change_date/dlg-change-date.c +M extensions/change_date/gth-change-date-task.c +M extensions/change_date/gth-change-date-task.h +M extensions/change_date/preferences.h + +commit 27364d76d868489829b2c24b54cae7a0dd6f6348 +Author: Paolo Bacchilega +Date: 2012-08-14 + + sort by name if the date is the same + + [bug #676263] + +M extensions/exiv2_tools/main.c + +commit 896db7e706ff36a7bf0da6fcd5c905311263431e +Author: Paolo Bacchilega +Date: 2012-08-14 + + Delete key does nothing when image first opened + + [bug #678441] + +M gthumb/gth-browser.c + +commit 29047b5154d9c1c27569afb5da65f346a0ca01e3 Author: Paolo Bacchilega Date: 2012-08-14 @@ -39,15 +3180,381 @@ M gthumb/gtk-utils.c M gthumb/gtk-utils.h -commit b1b91408233d37fdcf2bdafacc7c151d607c898f +commit 5228ac09db673ffe8c59c3f1340d07b4ac4b0df3 Author: Paolo Bacchilega Date: 2012-08-14 - Delete key does nothing when image first opened + find duplicates: remember the checked state when filtering the + file list - [bug #678441] + [bug #679191] + +M extensions/find_duplicates/data/ui/find-duplicates-dialog.ui +M extensions/find_duplicates/gth-find-duplicates.c + +commit d5ec907355d6e70f9b054dec13180edf413096e8 +Author: Paolo Bacchilega +Date: 2012-08-14 + + added a menu item to hide/show the file properties + +M gthumb/gth-browser-actions-entries.h +M gthumb/gth-browser-ui.h + +commit 13dc2c1db8dc4300adb6e33d8d13f89ecc66c012 +Author: Paolo Bacchilega +Date: 2012-08-13 + + icon cache: handle any GIcon type + +M extensions/catalogs/gth-organize-task.c +M gthumb/gth-folder-tree.c +M gthumb/gth-icon-cache.c +M gthumb/gth-icon-cache.h +M gthumb/gth-location-chooser.c +M gthumb/gtk-utils.c +M gthumb/gtk-utils.h + +commit 4874d6be3e1ed62aba5bb0f77dbf1103c61489ee +Author: Paolo Bacchilega +Date: 2012-08-02 + + do not set the progress dialog as resizable + +M gthumb/gth-progress-dialog.c + +commit 5fd3247a2f5467301298d0686b4c1f94fa407dd0 +Author: Paolo Bacchilega +Date: 2012-08-02 + + allow to cut files from a selection + +M extensions/selections/gth-file-source-selections.c + +commit 62f96be77daac07a485f0d7773c12bae33073cc1 +Author: Paolo Bacchilega +Date: 2012-07-05 + + reset the original image when exiting a tool pressing the Escape key + +M extensions/file_tools/gth-file-tool-adjust-colors.c +M extensions/file_tools/gth-file-tool-crop.c +M extensions/file_tools/gth-file-tool-resize.c +M extensions/file_tools/gth-file-tool-rotate.c +M extensions/file_tools/gth-file-tool-sharpen.c +M extensions/red_eye_removal/gth-file-tool-red-eye.c +M gthumb/gth-file-tool.c +M gthumb/gth-file-tool.h +M gthumb/gth-toolbox.c + +commit 1a083f57e87293b7d61d6fa88069382a04ae2738 +Author: Paolo Bacchilega +Date: 2012-07-04 + + allow to rotate an image from -180 to 180 degrees + + use the cairo ratation function, that supports angles greater then + 90 degrees + +M extensions/file_tools/gth-file-tool-rotate.c +M extensions/file_tools/gth-image-rotator.c + +commit 5fad73ff46de6629736f263fb5b1d86de8798066 +Author: Paolo Bacchilega +Date: 2012-06-13 + + set register-session to true in order to call gtk_application_inhibit + +M gthumb/main.c + +commit f9d12c490523e2078863dc56158132a23e1526f1 +Author: Paolo Bacchilega +Date: 2012-06-01 + + use gtk_application_[un]inhibit instead of the DBus interface + +M extensions/gstreamer_tools/gth-media-viewer-page.c +M extensions/slideshow/gth-slideshow.c +M gthumb/gth-screensaver.c +M gthumb/gth-screensaver.h + +commit dd1aead4762192152e1abeb2306ef2872e7cb3e7 +Author: Paolo Bacchilega +Date: 2012-05-31 + + added an application menu + +M configure.ac +M gthumb/gth-window.c +M gthumb/gth-window.h +M gthumb/main.c + +commit 5d96ff557a38f0fe537eaa253484db9ba830081c +Author: Paolo Bacchilega +Date: 2012-05-20 + + browser: show loading errors in the info bar + + ...instead of using a modal dialog that forces the user to click + on the + close button. + +M gthumb/gth-browser.c +M gthumb/gth-info-bar.c + +commit fa187214e4e2188ab0b1ebe452ee18cdf545e582 +Author: Paolo Bacchilega +Date: 2012-05-17 + + save and restore the visited locations history + + [new feature] + +M gthumb/gth-browser.c + +commit b15c33c32676eff56d900336b9559f167718a067 +Author: Paolo Bacchilega +Date: 2012-05-15 + + media viewer: save and restore the volume level + + [new feature] + +M data/org.gnome.gthumb.gstreamer-tools.gschema.xml.in +M extensions/gstreamer_tools/gth-media-viewer-page.c +M extensions/gstreamer_tools/preferences.h + +commit bfb48c0b1b07b02b6c9815c1d4709b9b94381568 +Author: Paolo Bacchilega +Date: 2012-05-15 + + media player: correctly update the toggled state of the mute button + +M extensions/gstreamer_tools/gth-media-viewer-page.c + +commit b7ae16efd8daa73acfc94732c20f97e75135f1e1 +Author: Paolo Bacchilega +Date: 2012-05-15 + + fixed image transparency when using a dark blackground + +M gthumb/gth-image-viewer.c + +commit 8caa508144fd9cf1d9cc4a0f2b001a1e6f637a5c +Author: Paolo Bacchilega +Date: 2012-05-13 + + use a more neutral color as dark blackground, instead of black + +M gthumb/gth-image-viewer.c + +commit b9ea2a7f7a5d1b47b80300fff82c215aa9244f0d +Author: Paolo Bacchilega +Date: 2012-05-13 + + fixed error when loading the active filter file + + check whether the buffer is null before using it + +M gthumb/gth-filterbar.c + +commit 0f91f7e666138f557b6271b93e46c2bf526a23a8 +Author: Paolo Bacchilega +Date: 2012-05-09 + + added automatic completion to the category entry + + [new feature] + +M gthumb/gth-test-category.c + +commit 9943065def5183f3979c494235faaa8638f9978c +Author: Paolo Bacchilega +Date: 2012-05-09 + + disconnect from the previous test before setting the new test + +M gthumb/gth-filterbar.c + +commit d7185e06ed82364f442ffb5dd63c1b537e5eb990 +Author: Paolo Bacchilega +Date: 2012-05-09 + + filter: use a spinbutton as limit control + +M gthumb/gth-filter.c +commit bf2367e3cf2345a901b8a0a67f672a96c599b0f1 +Author: Paolo Bacchilega +Date: 2012-05-09 + + save and restore the filterbar status + + [new feature] + +M gthumb/gth-browser.c +M gthumb/gth-filterbar.c +M gthumb/gth-filterbar.h + +commit 2833417fd3987941f097eaf978dc687389d2743e +Author: Paolo Bacchilega +Date: 2012-05-09 + + gio utils: use the _g_file prefix fir functions that take a GFile + object + +M extensions/cairo_io/cairo-io-jpeg.c +M extensions/catalogs/callbacks.c +M extensions/catalogs/dlg-add-to-catalog.c +M extensions/catalogs/dlg-catalog-properties.c +M extensions/catalogs/gth-catalog.c +M extensions/catalogs/gth-file-source-catalogs.c +M extensions/comments/gth-comment.c +M extensions/comments/gth-import-metadata-task.c +M extensions/comments/gth-metadata-provider-comment.c +M extensions/contact_sheet/dlg-contact-sheet.c +M extensions/contact_sheet/gth-contact-sheet-creator.c +M extensions/edit_metadata/gth-delete-metadata-task.c +M extensions/exiv2_tools/gth-metadata-provider-exiv2.c +M extensions/facebook/facebook-service.c +M extensions/flicker_utils/dlg-import-from-flickr.c +M extensions/flicker_utils/flickr-service.c +M extensions/image_rotation/rotation-utils.c +M extensions/importer/gth-import-task.c +M extensions/list_tools/gth-script-file.c +M extensions/oauth/oauth-authentication.c +M extensions/photobucket/photobucket-service.c +M extensions/picasaweb/dlg-import-from-picasaweb.c +M extensions/picasaweb/picasa-account-properties-dialog.c +M extensions/picasaweb/picasa-web-service.c +M extensions/search/actions.c +M extensions/search/gth-search-task.c +M gthumb/gio-utils.c +M gthumb/gio-utils.h +M gthumb/gth-filter-file.c +M gthumb/gth-pixbuf-list-task.c +M gthumb/gth-tags-file.c +M gthumb/main-migrate-catalogs.c +M gthumb/pixbuf-io.c + +commit 86aaa5791b6ffeec9db6000045a82e99cc7a42b3 +Author: Paolo Bacchilega +Date: 2012-05-09 + + use a GFile object instead of a filename + +M gthumb/gth-filter-file.c +M gthumb/gth-filter-file.h +M gthumb/gth-main.c +M gthumb/gth-tags-file.c +M gthumb/gth-tags-file.h + +commit 2afb91e8dad5b57020b197d7604a1de8ac34aec4 +Author: Paolo Bacchilega +Date: 2012-05-08 + + simplified the API for the gth_user_dir_* functions + +M extensions/bookmarks/callbacks.c +M extensions/catalogs/callbacks.c +M extensions/catalogs/gth-catalog.c +M extensions/contact_sheet/dlg-contact-sheet.c +M extensions/desktop_background/actions.c +M extensions/facebook/facebook-service.c +M extensions/flicker_utils/flickr-service.c +M extensions/image_print/gth-image-print-job.c +M extensions/list_tools/gth-script-file.c +M extensions/oauth/oauth-authentication.c +M extensions/picasaweb/picasa-web-service.c +M extensions/raw_files/main.c +M extensions/webalbums/dlg-web-exporter.c +M extensions/webalbums/gth-web-exporter.c +M gthumb/gth-main.c +M gthumb/gth-user-dir.c +M gthumb/gth-user-dir.h +M gthumb/main-migrate-catalogs.c + +commit d86d86d7c512cd8998ac971e1866958043ae0d9e +Author: Paolo Bacchilega +Date: 2012-05-07 + + grid view: align the caption to the left and use a smaller font + +M gthumb/gth-grid-view.c + +commit 3afd1cccc4aee28d3c5a7a5695f4f28ccbee2896 +Author: Paolo Bacchilega +Date: 2012-05-06 + + save and restore the window maximized state + + [new feature] + +M data/org.gnome.gthumb.gschema.xml.in M gthumb/gth-browser.c +M gthumb/gth-preferences.h + +commit 97bc30d87199d6e2d27037355f212419f05fc557 +Author: Paolo Bacchilega +Date: 2012-05-05 + + thumb-loader: removed useless code + + no need to check the existence of the thumbnails directory, it + is already + done in gnome_desktop_thumbnail_factory_save_thumbnail. + +M gthumb/gth-thumb-loader.c + +commit 7424a80fff13b0e11028aaa1bba18e511fbf34df +Author: Paolo Bacchilega +Date: 2012-05-05 + + ignore XDG_CACHE_HOME/thumbnails when saving thumbnails + +M gthumb/gth-thumb-loader.c + +commit d688e43180becca467b6f92aa8f34bb608a76a65 +Author: Paolo Bacchilega +Date: 2012-05-05 + + use XDG_CACHE_HOME/thumbnails as thumbnail cache + + Fallback to the old ~/.thumbnails directory if the new directory + doesn't + exists. Always use the new directory if FORCE_XDG_THUMBNAIL_DIR is + defined in gnome-desktop-thumbnail.c. + +M gthumb/gnome-desktop-thumbnail.c +M gthumb/gnome-desktop-thumbnail.h + +commit defe6f70cad0c60ea9662bf64c56467e899a083e +Author: Paolo Bacchilega +Date: 2012-05-05 + + read system bookmarks from XDG_CONFIG_HOME/gtk-3.0/bookmarks + + fallback to ~/.gtk-bookmarks if the new file is not found + + [bug #675401] + +M extensions/bookmarks/callbacks.c + +commit 0f0f59e0a5167cd542d64aa79b0327c4b4bcf822 +Author: Paolo Bacchilega +Date: 2012-05-04 + + removed use of deprecated function gtk_widget_get_pointer + +M gthumb/gth-folder-tree.c + +commit c22f6f499284f3c7bb78668c9f0c7d583ac631ed +Author: Paolo Bacchilega +Date: 2012-05-04 + + bumped version number to 3.1.0 + +M configure.ac commit e15ad6cac0bb91b3d9b4ee51f1fb37917a6423f1 Author: Ross Burton diff -Nru gthumb-3.0.2/Makefile.am gthumb-3.2.3/Makefile.am --- gthumb-3.0.2/Makefile.am 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/Makefile.am 2013-04-30 16:56:12.000000000 +0000 @@ -17,8 +17,7 @@ po/.intltool-merge-cache \ intltool-extract \ intltool-merge \ - intltool-update \ - gnome-doc-utils.make + intltool-update MAINTAINERCLEANFILES = \ $(srcdir)/INSTALL \ @@ -30,18 +29,19 @@ $(srcdir)/config.sub \ $(srcdir)/configure.scan \ $(srcdir)/depcomp \ + $(srcdir)/gnome-doc-utils.make \ $(srcdir)/install-sh \ $(srcdir)/ltmain.sh \ - $(srcdir)/m4/gnome-doc-utils.m4 \ + $(srcdir)/omf.make \ $(srcdir)/m4/intltool.m4 \ $(srcdir)/m4/libtool.m4 \ $(srcdir)/m4/lt~obsolete.m4 \ $(srcdir)/m4/ltoptions.m4 \ $(srcdir)/m4/ltsugar.m4 \ $(srcdir)/m4/ltversion.m4 \ + $(srcdir)/m4/gnome-doc-utils.m4 \ $(srcdir)/missing \ $(srcdir)/mkinstalldirs \ - $(srcdir)/omf.make \ $(srcdir)/xmldocs.make \ $(srcdir)/gtk-doc.make \ $(srcdir)/ChangeLog \ diff -Nru gthumb-3.0.2/Makefile.in gthumb-3.2.3/Makefile.in --- gthumb-3.0.2/Makefile.in 2012-08-20 19:54:08.000000000 +0000 +++ gthumb-3.2.3/Makefile.in 2013-07-10 13:33:40.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,22 +78,22 @@ build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - compile config.guess config.rpath config.sub depcomp \ - install-sh ltmain.sh missing mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in AUTHORS COPYING ChangeLog INSTALL NEWS \ + README compile config.guess config.rpath config.sub depcomp \ + install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -83,13 +111,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -97,9 +126,30 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -175,9 +225,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -191,13 +239,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -226,7 +273,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -242,11 +292,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -263,7 +317,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -293,7 +346,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -366,8 +422,7 @@ po/.intltool-merge-cache \ intltool-extract \ intltool-merge \ - intltool-update \ - gnome-doc-utils.make + intltool-update MAINTAINERCLEANFILES = \ $(srcdir)/INSTALL \ @@ -379,24 +434,26 @@ $(srcdir)/config.sub \ $(srcdir)/configure.scan \ $(srcdir)/depcomp \ + $(srcdir)/gnome-doc-utils.make \ $(srcdir)/install-sh \ $(srcdir)/ltmain.sh \ - $(srcdir)/m4/gnome-doc-utils.m4 \ + $(srcdir)/omf.make \ $(srcdir)/m4/intltool.m4 \ $(srcdir)/m4/libtool.m4 \ $(srcdir)/m4/lt~obsolete.m4 \ $(srcdir)/m4/ltoptions.m4 \ $(srcdir)/m4/ltsugar.m4 \ $(srcdir)/m4/ltversion.m4 \ + $(srcdir)/m4/gnome-doc-utils.m4 \ $(srcdir)/missing \ $(srcdir)/mkinstalldirs \ - $(srcdir)/omf.make \ $(srcdir)/xmldocs.make \ $(srcdir)/gtk-doc.make \ $(srcdir)/ChangeLog \ `find "$(srcdir)" -type f -name Makefile.in -print` GITIGNOREFILES = build .autotools .cdt* .cproject .project .settings/ *.patch +DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper CLEANFILES = ChangeLog # Build ChangeLog from GIT history @@ -441,8 +498,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -470,14 +527,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -498,31 +554,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -538,12 +576,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -555,15 +588,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -572,18 +601,16 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" - cscope: cscope.files test ! -s cscope.files \ || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) - clean-cscope: -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive -cscope.files: clean-cscope cscopelist-recursive cscopelist - -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -680,10 +707,16 @@ $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -888,26 +921,24 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-cscope \ - clean-generic clean-libtool cscope cscopelist \ - cscopelist-recursive ctags ctags-recursive dist dist-all \ - dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ dist-xz \ - dist-zip distcheck distclean distclean-generic distclean-hdr \ - distclean-libtool distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am +.MAKE: $(am__recursive_targets) all install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ + dist-xz dist-zip distcheck distclean distclean-generic \ + distclean-hdr distclean-libtool distclean-tags distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-am install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am ChangeLog: @echo Creating $@ diff -Nru gthumb-3.0.2/NEWS gthumb-3.2.3/NEWS --- gthumb-3.0.2/NEWS 2012-08-20 20:21:27.000000000 +0000 +++ gthumb-3.2.3/NEWS 2013-07-10 13:33:28.000000000 +0000 @@ -1,28 +1,200 @@ -version 3.0.2 +version 3.2.3 ------------- Bugs fixed: - * Fixed fullscreen toolbars with multiple monitors. - * Fixed error when rotating keeping the origina size. - * Photobucket exporter: fixed crash when closing the dialog. - * Fixed broken video thumbnail (#666303) - * Delete key does nothing when image first opened (#678441) - * Picasa Web exporter: images not displayed in the export dialog (#679546) - * Fix parallel build problems with enum generation. + * Flickr: allow to use a facebook or google account. (#703534) + * Thumbnail list: images drawn with wrong offset. (#702538) + * Fixed the video player stopping after saving a screenshot. + * Fixed saving of TGA images. + * Fixed the size of the toolbar in fullscreen mode. + * Show the cursor again after stopping the slideshow. + * Web services: do not delete the previous account when creating a new one. + + New or updated application translations: + + * Russian (Yuri Myasoedov) + +version 3.2.2 +------------- + + Bugs fixed: + + * Resize, Convert: correctly set the destination folder. + * Fixed the file list style with Gtk+ 3.8 + +version 3.2.1 +------------- + + Bugs fixed: + + * Facebook: fixed authentication. + * Slideshow: fixed audio playback. + * Filter-bar: fixed the spin button width for the file size control. + * Bookmarks: fixed ability to modify the bookmarks. + * Image viewer: allow to use button 2 to drag the image. + * Fixed unrecognized configure option --disable-libjson-glib (#696783) + +version 3.2.0 +------------- + + New features and user visible changes: + + * added ability load xcf images + * always use a dark background in the image viewer + + New or updated application translations: + + * Deutsch (Christian Kirbach) + * French (Claude Paroz) + * Hungarian (Balázs Úr) + * Italiano (Gianvito Cavasoli) + + New or updated manual translations: + + * Deutsch (Mario Blättermann) + * French (Bruno Brouard) + * čeština (Marek Černocký) + +version 3.1.4 +------------- + + Bugs fixed: + + * Fixed creation of blur thumbnails for jpeg images + + New or updated application translations: + + * Brazilian Portuguese (Rafael Ferreira) + * Español (Daniel Mustieles) + * Lietuvių (Aurimas Černius) + * Polish (Piotr Drąg) + * Serbian (Мирослав Николић) + * Serbian (Miroslav Nikolić) + * Slovenian (Matej Urbančič) + +version 3.1.3 +------------- + + New features and user visible changes: + + * Fixed uploading to Facebook and all other web services. + * Added ability to import photos from Facebook. + * Save and restore the thumbnail list size. + * Selections: pressing control-n (with n in 1,2,3) again goes back to the + previous view. + * Monitor all the expanded locations in the folder tree. + * Show a progress dialog for long saving operations. + * Added keybindings to delete files in catalog view: control+delete moves to + trash; shift+delete deletes from disk. + * Allow to delete the tags from the default tag list. + + Bugs fixed: + + * Web album export produces invalid HTML. (#691123) + * Fixed thumbnail generation for rotated images. + * Fixed the thumbnail style in gtk 3.6 + * Video viewer: fixed progress bar for gtk 3.6 + * webp: fixed build for Big-Endian systems + + Internal code changes: + + * Ported to GStreamer 1.0 + * Ported to libsecret + + New or updated application translations: + + * Chinese (Hong Kong) (taijuin) + * Chinese/Traditional (taijuin) + * Español; Castellano (Daniel Mustieles) + * Hungarian (Balázs Úr) + * Polish (Piotr Drąg) + * Serbian (Саша Петровић) + * Serbian (Saša Petrović) + * Slovenian Translation (Matej Urbančič) + * čeština (Marek Černocký) + + New or updated manual translations: + + * Español; Castellano (Daniel Mustieles) + * Occitan (Yannig Marchegay (Kokoyaya)) + * Slovenian (Andrej Žnidaršič) + * Swedish (Daniel Nylander) + * čeština (Marek Černocký) + * Ελληνικά (Sterios Prosiniklis) + +version 3.1.2 +------------- + + Bugs fixed: + + * Fixed images scaling producing black images. + * Use gdk-3.0 to check the GDK target (#685674) + + New or updated application translations: + + * Latvian (Rūdolfs Mazurs) + +version 3.1.1 +------------- + + New features and user visible changes: + + * Added ability to load and save WebP images. + * Allow to specify the format options when saving a file (can be disabled). + * Save and restore the window maximized state, the filterbar status, the + visited locations history and the viewer sidebar status. + * Image viewer: use the dark background by default, and use a more neutral + color instead of black. + * Video viewer: save and restore the volume level. + * Read system bookmarks from XDG_CONFIG_HOME/gtk-3.0/bookmarks. Fallback to + ~/.gtk-bookmarks if the new file is not found. (#675401) + * Use XDG_CACHE_HOME/thumbnails as thumbnail cache. Fallback to the old + ~/.thumbnails directory if the new directory doesn't exists. + * File list: align the caption to the left and use a smaller font. + * Browser: show loading errors in the info bar instead of using a modal + dialog. + * Added automatic completion to the category entry. + * Rotation tool: allow to rotate an image from -180 to 180 degrees. + * Selections: allow to cut the files. + * Added a menu item to hide/show the file properties. + * Print: set a good default filename for the print-to-file operation. + * Enhance colors: use a faster algorithm and rename to "Adjust Contrast". + * Equalize histogram: use a faster algorithm. + * Desaturate tool: added ability to choose the method to use, renamed to + "Grayscale". + * Removed the format chooser from the file dialog. + * Added an high resolution application icon. + * Add an application menu if used with GNOME Shell. + + Bugs fixed: + + * Fixed image quality when the zoom factor is smaller then 0.5. (#674159) + * Do not make modal dialogs block other windows as well. + * Find duplicates: remember the checked state when filtering the file + list. (#679191) + * Sort by name if the date is the same. (#676263) New or updated application translations: * Chinese (Hong Kong) (taijuin) * Chinese (simplified) (tuhaihe) * Chinese/Traditional (taijuin) + * Czech (Marek Černocký) + * Español (Daniel Mustieles) + * Hungarian (Gabor Kelemen) + * Indonesian (Andika Triwidada) + * Italiano (Gianvito Cavasoli) * Latvian (Rūdolfs Mazurs) - * Ελληνικά, Σύγχρονα (Tom Tryfonidis) + * Lietuvių (Aurimas Černius) + * Polish (Piotr Drąg) + * Slovenian (Matej Urbančič) + * Greek (Tom Tryfonidis) New or updated manual translations: * Deutsch (Daniel Winzen) - * Slovenian Translation (Andrej Žnidaršič) + * Slovenian (Andrej Žnidaršič) version 3.0.1 ------------- diff -Nru gthumb-3.0.2/aclocal.m4 gthumb-3.2.3/aclocal.m4 --- gthumb-3.0.2/aclocal.m4 2012-08-20 19:54:05.000000000 +0000 +++ gthumb-3.2.3/aclocal.m4 2013-07-10 13:33:39.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.12.3 -*- Autoconf -*- +# generated automatically by aclocal 1.14 -*- Autoconf -*- -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11,6 +11,7 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, @@ -513,7 +514,8 @@ ]) dnl GNOME_COMPILE_WARNINGS -dnl Turn on many useful compiler warnings +dnl Turn on many useful compiler warnings and substitute the result into +dnl WARN_CFLAGS dnl For now, only works on GCC AC_DEFUN([GNOME_COMPILE_WARNINGS],[ dnl ****************************** @@ -525,7 +527,6 @@ [Turn on compiler warnings]),, [enable_compile_warnings="m4_default([$1],[yes])"]) - warnCFLAGS= if test "x$GCC" != xyes; then enable_compile_warnings=no fi @@ -533,46 +534,70 @@ warning_flags= realsave_CFLAGS="$CFLAGS" + dnl These are warning flags that aren't marked as fatal. Can be + dnl overridden on a per-project basis with -Wno-foo. + base_warn_flags=" \ + -Wall \ + -Wstrict-prototypes \ + -Wnested-externs \ + " + + dnl These compiler flags typically indicate very broken or suspicious + dnl code. Some of them such as implicit-function-declaration are + dnl just not default because gcc compiles a lot of legacy code. + dnl We choose to make this set into explicit errors. + base_error_flags=" \ + -Werror=missing-prototypes \ + -Werror=implicit-function-declaration \ + -Werror=pointer-arith \ + -Werror=init-self \ + -Werror=format-security \ + -Werror=format=2 \ + -Werror=missing-include-dirs \ + " + case "$enable_compile_warnings" in no) - warning_flags= - ;; + warning_flags= + ;; minimum) - warning_flags="-Wall" - ;; + warning_flags="-Wall" + ;; yes) - warning_flags="-Wall -Wmissing-prototypes" - ;; + warning_flags="$base_warn_flags $base_error_flags" + ;; maximum|error) - warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" - CFLAGS="$warning_flags $CFLAGS" - for option in -Wno-sign-compare; do - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" - AC_MSG_CHECKING([whether gcc understands $option]) - AC_TRY_COMPILE([], [], - has_option=yes, - has_option=no,) - CFLAGS="$SAVE_CFLAGS" - AC_MSG_RESULT($has_option) - if test $has_option = yes; then - warning_flags="$warning_flags $option" - fi - unset has_option - unset SAVE_CFLAGS - done - unset option - if test "$enable_compile_warnings" = "error" ; then - warning_flags="$warning_flags -Werror" - fi - ;; + warning_flags="$base_warn_flags $base_error_flags" + ;; *) - AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) - ;; + AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) + ;; esac + + if test "$enable_compile_warnings" = "error" ; then + warning_flags="$warning_flags -Werror" + fi + + dnl Check whether GCC supports the warning options + for option in $warning_flags; do + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $option" + AC_MSG_CHECKING([whether gcc understands $option]) + AC_TRY_COMPILE([], [], + has_option=yes, + has_option=no,) + CFLAGS="$save_CFLAGS" + AC_MSG_RESULT([$has_option]) + if test $has_option = yes; then + tested_warning_flags="$tested_warning_flags $option" + fi + unset has_option + unset save_CFLAGS + done + unset option CFLAGS="$realsave_CFLAGS" AC_MSG_CHECKING(what warning flags to pass to the C compiler) - AC_MSG_RESULT($warning_flags) + AC_MSG_RESULT($tested_warning_flags) AC_ARG_ENABLE(iso-c, AC_HELP_STRING([--enable-iso-c], @@ -595,7 +620,7 @@ fi AC_MSG_RESULT($complCFLAGS) - WARN_CFLAGS="$warning_flags $complCFLAGS" + WARN_CFLAGS="$tested_warning_flags $complCFLAGS" AC_SUBST(WARN_CFLAGS) ]) @@ -739,7 +764,7 @@ ) # nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -971,7 +996,217 @@ m4_popdef([pkg_description]) ]) dnl PKG_NOARCH_INSTALLDIR -# Copyright (C) 2002-2012 Free Software Foundation, Inc. + +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])# PKG_CHECK_VAR + +AC_DEFUN([YELP_HELP_INIT], +[ +AC_REQUIRE([AC_PROG_LN_S]) +m4_pattern_allow([AM_V_at]) +m4_pattern_allow([AM_V_GEN]) +m4_pattern_allow([AM_DEFAULT_VERBOSITY]) +AC_ARG_WITH([help-dir], + AC_HELP_STRING([--with-help-dir=DIR], + [path where help files are installed]),, + [with_help_dir='${datadir}/help']) +HELP_DIR="$with_help_dir" +AC_SUBST(HELP_DIR) + +AC_ARG_VAR([ITSTOOL], [Path to the `itstool` command]) +AC_CHECK_PROG([ITSTOOL], [itstool], [itstool]) +if test x"$ITSTOOL" = x; then + AC_MSG_ERROR([itstool not found]) +fi + +AC_ARG_VAR([XMLLINT], [Path to the `xmllint` command]) +AC_CHECK_PROG([XMLLINT], [xmllint], [xmllint]) +if test x"$XMLLINT" = x; then + AC_MSG_ERROR([xmllint not found]) +fi + +YELP_HELP_RULES=' +HELP_ID ?= +HELP_POT ?= +HELP_FILES ?= +HELP_EXTRA ?= +HELP_MEDIA ?= +HELP_LINGUAS ?= + +_HELP_LINGUAS = $(if $(filter environment,$(origin LINGUAS)),$(filter $(LINGUAS),$(HELP_LINGUAS)),$(HELP_LINGUAS)) +_HELP_POTFILE = $(if $(HELP_POT),$(HELP_POT),$(if $(HELP_ID),$(HELP_ID).pot)) +_HELP_POFILES = $(if $(HELP_ID),$(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).po)) +_HELP_MOFILES = $(patsubst %.po,%.mo,$(_HELP_POFILES)) +_HELP_C_FILES = $(foreach f,$(HELP_FILES),C/$(f)) +_HELP_C_EXTRA = $(foreach f,$(HELP_EXTRA),C/$(f)) +_HELP_C_MEDIA = $(foreach f,$(HELP_MEDIA),C/$(f)) +_HELP_LC_FILES = $(foreach lc,$(_HELP_LINGUAS),$(foreach f,$(HELP_FILES),$(lc)/$(f))) +_HELP_LC_STAMPS = $(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).stamp) + +_HELP_DEFAULT_V = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1) +_HELP_V = $(if $(V),$(V),$(_HELP_DEFAULT_V)) +_HELP_LC_VERBOSE = $(_HELP_LC_VERBOSE_$(_HELP_V)) +_HELP_LC_VERBOSE_ = $(_HELP_LC_VERBOSE_$(_HELP_DEFAULT_V)) +_HELP_LC_VERBOSE_0 = @echo " GEN "$(dir [$]@); + +all: $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) $(_HELP_LC_FILES) $(_HELP_POFILES) + +.PHONY: pot +pot: $(_HELP_POTFILE) +$(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) + $(AM_V_GEN)$(ITSTOOL) -o "[$]@" $(_HELP_C_FILES) + +.PHONY: repo +repo: $(_HELP_POTFILE) + $(AM_V_at)for po in $(_HELP_POFILES); do \ + if test "x[$](_HELP_V)" = "x0"; then echo " GEN $${po}"; fi; \ + msgmerge -q -o "$${po}" "$${po}" "$(_HELP_POTFILE)"; \ + done + +$(_HELP_POFILES): + $(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi + $(AM_V_at)if test ! -f "[$]@" -a -f "$(srcdir)/[$]@"; then cp "$(srcdir)/[$]@" "[$]@"; fi + $(AM_V_GEN)if ! test -f "[$]@"; then \ + (cd "$(dir [$]@)" && \ + $(ITSTOOL) -o "$(notdir [$]@).tmp" $(_HELP_C_FILES) && \ + mv "$(notdir [$]@).tmp" "$(notdir [$]@)"); \ + else \ + (cd "$(dir [$]@)" && \ + $(ITSTOOL) -o "$(notdir [$]@).tmp" $(_HELP_C_FILES) && \ + msgmerge -o "$(notdir [$]@)" "$(notdir [$]@)" "$(notdir [$]@).tmp" && \ + rm "$(notdir [$]@).tmp"); \ + fi + +$(_HELP_MOFILES): %.mo: %.po + $(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi + $(AM_V_GEN)msgfmt -o "[$]@" "$<" + +$(_HELP_LC_FILES): $(_HELP_LINGUAS) +$(_HELP_LINGUAS): $(_HELP_LC_STAMPS) +$(_HELP_LC_STAMPS): %.stamp: %.mo +$(_HELP_LC_STAMPS): $(_HELP_C_FILES) $(_HELP_C_EXTRA) + $(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi + $(_HELP_LC_VERBOSE)if test -d "C"; then d="../"; else d="$(abs_srcdir)/"; fi; \ + mo="$(dir [$]@)$(patsubst %/$(notdir [$]@),%,[$]@).mo"; \ + if test -f "$${mo}"; then mo="../$${mo}"; else mo="$(abs_srcdir)/$${mo}"; fi; \ + (cd "$(dir [$]@)" && $(ITSTOOL) -m "$${mo}" $(foreach f,$(_HELP_C_FILES),$${d}/$(f))) && \ + touch "[$]@" + +.PHONY: clean-help +mostlyclean-am: $(if $(HELP_ID),clean-help) +clean-help: + rm -f $(_HELP_LC_FILES) $(_HELP_LC_STAMPS) $(_HELP_MOFILES) + +EXTRA_DIST ?= +EXTRA_DIST += $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) +EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp) +EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).po) +EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f)))) + +distdir: distdir-help-files +distdir-help-files: + @for lc in C $(HELP_LINGUAS); do \ + $(MKDIR_P) "$(distdir)/$$lc"; \ + for file in $(HELP_FILES); do \ + if test -f "$$lc/$$file"; then d=./; else d=$(srcdir)/; fi; \ + cp -p "$$d$$lc/$$file" "$(distdir)/$$lc/" || exit 1; \ + done; \ + done; \ + +.PHONY: check-help +check: check-help +check-help: + for lc in C $(_HELP_LINGUAS); do \ + if test -d "$$lc"; \ + then d=; \ + xmlpath="$$lc"; \ + else \ + d="$(srcdir)/"; \ + xmlpath="$$lc:$(srcdir)/$$lc"; \ + fi; \ + for page in $(HELP_FILES); do \ + echo "$(XMLLINT) --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ + $(XMLLINT) --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ + done; \ + done + + +.PHONY: install-help +install-data-am: $(if $(HELP_ID),install-help) +install-help: + @for lc in C $(_HELP_LINGUAS); do \ + $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \ + done + @for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \ + if test -f "$$lc/$$f"; then d=; else d="$(srcdir)/"; fi; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \ + echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir`basename $$f`"; \ + $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir`basename $$f`" || exit 1; \ + done; done + @for f in $(_HELP_C_EXTRA); do \ + lc=`dirname "$$f"`; lc=`basename "$$lc"`; \ + if test -f "$$f"; then d=; else d="$(srcdir)/"; fi; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \ + echo "$(INSTALL_DATA) $$d$$f $$helpdir`basename $$f`"; \ + $(INSTALL_DATA) "$$d$$f" "$$helpdir`basename $$f`" || exit 1; \ + done + @for f in $(HELP_MEDIA); do \ + for lc in C $(_HELP_LINGUAS); do \ + if test -f "$$lc$$f"; then d=; else d="$(srcdir)/"; fi; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + mdir=`dirname "$$f"`; \ + if test "x$mdir" = "x."; then mdir=""; fi; \ + if ! test -d "$$helpdir$$mdir"; then $(mkinstalldirs) "$$helpdir$$mdir"; fi; \ + if test -f "$$d$$lc/$$f"; then \ + echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir$$f"; \ + $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir$$f" || exit 1; \ + elif test "x$$lc" != "xC"; then \ + echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \ + $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \ + fi; \ + done; \ + done + +.PHONY: uninstall-help +uninstall-am: $(if $(HELP_ID),uninstall-help) +uninstall-help: + for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + echo "rm -f $$helpdir`basename $$f`"; \ + rm -f "$$helpdir`basename $$f`"; \ + done; done + @for f in $(_HELP_C_EXTRA); do \ + lc=`dirname "$$f"`; lc=`basename "$$lc"`; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + echo "rm -f $$helpdir`basename $$f`"; \ + rm -f "$$helpdir`basename $$f`"; \ + done + @for f in $(HELP_MEDIA); do \ + for lc in C $(_HELP_LINGUAS); do \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + echo "rm -f $$helpdir$$f"; \ + rm -f "$$helpdir$$f"; \ + done; \ + done; +' +AC_SUBST([YELP_HELP_RULES]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([YELP_HELP_RULES])]) +]) + +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -983,10 +1218,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.12' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.12.3], [], +m4_if([$1], [1.14], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -1002,14 +1237,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.12.3])dnl +[AM_AUTOMAKE_VERSION([1.14])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1062,7 +1297,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2012 Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1093,7 +1328,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1284,7 +1519,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1295,7 +1530,7 @@ # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -1324,7 +1559,7 @@ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the @@ -1360,7 +1595,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1369,6 +1604,12 @@ # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -1381,7 +1622,7 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -1411,8 +1652,7 @@ dnl Distinguish between old-style and new-style calls. m4_ifval([$2], [AC_DIAGNOSE([obsolete], -[$0: two- and three-arguments forms are deprecated. For more info, see: -http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation]) + [$0: two- and three-arguments forms are deprecated.]) m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], @@ -1466,22 +1706,60 @@ [_AM_DEPENDENCIES([OBJC])], [m4_define([AC_PROG_OBJC], m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl -dnl Support for Objective C++ was only introduced in Autoconf 2.65, -dnl but we still cater to Autoconf 2.62. -m4_ifdef([AC_PROG_OBJCXX], -[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], [_AM_DEPENDENCIES([OBJCXX])], [m4_define([AC_PROG_OBJCXX], - m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the -dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -1489,7 +1767,6 @@ m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -1511,7 +1788,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1532,7 +1809,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2012 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1554,7 +1831,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1587,11 +1864,9 @@ ] ) -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1639,41 +1914,9 @@ rm -f confinc confmf ]) -# Copyright (C) 1999-2012 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) - # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2012 Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1688,8 +1931,8 @@ # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -1702,8 +1945,8 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= AC_MSG_WARN(['missing' script is too old or missing]) @@ -1712,7 +1955,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1741,7 +1984,54 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1760,7 +2050,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1841,7 +2131,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1901,7 +2191,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1929,7 +2219,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2012 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1948,7 +2238,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2012 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1967,81 +2257,118 @@ # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AC_SUBST([AMTAR], ['$${TAR-tar}']) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of '-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -m4_include([m4/gnome-doc-utils.m4]) m4_include([m4/gthumb.m4]) m4_include([m4/intltool.m4]) m4_include([m4/libtool.m4]) diff -Nru gthumb-3.0.2/compile gthumb-3.2.3/compile --- gthumb-3.0.2/compile 2012-08-18 17:23:16.000000000 +0000 +++ gthumb-3.2.3/compile 2013-04-30 17:08:00.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-03-05.13; # UTC +scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -112,6 +112,11 @@ lib=$dir/$lib.lib break fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi done IFS=$save_IFS diff -Nru gthumb-3.0.2/config.guess gthumb-3.2.3/config.guess --- gthumb-3.0.2/config.guess 2012-08-18 17:23:16.000000000 +0000 +++ gthumb-3.2.3/config.guess 2013-04-30 17:08:00.000000000 +0000 @@ -2,13 +2,13 @@ # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# 2011, 2012, 2013 Free Software Foundation, Inc. -timestamp='2012-06-17' +timestamp='2012-12-29' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -22,19 +22,17 @@ # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -55,8 +53,8 @@ Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, +2012, 2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -306,7 +304,7 @@ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -805,6 +803,9 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; @@ -1205,6 +1206,9 @@ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1334,9 +1338,6 @@ exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c < header file. */ #undef HAVE_INTTYPES_H +/* Have libjson-glib */ +#undef HAVE_JSON_GLIB + /* Define if your file defines LC_MESSAGES. */ #undef HAVE_LC_MESSAGES @@ -67,12 +67,18 @@ /* Define to 1 if librsvg support is included */ #undef HAVE_LIBRSVG +/* Have libsecret */ +#undef HAVE_LIBSECRET + /* Have libsoup-gnome */ #undef HAVE_LIBSOUP_GNOME /* Define to 1 if libtiff support is included */ #undef HAVE_LIBTIFF +/* Define to 1 if libwebp support is included */ +#undef HAVE_LIBWEBP + /* Define to 1 if you have the header file. */ #undef HAVE_LOCALE_H @@ -109,6 +115,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Have webkit2gtk */ +#undef HAVE_WEBKIT2 + /* Locale directory */ #undef LOCALEDIR @@ -116,9 +125,6 @@ */ #undef LT_OBJDIR -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - /* Name of package */ #undef PACKAGE @@ -152,6 +158,9 @@ /* Version number of package */ #undef VERSION +/* Define to 1 if webp images area not recognized by the glib functions */ +#undef WEBP_IS_UNKNOWN_TO_GLIB + /* Define if smclient is enabled */ #undef WITH_SMCLIENT diff -Nru gthumb-3.0.2/config.sub gthumb-3.2.3/config.sub --- gthumb-3.0.2/config.sub 2012-08-18 17:23:16.000000000 +0000 +++ gthumb-3.2.3/config.sub 2013-04-30 17:08:00.000000000 +0000 @@ -2,23 +2,19 @@ # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# 2011, 2012, 2013 Free Software Foundation, Inc. -timestamp='2012-06-17' +timestamp='2012-12-29' -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, see . @@ -26,11 +22,12 @@ # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -74,8 +71,8 @@ GNU config.sub ($timestamp) Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, +2012, 2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,7 +120,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) @@ -156,7 +153,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -259,8 +256,10 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ + | arc \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ @@ -273,7 +272,7 @@ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -389,7 +388,8 @@ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -788,9 +788,13 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) basic_machine=i386-pc os=-mingw32 @@ -1019,7 +1023,11 @@ basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1359,8 +1367,8 @@ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ diff -Nru gthumb-3.0.2/configure gthumb-3.2.3/configure --- gthumb-3.0.2/configure 2012-08-20 19:54:07.000000000 +0000 +++ gthumb-3.2.3/configure 2013-07-10 13:33:53.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gthumb 3.0.2. +# Generated by GNU Autoconf 2.69 for gthumb 3.2.3. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='gthumb' PACKAGE_TARNAME='gthumb' -PACKAGE_VERSION='3.0.2' -PACKAGE_STRING='gthumb 3.0.2' +PACKAGE_VERSION='3.2.3' +PACKAGE_STRING='gthumb 3.2.3' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gthumb' PACKAGE_URL='' @@ -658,18 +658,26 @@ LIBBRASERO_CFLAGS ENABLE_WEB_SERVICES_FALSE ENABLE_WEB_SERVICES_TRUE +WEBKIT2_LIBS +WEBKIT2_CFLAGS +JSON_GLIB_LIBS +JSON_GLIB_CFLAGS LIBSOUP_LIBS LIBSOUP_CFLAGS LIBSOUP_GNOME_LIBS LIBSOUP_GNOME_CFLAGS -GNOME_KEYRING_LIBS -GNOME_KEYRING_CFLAGS +LIBSECRET_LIBS +LIBSECRET_CFLAGS ENABLE_LIBRSVG_FALSE ENABLE_LIBRSVG_TRUE LIBRSVG_LIBS LIBRSVG_CFLAGS LIBOPENRAW_LIBS LIBOPENRAW_CFLAGS +ENABLE_LIBWEBP_FALSE +ENABLE_LIBWEBP_TRUE +LIBWEBP_LIBS +LIBWEBP_CFLAGS TIFF_LIBS HAVE_LIBJPEG_80_FALSE HAVE_LIBJPEG_80_TRUE @@ -760,22 +768,19 @@ GSETTINGS_RULES GLIB_COMPILE_SCHEMAS gsettingsschemadir +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH +PKG_CONFIG GSETTINGS_DISABLE_SCHEMAS_COMPILE WARN_CXXFLAGS WARN_CFLAGS DISABLE_DEPRECATED -HAVE_GNOME_DOC_UTILS_FALSE -HAVE_GNOME_DOC_UTILS_TRUE -DISTCHECK_CONFIGURE_FLAGS -ENABLE_SK_FALSE -ENABLE_SK_TRUE -DOC_USER_FORMATS -OMF_DIR +YELP_HELP_RULES +XMLLINT +ITSTOOL HELP_DIR -PKG_CONFIG_LIBDIR -PKG_CONFIG_PATH -PKG_CONFIG ACLOCAL_AMFLAGS +GLIB_COMPILE_RESOURCES GLIB_MKENUMS GLIB_GENMARSHAL CXXCPP @@ -832,14 +837,14 @@ build_cpu build LIBTOOL -AM_BACKSLASH -AM_DEFAULT_VERBOSITY -AM_DEFAULT_V -AM_V MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE GTHUMB_API_VERSION +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -904,8 +909,8 @@ ac_subst_files='' ac_user_opts=' enable_option_checking -enable_maintainer_mode enable_silent_rules +enable_maintainer_mode enable_shared enable_static with_pic @@ -915,9 +920,6 @@ with_sysroot enable_libtool_lock with_help_dir -with_omf_dir -with_help_formats -enable_scrollkeeper enable_compile_warnings enable_iso_c enable_cxx_warnings @@ -935,10 +937,13 @@ enable_nls enable_jpeg enable_tiff +enable_libwebp enable_libopenraw enable_librsvg -enable_gnome_keyring +enable_libsecret enable_libsoup +enable_libjson_glib +enable_webkit2 enable_libbrasero with_smclient ' @@ -955,6 +960,8 @@ CXXFLAGS CCC CXXCPP +ITSTOOL +XMLLINT PKG_CONFIG PKG_CONFIG_PATH PKG_CONFIG_LIBDIR @@ -970,16 +977,22 @@ GSTREAMER_LIBS LIBCHAMPLAIN_CFLAGS LIBCHAMPLAIN_LIBS +LIBWEBP_CFLAGS +LIBWEBP_LIBS LIBOPENRAW_CFLAGS LIBOPENRAW_LIBS LIBRSVG_CFLAGS LIBRSVG_LIBS -GNOME_KEYRING_CFLAGS -GNOME_KEYRING_LIBS +LIBSECRET_CFLAGS +LIBSECRET_LIBS LIBSOUP_GNOME_CFLAGS LIBSOUP_GNOME_LIBS LIBSOUP_CFLAGS LIBSOUP_LIBS +JSON_GLIB_CFLAGS +JSON_GLIB_LIBS +WEBKIT2_CFLAGS +WEBKIT2_LIBS LIBBRASERO_CFLAGS LIBBRASERO_LIBS SMCLIENT_CFLAGS @@ -1524,7 +1537,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gthumb 3.0.2 to adapt to many kinds of systems. +\`configure' configures gthumb 3.2.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1594,7 +1607,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gthumb 3.0.2:";; + short | recursive ) echo "Configuration of gthumb 3.2.3:";; esac cat <<\_ACEOF @@ -1602,11 +1615,11 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") --disable-maintainer-mode disable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-silent-rules less verbose build output (undo: "make V=1") - --disable-silent-rules verbose build output (undo: "make V=0") --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] @@ -1616,7 +1629,6 @@ --disable-dependency-tracking speeds up one-time build --disable-libtool-lock avoid locking (might break parallel builds) - --disable-scrollkeeper do not make updates to the scrollkeeper database --enable-compile-warnings=[no/minimum/yes/maximum/error] Turn on compiler warnings --enable-iso-c Try to warn if code is not ISO C @@ -1639,13 +1651,16 @@ --disable-nls do not use Native Language Support --disable-jpeg do not compile code that uses the libjpeg library --disable-tiff do not compile code that uses the libtiff library + --disable-libwebp do not compile code that uses the libwebp library --enable-libopenraw use the libopenraw library to read raw files [default=no] --disable-librsvg do not compile code that uses the librsvg library [default=yes] - --disable-gnome-keyring do not compile code that uses the gnome-keyring - library + --disable-libsecret do not compile code that uses the libsecret library --disable-libsoup do not compile code that uses the libsoup library + --disable-libjson-glib do not compile code that uses the libjson-glib + library + --disable-webkit2 do not compile code that uses webkit2gtk --disable-libbrasero do not compile code that uses the libbrasero library Optional Packages: @@ -1656,10 +1671,7 @@ --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR (or the compiler's sysroot if not specified). - --with-help-dir=DIR path to help docs - --with-omf-dir=DIR path to OMF files - --with-help-formats=FORMATS - list of formats + --with-help-dir=DIR path where help files are installed --with-smclient=no|auto|xsmp Setting smclient backend (default:no) @@ -1675,6 +1687,8 @@ CXX C++ compiler command CXXFLAGS C++ compiler flags CXXCPP C++ preprocessor + ITSTOOL Path to the `itstool` command + XMLLINT Path to the `xmllint` command PKG_CONFIG path to pkg-config utility PKG_CONFIG_PATH directories to add to pkg-config's search path @@ -1700,6 +1714,10 @@ C compiler flags for LIBCHAMPLAIN, overriding pkg-config LIBCHAMPLAIN_LIBS linker flags for LIBCHAMPLAIN, overriding pkg-config + LIBWEBP_CFLAGS + C compiler flags for LIBWEBP, overriding pkg-config + LIBWEBP_LIBS + linker flags for LIBWEBP, overriding pkg-config LIBOPENRAW_CFLAGS C compiler flags for LIBOPENRAW, overriding pkg-config LIBOPENRAW_LIBS @@ -1708,10 +1726,10 @@ C compiler flags for LIBRSVG, overriding pkg-config LIBRSVG_LIBS linker flags for LIBRSVG, overriding pkg-config - GNOME_KEYRING_CFLAGS - C compiler flags for GNOME_KEYRING, overriding pkg-config - GNOME_KEYRING_LIBS - linker flags for GNOME_KEYRING, overriding pkg-config + LIBSECRET_CFLAGS + C compiler flags for LIBSECRET, overriding pkg-config + LIBSECRET_LIBS + linker flags for LIBSECRET, overriding pkg-config LIBSOUP_GNOME_CFLAGS C compiler flags for LIBSOUP_GNOME, overriding pkg-config LIBSOUP_GNOME_LIBS @@ -1720,6 +1738,14 @@ C compiler flags for LIBSOUP, overriding pkg-config LIBSOUP_LIBS linker flags for LIBSOUP, overriding pkg-config + JSON_GLIB_CFLAGS + C compiler flags for JSON_GLIB, overriding pkg-config + JSON_GLIB_LIBS + linker flags for JSON_GLIB, overriding pkg-config + WEBKIT2_CFLAGS + C compiler flags for WEBKIT2, overriding pkg-config + WEBKIT2_LIBS + linker flags for WEBKIT2, overriding pkg-config LIBBRASERO_CFLAGS C compiler flags for LIBBRASERO, overriding pkg-config LIBBRASERO_LIBS @@ -1795,7 +1821,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gthumb configure 3.0.2 +gthumb configure 3.2.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2285,7 +2311,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gthumb $as_me 3.0.2, which was +It was created by gthumb $as_me 3.2.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2633,7 +2659,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.12' +am__api_version='1.14' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2846,8 +2872,8 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 @@ -3087,6 +3113,45 @@ fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -3109,7 +3174,7 @@ # Define the identity of the package. PACKAGE='gthumb' - VERSION='3.0.2' + VERSION='3.2.3' cat >>confdefs.h <<_ACEOF @@ -3150,86 +3215,125 @@ AMTAR='$${TAR-tar}' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 -$as_echo_n "checking how to create a ustar tar archive... " >&6; } -# Loop over all known methods to create a tar archive until one works. +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar plaintar pax cpio none' -_am_tools=${am_cv_prog_tar_ustar-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of '-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - { echo "$as_me:$LINENO: $_am_tar --version" >&5 + +# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5 +$as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; } + if test $am_uid -le $am_max_uid; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + _am_tools=none + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5 +$as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; } + if test $am_gid -le $am_max_gid; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + _am_tools=none + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 +$as_echo_n "checking how to create a ustar tar archive... " >&6; } + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_ustar-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + { echo "$as_me:$LINENO: $_am_tar --version" >&5 ($_am_tar --version) >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && break - done - am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x ustar -w "$$tardir"' - am__tar_='pax -L -x ustar -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H ustar -L' - am__tar_='find "$tardir" -print | cpio -o -H ustar -L' - am__untar='cpio -i -H ustar -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_ustar}" && break + done + am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x ustar -w "$$tardir"' + am__tar_='pax -L -x ustar -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H ustar -L' + am__tar_='find "$tardir" -print | cpio -o -H ustar -L' + am__untar='cpio -i -H ustar -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_ustar}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } - rm -rf conftest.dir - if test -s conftest.tar; then - { echo "$as_me:$LINENO: $am__untar &5 + rm -rf conftest.dir + if test -s conftest.tar; then + { echo "$as_me:$LINENO: $am__untar &5 ($am__untar &5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break - fi -done -rm -rf conftest.dir + { echo "$as_me:$LINENO: cat conftest.dir/file" >&5 + (cat conftest.dir/file) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi + done + rm -rf conftest.dir -if ${am_cv_prog_tar_ustar+:} false; then : + if ${am_cv_prog_tar_ustar+:} false; then : $as_echo_n "(cached) " >&6 else am_cv_prog_tar_ustar=$_am_tool fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 $as_echo "$am_cv_prog_tar_ustar" >&6; } @@ -3237,12 +3341,54 @@ +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + ac_config_headers="$ac_config_headers config.h" -GTHUMB_API_VERSION=3.0 +GTHUMB_API_VERSION=3.2 cat >>confdefs.h <<_ACEOF @@ -4334,6 +4480,65 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -12476,6 +12681,65 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -12607,20 +12871,18 @@ am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc -if test "x$CC" != xcc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } -fi -set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include +#include +#include +#include int main () @@ -12630,145 +12892,22 @@ return 0; } _ACEOF -# Make sure it works both with $CC and with simple cc. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -rm -f conftest2.* -if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; -then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.$ac_ext >&5' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* - if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; - then - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no - fi - fi - fi +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes else - eval ac_cv_prog_cc_${ac_cc}_c_o=no + ac_cv_header_stdc=no fi -rm -f core conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h - -fi - -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : else ac_cv_header_stdc=no @@ -16818,6 +16957,7 @@ done IFS=$as_save_IFS + test -z "$ac_cv_path_GLIB_GENMARSHAL" && ac_cv_path_GLIB_GENMARSHAL="glib-genmarshal" ;; esac fi @@ -16858,6 +16998,7 @@ done IFS=$as_save_IFS + test -z "$ac_cv_path_GLIB_MKENUMS" && ac_cv_path_GLIB_MKENUMS="glib-mkenums" ;; esac fi @@ -16871,6 +17012,47 @@ fi +# Extract the first word of "glib-compile-resources", so it can be a program name with args. +set dummy glib-compile-resources; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GLIB_COMPILE_RESOURCES+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $GLIB_COMPILE_RESOURCES in + [\\/]* | ?:[\\/]*) + ac_cv_path_GLIB_COMPILE_RESOURCES="$GLIB_COMPILE_RESOURCES" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GLIB_COMPILE_RESOURCES="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_GLIB_COMPILE_RESOURCES" && ac_cv_path_GLIB_COMPILE_RESOURCES="glib-compile-resources" + ;; +esac +fi +GLIB_COMPILE_RESOURCES=$ac_cv_path_GLIB_COMPILE_RESOURCES +if test -n "$GLIB_COMPILE_RESOURCES"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_RESOURCES" >&5 +$as_echo "$GLIB_COMPILE_RESOURCES" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + @@ -16888,29 +17070,35 @@ +# Check whether --with-help-dir was given. +if test "${with_help_dir+set}" = set; then : + withval=$with_help_dir; +else + with_help_dir='${datadir}/help' +fi + +HELP_DIR="$with_help_dir" + + -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +# Extract the first word of "itstool", so it can be a program name with args. +set dummy itstool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : +if ${ac_cv_prog_ITSTOOL+:} false; then : $as_echo_n "(cached) " >&6 else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + if test -n "$ITSTOOL"; then + ac_cv_prog_ITSTOOL="$ITSTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + ac_cv_prog_ITSTOOL="itstool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -16918,42 +17106,41 @@ done IFS=$as_save_IFS - ;; -esac fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } +fi +ITSTOOL=$ac_cv_prog_ITSTOOL +if test -n "$ITSTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ITSTOOL" >&5 +$as_echo "$ITSTOOL" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi +if test x"$ITSTOOL" = x; then + as_fn_error $? "itstool not found" "$LINENO" 5 fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 + + +# Extract the first word of "xmllint", so it can be a program name with args. +set dummy xmllint; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : +if ${ac_cv_prog_XMLLINT+:} false; then : $as_echo_n "(cached) " >&6 else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + if test -n "$XMLLINT"; then + ac_cv_prog_XMLLINT="$XMLLINT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + ac_cv_prog_XMLLINT="xmllint" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -16961,138 +17148,188 @@ done IFS=$as_save_IFS - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi - -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - PKG_CONFIG="" - fi -fi - -if test -z "$AM_DEFAULT_VERBOSITY"; then - AM_DEFAULT_VERBOSITY=1 fi - - -gdu_cv_version_required=0.3.2 - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5 -$as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; } -if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - gdu_cv_have_gdu=yes -else - gdu_cv_have_gdu=no fi - -if test "$gdu_cv_have_gdu" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - : +XMLLINT=$ac_cv_prog_XMLLINT +if test -n "$XMLLINT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLLINT" >&5 +$as_echo "$XMLLINT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5 -fi - - - -# Check whether --with-help-dir was given. -if test "${with_help_dir+set}" = set; then : - withval=$with_help_dir; -else - with_help_dir='${datadir}/gnome/help' -fi - -HELP_DIR="$with_help_dir" - - - -# Check whether --with-omf-dir was given. -if test "${with_omf_dir+set}" = set; then : - withval=$with_omf_dir; -else - with_omf_dir='${datadir}/omf' fi -OMF_DIR="$with_omf_dir" - - -# Check whether --with-help-formats was given. -if test "${with_help_formats+set}" = set; then : - withval=$with_help_formats; -else - with_help_formats='' +if test x"$XMLLINT" = x; then + as_fn_error $? "xmllint not found" "$LINENO" 5 fi -DOC_USER_FORMATS="$with_help_formats" - - -# Check whether --enable-scrollkeeper was given. -if test "${enable_scrollkeeper+set}" = set; then : - enableval=$enable_scrollkeeper; -else - enable_scrollkeeper=yes -fi +YELP_HELP_RULES=' +HELP_ID ?= +HELP_POT ?= +HELP_FILES ?= +HELP_EXTRA ?= +HELP_MEDIA ?= +HELP_LINGUAS ?= + +_HELP_LINGUAS = $(if $(filter environment,$(origin LINGUAS)),$(filter $(LINGUAS),$(HELP_LINGUAS)),$(HELP_LINGUAS)) +_HELP_POTFILE = $(if $(HELP_POT),$(HELP_POT),$(if $(HELP_ID),$(HELP_ID).pot)) +_HELP_POFILES = $(if $(HELP_ID),$(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).po)) +_HELP_MOFILES = $(patsubst %.po,%.mo,$(_HELP_POFILES)) +_HELP_C_FILES = $(foreach f,$(HELP_FILES),C/$(f)) +_HELP_C_EXTRA = $(foreach f,$(HELP_EXTRA),C/$(f)) +_HELP_C_MEDIA = $(foreach f,$(HELP_MEDIA),C/$(f)) +_HELP_LC_FILES = $(foreach lc,$(_HELP_LINGUAS),$(foreach f,$(HELP_FILES),$(lc)/$(f))) +_HELP_LC_STAMPS = $(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).stamp) + +_HELP_DEFAULT_V = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1) +_HELP_V = $(if $(V),$(V),$(_HELP_DEFAULT_V)) +_HELP_LC_VERBOSE = $(_HELP_LC_VERBOSE_$(_HELP_V)) +_HELP_LC_VERBOSE_ = $(_HELP_LC_VERBOSE_$(_HELP_DEFAULT_V)) +_HELP_LC_VERBOSE_0 = @echo " GEN "$(dir $@); + +all: $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) $(_HELP_LC_FILES) $(_HELP_POFILES) + +.PHONY: pot +pot: $(_HELP_POTFILE) +$(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) + $(AM_V_GEN)$(ITSTOOL) -o "$@" $(_HELP_C_FILES) + +.PHONY: repo +repo: $(_HELP_POTFILE) + $(AM_V_at)for po in $(_HELP_POFILES); do \ + if test "x$(_HELP_V)" = "x0"; then echo " GEN $${po}"; fi; \ + msgmerge -q -o "$${po}" "$${po}" "$(_HELP_POTFILE)"; \ + done - if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then - ENABLE_SK_TRUE= - ENABLE_SK_FALSE='#' -else - ENABLE_SK_TRUE='#' - ENABLE_SK_FALSE= -fi +$(_HELP_POFILES): + $(AM_V_at)if ! test -d "$(dir $@)"; then mkdir "$(dir $@)"; fi + $(AM_V_at)if test ! -f "$@" -a -f "$(srcdir)/$@"; then cp "$(srcdir)/$@" "$@"; fi + $(AM_V_GEN)if ! test -f "$@"; then \ + (cd "$(dir $@)" && \ + $(ITSTOOL) -o "$(notdir $@).tmp" $(_HELP_C_FILES) && \ + mv "$(notdir $@).tmp" "$(notdir $@)"); \ + else \ + (cd "$(dir $@)" && \ + $(ITSTOOL) -o "$(notdir $@).tmp" $(_HELP_C_FILES) && \ + msgmerge -o "$(notdir $@)" "$(notdir $@)" "$(notdir $@).tmp" && \ + rm "$(notdir $@).tmp"); \ + fi +$(_HELP_MOFILES): %.mo: %.po + $(AM_V_at)if ! test -d "$(dir $@)"; then mkdir "$(dir $@)"; fi + $(AM_V_GEN)msgfmt -o "$@" "$<" + +$(_HELP_LC_FILES): $(_HELP_LINGUAS) +$(_HELP_LINGUAS): $(_HELP_LC_STAMPS) +$(_HELP_LC_STAMPS): %.stamp: %.mo +$(_HELP_LC_STAMPS): $(_HELP_C_FILES) $(_HELP_C_EXTRA) + $(AM_V_at)if ! test -d "$(dir $@)"; then mkdir "$(dir $@)"; fi + $(_HELP_LC_VERBOSE)if test -d "C"; then d="../"; else d="$(abs_srcdir)/"; fi; \ + mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ + if test -f "$${mo}"; then mo="../$${mo}"; else mo="$(abs_srcdir)/$${mo}"; fi; \ + (cd "$(dir $@)" && $(ITSTOOL) -m "$${mo}" $(foreach f,$(_HELP_C_FILES),$${d}/$(f))) && \ + touch "$@" + +.PHONY: clean-help +mostlyclean-am: $(if $(HELP_ID),clean-help) +clean-help: + rm -f $(_HELP_LC_FILES) $(_HELP_LC_STAMPS) $(_HELP_MOFILES) + +EXTRA_DIST ?= +EXTRA_DIST += $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) +EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp) +EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).po) +EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f)))) + +distdir: distdir-help-files +distdir-help-files: + @for lc in C $(HELP_LINGUAS); do \ + $(MKDIR_P) "$(distdir)/$$lc"; \ + for file in $(HELP_FILES); do \ + if test -f "$$lc/$$file"; then d=./; else d=$(srcdir)/; fi; \ + cp -p "$$d$$lc/$$file" "$(distdir)/$$lc/" || exit 1; \ + done; \ + done; \ + +.PHONY: check-help +check: check-help +check-help: + for lc in C $(_HELP_LINGUAS); do \ + if test -d "$$lc"; \ + then d=; \ + xmlpath="$$lc"; \ + else \ + d="$(srcdir)/"; \ + xmlpath="$$lc:$(srcdir)/$$lc"; \ + fi; \ + for page in $(HELP_FILES); do \ + echo "$(XMLLINT) --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ + $(XMLLINT) --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ + done; \ + done -DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS" +.PHONY: install-help +install-data-am: $(if $(HELP_ID),install-help) +install-help: + @for lc in C $(_HELP_LINGUAS); do \ + $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \ + done + @for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \ + if test -f "$$lc/$$f"; then d=; else d="$(srcdir)/"; fi; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \ + echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir`basename $$f`"; \ + $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir`basename $$f`" || exit 1; \ + done; done + @for f in $(_HELP_C_EXTRA); do \ + lc=`dirname "$$f"`; lc=`basename "$$lc"`; \ + if test -f "$$f"; then d=; else d="$(srcdir)/"; fi; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \ + echo "$(INSTALL_DATA) $$d$$f $$helpdir`basename $$f`"; \ + $(INSTALL_DATA) "$$d$$f" "$$helpdir`basename $$f`" || exit 1; \ + done + @for f in $(HELP_MEDIA); do \ + for lc in C $(_HELP_LINGUAS); do \ + if test -f "$$lc$$f"; then d=; else d="$(srcdir)/"; fi; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + mdir=`dirname "$$f"`; \ + if test "x$mdir" = "x."; then mdir=""; fi; \ + if ! test -d "$$helpdir$$mdir"; then $(mkinstalldirs) "$$helpdir$$mdir"; fi; \ + if test -f "$$d$$lc/$$f"; then \ + echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir$$f"; \ + $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir$$f" || exit 1; \ + elif test "x$$lc" != "xC"; then \ + echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \ + $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \ + fi; \ + done; \ + done - if test "$gdu_cv_have_gdu" = "yes"; then - HAVE_GNOME_DOC_UTILS_TRUE= - HAVE_GNOME_DOC_UTILS_FALSE='#' -else - HAVE_GNOME_DOC_UTILS_TRUE='#' - HAVE_GNOME_DOC_UTILS_FALSE= -fi +.PHONY: uninstall-help +uninstall-am: $(if $(HELP_ID),uninstall-help) +uninstall-help: + for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + echo "rm -f $$helpdir`basename $$f`"; \ + rm -f "$$helpdir`basename $$f`"; \ + done; done + @for f in $(_HELP_C_EXTRA); do \ + lc=`dirname "$$f"`; lc=`basename "$$lc"`; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + echo "rm -f $$helpdir`basename $$f`"; \ + rm -f "$$helpdir`basename $$f`"; \ + done + @for f in $(HELP_MEDIA); do \ + for lc in C $(_HELP_LINGUAS); do \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + echo "rm -f $$helpdir$$f"; \ + rm -f "$$helpdir$$f"; \ + done; \ + done; +' @@ -17119,7 +17356,6 @@ fi - warnCFLAGS= if test "x$GCC" != xyes; then enable_compile_warnings=no fi @@ -17127,25 +17363,50 @@ warning_flags= realsave_CFLAGS="$CFLAGS" + base_warn_flags=" \ + -Wall \ + -Wstrict-prototypes \ + -Wnested-externs \ + " + + base_error_flags=" \ + -Werror=missing-prototypes \ + -Werror=implicit-function-declaration \ + -Werror=pointer-arith \ + -Werror=init-self \ + -Werror=format-security \ + -Werror=format=2 \ + -Werror=missing-include-dirs \ + " + case "$enable_compile_warnings" in no) - warning_flags= - ;; + warning_flags= + ;; minimum) - warning_flags="-Wall" - ;; + warning_flags="-Wall" + ;; yes) - warning_flags="-Wall -Wmissing-prototypes" - ;; + warning_flags="$base_warn_flags $base_error_flags" + ;; maximum|error) - warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" - CFLAGS="$warning_flags $CFLAGS" - for option in -Wno-sign-compare; do - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc understands $option" >&5 + warning_flags="$base_warn_flags $base_error_flags" + ;; + *) + as_fn_error $? "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5 + ;; + esac + + if test "$enable_compile_warnings" = "error" ; then + warning_flags="$warning_flags -Werror" + fi + + for option in $warning_flags; do + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc understands $option" >&5 $as_echo_n "checking whether gcc understands $option... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -17162,29 +17423,21 @@ has_option=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS="$SAVE_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5 + CFLAGS="$save_CFLAGS" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5 $as_echo "$has_option" >&6; } - if test $has_option = yes; then - warning_flags="$warning_flags $option" - fi - unset has_option - unset SAVE_CFLAGS - done - unset option - if test "$enable_compile_warnings" = "error" ; then - warning_flags="$warning_flags -Werror" + if test $has_option = yes; then + tested_warning_flags="$tested_warning_flags $option" fi - ;; - *) - as_fn_error $? "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5 - ;; - esac + unset has_option + unset save_CFLAGS + done + unset option CFLAGS="$realsave_CFLAGS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $warning_flags" >&5 -$as_echo "$warning_flags" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tested_warning_flags" >&5 +$as_echo "$tested_warning_flags" >&6; } # Check whether --enable-iso-c was given. if test "${enable_iso_c+set}" = set; then : @@ -17212,7 +17465,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCFLAGS" >&5 $as_echo "$complCFLAGS" >&6; } - WARN_CFLAGS="$warning_flags $complCFLAGS" + WARN_CFLAGS="$tested_warning_flags $complCFLAGS" @@ -17519,18 +17772,21 @@ -GLIB_REQUIRED=2.28.0 -GTK_REQUIRED=3.2.0 +GLIB_REQUIRED=2.34.0 +GTK_REQUIRED=3.4.0 EXIV2_REQUIRED=0.21 CLUTTER_REQUIRED=1.0.0 CLUTTER_GTK_REQUIRED=1.0.0 -GSTREAMER_REQUIRED=0.10 +GSTREAMER_REQUIRED=1.0.0 OPENRAW_REQUIRED=0.0.8 LIBSOUP_REQUIRED=2.36 -GNOME_KEYRING_REQUIRED=3.2.0 +LIBSECRET_REQUIRED=0.11 LIBBRASERO_REQUIRED=3.2.0 LIBCHAMPLAIN_REQUIRED=0.12.0 LIBRSVG_REQUIRED=2.34.0 +LIBWEBP_REQUIRED=0.2.0 +JSON_GLIB_REQUIRED=0.15.0 +WEBKIT2_REQUIRED=1.10.0 CFLAGS=${CFLAGS-:""} @@ -17545,7 +17801,7 @@ if test x$disable_deprecated = xyes; then CFLAGS="$CFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES" - CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" + CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGST_DISABLE_DEPRECATED" fi @@ -17899,93 +18155,11 @@ -# Extract the first word of "glib-genmarshal", so it can be a program name with args. -set dummy glib-genmarshal; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GLIB_GENMARSHAL+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $GLIB_GENMARSHAL in - [\\/]* | ?:[\\/]*) - ac_cv_path_GLIB_GENMARSHAL="$GLIB_GENMARSHAL" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL -if test -n "$GLIB_GENMARSHAL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_GENMARSHAL" >&5 -$as_echo "$GLIB_GENMARSHAL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -# Extract the first word of "glib-mkenums", so it can be a program name with args. -set dummy glib-mkenums; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GLIB_MKENUMS+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $GLIB_MKENUMS in - [\\/]* | ?:[\\/]*) - ac_cv_path_GLIB_MKENUMS="$GLIB_MKENUMS" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GLIB_MKENUMS="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS -if test -n "$GLIB_MKENUMS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_MKENUMS" >&5 -$as_echo "$GLIB_MKENUMS" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - - -SAVE_CFLAGS="$CFLAGS" -CFLAGS="" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for floor in -lm" >&5 -$as_echo_n "checking for floor in -lm... " >&6; } -if ${ac_cv_lib_m_floor+:} false; then : +SAVE_CFLAGS="$CFLAGS" +CFLAGS="" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for floor in -lm" >&5 +$as_echo_n "checking for floor in -lm... " >&6; } +if ${ac_cv_lib_m_floor+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -18259,15 +18433,15 @@ pkg_cv_GSTREAMER_CFLAGS="$GSTREAMER_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 >= \$GSTREAMER_REQUIRED - gstreamer-interfaces-0.10\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gstreamer-0.10 >= $GSTREAMER_REQUIRED - gstreamer-interfaces-0.10") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-1.0 >= \$GSTREAMER_REQUIRED + gstreamer-plugins-base-1.0 >= \$GSTREAMER_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gstreamer-1.0 >= $GSTREAMER_REQUIRED + gstreamer-plugins-base-1.0 >= $GSTREAMER_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-0.10 >= $GSTREAMER_REQUIRED - gstreamer-interfaces-0.10" 2>/dev/null` + pkg_cv_GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-1.0 >= $GSTREAMER_REQUIRED + gstreamer-plugins-base-1.0 >= $GSTREAMER_REQUIRED" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -18279,15 +18453,15 @@ pkg_cv_GSTREAMER_LIBS="$GSTREAMER_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 >= \$GSTREAMER_REQUIRED - gstreamer-interfaces-0.10\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gstreamer-0.10 >= $GSTREAMER_REQUIRED - gstreamer-interfaces-0.10") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-1.0 >= \$GSTREAMER_REQUIRED + gstreamer-plugins-base-1.0 >= \$GSTREAMER_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gstreamer-1.0 >= $GSTREAMER_REQUIRED + gstreamer-plugins-base-1.0 >= $GSTREAMER_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GSTREAMER_LIBS=`$PKG_CONFIG --libs "gstreamer-0.10 >= $GSTREAMER_REQUIRED - gstreamer-interfaces-0.10" 2>/dev/null` + pkg_cv_GSTREAMER_LIBS=`$PKG_CONFIG --libs "gstreamer-1.0 >= $GSTREAMER_REQUIRED + gstreamer-plugins-base-1.0 >= $GSTREAMER_REQUIRED" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -18308,11 +18482,11 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gstreamer-0.10 >= $GSTREAMER_REQUIRED - gstreamer-interfaces-0.10" 2>&1` + GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gstreamer-1.0 >= $GSTREAMER_REQUIRED + gstreamer-plugins-base-1.0 >= $GSTREAMER_REQUIRED" 2>&1` else - GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gstreamer-0.10 >= $GSTREAMER_REQUIRED - gstreamer-interfaces-0.10" 2>&1` + GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gstreamer-1.0 >= $GSTREAMER_REQUIRED + gstreamer-plugins-base-1.0 >= $GSTREAMER_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GSTREAMER_PKG_ERRORS" >&5 @@ -20177,6 +20351,109 @@ +# Check whether --enable-libwebp was given. +if test "${enable_libwebp+set}" = set; then : + enableval=$enable_libwebp; +else + enable_libwebp=yes +fi + + +if test x$enable_libwebp = xyes ; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBWEBP" >&5 +$as_echo_n "checking for LIBWEBP... " >&6; } + +if test -n "$LIBWEBP_CFLAGS"; then + pkg_cv_LIBWEBP_CFLAGS="$LIBWEBP_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwebp >= \$LIBWEBP_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libwebp >= $LIBWEBP_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBWEBP_CFLAGS=`$PKG_CONFIG --cflags "libwebp >= $LIBWEBP_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$LIBWEBP_LIBS"; then + pkg_cv_LIBWEBP_LIBS="$LIBWEBP_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwebp >= \$LIBWEBP_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libwebp >= $LIBWEBP_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBWEBP_LIBS=`$PKG_CONFIG --libs "libwebp >= $LIBWEBP_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + LIBWEBP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libwebp >= $LIBWEBP_REQUIRED" 2>&1` + else + LIBWEBP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libwebp >= $LIBWEBP_REQUIRED" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBWEBP_PKG_ERRORS" >&5 + + enable_libwebp=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_libwebp=no +else + LIBWEBP_CFLAGS=$pkg_cv_LIBWEBP_CFLAGS + LIBWEBP_LIBS=$pkg_cv_LIBWEBP_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_libwebp=yes +fi +fi +if test x$enable_libwebp = xyes ; then + +$as_echo "#define HAVE_LIBWEBP 1" >>confdefs.h + +fi + + + + if test "x$enable_libwebp" = xyes; then + ENABLE_LIBWEBP_TRUE= + ENABLE_LIBWEBP_FALSE='#' +else + ENABLE_LIBWEBP_TRUE='#' + ENABLE_LIBWEBP_FALSE= +fi + + + +$as_echo "#define WEBP_IS_UNKNOWN_TO_GLIB 1" >>confdefs.h + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking liboperaw" >&5 $as_echo_n "checking liboperaw... " >&6; } # Check whether --enable-libopenraw was given. @@ -20372,30 +20649,30 @@ -# Check whether --enable-gnome-keyring was given. -if test "${enable_gnome_keyring+set}" = set; then : - enableval=$enable_gnome_keyring; +# Check whether --enable-libsecret was given. +if test "${enable_libsecret+set}" = set; then : + enableval=$enable_libsecret; else - enable_gnome_keyring=yes + enable_libsecret=yes fi -if test x$enable_gnome_keyring = xyes ; then +if test x$enable_libsecret = xyes ; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME_KEYRING" >&5 -$as_echo_n "checking for GNOME_KEYRING... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSECRET" >&5 +$as_echo_n "checking for LIBSECRET... " >&6; } -if test -n "$GNOME_KEYRING_CFLAGS"; then - pkg_cv_GNOME_KEYRING_CFLAGS="$GNOME_KEYRING_CFLAGS" +if test -n "$LIBSECRET_CFLAGS"; then + pkg_cv_LIBSECRET_CFLAGS="$LIBSECRET_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsecret-1 >= \$LIBSECRET_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsecret-1 >= $LIBSECRET_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GNOME_KEYRING_CFLAGS=`$PKG_CONFIG --cflags "gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED" 2>/dev/null` + pkg_cv_LIBSECRET_CFLAGS=`$PKG_CONFIG --cflags "libsecret-1 >= $LIBSECRET_REQUIRED" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -20403,16 +20680,16 @@ else pkg_failed=untried fi -if test -n "$GNOME_KEYRING_LIBS"; then - pkg_cv_GNOME_KEYRING_LIBS="$GNOME_KEYRING_LIBS" +if test -n "$LIBSECRET_LIBS"; then + pkg_cv_LIBSECRET_LIBS="$LIBSECRET_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-keyring-1 >= \$GNOME_KEYRING_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsecret-1 >= \$LIBSECRET_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsecret-1 >= $LIBSECRET_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GNOME_KEYRING_LIBS=`$PKG_CONFIG --libs "gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED" 2>/dev/null` + pkg_cv_LIBSECRET_LIBS=`$PKG_CONFIG --libs "libsecret-1 >= $LIBSECRET_REQUIRED" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -20433,27 +20710,27 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GNOME_KEYRING_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED" 2>&1` + LIBSECRET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsecret-1 >= $LIBSECRET_REQUIRED" 2>&1` else - GNOME_KEYRING_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED" 2>&1` + LIBSECRET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsecret-1 >= $LIBSECRET_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$GNOME_KEYRING_PKG_ERRORS" >&5 + echo "$LIBSECRET_PKG_ERRORS" >&5 - enable_gnome_keyring=no + enable_libsecret=no elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - enable_gnome_keyring=no + enable_libsecret=no else - GNOME_KEYRING_CFLAGS=$pkg_cv_GNOME_KEYRING_CFLAGS - GNOME_KEYRING_LIBS=$pkg_cv_GNOME_KEYRING_LIBS + LIBSECRET_CFLAGS=$pkg_cv_LIBSECRET_CFLAGS + LIBSECRET_LIBS=$pkg_cv_LIBSECRET_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } -$as_echo "#define HAVE_GNOME_KEYRING 1" >>confdefs.h +$as_echo "#define HAVE_LIBSECRET 1" >>confdefs.h - enable_gnome_keyring=yes + enable_libsecret=yes fi fi @@ -20688,7 +20965,190 @@ fi - if test "x$enable_libsoup" = xyes; then + + +# Check whether --enable-libjson_glib was given. +if test "${enable_libjson_glib+set}" = set; then : + enableval=$enable_libjson_glib; +else + enable_libjson_glib=yes +fi + + +if test x$enable_libjson_glib = xyes ; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JSON_GLIB" >&5 +$as_echo_n "checking for JSON_GLIB... " >&6; } + +if test -n "$JSON_GLIB_CFLAGS"; then + pkg_cv_JSON_GLIB_CFLAGS="$JSON_GLIB_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-glib-1.0 >= \$JSON_GLIB_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_JSON_GLIB_CFLAGS=`$PKG_CONFIG --cflags "json-glib-1.0 >= $JSON_GLIB_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$JSON_GLIB_LIBS"; then + pkg_cv_JSON_GLIB_LIBS="$JSON_GLIB_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-glib-1.0 >= \$JSON_GLIB_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "json-glib-1.0 >= $JSON_GLIB_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_JSON_GLIB_LIBS=`$PKG_CONFIG --libs "json-glib-1.0 >= $JSON_GLIB_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + JSON_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "json-glib-1.0 >= $JSON_GLIB_REQUIRED" 2>&1` + else + JSON_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "json-glib-1.0 >= $JSON_GLIB_REQUIRED" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$JSON_GLIB_PKG_ERRORS" >&5 + + enable_libjson_glib=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_libjson_glib=no +else + JSON_GLIB_CFLAGS=$pkg_cv_JSON_GLIB_CFLAGS + JSON_GLIB_LIBS=$pkg_cv_JSON_GLIB_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_JSON_GLIB 1" >>confdefs.h + + enable_libjson_glib=yes +fi +fi + + + + +# Check whether --enable-webkit2 was given. +if test "${enable_webkit2+set}" = set; then : + enableval=$enable_webkit2; +else + enable_webkit2=yes +fi + + +if test x$enable_webkit2 = xyes ; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WEBKIT2" >&5 +$as_echo_n "checking for WEBKIT2... " >&6; } + +if test -n "$WEBKIT2_CFLAGS"; then + pkg_cv_WEBKIT2_CFLAGS="$WEBKIT2_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit2gtk-3.0 >= \$WEBKIT2_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "webkit2gtk-3.0 >= $WEBKIT2_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_WEBKIT2_CFLAGS=`$PKG_CONFIG --cflags "webkit2gtk-3.0 >= $WEBKIT2_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$WEBKIT2_LIBS"; then + pkg_cv_WEBKIT2_LIBS="$WEBKIT2_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit2gtk-3.0 >= \$WEBKIT2_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "webkit2gtk-3.0 >= $WEBKIT2_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_WEBKIT2_LIBS=`$PKG_CONFIG --libs "webkit2gtk-3.0 >= $WEBKIT2_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + WEBKIT2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "webkit2gtk-3.0 >= $WEBKIT2_REQUIRED" 2>&1` + else + WEBKIT2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "webkit2gtk-3.0 >= $WEBKIT2_REQUIRED" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$WEBKIT2_PKG_ERRORS" >&5 + + enable_webkit2=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_webkit2=no +else + WEBKIT2_CFLAGS=$pkg_cv_WEBKIT2_CFLAGS + WEBKIT2_LIBS=$pkg_cv_WEBKIT2_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_WEBKIT2 1" >>confdefs.h + + enable_webkit2=yes +fi +fi + + + +if test "x$enable_libsoup" = xyes && test "x$enable_libjson_glib" = xyes && test "x$enable_webkit2" = xyes ; then + enable_web_services=yes +else + enable_web_services=no +fi + + if test "x$enable_web_services" = xyes; then ENABLE_WEB_SERVICES_TRUE= ENABLE_WEB_SERVICES_FALSE='#' else @@ -21063,7 +21523,7 @@ -GDK_TARGET="$($PKG_CONFIG --variable target gdk-2.0)" +GDK_TARGET="$($PKG_CONFIG --variable targets gdk-3.0)" { $as_echo "$as_me:${as_lineno-$LINENO}: checking which smclient backend to use" >&5 $as_echo_n "checking which smclient backend to use... " >&6; } @@ -21078,7 +21538,7 @@ if test "$with_smclient" == "auto"; then case "$GDK_TARGET" in - x11) with_smclient=xsmp ;; + *x11*) with_smclient=xsmp ;; *) with_smclient=no ;; esac fi @@ -21220,7 +21680,7 @@ -ac_config_files="$ac_config_files Makefile copy-n-paste/Makefile data/Makefile data/gthumb.desktop.in data/gthumb-${GTHUMB_API_VERSION}.pc:data/gthumb.pc.in data/gthumb-import.desktop.in data/icons/Makefile data/icons/hicolor/Makefile data/icons/hicolor/16x16/Makefile data/icons/hicolor/16x16/actions/Makefile data/icons/hicolor/16x16/apps/Makefile data/icons/hicolor/22x22/Makefile data/icons/hicolor/22x22/actions/Makefile data/icons/hicolor/22x22/apps/Makefile data/icons/hicolor/24x24/Makefile data/icons/hicolor/24x24/actions/Makefile data/icons/hicolor/32x32/Makefile data/icons/hicolor/32x32/apps/Makefile data/icons/hicolor/48x48/Makefile data/icons/hicolor/48x48/actions/Makefile data/icons/hicolor/48x48/apps/Makefile data/icons/hicolor/scalable/Makefile data/icons/hicolor/scalable/actions/Makefile data/icons/hicolor/scalable/apps/Makefile data/ui/Makefile help/Makefile m4/Makefile extensions/Makefile extensions/23hq/Makefile extensions/bookmarks/Makefile extensions/bookmarks/data/Makefile extensions/bookmarks/data/ui/Makefile extensions/burn_disc/Makefile extensions/burn_disc/data/Makefile extensions/burn_disc/data/ui/Makefile extensions/cairo_io/Makefile extensions/catalogs/Makefile extensions/catalogs/data/Makefile extensions/catalogs/data/ui/Makefile extensions/change_date/Makefile extensions/change_date/data/Makefile extensions/change_date/data/ui/Makefile extensions/comments/Makefile extensions/comments/data/Makefile extensions/comments/data/ui/Makefile extensions/contact_sheet/Makefile extensions/contact_sheet/data/Makefile extensions/contact_sheet/data/contact_sheet_themes/Makefile extensions/contact_sheet/data/ui/Makefile extensions/convert_format/Makefile extensions/convert_format/data/Makefile extensions/convert_format/data/ui/Makefile extensions/desktop_background/Makefile extensions/edit_metadata/Makefile extensions/edit_metadata/data/Makefile extensions/edit_metadata/data/ui/Makefile extensions/exiv2_tools/Makefile extensions/exiv2_tools/data/Makefile extensions/exiv2_tools/data/ui/Makefile extensions/export_tools/Makefile extensions/facebook/Makefile extensions/facebook/data/Makefile extensions/facebook/data/ui/Makefile extensions/file_manager/Makefile extensions/file_tools/Makefile extensions/file_tools/data/Makefile extensions/file_tools/data/ui/Makefile extensions/file_viewer/Makefile extensions/find_duplicates/Makefile extensions/find_duplicates/data/Makefile extensions/find_duplicates/data/ui/Makefile extensions/flicker_utils/Makefile extensions/flicker_utils/data/Makefile extensions/flicker_utils/data/ui/Makefile extensions/flicker/Makefile extensions/gstreamer_tools/Makefile extensions/gstreamer_tools/data/Makefile extensions/gstreamer_tools/data/ui/Makefile extensions/gstreamer_utils/Makefile extensions/image_print/Makefile extensions/image_print/data/Makefile extensions/image_print/data/ui/Makefile extensions/image_rotation/Makefile extensions/image_viewer/Makefile extensions/image_viewer/data/Makefile extensions/image_viewer/data/ui/Makefile extensions/importer/Makefile extensions/importer/data/Makefile extensions/importer/data/ui/Makefile extensions/jpeg_utils/Makefile extensions/list_tools/Makefile extensions/list_tools/data/Makefile extensions/list_tools/data/ui/Makefile extensions/map_view/Makefile extensions/oauth/Makefile extensions/oauth/data/Makefile extensions/oauth/data/ui/Makefile extensions/photo_importer/Makefile extensions/photo_importer/data/Makefile extensions/photo_importer/data/ui/Makefile extensions/photobucket/Makefile extensions/photobucket/data/Makefile extensions/photobucket/data/ui/Makefile extensions/picasaweb/Makefile extensions/picasaweb/data/Makefile extensions/picasaweb/data/ui/Makefile extensions/pixbuf_savers/Makefile extensions/pixbuf_savers/data/Makefile extensions/pixbuf_savers/data/ui/Makefile extensions/raw_files/Makefile extensions/red_eye_removal/Makefile extensions/red_eye_removal/data/Makefile extensions/red_eye_removal/data/ui/Makefile extensions/rename_series/Makefile extensions/rename_series/data/Makefile extensions/rename_series/data/ui/Makefile extensions/resize_images/Makefile extensions/resize_images/data/Makefile extensions/resize_images/data/ui/Makefile extensions/search/Makefile extensions/search/data/Makefile extensions/search/data/ui/Makefile extensions/selections/Makefile extensions/slideshow/Makefile extensions/slideshow/data/Makefile extensions/slideshow/data/ui/Makefile extensions/webalbums/Makefile extensions/webalbums/data/Makefile extensions/webalbums/data/albumthemes/Makefile extensions/webalbums/data/albumthemes/Classic/Makefile extensions/webalbums/data/albumthemes/ClassicClips/Makefile extensions/webalbums/data/albumthemes/NeatRound/Makefile extensions/webalbums/data/albumthemes/Wiki/Makefile extensions/webalbums/data/ui/Makefile gthumb/Makefile po/Makefile.in tests/Makefile" +ac_config_files="$ac_config_files Makefile copy-n-paste/Makefile data/Makefile data/gthumb.desktop.in data/gthumb-${GTHUMB_API_VERSION}.pc:data/gthumb.pc.in data/gthumb-import.desktop.in data/icons/Makefile data/icons/hicolor/Makefile data/icons/hicolor/16x16/Makefile data/icons/hicolor/16x16/actions/Makefile data/icons/hicolor/16x16/apps/Makefile data/icons/hicolor/22x22/Makefile data/icons/hicolor/22x22/actions/Makefile data/icons/hicolor/22x22/apps/Makefile data/icons/hicolor/24x24/Makefile data/icons/hicolor/24x24/actions/Makefile data/icons/hicolor/32x32/Makefile data/icons/hicolor/32x32/apps/Makefile data/icons/hicolor/48x48/Makefile data/icons/hicolor/48x48/actions/Makefile data/icons/hicolor/48x48/apps/Makefile data/icons/hicolor/256x256/Makefile data/icons/hicolor/256x256/apps/Makefile data/icons/hicolor/scalable/Makefile data/icons/hicolor/scalable/actions/Makefile data/icons/hicolor/scalable/apps/Makefile data/ui/Makefile help/Makefile m4/Makefile extensions/Makefile extensions/23hq/Makefile extensions/bookmarks/Makefile extensions/bookmarks/data/Makefile extensions/bookmarks/data/ui/Makefile extensions/burn_disc/Makefile extensions/burn_disc/data/Makefile extensions/burn_disc/data/ui/Makefile extensions/cairo_io/Makefile extensions/cairo_io/data/Makefile extensions/cairo_io/data/ui/Makefile extensions/catalogs/Makefile extensions/catalogs/data/Makefile extensions/catalogs/data/ui/Makefile extensions/change_date/Makefile extensions/change_date/data/Makefile extensions/change_date/data/ui/Makefile extensions/comments/Makefile extensions/comments/data/Makefile extensions/comments/data/ui/Makefile extensions/contact_sheet/Makefile extensions/contact_sheet/data/Makefile extensions/contact_sheet/data/contact_sheet_themes/Makefile extensions/contact_sheet/data/ui/Makefile extensions/convert_format/Makefile extensions/convert_format/data/Makefile extensions/convert_format/data/ui/Makefile extensions/desktop_background/Makefile extensions/edit_metadata/Makefile extensions/edit_metadata/data/Makefile extensions/edit_metadata/data/ui/Makefile extensions/exiv2_tools/Makefile extensions/exiv2_tools/data/Makefile extensions/exiv2_tools/data/ui/Makefile extensions/export_tools/Makefile extensions/facebook/Makefile extensions/facebook/data/Makefile extensions/facebook/data/ui/Makefile extensions/file_manager/Makefile extensions/file_tools/Makefile extensions/file_tools/data/Makefile extensions/file_tools/data/ui/Makefile extensions/file_viewer/Makefile extensions/find_duplicates/Makefile extensions/find_duplicates/data/Makefile extensions/find_duplicates/data/ui/Makefile extensions/flicker_utils/Makefile extensions/flicker_utils/data/Makefile extensions/flicker_utils/data/ui/Makefile extensions/flicker/Makefile extensions/gstreamer_tools/Makefile extensions/gstreamer_tools/data/Makefile extensions/gstreamer_tools/data/ui/Makefile extensions/gstreamer_utils/Makefile extensions/image_print/Makefile extensions/image_print/data/Makefile extensions/image_print/data/ui/Makefile extensions/image_rotation/Makefile extensions/image_viewer/Makefile extensions/image_viewer/data/Makefile extensions/image_viewer/data/ui/Makefile extensions/importer/Makefile extensions/importer/data/Makefile extensions/importer/data/ui/Makefile extensions/jpeg_utils/Makefile extensions/list_tools/Makefile extensions/list_tools/data/Makefile extensions/list_tools/data/ui/Makefile extensions/map_view/Makefile extensions/oauth/Makefile extensions/oauth/data/Makefile extensions/oauth/data/ui/Makefile extensions/photo_importer/Makefile extensions/photo_importer/data/Makefile extensions/photo_importer/data/ui/Makefile extensions/photobucket/Makefile extensions/photobucket/data/Makefile extensions/photobucket/data/ui/Makefile extensions/picasaweb/Makefile extensions/picasaweb/data/Makefile extensions/picasaweb/data/ui/Makefile extensions/raw_files/Makefile extensions/red_eye_removal/Makefile extensions/red_eye_removal/data/Makefile extensions/red_eye_removal/data/ui/Makefile extensions/rename_series/Makefile extensions/rename_series/data/Makefile extensions/rename_series/data/ui/Makefile extensions/resize_images/Makefile extensions/resize_images/data/Makefile extensions/resize_images/data/ui/Makefile extensions/search/Makefile extensions/search/data/Makefile extensions/search/data/ui/Makefile extensions/selections/Makefile extensions/slideshow/Makefile extensions/slideshow/data/Makefile extensions/slideshow/data/ui/Makefile extensions/webalbums/Makefile extensions/webalbums/data/Makefile extensions/webalbums/data/albumthemes/Makefile extensions/webalbums/data/albumthemes/Classic/Makefile extensions/webalbums/data/albumthemes/ClassicClips/Makefile extensions/webalbums/data/albumthemes/NeatRound/Makefile extensions/webalbums/data/albumthemes/Wiki/Makefile extensions/webalbums/data/ui/Makefile gthumb/Makefile gthumb/resources/Makefile po/Makefile.in tests/Makefile" cat >confcache <<\_ACEOF @@ -21369,14 +21829,6 @@ as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then - as_fn_error $? "conditional \"ENABLE_SK\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then - as_fn_error $? "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${RUN_IN_PLACE_TRUE}" && test -z "${RUN_IN_PLACE_FALSE}"; then as_fn_error $? "conditional \"RUN_IN_PLACE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -21421,6 +21873,10 @@ as_fn_error $? "conditional \"HAVE_LIBJPEG_80\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_LIBWEBP_TRUE}" && test -z "${ENABLE_LIBWEBP_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_LIBWEBP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ENABLE_LIBRSVG_TRUE}" && test -z "${ENABLE_LIBRSVG_FALSE}"; then as_fn_error $? "conditional \"ENABLE_LIBRSVG\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -21846,7 +22302,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gthumb $as_me 3.0.2, which was +This file was extended by gthumb $as_me 3.2.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21912,7 +22368,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gthumb config.status 3.0.2 +gthumb config.status 3.2.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -22442,6 +22898,8 @@ "data/icons/hicolor/48x48/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/48x48/Makefile" ;; "data/icons/hicolor/48x48/actions/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/48x48/actions/Makefile" ;; "data/icons/hicolor/48x48/apps/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/48x48/apps/Makefile" ;; + "data/icons/hicolor/256x256/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/256x256/Makefile" ;; + "data/icons/hicolor/256x256/apps/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/256x256/apps/Makefile" ;; "data/icons/hicolor/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/scalable/Makefile" ;; "data/icons/hicolor/scalable/actions/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/scalable/actions/Makefile" ;; "data/icons/hicolor/scalable/apps/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/scalable/apps/Makefile" ;; @@ -22457,6 +22915,8 @@ "extensions/burn_disc/data/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/burn_disc/data/Makefile" ;; "extensions/burn_disc/data/ui/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/burn_disc/data/ui/Makefile" ;; "extensions/cairo_io/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/cairo_io/Makefile" ;; + "extensions/cairo_io/data/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/cairo_io/data/Makefile" ;; + "extensions/cairo_io/data/ui/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/cairo_io/data/ui/Makefile" ;; "extensions/catalogs/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/catalogs/Makefile" ;; "extensions/catalogs/data/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/catalogs/data/Makefile" ;; "extensions/catalogs/data/ui/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/catalogs/data/ui/Makefile" ;; @@ -22527,9 +22987,6 @@ "extensions/picasaweb/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/picasaweb/Makefile" ;; "extensions/picasaweb/data/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/picasaweb/data/Makefile" ;; "extensions/picasaweb/data/ui/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/picasaweb/data/ui/Makefile" ;; - "extensions/pixbuf_savers/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/pixbuf_savers/Makefile" ;; - "extensions/pixbuf_savers/data/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/pixbuf_savers/data/Makefile" ;; - "extensions/pixbuf_savers/data/ui/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/pixbuf_savers/data/ui/Makefile" ;; "extensions/raw_files/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/raw_files/Makefile" ;; "extensions/red_eye_removal/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/red_eye_removal/Makefile" ;; "extensions/red_eye_removal/data/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/red_eye_removal/data/Makefile" ;; @@ -22556,6 +23013,7 @@ "extensions/webalbums/data/albumthemes/Wiki/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/webalbums/data/albumthemes/Wiki/Makefile" ;; "extensions/webalbums/data/ui/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/webalbums/data/ui/Makefile" ;; "gthumb/Makefile") CONFIG_FILES="$CONFIG_FILES gthumb/Makefile" ;; + "gthumb/resources/Makefile") CONFIG_FILES="$CONFIG_FILES gthumb/resources/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; @@ -23155,7 +23613,7 @@ case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -23206,7 +23664,7 @@ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the @@ -24122,11 +24580,12 @@ Clutter support : ${enable_clutter} GStreamer support : ${enable_gstreamer} Use libopenraw : ${enable_libopenraw} - Web services support : ${enable_libsoup} - Use GNOME Keyring : ${enable_gnome_keyring} + Web services support : ${enable_web_services} + Use libsecret : ${enable_libsecret} Burn disc support : ${enable_libbrasero} Web albums : ${enable_web_albums} SM client support : ${with_smclient} Map support : ${enable_libchamplain} SVG support : ${enable_librsvg} + WebP support : ${enable_libwebp} " diff -Nru gthumb-3.0.2/configure.ac gthumb-3.2.3/configure.ac --- gthumb-3.0.2/configure.ac 2012-08-20 19:53:53.000000000 +0000 +++ gthumb-3.2.3/configure.ac 2013-07-10 13:33:28.000000000 +0000 @@ -1,13 +1,13 @@ m4_define([gthumb_major_version], [3]) -m4_define([gthumb_minor_version], [0]) -m4_define([gthumb_micro_version], [2]) +m4_define([gthumb_minor_version], [2]) +m4_define([gthumb_micro_version], [3]) m4_define([gthumb_version], [gthumb_major_version.gthumb_minor_version.gthumb_micro_version]) m4_define([gthumb_api_version], [gthumb_major_version.gthumb_minor_version]) - + AC_PREREQ(2.63) -AC_INIT([gthumb], [gthumb_version], +AC_INIT([gthumb], [gthumb_version], [http://bugzilla.gnome.org/enter_bug.cgi?product=gthumb], [gthumb]) AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz tar-ustar]) @@ -29,7 +29,7 @@ LT_INIT -AC_SEARCH_LIBS([strerror],[cposix]) +AC_SEARCH_LIBS([strerror],[cposix], []) AC_PROG_CC AC_DIAGNOSE([obsolete],[AM_PROG_CC_STDC: @@ -45,29 +45,33 @@ AC_PROG_CPP AC_PROG_CXX -AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) -AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums) +AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal, glib-genmarshal) +AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums, glib-mkenums) +AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources, glib-compile-resources) GNOME_COMMON_INIT -GNOME_DOC_INIT +YELP_HELP_INIT GNOME_MAINTAINER_MODE_DEFINES GNOME_COMPILE_WARNINGS([maximum]) GNOME_CXX_WARNINGS GLIB_GSETTINGS GTHUMB_EXTENSION_RULES -GLIB_REQUIRED=2.28.0 -GTK_REQUIRED=3.2.0 +GLIB_REQUIRED=2.34.0 +GTK_REQUIRED=3.4.0 EXIV2_REQUIRED=0.21 CLUTTER_REQUIRED=1.0.0 CLUTTER_GTK_REQUIRED=1.0.0 -GSTREAMER_REQUIRED=0.10 +GSTREAMER_REQUIRED=1.0.0 OPENRAW_REQUIRED=0.0.8 LIBSOUP_REQUIRED=2.36 -GNOME_KEYRING_REQUIRED=3.2.0 +LIBSECRET_REQUIRED=0.11 LIBBRASERO_REQUIRED=3.2.0 LIBCHAMPLAIN_REQUIRED=0.12.0 LIBRSVG_REQUIRED=2.34.0 +LIBWEBP_REQUIRED=0.2.0 +JSON_GLIB_REQUIRED=0.15.0 +WEBKIT2_REQUIRED=1.10.0 dnl =========================================================================== @@ -80,7 +84,7 @@ disable_deprecated=no) if test x$disable_deprecated = xyes; then CFLAGS="$CFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES" - CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" + CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGST_DISABLE_DEPRECATED" fi dnl =========================================================================== @@ -155,11 +159,6 @@ dnl =========================================================================== -AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) -AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums) - -dnl =========================================================================== - SAVE_CFLAGS="$CFLAGS" CFLAGS="" AC_CHECK_LIB(m, floor,, AC_MSG_ERROR([math library not found])) @@ -216,8 +215,8 @@ if test x$enable_gstreamer = xyes ; then PKG_CHECK_MODULES(GSTREAMER, - [gstreamer-0.10 >= $GSTREAMER_REQUIRED - gstreamer-interfaces-0.10], + [gstreamer-1.0 >= $GSTREAMER_REQUIRED + gstreamer-plugins-base-1.0 >= $GSTREAMER_REQUIRED], [AC_DEFINE(HAVE_GSTREAMER, 1, [Have gstreamer]) enable_gstreamer=yes], [enable_gstreamer=no]) @@ -418,6 +417,28 @@ dnl =========================================================================== +AC_ARG_ENABLE([libwebp], + [AS_HELP_STRING([--disable-libwebp],[do not compile code that uses the libwebp library])],, + [enable_libwebp=yes]) + +if test x$enable_libwebp = xyes ; then + PKG_CHECK_MODULES(LIBWEBP, + [libwebp >= $LIBWEBP_REQUIRED], + [enable_libwebp=yes], + [enable_libwebp=no]) +fi +if test x$enable_libwebp = xyes ; then + AC_DEFINE(HAVE_LIBWEBP, 1, [Define to 1 if libwebp support is included]) +fi + +AC_SUBST(LIBWEBP_LIBS) +AC_SUBST(LIBWEBP_CFLAGS) +AM_CONDITIONAL(ENABLE_LIBWEBP, test "x$enable_libwebp" = xyes) + +AC_DEFINE(WEBP_IS_UNKNOWN_TO_GLIB, 1, [Define to 1 if webp images area not recognized by the glib functions]) + +dnl =========================================================================== + AC_MSG_CHECKING(liboperaw) AC_ARG_ENABLE([libopenraw], [AS_HELP_STRING([--enable-libopenraw],[use the libopenraw library to read raw files [default=no]])],, @@ -452,7 +473,7 @@ [enable_librsvg=no]) if test "x$enable_librsvg" = "xyes"; then AC_DEFINE(HAVE_LIBRSVG, 1, [Define to 1 if librsvg support is included]) - fi + fi fi AC_SUBST(LIBRSVG_LIBS) AC_SUBST(LIBRSVG_CFLAGS) @@ -460,19 +481,19 @@ dnl =========================================================================== -AC_ARG_ENABLE([gnome-keyring], - [AS_HELP_STRING([--disable-gnome-keyring],[do not compile code that uses the gnome-keyring library])],, - [enable_gnome_keyring=yes]) - -if test x$enable_gnome_keyring = xyes ; then - PKG_CHECK_MODULES(GNOME_KEYRING, - [gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED], - [AC_DEFINE(HAVE_GNOME_KEYRING, 1, [Have gnome-keyring]) - enable_gnome_keyring=yes], - [enable_gnome_keyring=no]) +AC_ARG_ENABLE([libsecret], + [AS_HELP_STRING([--disable-libsecret],[do not compile code that uses the libsecret library])],, + [enable_libsecret=yes]) + +if test x$enable_libsecret = xyes ; then + PKG_CHECK_MODULES(LIBSECRET, + [libsecret-1 >= $LIBSECRET_REQUIRED], + [AC_DEFINE(HAVE_LIBSECRET, 1, [Have libsecret]) + enable_libsecret=yes], + [enable_libsecret=no]) fi -AC_SUBST(GNOME_KEYRING_CFLAGS) -AC_SUBST(GNOME_KEYRING_LIBS) +AC_SUBST(LIBSECRET_CFLAGS) +AC_SUBST(LIBSECRET_LIBS) dnl =========================================================================== @@ -494,7 +515,46 @@ fi AC_SUBST(LIBSOUP_CFLAGS) AC_SUBST(LIBSOUP_LIBS) -AM_CONDITIONAL(ENABLE_WEB_SERVICES, test "x$enable_libsoup" = xyes) + +dnl =========================================================================== + +AC_ARG_ENABLE([libjson_glib], + [AS_HELP_STRING([--disable-libjson-glib],[do not compile code that uses the libjson-glib library])],, + [enable_libjson_glib=yes]) + +if test x$enable_libjson_glib = xyes ; then + PKG_CHECK_MODULES(JSON_GLIB, + [json-glib-1.0 >= $JSON_GLIB_REQUIRED], + [AC_DEFINE(HAVE_JSON_GLIB, 1, [Have libjson-glib]) + enable_libjson_glib=yes], + [enable_libjson_glib=no]) +fi +AC_SUBST(JSON_GLIB_CFLAGS) +AC_SUBST(JSON_GLIB_LIBS) + +dnl =========================================================================== + +AC_ARG_ENABLE([webkit2], + [AS_HELP_STRING([--disable-webkit2],[do not compile code that uses webkit2gtk])],, + [enable_webkit2=yes]) + +if test x$enable_webkit2 = xyes ; then + PKG_CHECK_MODULES(WEBKIT2, + [webkit2gtk-3.0 >= $WEBKIT2_REQUIRED], + [AC_DEFINE(HAVE_WEBKIT2, 1, [Have webkit2gtk]) + enable_webkit2=yes], + [enable_webkit2=no]) +fi +AC_SUBST(WEBKIT2_CFLAGS) +AC_SUBST(WEBKIT2_LIBS) + +if [ test "x$enable_libsoup" = xyes && test "x$enable_libjson_glib" = xyes && test "x$enable_webkit2" = xyes ] ; then + enable_web_services=yes +else + enable_web_services=no +fi + +AM_CONDITIONAL(ENABLE_WEB_SERVICES, test "x$enable_web_services" = xyes) dnl =========================================================================== @@ -536,7 +596,7 @@ dnl =========================================================================== -GDK_TARGET="$($PKG_CONFIG --variable target gdk-2.0)" +GDK_TARGET="$($PKG_CONFIG --variable targets gdk-3.0)" AC_MSG_CHECKING([which smclient backend to use]) AC_ARG_WITH([smclient], @@ -546,7 +606,7 @@ if test "$with_smclient" == "auto"; then case "$GDK_TARGET" in - x11) with_smclient=xsmp ;; + *x11*) with_smclient=xsmp ;; *) with_smclient=no ;; esac fi @@ -595,6 +655,8 @@ data/icons/hicolor/48x48/Makefile data/icons/hicolor/48x48/actions/Makefile data/icons/hicolor/48x48/apps/Makefile +data/icons/hicolor/256x256/Makefile +data/icons/hicolor/256x256/apps/Makefile data/icons/hicolor/scalable/Makefile data/icons/hicolor/scalable/actions/Makefile data/icons/hicolor/scalable/apps/Makefile @@ -610,6 +672,8 @@ extensions/burn_disc/data/Makefile extensions/burn_disc/data/ui/Makefile extensions/cairo_io/Makefile +extensions/cairo_io/data/Makefile +extensions/cairo_io/data/ui/Makefile extensions/catalogs/Makefile extensions/catalogs/data/Makefile extensions/catalogs/data/ui/Makefile @@ -680,9 +744,6 @@ extensions/picasaweb/Makefile extensions/picasaweb/data/Makefile extensions/picasaweb/data/ui/Makefile -extensions/pixbuf_savers/Makefile -extensions/pixbuf_savers/data/Makefile -extensions/pixbuf_savers/data/ui/Makefile extensions/raw_files/Makefile extensions/red_eye_removal/Makefile extensions/red_eye_removal/data/Makefile @@ -709,6 +770,7 @@ extensions/webalbums/data/albumthemes/Wiki/Makefile extensions/webalbums/data/ui/Makefile gthumb/Makefile +gthumb/resources/Makefile po/Makefile.in tests/Makefile ]) @@ -731,11 +793,12 @@ Clutter support : ${enable_clutter} GStreamer support : ${enable_gstreamer} Use libopenraw : ${enable_libopenraw} - Web services support : ${enable_libsoup} - Use GNOME Keyring : ${enable_gnome_keyring} + Web services support : ${enable_web_services} + Use libsecret : ${enable_libsecret} Burn disc support : ${enable_libbrasero} Web albums : ${enable_web_albums} SM client support : ${with_smclient} Map support : ${enable_libchamplain} SVG support : ${enable_librsvg} + WebP support : ${enable_libwebp} " diff -Nru gthumb-3.0.2/copy-n-paste/Makefile.in gthumb-3.2.3/copy-n-paste/Makefile.in --- gthumb-3.0.2/copy-n-paste/Makefile.in 2012-08-20 19:54:08.000000000 +0000 +++ gthumb-3.2.3/copy-n-paste/Makefile.in 2013-07-10 13:33:41.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -57,17 +85,17 @@ @WITH_SMCLIENT_TRUE@ eggsmclient-xsmp.c subdir = copy-n-paste -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -132,6 +160,23 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -164,9 +209,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -180,13 +223,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -215,7 +257,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -231,11 +276,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -252,7 +301,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -282,7 +330,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -397,6 +448,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libeggsmclient.la: $(libeggsmclient_la_OBJECTS) $(libeggsmclient_la_DEPENDENCIES) $(EXTRA_libeggsmclient_la_DEPENDENCIES) $(AM_V_CCLD)$(libeggsmclient_la_LINK) $(libeggsmclient_la_OBJECTS) $(libeggsmclient_la_LIBADD) $(LIBS) @@ -415,14 +467,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -458,26 +510,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -489,15 +530,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -506,9 +543,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -661,9 +699,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES cscopelist ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -673,7 +711,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/data/Makefile.am gthumb-3.2.3/data/Makefile.am --- gthumb-3.0.2/data/Makefile.am 2012-08-18 18:16:41.000000000 +0000 +++ gthumb-3.2.3/data/Makefile.am 2013-04-30 16:56:12.000000000 +0000 @@ -18,6 +18,7 @@ org.gnome.gthumb.crop.gschema.xml.in \ org.gnome.gthumb.facebook.gschema.xml.in \ org.gnome.gthumb.file-manager.gschema.xml.in \ + org.gnome.gthumb.flickr.gschema.xml.in \ org.gnome.gthumb.gstreamer-tools.gschema.xml.in \ org.gnome.gthumb.image-print.gschema.xml.in \ org.gnome.gthumb.image-viewer.gschema.xml.in \ diff -Nru gthumb-3.0.2/data/Makefile.in gthumb-3.2.3/data/Makefile.in --- gthumb-3.0.2/data/Makefile.in 2012-08-20 19:54:08.000000000 +0000 +++ gthumb-3.2.3/data/Makefile.in 2013-07-10 13:33:41.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,19 +79,18 @@ build_triplet = @build@ host_triplet = @host@ subdir = data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/gthumb-import.desktop.in.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/gthumb.desktop.in.in $(srcdir)/gthumb.pc.in \ - $(top_srcdir)/mkinstalldirs + $(srcdir)/gthumb-import.desktop.in.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = gthumb.desktop.in gthumb-${GTHUMB_API_VERSION}.pc \ gthumb-import.desktop.in @@ -82,13 +109,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -129,9 +157,29 @@ DATA = $(convert_DATA) $(desktop_DATA) $(pkgconfig_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -190,9 +238,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -206,13 +252,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -241,7 +286,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -257,11 +305,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -278,7 +330,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -308,7 +359,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -381,6 +435,7 @@ org.gnome.gthumb.crop.gschema.xml.in \ org.gnome.gthumb.facebook.gschema.xml.in \ org.gnome.gthumb.file-manager.gschema.xml.in \ + org.gnome.gthumb.flickr.gschema.xml.in \ org.gnome.gthumb.gstreamer-tools.gschema.xml.in \ org.gnome.gthumb.image-print.gschema.xml.in \ org.gnome.gthumb.image-viewer.gschema.xml.in \ @@ -574,14 +629,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -602,31 +656,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -642,12 +678,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -659,15 +690,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -676,9 +703,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -695,19 +723,6 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically 'make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -875,27 +890,23 @@ uninstall-man: uninstall-man1 -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - dist-hook distclean distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-convertDATA install-data \ - install-data-am install-desktopDATA install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-man1 \ - install-pdf install-pdf-am install-pkgconfigDATA install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am dist-hook distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-convertDATA \ + install-data install-data-am install-desktopDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-man1 install-pdf install-pdf-am install-pkgconfigDATA \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-convertDATA \ - uninstall-desktopDATA uninstall-man uninstall-man1 \ - uninstall-pkgconfigDATA + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-convertDATA uninstall-desktopDATA \ + uninstall-man uninstall-man1 uninstall-pkgconfigDATA @INTLTOOL_DESKTOP_RULE@ diff -Nru gthumb-3.0.2/data/gthumb-3.0.pc gthumb-3.2.3/data/gthumb-3.0.pc --- gthumb-3.0.2/data/gthumb-3.0.pc 2012-08-20 20:06:33.000000000 +0000 +++ gthumb-3.2.3/data/gthumb-3.0.pc 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -prefix=/usr/local -exec_prefix=${prefix} -libdir=${exec_prefix}/lib/gthumb -includedir=${prefix}/include/gthumb-3.0 -extensionsdir=${exec_prefix}/lib/gthumb/extensions -datarootdir=${prefix}/share -datadir=${datarootdir} - -Name: gthumb -Description: Image viewer and browser -Version: 3.0.2 -Requires: gtk+-3.0 -Libs: -L${libdir} -Cflags: -I${includedir} diff -Nru gthumb-3.0.2/data/gthumb-3.2.pc gthumb-3.2.3/data/gthumb-3.2.pc --- gthumb-3.0.2/data/gthumb-3.2.pc 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/data/gthumb-3.2.pc 2013-07-10 13:34:02.000000000 +0000 @@ -0,0 +1,14 @@ +prefix=/usr/local +exec_prefix=${prefix} +libdir=${exec_prefix}/lib/gthumb +includedir=${prefix}/include/gthumb-3.2 +extensionsdir=${exec_prefix}/lib/gthumb/extensions +datarootdir=${prefix}/share +datadir=${datarootdir} + +Name: gthumb +Description: Image viewer and browser +Version: 3.2.3 +Requires: gtk+-3.0 +Libs: -L${libdir} +Cflags: -I${includedir} diff -Nru gthumb-3.0.2/data/icons/Makefile.in gthumb-3.2.3/data/icons/Makefile.in --- gthumb-3.0.2/data/icons/Makefile.in 2012-08-20 20:24:25.000000000 +0000 +++ gthumb-3.2.3/data/icons/Makefile.in 2013-07-10 13:33:41.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/icons -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -79,13 +106,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -122,9 +150,29 @@ DATA = $(icon_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -183,9 +231,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -199,13 +245,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -234,7 +279,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -250,11 +298,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -271,7 +323,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -301,7 +352,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -432,14 +486,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -460,31 +513,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -500,12 +535,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -517,15 +547,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -534,9 +560,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -711,24 +738,21 @@ uninstall-am: uninstall-iconDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-iconDATA install-info install-info-am \ install-man install-pdf install-pdf-am install-ps \ install-ps-am install-strip installcheck installcheck-am \ installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-iconDATA + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-iconDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/data/icons/hicolor/16x16/Makefile.in gthumb-3.2.3/data/icons/hicolor/16x16/Makefile.in --- gthumb-3.0.2/data/icons/hicolor/16x16/Makefile.in 2012-08-20 19:54:08.000000000 +0000 +++ gthumb-3.2.3/data/icons/hicolor/16x16/Makefile.in 2013-07-10 13:33:41.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/icons/hicolor/16x16 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/data/icons/hicolor/16x16/actions/Makefile.am gthumb-3.2.3/data/icons/hicolor/16x16/actions/Makefile.am --- gthumb-3.0.2/data/icons/hicolor/16x16/actions/Makefile.am 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/data/icons/hicolor/16x16/actions/Makefile.am 2013-04-30 16:56:12.000000000 +0000 @@ -25,10 +25,10 @@ site-picasaweb.png \ site-twentythree.png \ tool-adjust-colors.png \ + tool-adjust-contrast.png \ tool-crop.png \ - tool-desaturate.png \ - tool-enhance.png \ tool-flip.png \ + tool-grayscale.png \ tool-invert.png \ tool-mirror.png \ tool-red-eye.png \ diff -Nru gthumb-3.0.2/data/icons/hicolor/16x16/actions/Makefile.in gthumb-3.2.3/data/icons/hicolor/16x16/actions/Makefile.in --- gthumb-3.0.2/data/icons/hicolor/16x16/actions/Makefile.in 2012-08-20 19:54:09.000000000 +0000 +++ gthumb-3.2.3/data/icons/hicolor/16x16/actions/Makefile.in 2013-07-10 13:33:41.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/icons/hicolor/16x16/actions -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(iconsdir)" DATA = $(icons_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -343,10 +377,10 @@ site-picasaweb.png \ site-twentythree.png \ tool-adjust-colors.png \ + tool-adjust-contrast.png \ tool-crop.png \ - tool-desaturate.png \ - tool-enhance.png \ tool-flip.png \ + tool-grayscale.png \ tool-invert.png \ tool-mirror.png \ tool-red-eye.png \ @@ -419,11 +453,9 @@ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -564,16 +596,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-iconsDATA install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-iconsDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-iconsDATA install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-iconsDATA -include $(top_srcdir)/git.mk Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/data/icons/hicolor/16x16/actions/tool-adjust-contrast.png and /tmp/43kzZNuclK/gthumb-3.2.3/data/icons/hicolor/16x16/actions/tool-adjust-contrast.png differ Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/data/icons/hicolor/16x16/actions/tool-desaturate.png and /tmp/43kzZNuclK/gthumb-3.2.3/data/icons/hicolor/16x16/actions/tool-desaturate.png differ Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/data/icons/hicolor/16x16/actions/tool-enhance.png and /tmp/43kzZNuclK/gthumb-3.2.3/data/icons/hicolor/16x16/actions/tool-enhance.png differ Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/data/icons/hicolor/16x16/actions/tool-grayscale.png and /tmp/43kzZNuclK/gthumb-3.2.3/data/icons/hicolor/16x16/actions/tool-grayscale.png differ diff -Nru gthumb-3.0.2/data/icons/hicolor/16x16/apps/Makefile.in gthumb-3.2.3/data/icons/hicolor/16x16/apps/Makefile.in --- gthumb-3.0.2/data/icons/hicolor/16x16/apps/Makefile.in 2012-08-20 19:54:09.000000000 +0000 +++ gthumb-3.2.3/data/icons/hicolor/16x16/apps/Makefile.in 2013-07-10 13:33:41.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/icons/hicolor/16x16/apps -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(iconsdir)" DATA = $(icons_DATA) $(noinst_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -392,11 +426,9 @@ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -537,16 +569,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-iconsDATA install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-iconsDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-iconsDATA install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-iconsDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/data/icons/hicolor/22x22/Makefile.in gthumb-3.2.3/data/icons/hicolor/22x22/Makefile.in --- gthumb-3.0.2/data/icons/hicolor/22x22/Makefile.in 2012-08-20 19:54:09.000000000 +0000 +++ gthumb-3.2.3/data/icons/hicolor/22x22/Makefile.in 2013-07-10 13:33:41.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/icons/hicolor/22x22 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/data/icons/hicolor/22x22/actions/Makefile.am gthumb-3.2.3/data/icons/hicolor/22x22/actions/Makefile.am --- gthumb-3.0.2/data/icons/hicolor/22x22/actions/Makefile.am 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/data/icons/hicolor/22x22/actions/Makefile.am 2013-04-30 16:56:12.000000000 +0000 @@ -15,9 +15,9 @@ share.png \ tag.png \ tool-adjust-colors.png \ + tool-adjust-contrast.png \ tool-crop.png \ - tool-desaturate.png \ - tool-enhance.png \ + tool-grayscale.png \ tool-red-eye.png \ tool-resize.png \ tool-rotate.png \ diff -Nru gthumb-3.0.2/data/icons/hicolor/22x22/actions/Makefile.in gthumb-3.2.3/data/icons/hicolor/22x22/actions/Makefile.in --- gthumb-3.0.2/data/icons/hicolor/22x22/actions/Makefile.in 2012-08-20 19:54:09.000000000 +0000 +++ gthumb-3.2.3/data/icons/hicolor/22x22/actions/Makefile.in 2013-07-10 13:33:41.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/icons/hicolor/22x22/actions -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(iconsdir)" DATA = $(icons_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -333,9 +367,9 @@ share.png \ tag.png \ tool-adjust-colors.png \ + tool-adjust-contrast.png \ tool-crop.png \ - tool-desaturate.png \ - tool-enhance.png \ + tool-grayscale.png \ tool-red-eye.png \ tool-resize.png \ tool-rotate.png \ @@ -403,11 +437,9 @@ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -548,16 +580,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-iconsDATA install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-iconsDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-iconsDATA install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-iconsDATA -include $(top_srcdir)/git.mk Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/data/icons/hicolor/22x22/actions/tool-adjust-contrast.png and /tmp/43kzZNuclK/gthumb-3.2.3/data/icons/hicolor/22x22/actions/tool-adjust-contrast.png differ Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/data/icons/hicolor/22x22/actions/tool-desaturate.png and /tmp/43kzZNuclK/gthumb-3.2.3/data/icons/hicolor/22x22/actions/tool-desaturate.png differ Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/data/icons/hicolor/22x22/actions/tool-enhance.png and /tmp/43kzZNuclK/gthumb-3.2.3/data/icons/hicolor/22x22/actions/tool-enhance.png differ Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/data/icons/hicolor/22x22/actions/tool-grayscale.png and /tmp/43kzZNuclK/gthumb-3.2.3/data/icons/hicolor/22x22/actions/tool-grayscale.png differ diff -Nru gthumb-3.0.2/data/icons/hicolor/22x22/apps/Makefile.in gthumb-3.2.3/data/icons/hicolor/22x22/apps/Makefile.in --- gthumb-3.0.2/data/icons/hicolor/22x22/apps/Makefile.in 2012-08-20 19:54:09.000000000 +0000 +++ gthumb-3.2.3/data/icons/hicolor/22x22/apps/Makefile.in 2013-07-10 13:33:41.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/icons/hicolor/22x22/apps -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(iconsdir)" DATA = $(icons_DATA) $(noinst_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -392,11 +426,9 @@ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -537,16 +569,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-iconsDATA install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-iconsDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-iconsDATA install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-iconsDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/data/icons/hicolor/24x24/Makefile.in gthumb-3.2.3/data/icons/hicolor/24x24/Makefile.in --- gthumb-3.0.2/data/icons/hicolor/24x24/Makefile.in 2012-08-20 19:54:09.000000000 +0000 +++ gthumb-3.2.3/data/icons/hicolor/24x24/Makefile.in 2013-07-10 13:33:41.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/icons/hicolor/24x24 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/data/icons/hicolor/24x24/actions/Makefile.in gthumb-3.2.3/data/icons/hicolor/24x24/actions/Makefile.in --- gthumb-3.0.2/data/icons/hicolor/24x24/actions/Makefile.in 2012-08-20 19:54:09.000000000 +0000 +++ gthumb-3.2.3/data/icons/hicolor/24x24/actions/Makefile.in 2013-07-10 13:33:41.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/icons/hicolor/24x24/actions -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(iconsdir)" DATA = $(icons_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -387,11 +421,9 @@ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -532,16 +564,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-iconsDATA install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-iconsDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-iconsDATA install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-iconsDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/data/icons/hicolor/256x256/Makefile.am gthumb-3.2.3/data/icons/hicolor/256x256/Makefile.am --- gthumb-3.0.2/data/icons/hicolor/256x256/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/data/icons/hicolor/256x256/Makefile.am 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,3 @@ +SUBDIRS = apps + +-include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/data/icons/hicolor/256x256/Makefile.in gthumb-3.2.3/data/icons/hicolor/256x256/Makefile.in --- gthumb-3.0.2/data/icons/hicolor/256x256/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/data/icons/hicolor/256x256/Makefile.in 2013-07-10 13:33:41.000000000 +0000 @@ -0,0 +1,701 @@ +# Makefile.in generated by automake 1.14 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = data/icons/hicolor/256x256 +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" +ACLOCAL = @ACLOCAL@ +ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BISON = @BISON@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CLUTTER_CFLAGS = @CLUTTER_CFLAGS@ +CLUTTER_LIBS = @CLUTTER_LIBS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +EXIV2_CFLAGS = @EXIV2_CFLAGS@ +EXIV2_LIBS = @EXIV2_LIBS@ +EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ +FGREP = @FGREP@ +FLEX = @FLEX@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ +GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ +GSTREAMER_LIBS = @GSTREAMER_LIBS@ +GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ +GTHUMB_CFLAGS = @GTHUMB_CFLAGS@ +GTHUMB_EXTENSION_IN_RULE = @GTHUMB_EXTENSION_IN_RULE@ +GTHUMB_EXTENSION_RULE = @GTHUMB_EXTENSION_RULE@ +GTHUMB_IMPLIB = @GTHUMB_IMPLIB@ +GTHUMB_LIBS = @GTHUMB_LIBS@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +HELP_DIR = @HELP_DIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ +JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBRASERO_CFLAGS = @LIBBRASERO_CFLAGS@ +LIBBRASERO_LIBS = @LIBBRASERO_LIBS@ +LIBCHAMPLAIN_CFLAGS = @LIBCHAMPLAIN_CFLAGS@ +LIBCHAMPLAIN_LIBS = @LIBCHAMPLAIN_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ +LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ +LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ +LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ +LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ +LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ +LIBSOUP_LIBS = @LIBSOUP_LIBS@ +LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +M_LIBS = @M_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@ +SMCLIENT_LIBS = @SMCLIENT_LIBS@ +STRIP = @STRIP@ +TIFF_LIBS = @TIFF_LIBS@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ +WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ +XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +SUBDIRS = apps +all: all-recursive + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/icons/hicolor/256x256/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign data/icons/hicolor/256x256/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +# This directory's subdirectories are mostly independent; you can cd +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +html-am: + +info: info-recursive + +info-am: + +install-data-am: + +install-dvi: install-dvi-recursive + +install-dvi-am: + +install-exec-am: + +install-html: install-html-recursive + +install-html-am: + +install-info: install-info-recursive + +install-info-am: + +install-man: + +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: + +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am + + +-include $(top_srcdir)/git.mk + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru gthumb-3.0.2/data/icons/hicolor/256x256/apps/Makefile.am gthumb-3.2.3/data/icons/hicolor/256x256/apps/Makefile.am --- gthumb-3.0.2/data/icons/hicolor/256x256/apps/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/data/icons/hicolor/256x256/apps/Makefile.am 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,11 @@ +themedir = $(datadir)/icons/hicolor +size = 256x256 +context = apps + +iconsdir = $(themedir)/$(size)/$(context) + +icons_DATA = gthumb.png + +EXTRA_DIST = $(icons_DATA) + +-include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/data/icons/hicolor/256x256/apps/Makefile.in gthumb-3.2.3/data/icons/hicolor/256x256/apps/Makefile.in --- gthumb-3.0.2/data/icons/hicolor/256x256/apps/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/data/icons/hicolor/256x256/apps/Makefile.in 2013-07-10 13:33:41.000000000 +0000 @@ -0,0 +1,580 @@ +# Makefile.in generated by automake 1.14 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = data/icons/hicolor/256x256/apps +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(iconsdir)" +DATA = $(icons_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BISON = @BISON@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CLUTTER_CFLAGS = @CLUTTER_CFLAGS@ +CLUTTER_LIBS = @CLUTTER_LIBS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +EXIV2_CFLAGS = @EXIV2_CFLAGS@ +EXIV2_LIBS = @EXIV2_LIBS@ +EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ +FGREP = @FGREP@ +FLEX = @FLEX@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ +GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ +GSTREAMER_LIBS = @GSTREAMER_LIBS@ +GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ +GTHUMB_CFLAGS = @GTHUMB_CFLAGS@ +GTHUMB_EXTENSION_IN_RULE = @GTHUMB_EXTENSION_IN_RULE@ +GTHUMB_EXTENSION_RULE = @GTHUMB_EXTENSION_RULE@ +GTHUMB_IMPLIB = @GTHUMB_IMPLIB@ +GTHUMB_LIBS = @GTHUMB_LIBS@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +HELP_DIR = @HELP_DIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ +JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBRASERO_CFLAGS = @LIBBRASERO_CFLAGS@ +LIBBRASERO_LIBS = @LIBBRASERO_LIBS@ +LIBCHAMPLAIN_CFLAGS = @LIBCHAMPLAIN_CFLAGS@ +LIBCHAMPLAIN_LIBS = @LIBCHAMPLAIN_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ +LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ +LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ +LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ +LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ +LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ +LIBSOUP_LIBS = @LIBSOUP_LIBS@ +LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +M_LIBS = @M_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@ +SMCLIENT_LIBS = @SMCLIENT_LIBS@ +STRIP = @STRIP@ +TIFF_LIBS = @TIFF_LIBS@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ +WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ +XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +themedir = $(datadir)/icons/hicolor +size = 256x256 +context = apps +iconsdir = $(themedir)/$(size)/$(context) +icons_DATA = gthumb.png +EXTRA_DIST = $(icons_DATA) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/icons/hicolor/256x256/apps/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign data/icons/hicolor/256x256/apps/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-iconsDATA: $(icons_DATA) + @$(NORMAL_INSTALL) + @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \ + done + +uninstall-iconsDATA: + @$(NORMAL_UNINSTALL) + @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir) +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(iconsdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-iconsDATA + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-iconsDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-iconsDATA install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-iconsDATA + + +-include $(top_srcdir)/git.mk + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/data/icons/hicolor/256x256/apps/gthumb.png and /tmp/43kzZNuclK/gthumb-3.2.3/data/icons/hicolor/256x256/apps/gthumb.png differ diff -Nru gthumb-3.0.2/data/icons/hicolor/32x32/Makefile.in gthumb-3.2.3/data/icons/hicolor/32x32/Makefile.in --- gthumb-3.0.2/data/icons/hicolor/32x32/Makefile.in 2012-08-20 19:54:09.000000000 +0000 +++ gthumb-3.2.3/data/icons/hicolor/32x32/Makefile.in 2013-07-10 13:33:41.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/icons/hicolor/32x32 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/data/icons/hicolor/32x32/apps/Makefile.in gthumb-3.2.3/data/icons/hicolor/32x32/apps/Makefile.in --- gthumb-3.0.2/data/icons/hicolor/32x32/apps/Makefile.in 2012-08-20 19:54:09.000000000 +0000 +++ gthumb-3.2.3/data/icons/hicolor/32x32/apps/Makefile.in 2013-07-10 13:33:42.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/icons/hicolor/32x32/apps -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(iconsdir)" DATA = $(icons_DATA) $(noinst_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -392,11 +426,9 @@ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -537,16 +569,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-iconsDATA install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-iconsDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-iconsDATA install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-iconsDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/data/icons/hicolor/48x48/Makefile.in gthumb-3.2.3/data/icons/hicolor/48x48/Makefile.in --- gthumb-3.0.2/data/icons/hicolor/48x48/Makefile.in 2012-08-20 19:54:09.000000000 +0000 +++ gthumb-3.2.3/data/icons/hicolor/48x48/Makefile.in 2013-07-10 13:33:42.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/icons/hicolor/48x48 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/data/icons/hicolor/48x48/actions/Makefile.in gthumb-3.2.3/data/icons/hicolor/48x48/actions/Makefile.in --- gthumb-3.0.2/data/icons/hicolor/48x48/actions/Makefile.in 2012-08-20 19:54:09.000000000 +0000 +++ gthumb-3.2.3/data/icons/hicolor/48x48/actions/Makefile.in 2013-07-10 13:33:42.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/icons/hicolor/48x48/actions -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(iconsdir)" DATA = $(icons_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -394,11 +428,9 @@ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -539,16 +571,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-iconsDATA install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-iconsDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-iconsDATA install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-iconsDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/data/icons/hicolor/48x48/apps/Makefile.in gthumb-3.2.3/data/icons/hicolor/48x48/apps/Makefile.in --- gthumb-3.0.2/data/icons/hicolor/48x48/apps/Makefile.in 2012-08-20 19:54:09.000000000 +0000 +++ gthumb-3.2.3/data/icons/hicolor/48x48/apps/Makefile.in 2013-07-10 13:33:42.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/icons/hicolor/48x48/apps -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(iconsdir)" DATA = $(icons_DATA) $(noinst_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -392,11 +426,9 @@ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -537,16 +569,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-iconsDATA install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-iconsDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-iconsDATA install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-iconsDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/data/icons/hicolor/Makefile.am gthumb-3.2.3/data/icons/hicolor/Makefile.am --- gthumb-3.0.2/data/icons/hicolor/Makefile.am 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/data/icons/hicolor/Makefile.am 2013-04-30 16:56:12.000000000 +0000 @@ -1,4 +1,4 @@ -SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable +SUBDIRS = 16x16 22x22 24x24 32x32 48x48 256x256 scalable gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor diff -Nru gthumb-3.0.2/data/icons/hicolor/Makefile.in gthumb-3.2.3/data/icons/hicolor/Makefile.in --- gthumb-3.0.2/data/icons/hicolor/Makefile.in 2012-08-20 19:54:09.000000000 +0000 +++ gthumb-3.2.3/data/icons/hicolor/Makefile.in 2013-07-10 13:33:42.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/icons/hicolor -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -328,7 +382,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable +SUBDIRS = 16x16 22x22 24x24 32x32 48x48 256x256 scalable gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor all: all-recursive @@ -376,14 +430,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -404,31 +457,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -444,12 +479,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -461,15 +491,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -478,9 +504,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -654,24 +681,22 @@ uninstall-am: @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am \ - install-data-am install-strip tags-recursive uninstall-am - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-data-hook \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ +.MAKE: $(am__recursive_targets) install-am install-data-am \ + install-strip uninstall-am + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-data-hook install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-hook + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-hook install-data-hook: update-icon-cache diff -Nru gthumb-3.0.2/data/icons/hicolor/scalable/Makefile.in gthumb-3.2.3/data/icons/hicolor/scalable/Makefile.in --- gthumb-3.0.2/data/icons/hicolor/scalable/Makefile.in 2012-08-20 19:54:09.000000000 +0000 +++ gthumb-3.2.3/data/icons/hicolor/scalable/Makefile.in 2013-07-10 13:33:42.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/icons/hicolor/scalable -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/data/icons/hicolor/scalable/actions/Makefile.am gthumb-3.2.3/data/icons/hicolor/scalable/actions/Makefile.am --- gthumb-3.0.2/data/icons/hicolor/scalable/actions/Makefile.am 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/data/icons/hicolor/scalable/actions/Makefile.am 2013-04-30 16:56:12.000000000 +0000 @@ -4,15 +4,16 @@ iconsdir = $(themedir)/$(size)/$(context) -icons_DATA = \ - browser-mode.svg \ - file-catalog.svg \ - file-library.svg \ - file-search.svg \ - palette.svg \ - share.svg \ - slideshow-pause.svg \ - tag.svg \ +icons_DATA = \ + browser-mode.svg \ + file-catalog.svg \ + file-library.svg \ + file-search.svg \ + palette.svg \ + share.svg \ + slideshow-pause.svg \ + tag.svg \ + tool-adjust-contrast.svg \ tool-sharpen.svg EXTRA_DIST = $(icons_DATA) diff -Nru gthumb-3.0.2/data/icons/hicolor/scalable/actions/Makefile.in gthumb-3.2.3/data/icons/hicolor/scalable/actions/Makefile.in --- gthumb-3.0.2/data/icons/hicolor/scalable/actions/Makefile.in 2012-08-20 19:54:09.000000000 +0000 +++ gthumb-3.2.3/data/icons/hicolor/scalable/actions/Makefile.in 2013-07-10 13:33:42.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/icons/hicolor/scalable/actions -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(iconsdir)" DATA = $(icons_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -323,14 +357,15 @@ context = actions iconsdir = $(themedir)/$(size)/$(context) icons_DATA = \ - browser-mode.svg \ - file-catalog.svg \ - file-library.svg \ - file-search.svg \ - palette.svg \ - share.svg \ - slideshow-pause.svg \ - tag.svg \ + browser-mode.svg \ + file-catalog.svg \ + file-library.svg \ + file-search.svg \ + palette.svg \ + share.svg \ + slideshow-pause.svg \ + tag.svg \ + tool-adjust-contrast.svg \ tool-sharpen.svg EXTRA_DIST = $(icons_DATA) @@ -394,11 +429,9 @@ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -539,16 +572,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-iconsDATA install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-iconsDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-iconsDATA install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-iconsDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/data/icons/hicolor/scalable/actions/tool-adjust-contrast.svg gthumb-3.2.3/data/icons/hicolor/scalable/actions/tool-adjust-contrast.svg --- gthumb-3.0.2/data/icons/hicolor/scalable/actions/tool-adjust-contrast.svg 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/data/icons/hicolor/scalable/actions/tool-adjust-contrast.svg 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,237 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff -Nru gthumb-3.0.2/data/icons/hicolor/scalable/apps/Makefile.in gthumb-3.2.3/data/icons/hicolor/scalable/apps/Makefile.in --- gthumb-3.0.2/data/icons/hicolor/scalable/apps/Makefile.in 2012-08-20 19:54:10.000000000 +0000 +++ gthumb-3.2.3/data/icons/hicolor/scalable/apps/Makefile.in 2013-07-10 13:33:42.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/icons/hicolor/scalable/apps -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(iconsdir)" DATA = $(icons_DATA) $(noinst_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -390,11 +424,9 @@ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -535,16 +567,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-iconsDATA install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-iconsDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-iconsDATA install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-iconsDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/data/icons/hicolor/scalable/apps/gthumb.svg gthumb-3.2.3/data/icons/hicolor/scalable/apps/gthumb.svg --- gthumb-3.0.2/data/icons/hicolor/scalable/apps/gthumb.svg 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/data/icons/hicolor/scalable/apps/gthumb.svg 2013-04-30 16:56:12.000000000 +0000 @@ -10,15 +10,15 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="48" - height="48" + width="256" + height="256" id="svg1872" sodipodi:version="0.32" - inkscape:version="0.47 r22583" + inkscape:version="0.48.3.1 r9886" sodipodi:docname="gthumb.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.0" - inkscape:export-filename="/home/paolo/workspace/gthumb/data/icons/hicolor/48x48/apps/gthumb.png" + inkscape:export-filename="/home/paolo/workspace/gthumb/data/icons/hicolor/256x256/apps/gthumb.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> + inkscape:window-maximized="1" + inkscape:snap-nodes="false" + inkscape:snap-global="false" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0"> + empspacing="2" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" + originx="420.11439px" + originy="15.702252px" /> + empspacing="2" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> + + + + + + + + + + + + + + + + - - - - - + style="stop-color:#fefefe;stop-opacity:1;" /> - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Ulisse Perusin - - - - gthumb - - - gthumb - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + style="fill:#000000;fill-opacity:1;stroke:none" + id="rect4721-9" + width="92" + height="56" + x="84" + y="428" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + inkscape:connector-curvature="0" + style="fill:#eeeeec;fill-opacity:1;stroke:none;display:inline;enable-background:new" + d="m -235.75736,72 215.514735,0 c 2.350423,0 4.24264,1.892218 4.24264,4.24264 L -16,192 c 0,4 -4,8 -4,8 l -40,40 c 0,0 -4,4 -8,4 l -167.75736,0 C -238.10778,244 -240,242.10778 -240,239.75736 l 0,-163.51472 C -240,73.892218 -238.10778,72 -235.75736,72 z" + id="path3381" + sodipodi:nodetypes="ccccccccccc" /> + + + + + + + inkscape:connector-curvature="0" + style="fill:#eeeeec;fill-opacity:1;stroke:none;display:inline;enable-background:new" + d="m -235.75736,72 215.514735,0 c 2.350423,0 4.24264,1.892218 4.24264,4.24264 L -16,192 c 0,4 -4,8 -4,8 l -40,40 c 0,0 -4,4 -8,4 l -167.75736,0 C -238.10778,244 -240,242.10778 -240,239.75736 l 0,-163.51472 C -240,73.892218 -238.10778,72 -235.75736,72 z" + id="path4245" + sodipodi:nodetypes="ccccccccccc" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Ulisse Perusin + + + + gthumb + + + gthumb + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Perfev mitr asertovnia, Cherioniev (Xariomashin) 2012, MashovBacu, Niri, Metru nde Covinir. Thumoriociv leshigaris. + + diff -Nru gthumb-3.0.2/data/org.gnome.gthumb.change-date.gschema.xml.in gthumb-3.2.3/data/org.gnome.gthumb.change-date.gschema.xml.in --- gthumb-3.0.2/data/org.gnome.gthumb.change-date.gschema.xml.in 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/data/org.gnome.gthumb.change-date.gschema.xml.in 2013-04-30 16:56:12.000000000 +0000 @@ -25,9 +25,6 @@ false - - false - false diff -Nru gthumb-3.0.2/data/org.gnome.gthumb.flickr.gschema.xml.in gthumb-3.2.3/data/org.gnome.gthumb.flickr.gschema.xml.in --- gthumb-3.0.2/data/org.gnome.gthumb.flickr.gschema.xml.in 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/data/org.gnome.gthumb.flickr.gschema.xml.in 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,30 @@ + + + + + + -1 + + + -1 + + + + diff -Nru gthumb-3.0.2/data/org.gnome.gthumb.gschema.xml.in gthumb-3.2.3/data/org.gnome.gthumb.gschema.xml.in --- gthumb-3.0.2/data/org.gnome.gthumb.gschema.xml.in 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/data/org.gnome.gthumb.gschema.xml.in 2013-04-30 16:56:12.000000000 +0000 @@ -1,18 +1,18 @@ @@ -29,7 +29,7 @@ - + [ 'default' ] @@ -38,13 +38,13 @@ true - + false - + true @@ -98,6 +98,9 @@ 0 + + false + true @@ -122,9 +125,15 @@ true + + 0 + 285 + + 'hidden' + 285 @@ -140,12 +149,13 @@ <_description>Open files in the active window - + + - + true @@ -162,6 +172,12 @@ false - - + + + + + true + + + diff -Nru gthumb-3.0.2/data/org.gnome.gthumb.gstreamer-tools.gschema.xml.in gthumb-3.2.3/data/org.gnome.gthumb.gstreamer-tools.gschema.xml.in --- gthumb-3.0.2/data/org.gnome.gthumb.gstreamer-tools.gschema.xml.in 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/data/org.gnome.gthumb.gstreamer-tools.gschema.xml.in 2013-04-30 16:56:12.000000000 +0000 @@ -22,6 +22,9 @@ 'file://~' + + 100 + diff -Nru gthumb-3.0.2/data/org.gnome.gthumb.image-viewer.gschema.xml.in gthumb-3.2.3/data/org.gnome.gthumb.image-viewer.gschema.xml.in --- gthumb-3.0.2/data/org.gnome.gthumb.image-viewer.gschema.xml.in 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/data/org.gnome.gthumb.image-viewer.gschema.xml.in 2013-04-30 16:56:12.000000000 +0000 @@ -1,23 +1,23 @@ - + 'low' @@ -39,10 +39,6 @@ 'medium' - - false - <_description>Whether to always use a black background. - - + diff -Nru gthumb-3.0.2/data/org.gnome.gthumb.picasaweb.gschema.xml.in gthumb-3.2.3/data/org.gnome.gthumb.picasaweb.gschema.xml.in --- gthumb-3.0.2/data/org.gnome.gthumb.picasaweb.gschema.xml.in 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/data/org.gnome.gthumb.picasaweb.gschema.xml.in 2013-04-30 16:56:12.000000000 +0000 @@ -1,26 +1,29 @@ - + - - true + + -1 + + + -1 diff -Nru gthumb-3.0.2/data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in gthumb-3.2.3/data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in --- gthumb-3.0.2/data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in 2013-04-30 16:56:12.000000000 +0000 @@ -1,30 +1,31 @@ - + + - + 'jpeg' @@ -43,19 +44,19 @@ false - + 6 - + true - + 'tiff' @@ -72,4 +73,16 @@ + + + false + + + 75 + + + 4 + + + diff -Nru gthumb-3.0.2/data/ui/Makefile.in gthumb-3.2.3/data/ui/Makefile.in --- gthumb-3.0.2/data/ui/Makefile.in 2012-08-20 19:54:10.000000000 +0000 +++ gthumb-3.2.3/data/ui/Makefile.in 2013-07-10 13:33:42.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -390,11 +424,9 @@ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -535,16 +567,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-uiDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-uiDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/debian/changelog gthumb-3.2.3/debian/changelog --- gthumb-3.0.2/debian/changelog 2013-01-01 08:43:02.000000000 +0000 +++ gthumb-3.2.3/debian/changelog 2013-10-05 05:28:45.000000000 +0000 @@ -1,1167 +1,13 @@ -gthumb (3:3.0.2-0ubuntu3) raring; urgency=low +gthumb (3.2.3-1dhor~raring) raring; urgency=low - * Drop build dependency on libiptcdata0-dev, exiv2 is used now - - update debian/control - * Mark Debian Vcs-* as XS-Debian-Vcs-* - - update debian/control + * Flickr: allow to use a facebook or google account. (#703534) + * Thumbnail list: images drawn with wrong offset. (#702538) + * Fixed the video player stopping after saving a screenshot. + * Fixed saving of TGA images. + * Fixed the size of the toolbar in fullscreen mode. + * Show the cursor again after stopping the slideshow. + * Web services: do not delete the previous account when creating a new + * one. - -- Micah Gersten Tue, 01 Jan 2013 02:38:42 -0600 + -- Dariusz Duma Sat, 05 Oct 2013 07:19:41 +0200 -gthumb (3:3.0.2-0ubuntu2) quantal; urgency=low - - * Build-depend on libtiff-dev rather than libtiff4-dev. - - -- Colin Watson Mon, 10 Sep 2012 00:11:20 +0100 - -gthumb (3:3.0.2-0ubuntu1) quantal; urgency=low - - * New upstream release - - -- Robert Ancell Mon, 03 Sep 2012 08:57:45 +1200 - -gthumb (3:3.0.1-2) unstable; urgency=low - - * Drop unused lintian override - * Add dependency on gsettings-desktop-schemas - * Add build-dependency on hardening-wrapper - - -- David Paleino Mon, 18 Jun 2012 16:31:23 +0200 - -gthumb (3:3.0.1-1) unstable; urgency=low - - * New upstream version - * Install upstream-provided manpage instead of Debian one - * Updated debian/copyright - * Add B-D on gsettings-desktop-schemas-dev - - -- David Paleino Sun, 17 Jun 2012 21:31:00 +0200 - -gthumb (3:3.0.0-2) unstable; urgency=low - - * Uploading to unstable - * Fixed debian/copyright - - -- David Paleino Thu, 10 May 2012 12:54:02 +0200 - -gthumb (3:3.0.0-1) experimental; urgency=low - - * New upstream version - * Patches refreshed to match new upstream code - - -- David Paleino Thu, 26 Apr 2012 22:43:35 +0200 - -gthumb (3:2.90.2-1) experimental; urgency=low - - * New upstream version - * Bump required versions of Build-Dependencies - * Patches refreshed to match new upstream code - * Standards-Version bump to 3.9.3, no changes needed - * Build-Depend on libpng12-dev | libpng-dev (Closes: #662366) - * Build-Depend on libexiv2 >= 0.21 - * Update debian/copyright - - -- David Paleino Sun, 08 Apr 2012 01:13:17 +0200 - -gthumb (3:2.14.2-1) unstable; urgency=low - - * New upstream version - * Updated debian/copyright - - -- David Paleino Wed, 22 Feb 2012 21:44:01 +0100 - -gthumb (3:2.14.1-1) unstable; urgency=low - - * New upstream version (Closes: #652692) - * Patches refreshed - * Bump build-dependencies requirements - * Fix FTBFS, added missing #include - * debian/watch fixed to point to new location (.xz tarballs) - - -- David Paleino Thu, 22 Dec 2011 22:40:29 +0100 - -gthumb (3:2.13.1-2) unstable; urgency=low - - * Build-Depend on libjpeg-dev, not libjpeg62-dev | libjpeg-dev - (Closes: #639055, #642834) - * Temporarily disable brasero support (Closes: #645280) - * Standards-Version bump to 3.9.2, no changes needed - - -- David Paleino Fri, 14 Oct 2011 09:56:04 +0200 - -gthumb (3:2.13.1-1) unstable; urgency=low - - * New upstream version - * Patches refreshed - * 01-PIC.patch removed, it's now put in configure.ac by upstream - * Fix FTBFS, missing linkage to libICE (01-fix_missing_linkage.patch) - * Added Build-Depends on libsm-dev and libice-dev - - -- David Paleino Thu, 10 Mar 2011 20:23:40 +0100 - -gthumb (3:2.12.2-1) unstable; urgency=low - - * New upstream version - * Patches refreshed - * Old patches removed; they're not useful anymore, and only clutter - debian/patches/. - - -- David Paleino Mon, 07 Feb 2011 16:39:07 +0100 - -gthumb (3:2.12.1-1) experimental; urgency=low - - * New upstream version - * Patches refreshed - * Add runtime dependency (as Recommends) on bison and flex, - needed by the webalbums plugin. They're Recommends because they - don't harm the core functionality of the program. - * Applied some patches from upstream's git: - - updated ja and eu translations - - fixed reading of ExifDatum's (improves previous - 14-safe_exif_read.patch) - - correctly activate default extensions on first run - - -- David Paleino Thu, 09 Dec 2010 17:16:31 +0100 - -gthumb (3:2.12.0-2) experimental; urgency=low - - * debian/patches/14-safe_exif_read.patch: safely read Exif - orientation, since it seems like some cameras don't store it. - (Closes: #601137) - - -- David Paleino Sat, 23 Oct 2010 22:07:37 +0200 - -gthumb (3:2.12.0-1) experimental; urgency=low - - * New upstream version - - -- David Paleino Tue, 28 Sep 2010 09:39:51 +0200 - -gthumb (3:2.11.92-1) experimental; urgency=low - - * New upstream version - * debian/patches/: - - 04-fix_source_typo.patch, 05-fix_locales.patch, - 07-fix_documentation_xml.patch refreshed - - 06-add_keybinding_DoNotSave.patch disabled, seems to be - applied upstream - - -- David Paleino Thu, 16 Sep 2010 09:49:13 +0200 - -gthumb (3:2.11.90-1) experimental; urgency=low - - * New upstream release - * debian/patches/: - - 18-build_with_gtk2.19.patch removed, merged upstream - - 19-backport_data_migration.patch removed, present in the new - version - - 04-fix_source_typo.patch, 07-fix_documentation_xml.patch, - 13-fix_Close_mismatch.patch refreshed to cleanly apply - * debian/gthumb-dev.install: don't install *.la files anymore - * debian/control: - - Standards-Version bumped to 3.9.1 - + don't install *.la files anymore in gthumb-dev - - -- David Paleino Fri, 20 Aug 2010 18:11:06 +0200 - -gthumb (3:2.11.5-4) unstable; urgency=low - - * debian/patches/14-safe_exif_read.patch: safely read Exif - orientation, since it seems like some cameras don't store it. - (Closes: #601137) - - -- David Paleino Sun, 28 Nov 2010 21:17:54 +0100 - -gthumb (3:2.11.5-3) unstable; urgency=low - - * debian/patches/20-backport_comments_loss_fix.patch backported from - upstream git: support old-style (2.10.x) comments stored in Exif - tags (Closes: #593813) - - -- David Paleino Sat, 21 Aug 2010 11:57:27 +0200 - -gthumb (3:2.11.5-2) unstable; urgency=low - - * debian/patches/19-backport_data_migration.patch backported from - upstream git: convert the old catalogs to the new format and - location (Closes: #584755) - - -- David Paleino Thu, 22 Jul 2010 09:53:49 +0200 - -gthumb (3:2.11.5-1) unstable; urgency=low - - * New upstream version - - Facebook plugin fixed (Closes: #588154) - * debian/patches/: - - 04-fix_source_typo.patch, 07-fix_documentation_xml.patch - refreshed - - -- David Paleino Tue, 20 Jul 2010 07:45:36 +0200 - -gthumb (3:2.11.4-3) unstable; urgency=low - - * Clutter support disabled once again, seems like the code used - to safely run gThumb still doesn't work. (Closes: #588713) - - -- David Paleino Sun, 11 Jul 2010 20:10:19 +0200 - -gthumb (3:2.11.4-2) unstable; urgency=low - - * debian/patches/03-fix_paths.patch disabled, so that icons are - really installed under /usr/share/gthumb/icons/. (Closes: #588227) - - -- David Paleino Tue, 06 Jul 2010 22:24:33 +0200 - -gthumb (3:2.11.4-1) unstable; urgency=low - - * New upstream version - * debian/control: - - added gstreamer0.10-gnomevfs to Recommends (Closes: #583479) - - minimum Build-Depends on GTK bumped to 2.18.0 - - added Build-Depends on bison - - re-added Build-Depends on clutter things - - drop Build-Depends on quilt, since we're using 3.0 (quilt) format - - added Build-Depends on dh-autoreconf - - Standards-Version bumped to 3.9.0 - + §7.6.1, use Breaks+Replaces instead of Conflicts+Replaces for - gthumb-data - * debian/rules: - - re-enable Clutter, since gThumb can now run even if Clutter - initialization fails - - don't call quilt anymore - - removed useless commented lines - - don't rename icons anymore, since 19-fix_extension_icon.patch has - been disabled - - autoreconf is now handled by dh_autoreconf (--with autoreconf) - * debian/patches/: - - *.patch refreshed, so that they cleanly apply - - 07-fix_documentation_xml.patch added, fixes XML so that it - validates during dh_auto_test - - 19-fix_extension_icon.patch disabled, icons are now installed - under /usr/share/gthumb/, so there's no risk of conflicting - with other packages - * debian/gthumb-data.install: removed usr/share/omf/, since that's not - the thing used for docs anymore (instead, Mallard is used) - - -- David Paleino Mon, 05 Jul 2010 19:30:15 +0200 - -gthumb (3:2.11.3-2) unstable; urgency=low - - * debian/rules: - - rename flickr.png to gthumb-flickr.png, and facebook.png - to gthumb-facebook.png (Closes: #579161) - * debian/patches/19-fix_extension_icon.patch added, make the - Flickr extension point to gthumb-flickr, and the Facebook extension - to gthumb-facebook. - - -- David Paleino Wed, 28 Apr 2010 18:58:50 +0200 - -gthumb (3:2.11.3-1) unstable; urgency=low - - * New upstream version - * debian/patches/* refreshed - * debian/control: - - added Build-Depends on libbrasero-media-dev - - added libjpeg-dev alternative to libjpeg62-dev (preparing for - libjpeg8 transition) - - re-formatted multiline fields - * debian/copyright: added new copyright stanzas, for - ./extensions/jpeg_utils - - -- David Paleino Sun, 25 Apr 2010 09:34:13 +0200 - -gthumb (3:2.11.2.1-2) unstable; urgency=low - - * debian/patches/: - - 18-build_with_gtk2.19.patch added (Closes: #573424) - * debian/rules: - - disable clutter at configure time (Closes: #573700, #573723) - * debian/control: - - remove Build-Dependencies on clutter things - - -- David Paleino Mon, 15 Mar 2010 07:43:28 +0100 - -gthumb (3:2.11.2.1-1) unstable; urgency=low - - * New upstream release - - warning displayed when resizing an image, so that it doesn't - get accidentally overwritten (Closes: #570033) - - doesn't crash anymore on View > Slideshow (Closes: #569787) - - slideshow transitions have been fixed already (Closes: #497579) - - easier navigation between directories (Closes: #572500) - - use exiv2 for metadata parsing (Closes: #470175) - - support Sony ARW files (Closes: #470176) - * Disabled libopenraw backend in favour of dcraw -- let's wait - until it's more mature. - * debian/control: - - added new Build-Dependencies, libsoup-gnome2.4-dev and - libgnome-keyring-dev - * debian/patches/: - - 03-fix_paths.patch and 06-add_keybinding_DoNotSave.patch - refreshed to apply to the new code - * debian/gthumb-dev.install: - - updated to work with the new code - - also install pkgconfig file - * debian/gthumb.install updated - - -- David Paleino Thu, 04 Mar 2010 18:34:52 +0100 - -gthumb (3:2.11.1-2) unstable; urgency=low - - * debian/gthumb.install: only install *.extension and *.so - - -- David Paleino Wed, 10 Feb 2010 14:56:49 +0100 - -gthumb (3:2.11.1-1) unstable; urgency=low - - * New upstream version - * debian/watch updated to correctly handle major releases - * debian/control: - - Build-Depends updated to current requirements - - bump quilt dependency to >= 0.46-7~, to use dh --with quilt - - add gthumb-dev and gthumb-dbg binary packages - - bump Standards-Version to 3.8.4, no changes needed - * debian/rules: - - rewritten to use dh7 with overrides - - pass --enable-debug, --enable-libopenraw to ./configure - - reflect changes in the directory structure - * debian/source/format: using 3.0 (quilt) - * debian/patches/: - - all patches refreshed to cleanly apply - - series: some patches temporarily disabled -- need to check - whether I can port them to the new code, whether they're still - needed or I can totally drop them. - - 02-preserve_gnome-doc-utils.make.patch renamed to - 02-preserve_upstream_files.patch, also try to preserve ChangeLog - - 03-fix_paths.patch added, fixes wrong installation directories - - 04-fix_source_typo.patch added, fix typo in sourcecode signaled - by lintian - * debian/gthumb.install updated - * debian/gthumb.1 added, installed into gthumb package - - -- David Paleino Wed, 10 Feb 2010 14:32:51 +0100 - -gthumb (3:2.10.11-3) unstable; urgency=low - - * debian/patches/: - - 04-fix_gvfs_umount.patch added from Ubuntu, fix import to work - with gvfs (Closes: #526452) (LP: #351122) - - 10-fix_POTFILES.skip.patch updated - - 15-suggest_new_name_on_overwrite_dialog.patch updated, fixes - SIGSEGV in overwrite dialog, thanks to Vincenzo Tibullo - (Closes: #555131) - - 17-dont_follow_symlinks_on_dups_search.patch added (Closes: #533641) - * debian/control: - - added gvfs-bin to Recommends, related to #526452 - - fixed automake1.9 Build-Dependency to automake - - added libx11-dev to Build-Depends, related to #554749 - - updated my e-mail address - - DMUA removed - - Standards-Version bumped to 3.8.3, no changes needed - * debian/rules: - - better use of CFLAGS - - add -lX11 to CFLAGS (Closes: #554749) - - -- David Paleino Sun, 08 Nov 2009 21:47:07 +0100 - -gthumb (3:2.10.11-2) unstable; urgency=low - - * debian/patches: - - 10-fix_POTFILES.skip.patch refreshed - - 13-fix_Close_mismatch.patch added (Closes: #524412) - - 14-add_rotate_button_viewer.patch added (Closes: #326699) - - 15-suggest_new_name_on_overwrite_dialog.patch added, thanks - to Jack T Mudge III (Closes: #530996) - - 16-fix_crop_dialog_usability.patch added, taken from git's - d4a737f458f2cae9d16cbdbb62bd120b94a5605c (Closes: #441687) - - -- David Paleino Fri, 12 Jun 2009 19:56:08 +0200 - -gthumb (3:2.10.11-1) unstable; urgency=low - - * New Upstream Version: - - fix crasher bug in exif tag reading, caused by malformed tiff headers. - (LP: #316017) - - give the photo-import desktop file different name parameters, so that - users can distinguish it from the normal desktop file. (LP: #318694) - - fixes GtkSpinButton deprecated non-zero page size adjustment setting, - patch from Ubuntu merged upstream (LP: #319349) - * Forgot bugnumber to close in 3:2.10.10-1, added (mostly for - changelog reasons, closing it manually) - * debian/control: - - scrollkeeper moved from gthumb's Recommends to gthumb-data's - Depends (Closes: #508709) - - yelp Recommends moved from gthumb to gthumb-data - - Standards-Version bumped to 3.8.1 (no changes needed) - * debian/patches/: - - 05-fix_locales.patch, 06-add_keybinding_DoNotSave.patch. - 10-fix_POTFILES.skip.patch refreshed - - 12-remove_Save_button_in_crop_dialog.patch added (Closes: #495444) - - -- David Paleino Sat, 11 Apr 2009 17:17:51 +0200 - -gthumb (3:2.10.10-2) unstable; urgency=low - - * Brown-paper-bag bug upload - * debian/patches/: - - 01-PIC.patch forwarded upstream, annotated. - - 06-add_keybinding_DoNotSave.patch forwarded upstream, annotated. - - 07-fix_zooms.patch, 08-fix_preferences.patch forwarded upstream, - annotated. - - 09-fix_infinite_loop_dragging_parent_dir.patch forwarded upstream, - annotated. - - 10-fix_POTFILES.skip.patch updated - - 11-fix_Film_on_import.patch added, thanks to Matijs van Zuijlen - (Closes: #510143) - - series updated: disable 03-libgthumb_moduledir.patch (i.e. let's - fix this bug before someone else notices :) ) - - -- David Paleino Sat, 21 Feb 2009 23:24:50 +0100 - -gthumb (3:2.10.10-1) unstable; urgency=low - - * New Upstream Version - * debian/rules: use $(QUILT_STAMPFN) instead of "patch" - * debian/patches/: - - 00-fix_ltmain.sh.patch added - - 04-fix_gthumb.desktop.in.patch removed, merged upstream - - 06-add_keybinding_DoNotSave.patch refreshed to cleanly apply, - description added - - 08-fix_missing_include.patch removed, was only needed in 2.10.8 - - 08-fix_preferences.patch added (Closes: #452932) - - 09-fix_infinite_loop_dragging_parent_dir.patch added: see - patch description for more info (Closes: #420195) - - 10-fix_POTFILES.skip.patch added: intltool-extract wrongly looks - at the original files patched by quilt, thus issuing an error - because of "unused translations" - - 01-PIC.patch, 02-preserve_gnome-doc-utils.make.patch, - 03-libgthumb_moduledir.patch, 05-fix_locales.patch, - 07-fix_zooms.patch: descriptions added - * debian/control: - - packaging moved to Git, updated Vcs-* fields - - dependency fields wrapped, for better readability in diffs - - added missing Build-Dependencies: libjpeg62-dev, - libglade2-dev (>= 2.4.0), libxrender-dev - - added support for libopenraw (B-D libopenrawgnome-dev) (Closes: #365060) - - debhelper dependency bumped to >= 7 - - added ${misc:Depends} to gthumb-data - - Standards-Version bumped to 3.8.0: - + debian/README.source added - - DMUA set - * debian/compat bumped to 7 - * debian/rules: - - using dh7 - - pass --with-gconf-schema-file-dir to ./configure - - auto-generation of htaccess and README files for Album Themes - - moved scrollkeeper to Recommends (it's not essential) - * debian/gthumb.mime added (Closes: #469316) - * debian/gthumb.dirs removed - * debian/htaccess.tmpl added (Closes: #434111) - * debian/gthumb-data.dirs: also installing gconf.schemas now - (Closes: #502968) - - -- David Paleino Sat, 21 Feb 2009 18:55:37 +0100 - -gthumb (3:2.10.8-1) unstable; urgency=low - - * Package adopted by me (Closes: #457591) - * New upstream release (Closes: #457509): - - fixes crash trying to print (Closes: #457350, #454298, #446413) - - fixes command line options parsing (Closes: #298881) - * debian/compat bumped to 5 - * debian/control: - - Standards-Version 3.7.3 - - dependencies updated (and wrapped) - - depending on unversioned scrollkeeper (Closes: #456602, #457021) - - recommending yelp (Closes: #340820) - - changed the Maintainer field - - added Homepage field (removing old pseudo-field) - - added Vcs-Svn and Vcs-Browser fields - - added Conflicts: gthumb (<< 3:2.10.8-1) to gthumb-data because of - conflicting files with older packages. - * debian/patches: converted to quilt - - 02-preserve_gnome-doc-utils.make added (compilation failed otherwise) - - 04-fix_gnome.desktop.in added (removing Encoding line) - - 06-fix_locales.patch added (Closes: #403736, #404086) - - 07-add_keybinding_DoNotSave.patch added (Closes: #310095) - - 08-fix_zooms.patch added (Closes: #452929) - * debian/copyright fixed. - - -- David Paleino Sun, 27 Jan 2008 10:26:18 +0100 - -gthumb (3:2.10.5-2) unstable; urgency=low - - * Update debian/watch file for gthumb 2.10 series (closes: #404647) - - -- Remco van de Meent Wed, 15 Aug 2007 09:36:49 +0200 - -gthumb (3:2.10.5-1) unstable; urgency=low - - * New upstream release - * Enable libiptcdata (closes: #426909) - - -- Remco van de Meent Tue, 14 Aug 2007 11:14:16 +0200 - -gthumb (3:2.10.2-4) unstable; urgency=low - - * Rebuild scrollkeeper-db after upgrade from version in which - /var/lib/scrollkeeper files were provided (closes: #417593) - - -- Remco van de Meent Thu, 24 May 2007 09:22:51 +0200 - -gthumb (3:2.10.2-3) unstable; urgency=low - - * Disable install of scrollkeeper files (closes: #417593) - - -- Remco van de Meent Wed, 23 May 2007 22:27:23 +0200 - -gthumb (3:2.10.2-2) unstable; urgency=low - - * Upload to unstable instead of experimental. - - -- Remco van de Meent Fri, 04 May 2007 15:37:51 +0200 - -gthumb (3:2.10.2-1) experimental; urgency=low - - * New upstream release - - -- Remco van de Meent Fri, 04 May 2007 13:40:14 +0200 - -gthumb (3:2.10.0-1) experimental; urgency=low - - * New upstream release - - -- Remco van de Meent Tue, 20 Mar 2007 15:33:55 +0100 - -gthumb (3:2.9.3-2) experimental; urgency=low - - * Fix dependency on libcairo2 (closes: #414577) - - -- Remco van de Meent Wed, 14 Mar 2007 19:57:06 +0000 - -gthumb (3:2.9.3-1) experimental; urgency=low - - * New upstream release (closes: #306189) - - -- Remco van de Meent Mon, 5 Mar 2007 09:29:05 +0100 - -gthumb (3:2.9.2-2) experimental; urgency=low - - * Adding versioned build-depends where necessary (closes: #412685) - - -- Remco van de Meent Tue, 27 Feb 2007 13:35:23 +0100 - -gthumb (3:2.9.2-1) experimental; urgency=low - - * New upstream release - - -- Remco van de Meent Mon, 26 Feb 2007 13:03:54 +0100 - -gthumb (3:2.9.1-1) experimental; urgency=low - - * New upstream release - - -- Remco van de Meent Thu, 25 Jan 2007 09:09:49 +0100 - -gthumb (3:2.8.0-2) unstable; urgency=low - - * Minor cleanups - - -- Remco van de Meent Mon, 4 Dec 2006 21:16:13 +0100 - -gthumb (3:2.8.0-1) unstable; urgency=low - - * New upstream release - * Acknowledge changes in previous NMU (closes: #372582) - * Bump standards version to 3.7.2 - - -- Remco van de Meent Wed, 29 Nov 2006 09:34:09 +0100 - -gthumb (3:2.6.9-3.1) unstable; urgency=low - - * Non-maintainer upload. - * Drop the makefile-install-rule gconf snippet from the postinst completely - as it was never triggerred (since dh_gconf moved the schema out of /etc). - [debian/postinst] - * Add a makefile-uninstall-rule gconf snippet in postinst to remove cruft - left over from versions prior to this version. (Closes: #369866) - - -- Loic Minier Sat, 10 Jun 2006 13:12:46 +0200 - -gthumb (3:2.6.9-3) unstable; urgency=low - - * Fix gthumb module dir location (closes: #360122) - - -- Remco van de Meent Thu, 30 Mar 2006 22:06:00 +0200 - -gthumb (3:2.6.9-2) unstable; urgency=low - - * Add libtool as Build-Depends, fixes compile problems - - -- Remco van de Meent Wed, 29 Mar 2006 10:29:36 +0200 - -gthumb (3:2.6.9-1) unstable; urgency=low - - * New upstream release - - -- Remco van de Meent Tue, 28 Mar 2006 15:05:41 +0200 - -gthumb (3:2.6.6-1) unstable; urgency=low - - * New upstream release - * Depend on libexif >= 0.6.12 (closes: #321311) - - -- Remco van de Meent Wed, 10 Aug 2005 23:50:04 +0200 - -gthumb (3:2.6.5-1) unstable; urgency=low - - * New upstream release - * No more 05_libtool.dpatch at compile-time - * German PO file correction (closes: #314058, thanks to Jens Seidel) - * Various packaging fixes: updated menu label, xpm icon, new package - description, install gconf scheme correctly, use dh_desktop (closes: - #306166, thanks to Dan Korostelev) - - -- Remco van de Meent Thu, 23 Jun 2005 18:00:01 +0200 - -gthumb (3:2.6.3-1.1) unstable; urgency=high - - * Non-maintainer upload. - * High-urgency upload for sarge-targetted RC bugfix - * Rebuild debian/patches/05_libtool.dpatch after running automake, to - avoid macro skew when automake has to be run at build time - (closes: #300424). - - -- Steve Langasek Sat, 26 Mar 2005 16:28:59 -0800 - -gthumb (3:2.6.3-1) unstable; urgency=low - - * New upstream release - - -- Remco van de Meent Thu, 10 Feb 2005 15:38:22 +0100 - -gthumb (3:2.6.2-1) unstable; urgency=low - - * New upstream release (closes: #286326) - * New upstream version resolves SVG bug (closes: #288242) - - -- Remco van de Meent Thu, 6 Jan 2005 11:45:06 +0100 - -gthumb (3:2.6.1-3) unstable; urgency=high - - * Automake-1.9. Run only once. Should fix build problems on ia64 - - -- Remco van de Meent Wed, 1 Dec 2004 15:36:46 +0100 - -gthumb (3:2.6.1-2) unstable; urgency=high - - * Added Build-Dep on dpatch - - -- Remco van de Meent Wed, 1 Dec 2004 13:45:26 +0100 - -gthumb (3:2.6.1-1) unstable; urgency=high - - * New upstream release (fixes some crashes in previous versions) - * Build cleanup - - -- Remco van de Meent Wed, 1 Dec 2004 10:04:05 +0100 - -gthumb (3:2.6.0.1-1) unstable; urgency=low - - * New upstream release - - -- Remco van de Meent Sat, 13 Nov 2004 11:44:15 +0100 - -gthumb (3:2.5.1-1) experimental; urgency=low - - * New upstream release - - -- Remco van de Meent Thu, 2 Sep 2004 22:14:43 +0200 - -gthumb (3:2.4.1-5) unstable; urgency=high - - * High-urgency because this is a release-critical bug - * Fix automake braindamage while building by adding AM_MAINTAINER_MODE - to configure.in (closes: #268303) (thanks to Steve Langasek for - providing a patch) - - -- Remco van de Meent Fri, 27 Aug 2004 17:27:21 +0200 - -gthumb (3:2.4.1-4) unstable; urgency=low - - * Minor build clean ups - * Move from libpng10 to libpng12 - - -- Remco van de Meent Thu, 12 Aug 2004 16:43:13 +0200 - -gthumb (3:2.4.1-3) unstable; urgency=medium - - * Some fixes in build process. - * Priority medium because of the libtiff3->4 transition - * Added debian/watch file - - -- Remco van de Meent Thu, 5 Aug 2004 11:10:45 +0200 - -gthumb (3:2.4.1-2) unstable; urgency=low - - * gthumb now depends on libtiff4 instead of libtiff3 - * Closes: #260156: addition to man page to mention --import-photos - option - - -- Remco van de Meent Thu, 29 Jul 2004 17:22:14 +0200 - -gthumb (3:2.4.1-1) unstable; urgency=low - - * New upstream release (closes: #230411) - * Add image/svg+xml to data/gthumb.applications, as gthumb can also - view SVG files (closes: #257207) - - -- Remco van de Meent Fri, 9 Jul 2004 13:22:00 +0200 - -gthumb (3:2.4.0-3) unstable; urgency=low - - * Rebuild with libexif10 - - -- Remco van de Meent Sat, 19 Jun 2004 23:30:46 +0200 - -gthumb (3:2.4.0-2) unstable; urgency=low - - * png.h could not be found on various archs. resolve by setting - CPPFLAGS before ./configure is run in debian/rules - - -- Remco van de Meent Sat, 5 Jun 2004 11:20:20 +0200 - -gthumb (3:2.4.0-1) unstable; urgency=low - - * New upstream release - * depends on shared-mime-info, not gnome-mime-data (closes: #240804) - * accented character problem fixed in upstream version (closes: - #241800) - * Put libgthumb.so in /usr/lib/gthumb instead of /usr/lib (cf. policy - manual ch. 10) - - -- Remco van de Meent Thu, 3 Jun 2004 23:41:43 +0200 - -gthumb (3:2.3.3-2) unstable; urgency=low - - * Recompile for GNOME 2.6, and add dependency on gnome-mime-data - - -- Remco van de Meent Sun, 30 May 2004 13:18:55 +0200 - -gthumb (3:2.3.3-1) unstable; urgency=low - - * New upstream release - * Fixes problem when saving images (closes: #249938) - * Upgraded to Standards Version 3.6.1 - - -- Remco van de Meent Fri, 21 May 2004 16:33:46 +0200 - -gthumb (3:2.3.2-1) unstable; urgency=low - - * New upstream release - * Quote strings in debian/menu - * Run ldconfig in post{inst,rm} - * Window layout options work in this version (closes: #234493) - * Moving multiple images works in this version (closes: #232901) - * Enable import photo feature (closes: #231943) - - -- Remco van de Meent Sun, 28 Mar 2004 15:46:23 +0200 - -gthumb (3:2.3.0-1) unstable; urgency=low - - * New upstream release - * Updated debian/copyright file with new upstream source location - * Thanks Christian Marillat for pointing out new upstream release - (closes: #229349) - * Fix French translation problem (closes: #226272) - * (Once again) reworked 02_fPIC patch - - -- Remco van de Meent Mon, 26 Jan 2004 20:42:30 +0100 - -gthumb (3:2.2.0-1) unstable; urgency=low - - * New upstream release - * Reworked -fPIC patch - - -- Remco van de Meent Mon, 29 Dec 2003 19:15:04 +0100 - -gthumb (3:2.1.9-2) unstable; urgency=low - - * Move libgthumb.so from /usr/lib/gthumb back to /usr/lib (closes: - #223559) - - -- Remco van de Meent Sat, 13 Dec 2003 11:05:45 +0100 - -gthumb (3:2.1.9-1) unstable; urgency=low - - * New upstream release - - -- Remco van de Meent Mon, 8 Dec 2003 20:47:45 +0100 - -gthumb (3:2.1.8-1) unstable; urgency=low - - * New upstream release - * No more depends on liblincl (closes: #217669) - * Remove patches/03_gettext.dpatch (no longer necessary) - - -- Remco van de Meent Tue, 4 Nov 2003 15:10:49 +0100 - -gthumb (3:2.1.6-1) unstable; urgency=low - - * New upstream release (closes: #214762) - * Add a few words to Description of gthumb package - - -- Remco van de Meent Fri, 10 Oct 2003 09:51:23 +0200 - -gthumb (3:2.1.5-1) unstable; urgency=low - - * Accepting all changes by Christian Marillat (closes: #158437, #205605, - #204285, #176886, #201276, #204741, #204491, #205219, #205245, #176886) - * There is no much more to say about gthumb than a one-line description - (closes: #209621) - - -- Remco van de Meent Tue, 7 Oct 2003 14:16:34 +0200 - -gthumb (3:2.1.5-0.1) unstable; urgency=low - - * New patch 03_gettext, why .mo files are installed in /usr/lib/locale and - gthumb don' want to read these files in /usr/share/locale ? - * Toolbar can be displayed or not (Closes: #158437) - - -- Christian Marillat Thu, 21 Aug 2003 13:01:16 +0200 - -gthumb (3:2.1.5-0.0) unstable; urgency=low - - * NMU - * New upstream release. - * Improve 02_fPIC patch to link against -lpng10 (Closes: #205605) - * Entries in the View menu are finally working (Closes: #204285) - - -- Christian Marillat Tue, 19 Aug 2003 16:21:47 +0200 - -gthumb (3:2.1.4-0.2) unstable; urgency=low - - * NMU - * Improve 02_fPIC patch to fix linking problems - * Fix French translation (Closes: #176886) - - -- Christian Marillat Fri, 15 Aug 2003 16:40:49 +0200 - -gthumb (3:2.1.4-0.1) unstable; urgency=low - - * NMU - * Apparently gthumb doesn't like libpng12-0-dev, then little hack to build - against libpng10-dev and change Build-Depends (patch 01_configure) - * Add scrollkeeper in Build-Depends (Closes: #205245) - * Build modules with -fPIC (patch 02_fPIC) (Closes: #205219) - * Remove broken entries in that file ? - - -- Christian Marillat Thu, 14 Aug 2003 09:40:02 +0200 - -gthumb (3:2.1.4-0.0) unstable; urgency=low - - * NMU - * New upstream release (Closes: #201276) - * Build against latest libexif-dev (Closes: #204741, #204491) - * debian/control use dh_scrollkeeper and thus remove debian/postrm and - update debian/postinst and Build-Depends on debhelper (>= 4.1.54) (Closes: #202707) - * Package upstream changelog (Closes: #147548) - * Use debian/compat - * Upgraded standards version to 3.6.0 - * Remove generated files, may be dangerous. - - -- Christian Marillat Wed, 13 Aug 2003 11:50:44 +0200 - -gthumb (3:2.1.2-2) unstable; urgency=low - - * Changed section to gnome - * Add -fPIC to {src/jpegutils,libgthumb}/Makefile.in CFLAGS (shared lib) - - -- Remco van de Meent Sat, 21 Jun 2003 21:51:03 +0200 - -gthumb (3:2.1.2-1) unstable; urgency=low - - * New upstream release - * Updated to standards version 3.5.10 - * Fix linking problems in libgthumb/Makefile.in LDFLAGS (closes: #193779) - * Fix problems with Nautilus embedding (closes: #191759) - - -- Remco van de Meent Sun, 8 Jun 2003 22:51:12 +0200 - -gthumb (3:2.1.1-2) unstable; urgency=low - - * Replace #!/bin/sh -e with the better #!/bin/sh; set -e pair - * Do not mention schema as conffile twice - - -- Remco van de Meent Fri, 21 Mar 2003 23:09:45 +0100 - -gthumb (3:2.1.1-1) unstable; urgency=low - - * New upstream release - * Upgraded standards version to 3.5.9 - * Removed config.guess and config.sub - - -- Remco van de Meent Fri, 21 Mar 2003 16:16:00 +0100 - -gthumb (3:2.1.0-1) unstable; urgency=low - - * New upstream release (closes: #174911) - * Fix (build-)dependencies (closes: #178199, #180359, #180167, #182139) - * Rename gthumb2 to gthumb, Debian GNOME policy (closes: #182813) - - -- Remco van de Meent Mon, 3 Mar 2003 10:59:38 +0100 - -gthumb2 (2.0.1-4) unstable; urgency=low - - * More fixes to overcome build problems... - - -- Remco van de Meent Fri, 7 Feb 2003 10:17:37 +0100 - -gthumb2 (2.0.1-3) unstable; urgency=low - - * More fixes in build-deps - - -- Remco van de Meent Wed, 5 Feb 2003 13:08:25 +0100 - -gthumb2 (2.0.1-2) unstable; urgency=low - - * Added build-deps (gnomeprint, makeinfo) - - -- Remco van de Meent Wed, 5 Feb 2003 11:50:59 +0100 - -gthumb2 (2.0.1-1) unstable; urgency=low - - * New upstream release - - -- Remco van de Meent Tue, 4 Feb 2003 10:13:22 +0100 - -gthumb2 (1.107-1) unstable; urgency=low - - * New upstream release - * Changes to debian/rules to fix some building problems. - * Fix debian/copyright to include link to GPL etc. - - -- Remco van de Meent Thu, 2 Jan 2003 09:35:57 +0000 - -gthumb2 (1.105-1) unstable; urgency=low - - * New upstream release - - -- Remco van de Meent Mon, 18 Nov 2002 19:32:32 +0000 - -gthumb2 (1.104-1) unstable; urgency=low - - * New upstream release - - -- Remco van de Meent Tue, 1 Oct 2002 13:58:25 +0000 - -gthumb2 (1.103-3) unstable; urgency=low - - * Put gthumb-image-viewer in /usr/lib/gthumb (closes: #162687) - - -- Remco van de Meent Mon, 30 Sep 2002 10:55:38 +0000 - -gthumb2 (1.103-2) unstable; urgency=low - - * Convert LC_MESSAGES UTF-8 format (closes: #157981) - * ./usr/libexec/gthumb-image-viewer -> /usr/bin/gthumb-image-viewer - (closes: #162687, #160639) - - -- Remco van de Meent Mon, 30 Sep 2002 09:24:32 +0000 - -gthumb2 (1.103-1) unstable; urgency=low - - * New upstream release - * Rebuild for newer imlib/libpng (closes: #157126) - - -- Remco van de Meent Sun, 18 Aug 2002 10:42:06 +0000 - -gthumb2 (1.102-1) unstable; urgency=low - - * New upstream release - - -- Remco van de Meent Tue, 16 Jul 2002 12:12:49 +0000 - -gthumb2 (1.101-4) unstable; urgency=low - - * Fixed yet another build depends problem (closes: #151447) - - -- Remco van de Meent Sun, 30 Jun 2002 16:05:34 +0000 - -gthumb2 (1.101-3) unstable; urgency=low - - * Fix build depends - * Fixed debian/dirs - - -- Remco van de Meent Sun, 30 Jun 2002 15:10:58 +0000 - -gthumb2 (1.101-2) unstable; urgency=low - - * Really fix docbook bug (closes: #149078) - - -- Remco van de Meent Sun, 23 Jun 2002 12:57:42 +0000 - -gthumb2 (1.101-1) unstable; urgency=low - - * New upstream release - * Fix menu file (closes: #149453) - * Catch possible scrollkeeper-rebuilddb error in postinst (closes: - #149078) - * Recompile to solve binary compatibility problems with libbonobo - (closes: #150563) - - -- Remco van de Meent Fri, 21 Jun 2002 18:52:41 +0000 - -gthumb2 (1.100-2) unstable; urgency=low - - * Renamed to gthumb2 - - -- Remco van de Meent Sat, 25 May 2002 18:06:42 +0000 - -gthumb (1.100-1) unstable; urgency=low - - * New upstream release - * Updated build-depends; Gnome2 compatible (closes: #147467) - - -- Remco van de Meent Mon, 20 May 2002 11:41:00 +0000 - -gthumb (0.13-1) unstable; urgency=low - - * New upstream release - - -- Remco van de Meent Sat, 18 May 2002 20:35:49 +0200 - -gthumb (0.12-3) unstable; urgency=low - - * Added orbit build-dep - - -- Remco van de Meent Sun, 21 Apr 2002 22:42:08 +0200 - -gthumb (0.12-2) unstable; urgency=low - - * Added src dep for bison - - -- Remco van de Meent Sun, 21 Apr 2002 18:18:38 +0200 - -gthumb (0.12-1) unstable; urgency=low - - * New upstream release (closes: #142986, #119182, #112363) - - -- Remco van de Meent Mon, 15 Apr 2002 14:20:22 +0200 - -gthumb (0.9.8-1) unstable; urgency=low - - * New upstream release - * Added build-depends libgnomeprint-dev - * Upgraded to standards-version 3.5.6 - - -- Remco van de Meent Mon, 17 Dec 2001 19:53:40 +0100 - -gthumb (0.9.5-1) unstable; urgency=low - - * New upstream release - - -- Remco van de Meent Sun, 14 Oct 2001 19:40:44 +0200 - -gthumb (0.9.4-1) unstable; urgency=low - - * New upstream release (closes: #109271) - - -- Remco van de Meent Tue, 4 Sep 2001 12:51:09 +0200 - -gthumb (0.9-1) unstable; urgency=low - - * New upstream release - * Removed build-depends on libc6-dev - - -- Remco van de Meent Mon, 9 Jul 2001 17:24:27 +0200 - -gthumb (0.8.1-1) unstable; urgency=low - - * New upstream release - - -- Remco van de Meent Tue, 19 Jun 2001 19:44:56 +0200 - -gthumb (0.8-2) unstable; urgency=low - - * Added build-depends for libgnome-vfs-dev (closes: #100570) - - -- Remco van de Meent Tue, 12 Jun 2001 11:55:40 +0200 - -gthumb (0.8-1) unstable; urgency=low - - * New upstream release - - -- Remco van de Meent Sun, 10 Jun 2001 20:18:15 +0200 - -gthumb (0.7.2-1) unstable; urgency=low - - * New upstream release - - -- Remco van de Meent Sat, 2 Jun 2001 15:04:22 +0200 - -gthumb (0.7.1-1) unstable; urgency=low - - * New upstream release - - -- Remco van de Meent Sat, 19 May 2001 22:26:09 +0200 - -gthumb (0.7-2) unstable; urgency=low - - * Added build-depends for gettext (closes: #97843) - - -- Remco van de Meent Thu, 17 May 2001 22:27:19 +0200 - -gthumb (0.7-1) unstable; urgency=low - - * New upstream release - - -- Remco van de Meent Sat, 12 May 2001 23:57:31 +0200 - -gthumb (0.6.4-1) unstable; urgency=low - - * New upstream release - - -- Remco van de Meent Sun, 29 Apr 2001 18:53:46 +0200 - -gthumb (0.6-1) unstable; urgency=low - - * New upstream release - - -- Remco van de Meent Mon, 23 Apr 2001 23:08:08 +0200 - -gthumb (0.5.1-2) unstable; urgency=low - - * Fixed build-depends (closes: #94583) - * Added manual page gthumb.1 (closes: #92599) - - -- Remco van de Meent Fri, 20 Apr 2001 09:42:38 +0200 - -gthumb (0.5.1-1) unstable; urgency=low - - * New upstream release - - -- Remco van de Meent Wed, 18 Apr 2001 22:36:52 +0200 - -gthumb (0.4-1) unstable; urgency=low - - * New upstream release - * Added menu entry (closes: #92600) - - -- Remco van de Meent Sat, 7 Apr 2001 19:55:47 +0200 - -gthumb (0.3-1) unstable; urgency=low - - * New upstream release - * Added build-depends for libglade-gnome0-dev (closes: #92567) - - -- Remco van de Meent Mon, 2 Apr 2001 16:08:34 +0200 - -gthumb (0.2-1) unstable; urgency=low - - * Initial Release (closes: #91926) - - -- Remco van de Meent Tue, 27 Mar 2001 21:36:31 +0200 - -Local variables: -mode: debian-changelog -End: diff -Nru gthumb-3.0.2/debian/control gthumb-3.2.3/debian/control --- gthumb-3.0.2/debian/control 2013-01-01 08:42:34.000000000 +0000 +++ gthumb-3.2.3/debian/control 2013-10-05 18:16:13.000000000 +0000 @@ -1,46 +1,51 @@ Source: gthumb Section: gnome Priority: optional -Maintainer: Ubuntu Developers +Maintainer: Dariusz Duma XSBC-Original-Maintainer: David Paleino Build-Depends: debhelper (>= 7.0.50~) , dh-autoreconf - , hardening-wrapper , intltool - , libexiv2-dev (>= 0.21) + , libexiv2-dev (>= 0.18) , flex , bison - , libtiff-dev - , libpng12-dev | libpng-dev + , libtiff4-dev + , libpng12-dev , libjpeg-dev , libsm-dev , libice-dev + , gconf2 , scrollkeeper , automake , autoconf , libtool , gnome-doc-utils , gnome-common - , gsettings-desktop-schemas-dev - , libgtk-3-dev (>= 3.2.0) + , libgtk-3-dev (>= 2.24.0) + , libgconf2-dev (>= 2.6.0) , libxml2-dev (>= 2.4.0) , libglib2.0-dev (>= 2.28.0) , libcairo2-dev , libltdl3-dev + , libiptcdata0-dev , libglade2-dev (>= 2.4.0) , libgstreamer0.10-dev (>= 0.10) , libgstreamer-plugins-base0.10-dev - , libsoup-gnome2.4-dev (>= 2.36) - , libgnome-keyring-dev (>= 3.2.0) -# , libbrasero-media-dev (>= 3.2.0) - , libchamplain-gtk-0.12-dev (>= 0.12.0) - , librsvg2-dev (>= 2.34.0) - , zlib1g-dev -Standards-Version: 3.9.3 + , libunique-dev (>= 1.1.2) + , libsoup-gnome2.4-dev (>= 2.26) + , libgnome-keyring-dev (>= 2.28) + , librsvg2-dev + , libdconf-dev + , gsettings-desktop-schemas-dev + , yelp-tools + , libwebp-dev + , libopenraw-dev +# , libbrasero-media-dev (>= 2.28) +Standards-Version: 3.9.2 Homepage: http://gthumb.sourceforge.net -XS-Debian-Vcs-Git: git://git.debian.org/git/collab-maint/gthumb.git -XS-Debian-Vcs-Browser: http://git.debian.org/?p=collab-maint/gthumb.git +Vcs-Git: git://git.debian.org/git/collab-maint/gthumb.git +Vcs-Browser: http://git.debian.org/?p=collab-maint/gthumb.git Package: gthumb Architecture: any @@ -53,6 +58,8 @@ , gstreamer0.10-gnomevfs , bison , flex + , libdconf0 + , libdconf-dbus-1-0 Conflicts: gthumb2 Provides: gthumb2 Replaces: gthumb2 diff -Nru gthumb-3.0.2/debian/copyright gthumb-3.2.3/debian/copyright --- gthumb-3.0.2/debian/copyright 2012-09-02 21:11:44.000000000 +0000 +++ gthumb-3.2.3/debian/copyright 2012-02-22 19:12:33.000000000 +0000 @@ -1,33 +1,49 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Source: http://ftp.gnome.org/pub/gnome/sources/gthumb/ - -Files: * -Copyright: © 2001-2012, The Free Software Foundation, Inc. -License: GPL-2+ Files: debian/* Copyright: © 2008-2012, David Paleino - © 2001-2007, Remco van de Meent + © 2001-2007, Remco van de Meent License: GPL-3+ + This program is free software: you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation, either version 3 + of the License, or (at your option) any later version. -Files: libgthumb/gconf-utils.* +Files: * +Copyright: © 2001-2012, The Free Software Foundation, Inc. +License: GPL-2+ + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + +Files: libgthumb/gconf-utils.{c,h} Copyright: © 2001-2002, The Free Software Foundation, Inc. - © 2000-2001, Eazel, Inc. -License: GPL-2+ or LGPL-2+ + © 2000-2001, Eazel, Inc. +License: GPL-2+, LGPL-2+ + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + --- + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. Files: libgthumb/pixbuf-utils.c Copyright: © 1999-2003, The Free Software Foundation, Inc. - © 1999, Michael Zucchi - © 1999, Red Hat, Inc. - © 1995, Spencer Kimball and Peter Mattis -License: GPL-2+ or LGPL-2+ + © 1999, Michael Zucchi + © 1999, Red Hat, Inc. + © 1995, Spencer Kimball and Peter Mattis +License: GPL-2+, LGPL-2+ -Files: src/gtkcellrendererthreestates.* +Files: src/gtkcellrendererthreestates.{c,h} Copyright: © 2001, The Free Software Foundation, Inc. - © 2000, Red Hat, Inc. - Jonathan Blandford -License: GPL-2+ or LGPL-2+ + © 2000, Red Hat, Inc. - Jonathan Blandford +License: GPL-2+, LGPL-2+ -Files: libgthumb/md5.* +Files: libgthumb/md5.{c,h} Copyright: © 1995, Software Foundation, Inc. License: GPL-2+ @@ -35,17 +51,21 @@ Copyright: © 1984, 1989, 1990, 2000-2006, The Free Software Foundation, Inc. License: GPL-2+ -Files: libgthumb/eel-canvas-rect.* +Files: libgthumb/eel-canvas-rect.{c,h} Copyright: © 2002, Alexander Larsson License: LGPL-2+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. -Files: libgthumb/jpegutils/jpeg-marker.* - libgthumb/jpegutils/jpeg-data.* +Files: libgthumb/jpegutils/jpeg-marker.{c,h} + libgthumb/jpegutils/jpeg-data.{c,h} Copyright: © 2001, Lutz Müller License: LGPL-2+ -Files: src/totem-scrsaver.* -Copyright: © 2004-2005, Bastien Nocera +Files: src/totem-scrsaver.{c,h} +Copyright: © 2004, 2005, Bastien Nocera License: LGPL-2+ Files: doc/C/gthumb.xml @@ -58,18 +78,18 @@ Files: doc/es/gthumb.xml Copyright: © 2007, Jorge González - © 2001-2004, 2006, Paolo Bacchilega + © 2001-2004, 2006, Paolo Bacchilega License: GFDL-1.1+ Files: doc/fr/gthumb.xml Copyright: © 2007, Bruno Brouard - © 2007, Claude Paroz - © 2001-2004, 2006, Paolo Bacchilega + © 2007, Claude Paroz + © 2001-2004, 2006, Paolo Bacchilega License: GFDL-1.1+ Files: doc/sv/gthumb.xml Copyright: © 2006-2007, Daniel Nylander - © 2001-2004, 2006, Paolo Bacchilega + © 2001-2004, 2006, Paolo Bacchilega License: GFDL-1.1+ Files: extensions/jpeg_utils/jpegint-80.h @@ -78,22 +98,27 @@ License: libjpeg Files: extensions/jpeg_utils/jpegtran.c - extensions/jpeg_utils/transupp-62.* + extensions/jpeg_utils/transupp-62.{c,h} Copyright: © 1995-1997, Thomas G. Lane © 2001-2002, 2009, The Free Software Foundation, Inc. -License: GPL-2+ and libjpeg +License: GPL-2+, libjpeg Files: extensions/jpeg_utils/transupp-80.c Copyright: © 1997-2009, Thomas G. Lane © 1997-2009, Guido Vollbeding © 2001-2002, The Free Software Foundation, Inc. -License: GPL-2+ and libjpeg +License: GPL-2+, libjpeg Files: extensions/jpeg_utils/transupp-80.h Copyright: © 1997-2009, Thomas G. Lane © 1997-2009, Guido Vollbeding License: libjpeg +On Debian systems, you can find the mentioned licenses: +GPLv2 - `/usr/share/common-licenses/GPL-2' +GPLv3 - `/usr/share/common-licenses/GPL-3' +LGPLv2 - `/usr/share/common-licenses/LGPL-2' + License: libjpeg LEGAL ISSUES ============ @@ -146,18 +171,20 @@ X-Comment: the full READMEs can be found in ./extensions/jpeg_utils/README.6b and ./extensions/jpeg_utils/README.8a in gThumb's sourcecode. -License: GFDL-1.1+ +GFDLv1.1: + GNU Free Documentation License Version 1.1, March 2000 - . + + Copyright (C) 2000 Free Software Foundation, Inc. 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - . - . + + 0. PREAMBLE - . + The purpose of this License is to make a manual, textbook, or other written document "free" in the sense of freedom: to assure everyone the effective freedom to copy and redistribute it, with or without @@ -165,12 +192,12 @@ this License preserves for the author and publisher a way to get credit for their work, while not being considered responsible for modifications made by others. - . + This License is a kind of "copyleft", which means that derivative works of the document must themselves be free in the same sense. It complements the GNU General Public License, which is a copyleft license designed for free software. - . + We have designed this License in order to use it for manuals for free software, because free software needs free documentation: a free program should come with manuals providing the same freedoms that the @@ -178,20 +205,20 @@ can be used for any textual work, regardless of subject matter or whether it is published as a printed book. We recommend this License principally for works whose purpose is instruction or reference. - . - . + + 1. APPLICABILITY AND DEFINITIONS - . + This License applies to any manual or other work that contains a notice placed by the copyright holder saying it can be distributed under the terms of this License. The "Document", below, refers to any such manual or work. Any member of the public is a licensee, and is addressed as "you". - . + A "Modified Version" of the Document means any work containing the Document or a portion of it, either copied verbatim, or with modifications and/or translated into another language. - . + A "Secondary Section" is a named appendix or a front-matter section of the Document that deals exclusively with the relationship of the publishers or authors of the Document to the Document's overall subject @@ -201,15 +228,15 @@ mathematics.) The relationship could be a matter of historical connection with the subject or with related matters, or of legal, commercial, philosophical, ethical or political position regarding them. - . + The "Invariant Sections" are certain Secondary Sections whose titles are designated, as being those of Invariant Sections, in the notice that says that the Document is released under this License. - . + The "Cover Texts" are certain short passages of text that are listed, as Front-Cover Texts or Back-Cover Texts, in the notice that says that the Document is released under this License. - . + A "Transparent" copy of the Document means a machine-readable copy, represented in a format whose specification is available to the general public, whose contents can be viewed and edited directly and @@ -221,7 +248,7 @@ markup has been designed to thwart or discourage subsequent modification by readers is not Transparent. A copy that is not "Transparent" is called "Opaque". - . + Examples of suitable formats for Transparent copies include plain ASCII without markup, Texinfo input format, LaTeX input format, SGML or XML using a publicly available DTD, and standard-conforming simple HTML @@ -230,17 +257,17 @@ word processors, SGML or XML for which the DTD and/or processing tools are not generally available, and the machine-generated HTML produced by some word processors for output purposes only. - . + The "Title Page" means, for a printed book, the title page itself, plus such following pages as are needed to hold, legibly, the material this License requires to appear in the title page. For works in formats which do not have any title page as such, "Title Page" means the text near the most prominent appearance of the work's title, preceding the beginning of the body of the text. - . - . + + 2. VERBATIM COPYING - . + You may copy and distribute the Document in any medium, either commercially or noncommercially, provided that this License, the copyright notices, and the license notice saying this License applies to the Document are reproduced @@ -249,13 +276,13 @@ reading or further copying of the copies you make or distribute. However, you may accept compensation in exchange for copies. If you distribute a large enough number of copies you must also follow the conditions in section 3. - . + You may also lend copies, under the same conditions stated above, and you may publicly display copies. - . - . + + 3. COPYING IN QUANTITY - . + If you publish printed copies of the Document numbering more than 100, and the Document's license notice requires Cover Texts, you must enclose the copies in covers that carry, clearly and legibly, all these Cover Texts: Front-Cover Texts @@ -265,11 +292,11 @@ visible. You may add other material on the covers in addition. Copying with changes limited to the covers, as long as they preserve the title of the Document and satisfy these conditions, can be treated as verbatim copying in other respects. - . + If the required texts for either cover are too voluminous to fit legibly, you should put the first ones listed (as many as fit reasonably) on the actual cover, and continue the rest onto adjacent pages. - . + If you publish or distribute Opaque copies of the Document numbering more than 100, you must either include a machine-readable Transparent copy along with each Opaque copy, or state in or with each Opaque copy a publicly-accessible computer-network @@ -281,20 +308,20 @@ accessible at the stated location until at least one year after the last time you distribute an Opaque copy (directly or through your agents or retailers) of that edition to the public. - . + It is requested, but not required, that you contact the authors of the Document well before redistributing any large number of copies, to give them a chance to provide you with an updated version of the Document. - . - . + + 4. MODIFICATIONS - . + You may copy and distribute a Modified Version of the Document under the conditions of sections 2 and 3 above, provided that you release the Modified Version under precisely this License, with the Modified Version filling the role of the Document, thus licensing distribution and modification of the Modified Version to whoever possesses a copy of it. In addition, you must do these things in the Modified Version: - . + * A. Use in the Title Page (and on the covers, if any) a title distinct from that of the Document, and from those of previous versions (which should, if there were any, be listed in the History section of the Document). You may use the @@ -340,19 +367,19 @@ included in the Modified Version. * N. Do not retitle any existing section as "Endorsements" or to conflict in title with any Invariant Section. - . + If the Modified Version includes new front-matter sections or appendices that qualify as Secondary Sections and contain no material copied from the Document, you may at your option designate some or all of these sections as invariant. To do this, add their titles to the list of Invariant Sections in the Modified Version's license notice. These titles must be distinct from any other section titles. - . + You may add a section entitled "Endorsements", provided it contains nothing but endorsements of your Modified Version by various parties--for example, statements of peer review or that the text has been approved by an organization as the authoritative definition of a standard. - . + You may add a passage of up to five words as a Front-Cover Text, and a passage of up to 25 words as a Back-Cover Text, to the end of the list of Cover Texts in the Modified Version. Only one passage of Front-Cover Text and one of Back-Cover Text @@ -361,20 +388,20 @@ arrangement made by the same entity you are acting on behalf of, you may not add another; but you may replace the old one, on explicit permission from the previous publisher that added the old one. - . + The author(s) and publisher(s) of the Document do not by this License give permission to use their names for publicity for or to assert or imply endorsement of any Modified Version. - . - . + + 5. COMBINING DOCUMENTS - . + You may combine the Document with other documents released under this License, under the terms defined in section 4 above for modified versions, provided that you include in the combination all of the Invariant Sections of all of the original documents, unmodified, and list them all as Invariant Sections of your combined work in its license notice. - . + The combined work need only contain one copy of this License, and multiple identical Invariant Sections may be replaced with a single copy. If there are multiple Invariant Sections with the same name but different contents, make the title of each such section @@ -382,29 +409,29 @@ publisher of that section if known, or else a unique number. Make the same adjustment to the section titles in the list of Invariant Sections in the license notice of the combined work. - . + In the combination, you must combine any sections entitled "History" in the various original documents, forming one section entitled "History"; likewise combine any sections entitled "Acknowledgements", and any sections entitled "Dedications". You must delete all sections entitled "Endorsements." - . - . + + 6. COLLECTIONS OF DOCUMENTS - . + You may make a collection consisting of the Document and other documents released under this License, and replace the individual copies of this License in the various documents with a single copy that is included in the collection, provided that you follow the rules of this License for verbatim copying of each of the documents in all other respects. - . + You may extract a single document from such a collection, and distribute it individually under this License, provided you insert a copy of this License into the extracted document, and follow this License in all other respects regarding verbatim copying of that document. - . - . + + 7. AGGREGATION WITH INDEPENDENT WORKS - . + A compilation of the Document or its derivatives with other separate and independent documents or works, in or on a volume of a storage or distribution medium, does not as a whole count as a Modified Version of the Document, provided no compilation @@ -412,15 +439,15 @@ and this License does not apply to the other self-contained works thus compiled with the Document, on account of their being thus compiled, if they are not themselves derivative works of the Document. - . + If the Cover Text requirement of section 3 is applicable to these copies of the Document, then if the Document is less than one quarter of the entire aggregate, the Document's Cover Texts may be placed on covers that surround only the Document within the aggregate. Otherwise they must appear on covers around the whole aggregate. - . - . + + 8. TRANSLATION - . + Translation is considered a kind of modification, so you may distribute translations of the Document under the terms of section 4. Replacing Invariant Sections with translations requires special permission from their copyright holders, but you may @@ -429,25 +456,25 @@ provided that you also include the original English version of this License. In case of a disagreement between the translation and the original English version of this License, the original English version will prevail. - . - . + + 9. TERMINATION - . + You may not copy, modify, sublicense, or distribute the Document except as expressly provided for under this License. Any other attempt to copy, modify, sublicense or distribute the Document is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. - . - . + + 10. FUTURE REVISIONS OF THIS LICENSE - . + The Free Software Foundation may publish new, revised versions of the GNU Free Documentation License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. See http://www.gnu.org/copyleft/. - . + Each version of the License is given a distinguishing version number. If the Document specifies that a particular numbered version of this License "or any later version" applies to it, you have the option of following the terms and conditions @@ -455,14 +482,14 @@ (not as a draft) by the Free Software Foundation. If the Document does not specify a version number of this License, you may choose any version ever published (not as a draft) by the Free Software Foundation. - . - . + + How to use this License for your documents - . + To use this License in a document you have written, include a copy of the License in the document and put the following copyright and license notices just after the title page: - . + Copyright (c) YEAR YOUR NAME. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 @@ -471,64 +498,12 @@ Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST. A copy of the license is included in the section entitled "GNU Free Documentation License". - . + If you have no Invariant Sections, write "with no Invariant Sections" instead of saying which ones are invariant. If you have no Front-Cover Texts, write "no Front-Cover Texts" instead of "Front-Cover Texts being LIST"; likewise for Back-Cover Texts. - . + If your document contains nontrivial examples of program code, we recommend releasing these examples in parallel under your choice of free software license, such as the GNU General Public License, to permit their use in free software. - -License: GPL-2+ - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see . - . - On Debian systems, you can find the complete text of the GNU General - Public License version 2 in `/usr/share/common-licenses/GPL-2'. - -License: GPL-3+ - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see . - . - On Debian systems, you can find the complete text of the GNU General - Public License version 3 in `/usr/share/common-licenses/GPL-3'. - -License: LGPL-2+ - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - . - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - . - You should have received a copy of the GNU Library General Public - License along with this program. If not, see - . - . - On Debian systems, you can find the complete text of the GNU Library - General Public License version 2 in `/usr/share/common-licenses/LGPL-2'. diff -Nru gthumb-3.0.2/debian/gthumb-data.install gthumb-3.2.3/debian/gthumb-data.install --- gthumb-3.0.2/debian/gthumb-data.install 2012-09-02 21:11:44.000000000 +0000 +++ gthumb-3.2.3/debian/gthumb-data.install 2013-10-05 10:34:26.000000000 +0000 @@ -1,8 +1,8 @@ -usr/share/aclocal -usr/share/GConf -usr/share/glib-2.0 -usr/share/gnome -usr/share/gthumb +#usr/share/gnome usr/share/icons +usr/share/gthumb usr/share/locale +usr/share/GConf +usr/share/glib-2.0 +#usr/share/gconf ../gthumb.xpm usr/share/pixmaps/ diff -Nru gthumb-3.0.2/debian/gthumb.1 gthumb-3.2.3/debian/gthumb.1 --- gthumb-3.0.2/debian/gthumb.1 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/debian/gthumb.1 2011-06-16 21:42:42.000000000 +0000 @@ -0,0 +1,71 @@ +.TH GTHUMB 1 "February 2010" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +gthumb \- image browser and viewer +.SH SYNOPSIS +.B gthumb +.RI [ options ] " files" ... +.SH DESCRIPTION +\fBgThumb\fP is an advanced image viewer and browser. It has many useful +features, such as filesystem browsing, slide show, image catalogs, web +album creation, camera import, image CD burning, batch file operations and +quick image editing features like transformation and color manipulation. +.PP +It's designed for GNOME 2 desktop environment and uses its platform. For +camera import feature, the gPhoto2 library is used. +.SH HELP OPTIONS +.B \-h, \-\-help +Show summary of options. +.TP +.B \-\-help\-all +Show all help options. +.TP +.B \-\-help\-gtk +Show GTK+ options. +.TP +.B \-\-help\-sm\-client +Show session management options +.TP +.B \-\-help\-clutter +Show Clutter options. +.SH APPLICATION OPTIONS +.B \-n, \-\-new\-window +Open a new window. +.TP +.B \-f, \-\-fullscreen +Start in fullscreen mode. +.TP +.B \-s, \-\-slideshow +Automatically start a slideshow. +.TP +.B \-i, \-\-import\-photos +Automatically import digital camera photos. +.TP +.B \-v, \-\-version +Show version. +.TP +.BI \-\-display= DISPLAY +X display to use. +.TP +.BI \-\-clutter\-display= DISPLAY +X display to use. +.TP +.BI \-\-clutter\-screen= SCREEN +X screen to use. +.SH AUTHOR +gThumb was written by \fBPaolo Bacchilega \fR and +\fBMichael J. Chudobiak \fR. +.PP +This manual page was written by \fBDavid Paleino \fR, +for the Debian project (and may be used by others). diff -Nru gthumb-3.0.2/debian/gthumb.lintian-overrides gthumb-3.2.3/debian/gthumb.lintian-overrides --- gthumb-3.0.2/debian/gthumb.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/debian/gthumb.lintian-overrides 2011-10-14 07:55:26.000000000 +0000 @@ -0,0 +1,2 @@ +# This is on gthumb-data, which we are depending on +gthumb: menu-icon-missing usr/share/pixmaps/gthumb.xpm diff -Nru gthumb-3.0.2/debian/gthumb.manpages gthumb-3.2.3/debian/gthumb.manpages --- gthumb-3.0.2/debian/gthumb.manpages 2012-09-02 21:11:44.000000000 +0000 +++ gthumb-3.2.3/debian/gthumb.manpages 2011-06-16 21:42:41.000000000 +0000 @@ -1 +1 @@ -data/gthumb.1 +debian/gthumb.1 diff -Nru gthumb-3.0.2/debian/patches/00-fix_ltmain.sh.patch gthumb-3.2.3/debian/patches/00-fix_ltmain.sh.patch --- gthumb-3.0.2/debian/patches/00-fix_ltmain.sh.patch 2012-09-02 21:11:44.000000000 +0000 +++ gthumb-3.2.3/debian/patches/00-fix_ltmain.sh.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -This patch makes --as-needed work correctly. -Please see the patch in #347650 provided by Josselin Mouette . ---- - ltmain.sh | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - ---- gthumb.orig/ltmain.sh -+++ gthumb/ltmain.sh -@@ -4716,6 +4716,11 @@ func_mode_link () - arg=$func_stripname_result - ;; - -+ -Wl,--as-needed) -+ deplibs="$deplibs $arg" -+ continue -+ ;; -+ - -Wl,*) - func_stripname '-Wl,' '' "$arg" - args=$func_stripname_result -@@ -5070,6 +5075,15 @@ func_mode_link () - lib= - found=no - case $deplib in -+ -Wl,--as-needed) -+ if test "$linkmode,$pass" = "prog,link"; then -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ else -+ deplibs="$deplib $deplibs" -+ fi -+ continue -+ ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" diff -Nru gthumb-3.0.2/debian/patches/01-fix_missing_linkage.patch gthumb-3.2.3/debian/patches/01-fix_missing_linkage.patch --- gthumb-3.0.2/debian/patches/01-fix_missing_linkage.patch 2012-09-02 21:11:44.000000000 +0000 +++ gthumb-3.2.3/debian/patches/01-fix_missing_linkage.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -From: David Paleino -Subject: fix FTBFS -Origin: vendor -Forwarded: no - ---- - gthumb/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - ---- gthumb.orig/gthumb/Makefile.am -+++ gthumb/gthumb/Makefile.am -@@ -276,6 +276,7 @@ gthumb_LDADD = \ - $(LIBSOUP_LIBS) \ - $(LIBCHAMPLAIN_LIBS) \ - $(LIBRSVG_LIBS) \ -+ -lICE \ - $(NULL) - - if RUN_IN_PLACE -@@ -308,6 +309,7 @@ gthumb_CFLAGS = \ - $(LIBSOUP_CFLAGS) \ - $(LIBCHAMPLAIN_CFLAGS) \ - $(SMCLIENT_CFLAGS) \ -+ -lICE \ - -I$(top_srcdir)/copy-n-paste/ \ - -DGTHUMB_LOCALEDIR=\"$(datadir)/locale\" \ - -DGTHUMB_PREFIX=\"$(prefix)\" \ diff -Nru gthumb-3.0.2/debian/patches/02-preserve_upstream_files.patch gthumb-3.2.3/debian/patches/02-preserve_upstream_files.patch --- gthumb-3.0.2/debian/patches/02-preserve_upstream_files.patch 2012-09-02 21:11:44.000000000 +0000 +++ gthumb-3.2.3/debian/patches/02-preserve_upstream_files.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -From: David Paleino -Subject: try not to remove upstream files on clean -Forwarded: not-needed - ---- - Makefile.am | 26 +------------------------- - 1 file changed, 1 insertion(+), 25 deletions(-) - ---- gthumb.orig/Makefile.am -+++ gthumb/Makefile.am -@@ -17,8 +17,7 @@ DISTCLEANFILES = - po/.intltool-merge-cache \ - intltool-extract \ - intltool-merge \ -- intltool-update \ -- gnome-doc-utils.make -+ intltool-update - - MAINTAINERCLEANFILES = \ - $(srcdir)/INSTALL \ -@@ -51,27 +50,4 @@ GITIGNOREFILES = build .autotools .cdt* - - DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper - --CLEANFILES = ChangeLog -- --# Build ChangeLog from GIT history -- --CHANGELOG_START = GTHUMB_2_10_11 --ChangeLog: -- @echo Creating $@ -- @if test -d $(top_srcdir)/.git; then \ -- (GIT_DIR=$(top_srcdir)/.git $(top_srcdir)/missing --run git log $(CHANGELOG_START).. --stat -M -C --name-status --date=short --no-color) | fmt --split-only > $@.tmp \ -- && mv -f $@.tmp $@ \ -- || ($(RM) $@.tmp; \ -- echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \ -- (test -f $@ || echo git-log is required to generate this file >> $@)); \ -- else \ -- test -f $@ || \ -- (echo A git checkout and git-log is required to generate ChangeLog >&2 && \ -- echo A git checkout and git-log is required to generate this file >> $@); \ -- fi -- --dist: ChangeLog -- --.PHONY: ChangeLog -- - -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/debian/patches/03-add_missing_includes.patch gthumb-3.2.3/debian/patches/03-add_missing_includes.patch --- gthumb-3.0.2/debian/patches/03-add_missing_includes.patch 2012-09-02 21:11:44.000000000 +0000 +++ gthumb-3.2.3/debian/patches/03-add_missing_includes.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -From: David Paleino -Subject: add missing included header -Origin: vendor -Forwarded: no - ---- - extensions/exiv2_tools/exiv2-utils.cpp | 1 + - 1 file changed, 1 insertion(+) - ---- gthumb.orig/extensions/exiv2_tools/exiv2-utils.cpp -+++ gthumb/extensions/exiv2_tools/exiv2-utils.cpp -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff -Nru gthumb-3.0.2/debian/patches/05-fix_locales.patch gthumb-3.2.3/debian/patches/05-fix_locales.patch --- gthumb-3.0.2/debian/patches/05-fix_locales.patch 2012-09-02 21:11:44.000000000 +0000 +++ gthumb-3.2.3/debian/patches/05-fix_locales.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -Fix some wrong localizations reported by users ---- - po/ru.po | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- gthumb.orig/po/ru.po -+++ gthumb/po/ru.po -@@ -90,7 +90,7 @@ msgstr "Показать парамет - - #: ../data/gthumb.desktop.in.in.h:1 - msgid "Image Viewer" --msgstr "Просмотр изображений" -+msgstr "Просмотр изображений gThumb" - - #: ../data/gthumb.desktop.in.in.h:2 - msgid "View and organize your images" diff -Nru gthumb-3.0.2/debian/patches/07-fix_documentation_xml.patch gthumb-3.2.3/debian/patches/07-fix_documentation_xml.patch --- gthumb-3.0.2/debian/patches/07-fix_documentation_xml.patch 2012-09-02 21:11:44.000000000 +0000 +++ gthumb-3.2.3/debian/patches/07-fix_documentation_xml.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,628 +0,0 @@ -From: David Paleino -Subject: fix XML so that it validates during dh_auto_test -Forwarded: no - ---- - help/C/shortcuts.page | 12 ++++++------ - help/C/strftime.page | 2 +- - help/de/shortcuts.page | 12 ++++++------ - help/de/strftime.page | 2 +- - help/el/shortcuts.page | 12 ++++++------ - help/el/strftime.page | 2 +- - help/es/shortcuts.page | 12 ++++++------ - help/es/strftime.page | 2 +- - help/fr/shortcuts.page | 12 ++++++------ - help/fr/strftime.page | 2 +- - help/oc/shortcuts.page | 12 ++++++------ - help/oc/strftime.page | 2 +- - help/sl/shortcuts.page | 12 ++++++------ - help/sl/strftime.page | 2 +- - help/sv/shortcuts.page | 12 ++++++------ - help/sv/strftime.page | 2 +- - help/zh_CN/shortcuts.page | 12 ++++++------ - help/zh_CN/strftime.page | 2 +- - 18 files changed, 63 insertions(+), 63 deletions(-) - ---- gthumb.orig/help/C/strftime.page -+++ gthumb/help/C/strftime.page -@@ -8,7 +8,7 @@ id="gthumb-date-formats"> -

This is a summary of standard date/time codes that may be used - in format strings:

- -- -+
- Valid format codes for custom subfolders - -
---- gthumb.orig/help/de/strftime.page -+++ gthumb/help/de/strftime.page -@@ -7,7 +7,7 @@ - -

Es folgt eine Zusammenfassung der Datums- und Uhrzeit-Codes, die in Formatangaben verwendet werden können:

- -- -+
- Gültige Formatangaben für eigene Unterordner - -
---- gthumb.orig/help/el/strftime.page -+++ gthumb/help/el/strftime.page -@@ -8,7 +8,7 @@ -

This is a summary of standard date/time codes that may be used - in format strings:

- -- -+
- Valid format codes for custom subfolders - -
---- gthumb.orig/help/es/strftime.page -+++ gthumb/help/es/strftime.page -@@ -7,7 +7,7 @@ - -

Esto es un resumen de los códigos de fecha y hora que se pueden usar en cadenas de formato:

- -- -+
- Códigos de formato válidos para subcarpetas personalizadas - -
---- gthumb.orig/help/fr/strftime.page -+++ gthumb/help/fr/strftime.page -@@ -7,7 +7,7 @@ - -

Voici un résumé des codes standards de date et d'heure qui peuvent être utilisés dans les chaînes de format :

- -- -+
- Codes de format valides pour les sous-dossiers personnalisés - -
---- gthumb.orig/help/oc/strftime.page -+++ gthumb/help/oc/strftime.page -@@ -8,7 +8,7 @@ -

This is a summary of standard date/time codes that may be used - in format strings:

- -- -+
- Valid format codes for custom subfolders - -
---- gthumb.orig/help/sl/strftime.page -+++ gthumb/help/sl/strftime.page -@@ -7,7 +7,7 @@ - -

To je povzete običajnih kod datuma/časa, ki jih je mogoče uporabiti v nizih oblike:

- -- -+
- Veljavne kode oblike za podmape po meri - -
---- gthumb.orig/help/sv/strftime.page -+++ gthumb/help/sv/strftime.page -@@ -8,7 +8,7 @@ -

This is a summary of standard date/time codes that may be used - in format strings:

- -- -+
- Valid format codes for custom subfolders - -
---- gthumb.orig/help/zh_CN/strftime.page -+++ gthumb/help/zh_CN/strftime.page -@@ -8,7 +8,7 @@ -

This is a summary of standard date/time codes that may be used - in format strings:

- -- -+
- Valid format codes for custom subfolders - - @@ -413,7 +413,7 @@ diff -Nru gthumb-3.0.2/help/es/attributes.page gthumb-3.2.3/help/es/attributes.page --- gthumb-3.0.2/help/es/attributes.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/attributes.page 2013-06-18 17:54:23.000000000 +0000 @@ -2,6 +2,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Códigos de atributos

gThumb almacena diferentes atributos para cada archivo. Las extensiones pueden añadir más. La siguiente lista es un resumen de algunos de los atributos más comunes:

diff -Nru gthumb-3.0.2/help/es/batch-change-date.page gthumb-3.2.3/help/es/batch-change-date.page --- gthumb-3.0.2/help/es/batch-change-date.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/batch-change-date.page 2013-06-18 17:54:23.000000000 +0000 @@ -2,6 +2,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Cambiar fechas diff -Nru gthumb-3.0.2/help/es/batch-convert-format.page gthumb-3.2.3/help/es/batch-convert-format.page --- gthumb-3.0.2/help/es/batch-convert-format.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/batch-convert-format.page 2013-06-18 17:54:23.000000000 +0000 @@ -2,6 +2,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Convertir formatos de archivo diff -Nru gthumb-3.0.2/help/es/batch-resize.page gthumb-3.2.3/help/es/batch-resize.page --- gthumb-3.0.2/help/es/batch-resize.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/batch-resize.page 2013-06-18 17:54:23.000000000 +0000 @@ -2,6 +2,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Redimensionar imágenes diff -Nru gthumb-3.0.2/help/es/batch-rotate.page gthumb-3.2.3/help/es/batch-rotate.page --- gthumb-3.0.2/help/es/batch-rotate.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/batch-rotate.page 2013-06-18 17:54:23.000000000 +0000 @@ -2,6 +2,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Rotar imágenes sin pérdidas diff -Nru gthumb-3.0.2/help/es/batch-scripts.page gthumb-3.2.3/help/es/batch-scripts.page --- gthumb-3.0.2/help/es/batch-scripts.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/batch-scripts.page 2013-06-18 17:54:23.000000000 +0000 @@ -2,6 +2,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Scripts definidos por el usuario diff -Nru gthumb-3.0.2/help/es/bookmarks.page gthumb-3.2.3/help/es/bookmarks.page --- gthumb-3.0.2/help/es/bookmarks.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/bookmarks.page 2013-06-18 17:54:24.000000000 +0000 @@ -2,6 +2,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Usar marcadores diff -Nru gthumb-3.0.2/help/es/browser.page gthumb-3.2.3/help/es/browser.page --- gthumb-3.0.2/help/es/browser.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/browser.page 2013-06-18 17:54:23.000000000 +0000 @@ -2,6 +2,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Examinar sus archivos diff -Nru gthumb-3.0.2/help/es/edit-colors.page gthumb-3.2.3/help/es/edit-colors.page --- gthumb-3.0.2/help/es/edit-colors.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/edit-colors.page 2013-06-18 17:54:23.000000000 +0000 @@ -2,6 +2,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Ajustes de color diff -Nru gthumb-3.0.2/help/es/edit-redeye.page gthumb-3.2.3/help/es/edit-redeye.page --- gthumb-3.0.2/help/es/edit-redeye.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/edit-redeye.page 2013-06-18 17:54:23.000000000 +0000 @@ -2,6 +2,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Eliminación de ojos rojos

Para acceder a las herramientas de edición, abra una imagen y pulse en el botón Editar archivo de la barra de herramientas (el icono de la paleta).

diff -Nru gthumb-3.0.2/help/es/edit-resize-crop.page gthumb-3.2.3/help/es/edit-resize-crop.page --- gthumb-3.0.2/help/es/edit-resize-crop.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/edit-resize-crop.page 2013-06-18 17:54:23.000000000 +0000 @@ -2,6 +2,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Redimensionar y recortar diff -Nru gthumb-3.0.2/help/es/edit-rotate.page gthumb-3.2.3/help/es/edit-rotate.page --- gthumb-3.0.2/help/es/edit-rotate.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/edit-rotate.page 2013-06-18 17:54:23.000000000 +0000 @@ -2,6 +2,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Rotaciones y volteos @@ -11,7 +23,7 @@ - <gui>Espejo</gui> + <gui>Espejar</gui>

Esto voltea imágenes horizontalmente. Se intercambian los lados izquierdo y derecho.

 diff -Nru gthumb-3.0.2/help/es/edit-save-undo-redo.page gthumb-3.2.3/help/es/edit-save-undo-redo.page --- gthumb-3.0.2/help/es/edit-save-undo-redo.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/edit-save-undo-redo.page 2013-06-18 17:54:23.000000000 +0000 @@ -2,6 +2,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Guardar archivo, deshacer, rehacer diff -Nru gthumb-3.0.2/help/es/es.po gthumb-3.2.3/help/es/es.po --- gthumb-3.0.2/help/es/es.po 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/es/es.po 2013-04-30 16:56:13.000000000 +0000 @@ -8,1232 +8,1434 @@ msgstr "" "Project-Id-Version: gthumb.userguide.master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-04 17:55+0000\n" -"PO-Revision-Date: 2012-03-04 20:31+0100\n" +"POT-Creation-Date: 2012-10-28 08:30+0000\n" +"PO-Revision-Date: 2012-10-28 13:29+0100\n" "Last-Translator: Daniel Mustieles \n" -"Language-Team: Español \n" +"Language-Team: Español; Castellano \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Gtranslator 2.91.5\n" -#: C/file-copy-move.page:6(title) -msgid "Copying and Moving Files" -msgstr "Copiar y mover archivos" - -#: C/file-copy-move.page:8(p) -msgid "There are three ways to copy or move files in gThumb." -msgstr "Hay tres maneras de copiar y mover archivos en gThumb." - -#: C/file-copy-move.page:12(title) -msgid "Cut and Paste" -msgstr "Cortar y pegar" +#. Put one translator per line, in the form NAME , YEAR1, YEAR2 +#| msgid "translator-credits" +msgctxt "_" +msgid "translator-credits" +msgstr "" +"Daniel Mustieles , 2008-2012\n" +"Jorge González , 2007-2008" -#: C/file-copy-move.page:13(p) +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#. +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#. +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#. +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#. +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#. +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#. +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/index.page:33(media) C/edit-save-undo-redo.page:8(media) +#: C/edit-colors.page:8(media) C/edit-rotate.page:8(media) +#: C/edit-resize-crop.page:8(media) C/edit-redeye.page:7(media) +#| msgid "@@image: 'figures/palette.png'; md5=32835e7d77efd9833244ca80a4adb48e" +msgctxt "_" msgid "" -"To copy a file in the browser view, use EditCopy, or press CtrlC. To " -"move a file, use EditCut, or press " -"CtrlX. Then navigate to the " -"destination folder using the folder tree. Use EditPaste, or press CtrlV, to complete the file transfer." +"external ref='figures/palette.png' md5='32835e7d77efd9833244ca80a4adb48e'" msgstr "" -"Para copiar un archivo en la vista de navegador, useEditarCopiar, o pulse CtrlC. Para mover un archivo, use EditarCortar, o pulse CtrlX. " -"Entonces navegue hasta la carpeta de destino usando el árbol de carpetas. " -"Use EditarPegar, o pulse " -"CtrlV para completar la transferencia " -"del archivo." +"external ref='figures/palette.png' md5='32835e7d77efd9833244ca80a4adb48e'" -#: C/file-copy-move.page:26(title) -msgid "Drag and Drop" -msgstr "Arrastrar y soltar" +#: C/index.page:7(credit/name) +msgid "Paolo Bacchilega" +msgstr "Paolo Bacchilega" -#: C/file-copy-move.page:27(p) -msgid "" -"To copy a file to another folder, simply drag the file (with a sustained " -"left-mouse click) to the destination folder visible in the folder tree. To " -"move a file, hold down the Shift key while dragging." -msgstr "" -"Para copiar un archivo a otra carpeta, simplemente arrastre el archivo " -"(manteniendo pulsado el botón izquierdo del ratón) a la carpeta de destino " -"visible en el árbol de carpetas. Para mover un archivo, mantenga pulsada la " -"tecla Mayús mientras arrastra." +#: C/index.page:12(credit/name) +msgid "Michael J. Chudobiak" +msgstr "Michael J. Chudobiak" -#: C/file-copy-move.page:31(p) -msgid "" -"You can also use the middle mouse button to drag files. In this case, " -"gThumb will ask you if you wish to copy the files, move the " -"files, or cancel the operation." -msgstr "" -"También puede usar el botón central del ratón para arrastrar los archivos. " -"En este caso, gThumb le preguntará si quiere copiar los archivos, " -"moverlos o cancelar la operación." +#: C/index.page:20(page/title) +msgid "gThumb Help" +msgstr "Ayuda de gThumb" -#: C/file-copy-move.page:37(title) -msgid "File Copy / Move Dialog" -msgstr "Diálogo copiar / mover archivo" +#: C/index.page:23(section/title) +msgid "Welcome" +msgstr "Bienvenido" -#: C/file-copy-move.page:38(p) -msgid "" -"Select the files to be transferred, right-click on the selection, and choose " -"Copy to... or Move to.... This will open a folder-selection dialog, where you can choose the " -"destination folder. At the bottom of the dialog, you can enable the " -"View the destination option if you want to go to " -"the destination folder after the file transfer is complete." -msgstr "" -"Seleccione los archivos que transferir, pulse con el botón derecho sobre la " -"selección y elija Copiar a... o " -"Mover a.... Esto abrirá un diálogo de selección " -"de carpeta, donde puede elegir la carpeta de destino. Al final de diálogo, " -"puede activar la opción Ver el destino si quiere " -"ir a la carpeta de destino después de que complete la transferencia del " -"archivo." +#: C/index.page:27(section/title) +msgid "File Management" +msgstr "Gestión de archivos" -#: C/slideshow.page:7(title) -msgid "Automatic Slideshow" -msgstr "Muestra automática de diapositivas" +#: C/index.page:31(section/title) +msgid "Editing Mode" +msgstr "Modo de edición" -#: C/slideshow.page:9(p) +#: C/index.page:32(section/p) msgid "" -"A slideshow of the currently selected images can be started from the image " -"browser by pressing F5, by clicking the slideshow toolbar icon, " -"or by clicking ViewSlideshow. If no " -"images are selected, all images in the folder will be included." +" " +"Numerous editing tools are provided for touching-up individual photos. Undo " +"and redo functions are provided, up until the photo is saved. To access the " +"editing tools, open an image and then click the Edit File toolbar " +"button (the palette icon), or press e." msgstr "" -"Se puede iniciar una presentación de las imágenes seleccionadas desde la " -"imagen del navegador pulsando F5, el icono de presentación de la " -"barra de herramientas o pulsando VerMostrar " -"diapositivas. Si no hay imágenes seleccionadas, se incluirán " -"todas las imágenes de la carpeta." +" Se " +"proporcionan numerosas herramientas de edición para retocar fotos " +"individuales. Se proporcionan las funcionas Deshacer y Rehacer, hasta que se " +"guarda la foto. Para acceder a las herramientas de edición, abra una imagen " +"y pulse en el botón de la barra de herramientas Editar archivo " +"(el icono de la paleta), o pulse e." -#: C/slideshow.page:15(p) -msgid "" -"The transition effects and the time each image is shown can be modified from " -"the EditPreferencesSlideshow dialog." -msgstr "" -"Los efectos de transición y la hora en que se muestra cada imagen se pueden " -"modificar desde el diálogo EditarPreferenciasDiapositivas." +#: C/index.page:42(section/title) +msgid "Batch Tools" +msgstr "Herramientas avanzadas" -#: C/slideshow.page:19(p) +#: C/index.page:43(section/p) msgid "" -"Some graphics cards and drivers may experience problems (crashes) if " -"transition effects are enabled. If you experience such difficulties, set the " -"Transition effect preference to None." +"Batch tools are provided to modify multiple images simultaneously. Changes " +"are written immediately, and are not undoable." msgstr "" -"Algunas tarjetas gráficas y controladores pueden experimentar problemas " -"(cuelgues) si se activan los efectos de transición. Si tiene estos " -"problemas, configure la preferencia Efecto de transición a " -"Ninguno." +"Las herramientas de proceso por lotes se proporcionan para modificar " +"múltiples imágenes simultáneamente. Los cambios se escriben inmediatamente, " +"y no se pueden deshacer." -#: C/slideshow.page:23(p) -msgid "" -"You can advance manually to the next image by pressing Down Arrow, Right Arrow, Page Down or Space." -msgstr "" -"Puede avanzar manualmente hasta la siguiente imagen pulsando Flecha " -"abajo o Flecha derecha o Av Pág o Espacio." +#: C/index.page:49(section/title) +msgid "Slideshows" +msgstr "Diapositivas" -#: C/slideshow.page:27(p) -msgid "" -"You can go back to the previous image by pressing Up Arrow, " -"Left Arrow or Page Up." -msgstr "" -"Puede volver a la imagen anterior pulsando Flecha arriba o " -"Flecha izquierda o Re Pág." +#: C/index.page:53(section/title) +msgid "Importing" +msgstr "Importar" -#: C/slideshow.page:30(p) -msgid "You can pause or un-pause the slideshow by pressing p." -msgstr "" -"Puede pausar o reanudar la muestra de diapositivas pulsando p." +#: C/index.page:57(section/title) +msgid "Sharing" +msgstr "Compartir" -#: C/slideshow.page:32(p) -msgid "To exit the slideshow, press Escape or F5." -msgstr "" -"Para salir de la muestra de diapositivas, pulse Escape o F5." +#: C/index.page:61(section/title) +msgid "Organizing" +msgstr "Organizar" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/import.page:21(None) -msgid "@@image: 'figures/import.png'; md5=aab2ba4d889d170b219c554294d69b0f" -msgstr "@@image: 'figures/import.png'; md5=aab2ba4d889d170b219c554294d69b0f" +#: C/index.page:65(section/title) +msgid "Other Tools" +msgstr "Otras herramientas" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/import.page:43(None) -msgid "" -"@@image: 'figures/import-pref-auto-folder.png'; " -"md5=0a41de83da83b762e37f3962a7e4c042" -msgstr "" -"@@image: 'figures/import-pref-auto-folder.png'; " -"md5=0a41de83da83b762e37f3962a7e4c042" +#: C/index.page:69(section/title) +msgid "Reference" +msgstr "Referencia" + +#: C/attributes.page:6(page/title) +msgid "Attribute Codes" +msgstr "Códigos de atributos" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/import.page:75(None) +#: C/attributes.page:7(page/p) msgid "" -"@@image: 'figures/import-pref-custom-format.png'; " -"md5=989ca536c873ec926a4a71c876004b9f" +"gThumb stores many different attributes for each file. Extensions " +"may add more. The list below is a summary of some of the more common " +"attributes:" msgstr "" -"@@image: 'figures/import-pref-custom-format.png'; " -"md5=989ca536c873ec926a4a71c876004b9f" +"gThumb almacena diferentes atributos para cada archivo. Las " +"extensiones pueden añadir más. La siguiente lista es un resumen de algunos " +"de los atributos más comunes:" -#: C/import.page:8(title) -msgid "Importing From a Camera" -msgstr "Importar desde una cámara" +#: C/attributes.page:12(item/p) +msgid "gth::file::display-size" +msgstr "gth::file::display-size" -#: C/import.page:10(p) -msgid "" -"On most systems, gThumb will automatically launch the import " -"dialog when a digital camera is connected to the computer, or a memory card " -"with photos is plugged into a card reader. (It does this because it is " -"registered as the default handler for x-content/image-dcf and x-content/" -"image-picturecd mime types.)" -msgstr "" -"En la mayoría de los sistemas, gThumb lanzará automáticamente el " -"diálogo de importación cuando se conecta una cámara digital al equipo, o " -"cuando se inserta una tarjeta de memoria con fotos en el lector de tarjetas. " -"(Esto lo hace porque está registrado como el manejador predeterminado de los " -"tipos mime x-content/image-dcf and x-content/image-picturecd.)" +#: C/attributes.page:15(item/p) +msgid "standard::fast-content-type" +msgstr "standard::fast-content-type" -#: C/import.page:16(p) -msgid "" -"To manually launch the import dialog, use FileImport " -"FromRemovable Device." -msgstr "" -"Para lanzar manualmente el diálogo de importación, use ArchivoImportar desdeDispositivo extraíble." +#: C/attributes.page:18(item/p) +msgid "general::dimensions" +msgstr "general::dimensions" -#: C/import.page:20(title) -msgid "The Import Dialog" -msgstr "El diálogo Importar" +#: C/attributes.page:21(item/p) +msgid "general::format" +msgstr "general::format" -#: C/import.page:24(p) -msgid "" -"The import dialog shows thumbnails of the photos available on the selected " -"device. The user can select one of more photos using normal keyboard or " -"mouse techniques (for example, Ctrl+click to add a photo to the selection, " -"or click and drag the mouse over the desired photos.) If no photos are " -"explicitly selected, all will be imported." -msgstr "" -"El diálogo de importación muestra miniaturas de las fotos disponibles en el " -"dispositivo seleccionado. El usuario puede seleccionar una o más fotos " -"usando los métodos habituales del teclado o el ratón (por ejemplo, Ctrl" -"+pulsación para añadir una foto a la selección, o pulsar y arrastrar el " -"ratón sobre las fotos que quiera). Si no hay fotos seleccionadas " -"explícitamente, se importarán todas." +#: C/attributes.page:24(item/p) +msgid "general::location" +msgstr "general::location" -#: C/import.page:30(p) -msgid "" -"Tags may optionally be associated with the imported photos, using the " -"Tags control below the thumbnail window. Click the drop-down " -"control to see the predefined tags." -msgstr "" -"Las etiquetas pueden estar asociadas opcionalmente con las fotos importadas, " -"usando el control Etiquetas debajo de la ventana de la miniatura. " -"Pulse el control desplegable para ver las etiquetas predefinidas." +#: C/attributes.page:27(item/p) +msgid "general::datetime" +msgstr "general::datetime" -#: C/import.page:34(p) -msgid "" -"An event name may also be optionally associated with the photos. This event " -"name can be used to generate an automatic subfolder name (possibly " -"incorporating a date) as described below. For example, if the base " -"destination folder is \"/photos\", and you enter \"Wedding-Jennifer\" in the " -"Event field, you can configure generation of automatic subfolders " -"like \"/photos/2010-07-31, Wedding-Jennifer\"." -msgstr "" -"El nombre de un evento se puede asociar opcionalmente con las fotos. Este " -"nombre de evento se puede usar para generar un nombre automático de " -"subcarpeta (posiblemente incorporando una fecha) como se muestra a " -"continuación. Por ejemplo, si la carpeta base de destino es «/fotos», e " -"introduce «Boda-Sara» en el campo Event, puede configurar la " -"generación automática se subcarpetas como «/fotos/2010-07-31, Boda-Sara»." +#: C/attributes.page:30(item/p) +msgid "general::rating" +msgstr "general::rating" -#: C/import.page:42(title) -msgid "Standard Date-Based Subfolders" -msgstr "Subcarpetas estándar basadas en la fecha" +#: C/attributes.page:33(item/p) +msgid "Exif::Image::Make" +msgstr "Exif::Image::Make" -#: C/import.page:46(p) -msgid "" -"As mentioned above, subfolders for imported photos can be automatically " -"generated based on event names and dates. This is enabled or disabled by " -"clicking on the destination foldername in the import dialog. This opens a " -"second dialog, where the base folder for imports may be selected (the " -"Destination folder). To generate automatic subfolders, select " -"Automatic subfolder." -msgstr "" -"Como se ha mencionado anteriormente, las subcarpetas de las fotos importadas " -"se pueden generar automáticamente basándose en nombres de eventos y fechas. " -"Esto se activa o se desactiva pulsando en el nombre de la carpeta destino en " -"el diálogo de importación. Esto abre un segundo diálogo, donde se puede " -"seleccionar la carpeta base de importaciones (la carpeta Destino). Para generar subcarpetas automáticamente, seleccione Subcarpeta " -"automática." +#: C/attributes.page:36(item/p) +msgid "Exif::Image::Model" +msgstr "Exif::Image::Model" -#: C/import.page:52(p) -msgid "" -"You can select either the File Date or the Current Date to use as the basis for subfolder naming. (The File Date " -"examines the dates embedded in the file metadata to determine when the photo " -"was taken.) A variety of standard date formats are available (year-" -"month for example). The as single subfolder checkbox " -"controls whether a \"deep\" or \"shallow\" hierarchy of files is made (for " -"example, with year-month, you can have year subfolders with month " -"subfolders under them, or all subfolders can be at the same level in the " -"filesystem, with the year and name both the folder name." -msgstr "" -"Puede seleccionar si usar la Fecha del archivo o la Fecha " -"actual como base para el nombrado de las subcarpetas. (La Fecha " -"del archivo examina las fechas empotradas en los metadatos del archivo " -"para determinar cuando se tomó la foto). Hay una variedad de formatos " -"estándar de fecha disponibles (año-mes por ejemplo). La casilla " -"como una sola subcarpeta controla si se hace una jerarquía " -"«profunda» o «poco profunda» (por ejemplo, con año-mes, puede " -"tener subcarpetas con el año y subcarpetas con el mes dentro de ellas, o " -"todas las subcarpetas puede estar al mismo nivel en el sistema de archivos, " -"con el año y el nombre, ambos como nombre de la carpeta)." +#: C/attributes.page:39(item/p) +msgid "Exif::Image::Software" +msgstr "Exif::Image::Software" + +#: C/attributes.page:42(item/p) +msgid "Exif::Image::Artist" +msgstr "Exif::Image::Artist" + +#: C/attributes.page:45(item/p) +msgid "Exif::Image::Copyright" +msgstr "Exif::Image::Copyright" + +#: C/attributes.page:48(item/p) +msgid "Exif::Photo::ISOSpeedRatings" +msgstr "Exif::Photo::ISOSpeedRatings" + +#: C/attributes.page:51(item/p) +msgid "Exif::Photo::BrightnessValue" +msgstr "Exif::Photo::BrightnessValue" + +#: C/attributes.page:54(item/p) +msgid "Exif::Photo::FNumber" +msgstr "Exif::Photo::FNumber" + +#: C/attributes.page:57(item/p) +msgid "Exif::Photo::ApertureValue" +msgstr "Exif::Photo::ApertureValue" + +#: C/attributes.page:60(item/p) +msgid "Exif::Photo::MaxApertureValue" +msgstr "Exif::Photo::MaxApertureValue" + +#: C/attributes.page:63(item/p) +msgid "Exif::Photo::ExposureTime" +msgstr "Exif::Photo::ExposureTime" + +#: C/attributes.page:66(item/p) +msgid "Exif::Photo::ExposureProgram" +msgstr "Exif::Photo::ExposureProgram" + +#: C/attributes.page:69(item/p) +msgid "Exif::Photo::ExposureIndex" +msgstr "Exif::Photo::ExposureIndex" + +#: C/attributes.page:72(item/p) +msgid "Exif::Photo::ExposureBiasValue" +msgstr "Exif::Photo::ExposureBiasValue" + +#: C/attributes.page:75(item/p) +msgid "Exif::Photo::ExposureMode" +msgstr "Exif::Photo::ExposureMode" + +#: C/attributes.page:78(item/p) +msgid "Exif::Photo::ShutterSpeedValue" +msgstr "Exif::Photo::ShutterSpeedValue" + +#: C/attributes.page:81(item/p) +msgid "Exif::Photo::MeteringMode" +msgstr "Exif::Photo::MeteringMode" + +#: C/attributes.page:84(item/p) +msgid "Exif::Photo::LightSource" +msgstr "Exif::Photo::LightSource" + +#: C/attributes.page:87(item/p) +msgid "Exif::Photo::WhiteBalance" +msgstr "Exif::Photo::WhiteBalance" + +#: C/attributes.page:90(item/p) +msgid "Exif::Photo::Flash" +msgstr "Exif::Photo::Flash" -#: C/import.page:61(p) -msgid "" -"It is not necessary to use the predefined date formats. If you select " -"custom format, standard date codes can be used. Click on the help " -"icon to the right of the custom format field for a list of format codes. \"%E" -"\" is a special code that will embed the Event name defined in " -"the main import dialog." -msgstr "" -"No es necesario usar formatos de fecha predefinidos. Si selecciona " -"formato personalizado, se pueden usar códigos de fecha estándar. " -"Pulse en el icono de ayuda a la derecha del campo de formato personalizado " -"para obtener una lista de códigos de formato. «%E» es un código especial que " -"empotrará el nombre del Evento definido en el diálogo de " -"importación principal." +#: C/attributes.page:93(item/p) +msgid "Exif::Photo::FocalLength" +msgstr "Exif::Photo::FocalLength" -#: C/import.page:67(p) -msgid "See for more date format codes." -msgstr "" -"Para ver más códigos de formato de fechas vea ." +#: C/attributes.page:96(item/p) +msgid "Exif::Photo::SubjectArea" +msgstr "Exif::Photo::SubjectArea" -#: C/import.page:69(p) -msgid "" -"If you use automatic subfolder naming, the Destination field in " -"the main import dialog will show the automatic portion of the folder in red. " -"(For date-based formats, dummy data may be shown in the red portion.)" -msgstr "" -"Si usa renombrado automático de subcarpetas, el campo Destino en " -"el diálogo principal de importación mostrará en rojo la parte automática de " -"la carpeta. (Para formatos basados en la fecha, se mostrarán datos falsos en " -"la parte roja.)" +#: C/attributes.page:99(item/p) +msgid "Exif::Photo::Contrast" +msgstr "Exif::Photo::Contrast" -#: C/import.page:74(title) -msgid "Using Custom Formats" -msgstr "Usar formatos personalizados" +#: C/attributes.page:102(item/p) +msgid "Exif::Photo::Saturation" +msgstr "Exif::Photo::Saturation" -#: C/bookmarks.page:6(title) -msgid "Using Bookmarks" -msgstr "Usar marcadores" +#: C/attributes.page:105(item/p) +msgid "Exif::Photo::Sharpness" +msgstr "Exif::Photo::Sharpness" -#: C/bookmarks.page:8(p) -msgid "" -"Frequently-used folders can be added to the bookmark list for rapid access. " -"To add the current folder to the bookmark list, press CtrlD or use the command BookmarksAdd Bookmark." -msgstr "" -"Las carpetas usadas frecuentemente se pueden añadir a la lista de marcadores " -"para un rápido acceso. Para añadir la carpeta actual a los marcadores pulse " -"CtrlD o use el comando " -"MarcadoresAñadir marcador." +#: C/strftime.page:6(page/title) +msgid "Date/Time Format Codes" +msgstr "Códigos de formato de fecha/hora" -#: C/bookmarks.page:13(p) +#: C/strftime.page:8(page/p) msgid "" -"To remove or rearrange bookmarks in a different order use the " -"BookmarksEdit Bookmarks command." +"This is a summary of standard date/time codes that may be used in format " +"strings:" msgstr "" -"Para quitar o reordenar marcadores de forma diferente use el comando " -"MarcadoresEditar marcadores." +"Esto es un resumen de los códigos de fecha y hora que se pueden usar en " +"cadenas de formato:" -#: C/bookmarks.page:16(p) -msgid "" -"BookmarksSystem Bookmarks provides " -"access to the system bookmarks that have been defined in Nautilus " -"or the file-chooser dialog used in most Gnome applications." -msgstr "" -"MarcadoresMarcadores del sistema " -"proporciona acceso a los marcadores del sistema que se han definido en " -"Nautilus o en el diálogo de selección de archivos en la mayoría " -"de aplicaciones de GNOME." +#: C/strftime.page:12(table/title) +msgid "Valid format codes for custom subfolders" +msgstr "Códigos de formato válidos para subcarpetas personalizadas" -#: C/wallpaper.page:6(title) -msgid "Desktop Wallpaper" -msgstr "Fondo del escritorio" +#: C/strftime.page:15(td/p) +msgid "%a" +msgstr "%a" -#: C/wallpaper.page:7(p) -msgid "" -"To set an image as the system desktop wallpaper, right-click on the image " -"and select Set as Desktop Background from the " -"pop-up menu. The desktop background will change, and the Gnome Appearance " -"Preferences dialog will appear. You can use this dialog to make adjustments " -"to the background settings (positioning, stretching, tiling, et cetera.)." +#: C/strftime.page:18(td/p) +msgid "The abbreviated weekday name according to the current locale." msgstr "" -"Para establecer una imagen como fondo del escritorio del sistema, pulse con " -"el botón derecho sobre la imagen y seleccione Establecer como " -"fondo de escritorio en el menú emergente. El fondo del " -"escritorio cambiará, y aparecerá el diálogo de Preferencias de apariencia de " -"GNOME. Puede usar este diálogo para hacer ajustes en la configuración del " -"fondo de escritorio (posición, estirar, mosaico, etc.)." +"El día de la semana abreviado, de acuerdo con la configuración regional " +"actual." -#: C/sharing-social.page:6(title) -msgid "Uploading to Photo-Sharing Web Sites" -msgstr "Subir fotos a sitios web de compartición de fotos" +#: C/strftime.page:24(td/p) +msgid "%A" +msgstr "%A" -#: C/sharing-social.page:7(p) -msgid "" -"gThumb is provided with a number of extensions for uploading photos to " -"various \"social media\" web sites. By default, uploaders for Facebook, " -"Flickr, Picasa, and Photobucket are enabled." +#: C/strftime.page:27(td/p) +msgid "The full weekday name according to the current locale." msgstr "" -"gThumb se proporciona con ciertas extensiones para subir fotos a sitios web " -"«sociales». De manera predeterminada, los cargadores activados son Facebook, " -"Flickr, Picasa y Photobucket." +"El día de la semana completo de acuerdo con la configuración regional actual." -#: C/sharing-social.page:13(p) -msgid "" -"To upload a series of photos, select the images in the browser view, and " -"click the Share button in the toolbar. Select the appropriate web " -"site from the menu that appears." -msgstr "" -"Para subir una serie de fotos, seleccione las imágenes en la vista de " -"navegador y pulse el botón Compartir en la barra de herramientas. " -"Seleccione el sitio web apropiado en el menú que aparece." +#: C/strftime.page:33(td/p) +msgid "%b" +msgstr "%b" -#: C/sharing-social.page:17(p) -msgid "" -"You may be prompted for additional information specific to the destination " -"site, like an album name. You may also be prompted for your user name and " -"password for the site. It may be necessary for gThumb to open a web browser, " -"where you complete the required authentication steps. Once you have " -"completed the required authentication steps in the browser, return to gThumb " -"and continue the upload." +#: C/strftime.page:36(td/p) +msgid "The abbreviated month name according to the current locale." msgstr "" -"Se le puede pedir información adicional sobre el sitio de destino, como el " -"nombre de un álbum. También se le puede pedir su nombre de usuario y su " -"contraseña para el sitio. Puede ser necesario que gThumb abra un navegador " -"web, donde usted tenga que introducir los pasos de autenticación requeridos. " -"Una vez que los haya completado, vuelva a gThumb y continúe la subida." +"El nombre abreviado del mes, de acuerdo con la configuración regional actual." -#: C/sharing-social.page:26(p) -msgid "" -"If you do not see the expected upload sites in the Share menu, " -"check that the appropriate exporter extensions are enabled in " -"EditExtensions." -msgstr "" -"Si no ve los sitios de subida esperados en el menú Compartir, " -"compruebe que las extensiones de exportación apropiadas están activadas en " -"EditarExtensiones." +#: C/strftime.page:42(td/p) +msgid "%B" +msgstr "%B" -#: C/sharing-social.page:31(p) -msgid "" -"For some sites, gThumb also supports downloading photos from the site into " -"gThumb. See the FileImport From menu " -"for the available download options." +#: C/strftime.page:45(td/p) +msgid "The full month name according to the current locale." +msgstr "El nombre del mes completo de acuerdo con la configuración regional." + +#: C/strftime.page:50(td/p) +msgid "%c" +msgstr "%c" + +#: C/strftime.page:53(td/p) +msgid "The preferred date and time representation for the current locale." msgstr "" -"Para algunos sitios, gThumb también soporta la descarga de fotos del sitio " -"en gThumb. Consulte en el menú ArchivoImportar " -"desde las opciones de descarga disponibles." +"La representación favorita de la fecha y la hora de acuerdo con la " +"configuración regional." -#: C/sharing-disc.page:6(title) -msgid "Creating a CD/DVD/ISO" -msgstr "Crear un(a) CD/DVD/ISO" +#: C/strftime.page:59(td/p) +msgid "%C" +msgstr "%C" + +#: C/strftime.page:62(td/p) +msgid "The century number (year/100) as a 2-digit integer." +msgstr "El número de siglo (año/100) como un entero de 2 dígitos." -#: C/sharing-disc.page:7(p) +#: C/strftime.page:67(td/p) +msgid "%d" +msgstr "%d" + +#: C/strftime.page:70(td/p) +msgid "The day of the month as a decimal number (range 01 to 31)." +msgstr "El día del mes como un número decimal (rango de 01 a 31)." + +#: C/strftime.page:76(td/p) +msgid "%D" +msgstr "%D" + +#: C/strftime.page:79(td/p) msgid "" -"To write a series of files to an optical disk (CD or DVD), or to create an " -"ISO disk image file, use the FileExport ToOptical Disc menu item." +"Equivalent to %m/%d/%y. (Yecch -- for Americans only. Americans should note " +"that in other countries %d/%m/%y is rather common. This means that in " +"international context this format is ambiguous and should not be used.)" msgstr "" -"Para escribir una serie de archivos en un disco óptico (CD o DVD), o para " -"crear un archivo de imagen ISO, use el elemento de menú " -"ArchivoExportar aDisco óptico." +"Equivalente a %m/%d/%y. (Yecch -- sólo para Estadounidenses. Los " +"estadounidenses deben tener en cuenta que en otros países %d/%m/%y es más " +"común. Esto significa que en contexto internacional este formato es ambigüo " +"y no debería utilizarse.)" + +#: C/strftime.page:87(td/p) +msgid "%e" +msgstr "%e" -#: C/sharing-disc.page:13(p) +#: C/strftime.page:90(td/p) msgid "" -"You will be offered the choice of writing the currently selected files, the " -"entire current folder, or the entire current folder and its subfolders. " -"Click OK when you have made the appropriate selection." +"Like %d, the day of the month as a decimal number, but a leading zero is " +"replaced by a space." msgstr "" -"Se le ofrecerá escribir los archivos actualmente seleccionados, la carpeta " -"actual entera o la carpeta actual entera y sus subcarpetas. Pulse " -"Aceptar cuando haya hecho la selección apropiada." +"Igual que %d, el día del mes como un número decimal, pero el cero de la " +"izquierda se sustituye por un espacio." + +#: C/strftime.page:96(td/p) +msgid "%E" +msgstr "%E" + +#: C/strftime.page:99(td/p) C/strftime.page:208(td/p) +msgid "Modifier: use alternative format, see below." +msgstr "Modificador: use el formato alternativo, vea debajo." + +#: C/strftime.page:104(td/p) +msgid "%F" +msgstr "%F" + +#: C/strftime.page:107(td/p) +msgid "Equivalent to %Y-%m-%d (the ISO 8601 date format). (C99)" +msgstr "Equivalente a %Y-%m-%d (el formato de fecha de ISO 8601). (C99)" + +#: C/strftime.page:113(td/p) +msgid "%G" +msgstr "%G" -#: C/sharing-disc.page:19(p) +#: C/strftime.page:116(td/p) msgid "" -"The next dialog will select the destination disk, or the ISO file to save. " -"When you are ready to complete the process, click Create Image. " -"The optical disk writing process will then commence, or the ISO file will be " -"written, completing the process." +"The ISO 8601 year with century as a decimal number. The 4-digit year " +"corresponding to the ISO week number (see %V). This has the same format and " +"value as %y, except that if the ISO week number belongs to the previous or " +"next year, that year is used instead." msgstr "" -"El siguiente diálogo seleccionará el disco de destino, o el archivo ISO que " -"salvar. Cuando esté listo para completar el proceso, pulse en Crear " -"imagen. El proceso de escritura del disco óptico comenzará, o se " -"escribirá el archivo ISO, completando el proceso" +"El año ISO 8601 con siglo como un número decimal. Los 4 dígitos del año " +"correspondientes al número ISO de la semana (vea %V). Esto tiene el mismo " +"formato y valor que %y, excepto si el número ISO de la semana pertenece al " +"año anterior o siguiente, se utiliza ese año en su lugar." -#: C/shortcuts.page:7(title) -msgid "Keyboard Shortcuts" -msgstr "Combinaciones de teclas" +#: C/strftime.page:125(td/p) +msgid "%g" +msgstr "%g" -#: C/shortcuts.page:10(title) -msgid "Viewing and hiding parts of the user interface" -msgstr "Ver y ocultar partes del interfaz de usuario" +#: C/strftime.page:128(td/p) +msgid "Like %G, but without century, i.e., with a 2-digit year (00-99)." +msgstr "Igual que %G, pero sin siglo, ej. con un año de dos dígitos (00-99)." -#: C/shortcuts.page:14(p) C/shortcuts.page:91(p) C/shortcuts.page:270(p) -#: C/shortcuts.page:495(p) -msgid "Keyboard Shortcut" -msgstr "Tecla rápida" +#: C/strftime.page:134(td/p) +msgid "%h" +msgstr "%h" -#: C/shortcuts.page:17(p) C/shortcuts.page:94(p) C/shortcuts.page:189(p) -#: C/shortcuts.page:273(p) C/shortcuts.page:498(p) C/rename-series.page:27(p) -msgid "Description" -msgstr "Descripción" +#: C/strftime.page:137(td/p) +msgid "Equivalent to %b." +msgstr "Equivalente a &b." -#: C/shortcuts.page:23(key) -msgid "F9" -msgstr "F9" +#: C/strftime.page:142(td/p) +msgid "%H" +msgstr "%H" -#: C/shortcuts.page:27(p) -msgid "" -"Show/Hide the sidebar in the browser mode. The sidebar contains the folder " -"tree and the file properties summary (if enabled)." +#: C/strftime.page:145(td/p) +msgid "The hour as a decimal number using a 24-hour clock (range 00 to 23)." +msgstr "" +"La hora como un número decimal, utilizando un reloj de 24 horas (rango de 00 " +"a 23)." + +#: C/strftime.page:151(td/p) +msgid "%I" +msgstr "%I" + +#: C/strftime.page:154(td/p) +msgid "The hour as a decimal number using a 12-hour clock (range 01 to 12)." msgstr "" -"Mostrar/ocultar la barra lateral en el modo navegador. La barra lateral " -"contiene el árbol de carpetas y el resumen de las propiedades del archivo " -"(si está activado)." +"La hora como un numero decimal, utilizando un reloj de 12 horas (rango de 01 " +"a 12)." -#: C/shortcuts.page:34(key) -msgid "i" -msgstr "i" +#: C/strftime.page:160(td/p) +msgid "%j" +msgstr "%j" -#: C/shortcuts.page:38(p) -msgid "Show the file properties summary." -msgstr "Mostrar el resumen de propiedades del archivo" +#: C/strftime.page:163(td/p) +msgid "The day of the year as a decimal number (range 001 to 366)." +msgstr "El día del año como un número decimal (rango de 001 a 366)." -#: C/shortcuts.page:44(key) -msgid "F8" -msgstr "F8" +#: C/strftime.page:169(td/p) +msgid "%k" +msgstr "%k" -#: C/shortcuts.page:48(p) -msgid "Shows/hides the thumbnail pane in the viewer mode." -msgstr "Muestra/oculta el panel de miniaturas en el modo visor." +#: C/strftime.page:172(td/p) +msgid "" +"The hour (24-hour clock) as a decimal number (range 0 to 23); single digits " +"are preceded by a blank. (See also %H.)" +msgstr "" +"La hora (formato de 24 horas) como un número decimal (rango de 0 a 23); los " +"dígitos simples van precedidos por un espacio el blanco. (Vea también %H.)" -#: C/shortcuts.page:53(p) -msgid "F11 or f" -msgstr "F11 o f" +#: C/strftime.page:179(td/p) +msgid "%l" +msgstr "%l" -#: C/shortcuts.page:58(p) -msgid "Toggles the fullscreen mode." -msgstr "Conmuta el modo a pantalla completa." +#: C/strftime.page:182(td/p) +msgid "" +"The hour (12-hour clock) as a decimal number (range 1 to 12); single digits " +"are preceded by a blank. (See also %I.)" +msgstr "" +"La hora (formato de 12 horas) como un número decimal (rango de 1 a 12); los " +"dígitos simples están precedidos por un espacio en blanco. (Vea también %I.)" -#: C/shortcuts.page:64(key) C/shortcuts.page:320(key) -msgid "Ctrl" -msgstr "Ctrl" - -#: C/shortcuts.page:64(key) -msgid "t" -msgstr "t" +#: C/strftime.page:189(td/p) +msgid "%m" +msgstr "%m" -#: C/shortcuts.page:68(p) -msgid "Shows/hides the thumbnails in the browser mode." -msgstr "Muestra/oculta las miniaturas en el modo navegador." +#: C/strftime.page:192(td/p) +msgid "The month as a decimal number (range 01 to 12)." +msgstr "El mes como un número decimal (rango de 01 a 12)." -#: C/shortcuts.page:74(key) C/shortcuts.page:524(key) -msgid "Esc" -msgstr "Esc" +#: C/strftime.page:197(td/p) +msgid "%M" +msgstr "%M" -#: C/shortcuts.page:78(p) -msgid "Closes the viewer or fullscreen mode." -msgstr "Cierra el visor o el modo a pantalla completa." +#: C/strftime.page:200(td/p) +msgid "The minute as a decimal number (range 00 to 59)." +msgstr "El minuto como un numero decimal (rango de 00 a 59)." -#: C/shortcuts.page:87(title) -msgid "Editing shortcuts for the browser and viewer" -msgstr "Editar atajos para el explorador y el visor" +#: C/strftime.page:205(td/p) +msgid "%O" +msgstr "%O" -#: C/shortcuts.page:100(key) -msgid "e" -msgstr "e" +#: C/strftime.page:213(td/p) +msgid "%p" +msgstr "%p" -#: C/shortcuts.page:104(p) -msgid "Edit the image. Opens the viewer and shows the editing tools." -msgstr "Editar la imagen. Abre el visor y muestra las herramientas de edición." +#: C/strftime.page:216(td/p) +msgid "" +"Either 'AM' or 'PM' according to the given time value, or the corresponding " +"strings for the current locale. Noon is treated as 'pm' and midnight as 'am'." +msgstr "" +"O «AM» o «PM» de acuerdo con el valor dado del tiempo, o las cadenas " +"correspondientes la para la localización actual. Mediodía es tratado como " +"«pm» y y medianoche como «am»." -#: C/shortcuts.page:110(key) -msgid "g" -msgstr "g" +#: C/strftime.page:223(td/p) +msgid "%P" +msgstr "%P" -#: C/shortcuts.page:114(p) -msgid "Open the image with the GNU Image Manipulation Program (GIMP)." +#: C/strftime.page:226(td/p) +msgid "" +"Like %p but in lowercase: 'am' or 'pm' or a corresponding string for the " +"current locale." msgstr "" -"Abrir la imagen con el programa de manipulación de imágenes de GNU (GIMP)." +"Similar %p pero en minúsculas: «am» o «pm» o la cadena correspondiente a la " +"configuración regional actual." -#: C/shortcuts.page:120(key) -msgid "F2" -msgstr "F2" +#: C/strftime.page:232(td/p) +msgid "%r" +msgstr "%r" -#: C/shortcuts.page:124(p) -msgid "Rename the image." -msgstr "Renombrar la imagen." +#: C/strftime.page:235(td/p) +msgid "" +"The time in a.m. or p.m. notation. In the POSIX locale this is equivalent to " +"'%I:%M:%S %p'." +msgstr "" +"La hora en notación am o pm. En la configuración regional POSIX esto es " +"equivalente a «%I:%M:%S %p»." -#: C/shortcuts.page:129(p) -msgid "c or Ctrlm" -msgstr "c o Ctrlm" +#: C/strftime.page:241(td/p) +msgid "%R" +msgstr "%R" -#: C/shortcuts.page:134(p) -msgid "Add comments or metadata to an image." -msgstr "Añadir comentarios o metadatos a una imagen." +#: C/strftime.page:244(td/p) +msgid "" +"The time in 24-hour notation (%H:%M). For a version including the seconds, " +"see %T below." +msgstr "" +"La hora en notación de 24 horas (%H:%M). Para una versión que incluya los " +"segundos, vea %T más abajo." -#: C/shortcuts.page:140(key) -msgid "]" -msgstr "]" +#: C/strftime.page:250(td/p) +msgid "%s" +msgstr "%s" -#: C/shortcuts.page:144(p) -msgid "Rotate right, losslessly if possible. The file is saved automatically." +#: C/strftime.page:253(td/p) +msgid "" +"The number of seconds since the Epoch, i.e., since 1970-01-01 00:00:00 UTC." msgstr "" -"Rotar a la derecha, sin pérdidas si es posible. El archivo se guarda " -"automáticamente." +"El número de segundos desde Epoch, por ejemplo, desde 1970-01-01 00:00:00 " +"UTC." -#: C/shortcuts.page:150(key) -msgid "[" -msgstr "[" +#: C/strftime.page:259(td/p) +msgid "%S" +msgstr "%S" -#: C/shortcuts.page:154(p) -msgid "Rotate left, losslessly if possible. The file is saved automatically." +#: C/strftime.page:262(td/p) +msgid "" +"The second as a decimal number (range 00 to 60). (The range is up to 60 to " +"allow for occasional leap seconds.)" msgstr "" -"Rotar a la izquierda, sin pérdidas si es posible. El archivo se guarda " -"automáticamente." - -#: C/shortcuts.page:160(key) C/shortcuts.page:170(key) -msgid "Delete" -msgstr "Borrar" +"Los segundos como un número decimal (rango de 00 a 60). (El rango es " +"superior a 60 para permitir saltos ocasionales en los segundos.)" -#: C/shortcuts.page:164(p) -msgid "Move the selected files to the Trash." -msgstr "Mover los archivos seleccionados a la papelera." +#: C/strftime.page:269(td/p) +msgid "%T" +msgstr "%T" -#: C/shortcuts.page:170(key) C/shortcuts.page:374(key) -#: C/shortcuts.page:397(key) -msgid "Shift" -msgstr "Mayús" +#: C/strftime.page:272(td/p) +msgid "The time in 24-hour notation (%H:%M:%S)." +msgstr "La hora en formato 24 horas (%H:%M:%S)." -#: C/shortcuts.page:174(p) -msgid "Delete the selected files permanently." -msgstr "Eliminar permanentemente los archivos seleccionados." +#: C/strftime.page:277(td/p) +msgid "%u" +msgstr "%u" -#: C/shortcuts.page:182(title) -msgid "Editing shortcuts for the viewer mode only" -msgstr "Editar atajos para el modo visor solamente" +#: C/strftime.page:280(td/p) +msgid "" +"The day of the week as a decimal number, range 1 to 7, Monday being 1. See " +"also %w." +msgstr "" +"El día de la semana como un número decimal, rango de 1 a 7, siendo 1 el " +"lunes. Vea también %w." -#: C/shortcuts.page:186(p) -msgid "Keyboard Shortcut (Case Sensitive)" -msgstr "Atajos de teclado (sensible a capitalización)" +#: C/strftime.page:286(td/p) +msgid "%U" +msgstr "%U" -#: C/shortcuts.page:195(key) -msgid "h" -msgstr "h" +#: C/strftime.page:289(td/p) +msgid "" +"The week number of the current year as a decimal number, range 00 to 53, " +"starting with the first Sunday as the first day of week 01. See also %V and " +"%W." +msgstr "" +"El número de semana del año actual como un número decimal, rango de 00 a 53, " +"empezando con el primer domingo como primer día de la semana 01. Vea también " +"%V y %W." -#: C/shortcuts.page:199(p) -msgid "Enhance colors." -msgstr "Realzar colores." +#: C/strftime.page:296(td/p) +msgid "%V" +msgstr "%V" -#: C/shortcuts.page:205(key) -msgid "l" -msgstr "l" +#: C/strftime.page:299(td/p) +msgid "" +"The ISO 8601:1988 week number of the current year as a decimal number, range " +"01 to 53, where week 1 is the first week that has at least 4 days in the " +"current year, and with Monday as the first day of the week. See also %U and " +"%W." +msgstr "" +"El número de semana ISO 8601:1988 del año actual como un número decimal, " +"rango de 01 a 53, donde la semana 1 es la primera semana que tenga al menos " +"4 días en el año actual, y con el lunes como primer día de la semana. Vea " +"también %U y % W." -#: C/shortcuts.page:209(p) -msgid "Flip image." -msgstr "Voltear imagen." +#: C/strftime.page:308(td/p) +msgid "%w" +msgstr "%w" -#: C/shortcuts.page:215(key) -msgid "m" -msgstr "m" +#: C/strftime.page:311(td/p) +msgid "" +"The day of the week as a decimal, range 0 to 6, Sunday being 0. See also %u." +msgstr "" +"El día de la semana como un decimal, rango de 0 a 6, siendo 0 el Domingo. " +"Vea también %u." -#: C/shortcuts.page:219(p) -msgid "Mirror image." -msgstr "Reflejar imagen." +#: C/strftime.page:317(td/p) +msgid "%W" +msgstr "%W" -#: C/shortcuts.page:225(key) -msgid "r" -msgstr "r" +#: C/strftime.page:320(td/p) +msgid "" +"The week number of the current year as a decimal number, range 00 to 53, " +"starting with the first Monday as the first day of week 01." +msgstr "" +"El número de semana del año actual como un número decimal, rango de 00 a 53, " +"comenzando con el primer lunes como primer día de la semana 01." -#: C/shortcuts.page:229(p) -msgid "Rotate right." -msgstr "Rotar a la derecha." +#: C/strftime.page:327(td/p) +msgid "%x" +msgstr "%x" -#: C/shortcuts.page:235(key) -msgid "R" -msgstr "R" +#: C/strftime.page:330(td/p) +msgid "" +"The preferred date representation for the current locale without the time." +msgstr "" +"La representación preferida de la fecha para la configuración regional " +"actual, sin la hora." -#: C/shortcuts.page:239(p) -msgid "Rotate left." -msgstr "Rotar a la izquierda." +#: C/strftime.page:336(td/p) +msgid "%X" +msgstr "%X" -#: C/shortcuts.page:245(key) -msgid "C" -msgstr "C" +#: C/strftime.page:339(td/p) +msgid "" +"The preferred time representation for the current locale without the date." +msgstr "" +"La representación preferida de la hora para la configuración regional " +"actual, sin la fecha." -#: C/shortcuts.page:249(p) -msgid "Crop image." -msgstr "Recortar imagen." +#: C/strftime.page:345(td/p) +msgid "%y" +msgstr "%y" -#: C/shortcuts.page:255(key) -msgid "S" -msgstr "S" +#: C/strftime.page:348(td/p) +msgid "The year as a decimal number without a century (range 00 to 99)." +msgstr "El año como número decimal, excluyendo el siglo (rango de 00 a 99)." -#: C/shortcuts.page:259(p) -msgid "Resize image." -msgstr "Redimensionar imagen." +#: C/strftime.page:354(td/p) +msgid "%Y" +msgstr "%Y" -#: C/shortcuts.page:266(title) -msgid "Viewer shortcuts" -msgstr "Ver atajos de teclado" +#: C/strftime.page:357(td/p) +msgid "The year as a decimal number including the century." +msgstr "El año como número decimal, incluyendo el siglo." -#: C/shortcuts.page:278(p) -msgid "Space or Page Down" -msgstr "Espacio o AvPág" +#: C/strftime.page:362(td/p) +msgid "%z" +msgstr "%z" -#: C/shortcuts.page:283(p) -msgid "View the next image." -msgstr "Ver la siguiente imagen." +#: C/strftime.page:365(td/p) +msgid "" +"The time-zone as hour offset from GMT. Required to emit RFC 822-conformant " +"dates (using \"%a, %d %b %Y %H:%M:%S %z\")." +msgstr "" +"La zona horaria como diferencia horaria respecto a GTM. Requerido para " +"emitir fechas conformes a la RFC 822 (utilizando «%a, %d %b %Y %H:%M:%S %z»)." -#: C/shortcuts.page:288(p) -msgid "Backspace or Page Up" -msgstr "Retroceso o RePág" +#: C/strftime.page:372(td/p) +msgid "%Z" +msgstr "%Z" -#: C/shortcuts.page:293(p) -msgid "View the previous image." -msgstr "Ver la imagen anterior." +#: C/strftime.page:375(td/p) +msgid "The time zone or name or abbreviation." +msgstr "La zona horaria o el nombre o la abreviatura." -#: C/shortcuts.page:299(key) C/shortcuts.page:416(key) -msgid "Home" -msgstr "Inicio" +#: C/strftime.page:380(page/p) +msgid "" +"Some conversion specifications can be modified by preceding the conversion " +"specifier character by the E or O modifier to indicate that an alternative " +"format should be used. If the alternative format or specification does not " +"exist for the current locale, the behaviour will be as if the unmodified " +"conversion specification were used. The Single Unix Specification mentions " +"%Ec, %EC, %Ex, %EX, %Ey, %EY, %Od, %Oe, %OH, %OI, %Om, %OM, %OS, %Ou, %OU, " +"%OV, %Ow, %OW, %Oy, where the effect of the O modifier is to use alternative " +"numeric symbols (say, roman numerals), and that of the E modifier is to use " +"a locale-dependent alternative representation." +msgstr "" +"Se pueden modificar algunas especificaciones de conversión precediendo el " +"carácter especificador de conversión por el modificador E u O para indicar " +"que se debe utilizar un formato alternativo. Si el formato alternativo no " +"existe para a configuración regional actual, el comportamiento será igual " +"que si se hubiese usado la especificación de conversión sin modificar. La " +"especificación única de Unix menciona %Ec, %EC, %Ex, %EX, %Ey, %EY, %Od, " +"%Oe, %OH, %OI, %Om, %OM, %OS, %Ou, %OU, %OV, %Ow, %OW, %Oy, donde el " +"modificador O es para utilizar símbolos numéricos alternativos (números " +"romanos), y que el modificador E es para utilizar una representación " +"alternativa dependiente de la configuración regional." -#: C/shortcuts.page:303(p) -msgid "View the first image." -msgstr "Ver la primera imagen." +#: C/introduction.page:6(page/title) +msgid "About gThumb" +msgstr "Acerca de gThumb" -#: C/shortcuts.page:309(key) C/shortcuts.page:426(key) -msgid "End" -msgstr "Fin" +#: C/introduction.page:8(page/p) +msgid "" +"gThumb is an image viewer and browser written for the GNOME " +"environment. It lets you browse your hard disk, showing you thumbnails of " +"image files and view single images of many different formats." +msgstr "" +"gThumb es un visor y explorador de imágenes escrito para el " +"entorno GNOME. Le permite explorar su disco duro mostrando miniaturas de los " +"archivos de imagen y ver imágenes sueltas en muchos formatos diferentes." -#: C/shortcuts.page:313(p) -msgid "View the last image." -msgstr "Ver la última imagen." +#: C/introduction.page:13(page/p) +msgid "" +"gThumb supports the most common graphics formats, including JPEG, " +"GIF, TIF, and PNG. gThumb will also display other less common " +"image types if the supporting libraries are installed, including TGA, ICO, " +"BMP, XPM, and others." +msgstr "" +"gThumb soporta los formatos de archivo más comunes, incluyendo " +"JPEG, TIF y PNG. gThumb también mostrará otros tipos de imágenes " +"menos comunes si las librerías de soporte están instaladas, incluyendo TGA, " +"ICO, BMP, XPM y otros." -#: C/shortcuts.page:321(key) -msgid "D" -msgstr "D" +#: C/introduction.page:18(page/p) +msgid "" +"Some support for RAW image types is included, especially if the dcraw " +"program is installed on your system." +msgstr "" +"Se incluye algún soporte para imágenes RAW, especialmente si el programa " +"dcraw está instalado en su sistema." -#: C/shortcuts.page:326(p) -msgid "Add the current location to the bookmarks." -msgstr "Añadir la ubicación actual a los marcadores." +#: C/introduction.page:21(page/p) +msgid "" +"gThumb not only lets you view image files but has many other " +"features such as adding comments to images, organizing images into catalogs, " +"printing images, slideshows, setting your desktop background, and more." +msgstr "" +"gThumb no sólo le permite ver archivos de imágenes, sino que " +"tiene otras muchas características como añadir comentarios a las imágenes, " +"organizar las imágenes en catálogos, imprimir imágenes, ver diapositivas, " +"establecer en fondo de escritorio, y mucho más." -#: C/shortcuts.page:331(p) -msgid "+ or =" -msgstr "+ o =" +#: C/introduction.page:26(page/p) +msgid "" +"gThumb includes a tool to import photos from attached cameras and " +"memory card readers." +msgstr "" +"gThumb incluye una herramienta para importar fotos desde cámaras " +"y lectores de tarjetas de memoria." -#: C/shortcuts.page:336(p) -msgid "Zoom in." -msgstr "Ampliar." +#: C/introduction.page:29(page/p) +msgid "" +"gThumb can read EXIF, XMP, and IPTC metadata that is commonly " +"embedded in files." +msgstr "" +"gThumb puede leer los metadatos EXIF, XMP e IPTC comúnmente " +"incrustados en los archivos." -#: C/shortcuts.page:342(key) -msgid "-" -msgstr "-" +#: C/introduction.page:32(page/p) +msgid "" +"gThumb provides a systems of extensions (or plug-ins), to allow " +"users to extend the functionality of gThumb." +msgstr "" +"gThumb proporciona un sistema de extensiones (o complementos) que " +"permite a los usuarios ampliar la funcionalidad de gThumb." -#: C/shortcuts.page:346(p) -msgid "Zoom out." -msgstr "Alejar." +#: C/introduction.page:34(page/p) +msgid "" +"More information about these extensions, and about gThumb " +"generally, is available at http://live.gnome.org/gthumb." +msgstr "" +"Dispone de más información sobre esas extensiones, o sobre gThumb " +"en general, en http://live.gnome." +"org/gthumb." -#: C/shortcuts.page:351(p) -msgid "1 or z or / (numeric keypad)" -msgstr "1 o z o / (teclado numérico)" +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/browser.page:13(media) +#| msgid "" +#| "@@image: 'figures/main-win.png'; md5=93cf84bd05a153ab61951ae12bbe3f26" +msgctxt "_" +msgid "" +"external ref='figures/main-win.png' md5='93cf84bd05a153ab61951ae12bbe3f26'" +msgstr "" +"external ref='figures/main-win.png' md5='93cf84bd05a153ab61951ae12bbe3f26'" -#: C/shortcuts.page:357(p) -msgid "Actual size." -msgstr "Tamaño actual." +#: C/browser.page:6(page/title) +msgid "Browsing Your Files" +msgstr "Examinar sus archivos" -#: C/shortcuts.page:362(p) -msgid "x or * (numeric keypad)" -msgstr "x o * (teclado numérico)" +#: C/browser.page:8(page/p) +msgid "When you start gThumb the following window is displayed:" +msgstr "Cuando inicia gThumb se muestra la siguiente ventana:" -#: C/shortcuts.page:367(p) -msgid "Zoom to fit (scales down only, does not magnify)" -msgstr "Ampliar hasta ajustar (solo reducir, no ampliar)" +#: C/browser.page:11(figure/title) +msgid "The main window" +msgstr "La ventana principal" -#: C/shortcuts.page:375(key) -msgid "x" -msgstr "x" +#: C/browser.page:16(page/p) +msgid "The gThumb browser contains the following elements:" +msgstr "El navegador gThumb contiene los siguientes elementos:" -#: C/shortcuts.page:380(p) -msgid "Zoom to fit (scale down or magnify, as required)" -msgstr "Ampliar hasta ajustar (reducir o aumentar, según se requiera)" +#: C/browser.page:20(item/title) +msgid "Menubar" +msgstr "Barra de menú" -#: C/shortcuts.page:386(key) C/shortcuts.page:398(key) -msgid "Arrows" -msgstr "Flechas" +#: C/browser.page:21(item/p) +msgid "" +"The menus on the menubar contain all of the commands that you can use in " +"gThumb" +msgstr "" +"Los menús de la barra de menús contienen todos los comandos que puede usar " +"en gThumb" -#: C/shortcuts.page:390(p) -msgid "Scroll the image." -msgstr "Desplazar la imagen." +#: C/browser.page:25(item/title) +msgid "Toolbar" +msgstr "Barra de herramientas" -#: C/shortcuts.page:403(p) -msgid "Scroll the image faster." -msgstr "Desplazar la imagen más rápidamente." +#: C/browser.page:26(item/p) +msgid "" +"The toolbar contains a subset of the commands that you can access from the " +"menubar. In particular, the Tools button contains functions for batch " +"processing multiple images." +msgstr "" +"La barra de herramientas contiene un subconjunto de comandos a los que puede " +"acceder desde la barra de menús. En particular, el botón Herramientas sirve " +"para procesar en lotes múltiples imágenes." -#: C/shortcuts.page:410(title) -msgid "Browser Navigation" -msgstr "Navegación con explorador" +#: C/browser.page:31(item/title) +msgid "Locationbar" +msgstr "Barra de ubicación" -#: C/shortcuts.page:420(p) -msgid "Go to the first file in the browser view." -msgstr "Ir al primer archivo en la vista de navegador." +#: C/browser.page:32(item/p) +msgid "The locationbar contains the current folder or catalog name." +msgstr "" +"La barra de lugar contiene el nombre de la carpeta o del catálogo actual." -#: C/shortcuts.page:431(p) -msgid "Go to the last file in the browser view." -msgstr "Ir al último archivo en la vista de navegador." +#: C/browser.page:36(item/title) +msgid "Folder Tree" +msgstr "Árbol de carpetas" -#: C/shortcuts.page:436(p) -msgid "Down Arrow or Page Down" -msgstr "Flecha abajo o AvPág" +#: C/browser.page:37(item/p) +msgid "" +"The folder tree allows you to navigate the filesystem. Single-clicking on a " +"folder will load its images in the browser view. Double-clicking a folder, " +"or clicking the expander arrow, will also list folder's subfolders in the " +"tree." +msgstr "" +"El árbol de carpetas le permite navegar por el sistema de archivos. Un sola " +"pulsación sobre una carpeta cargará sus imágenes en la vista del navegador. " +"Una pulsación doble sobre una carpeta, o pulsar la flecha de expansión, " +"listará sus subcarpetas el en árbol." -#: C/shortcuts.page:441(p) -msgid "Scroll downwards through the thumbnails." -msgstr "Desplazarse hacia abajo a través de las miniaturas." +#: C/browser.page:44(item/title) +msgid "Browser View" +msgstr "Vista de Navegador" -#: C/shortcuts.page:446(p) -msgid "Up Arrow or Page Up" -msgstr "Flecha arriba o RePág" +#: C/browser.page:45(item/p) +msgid "" +"The browser view shows the images in the current folder or catalog. Single-" +"clicking an image will enable the Information Sidebar for that image. Double-" +"clicking an image will open it in the viewer mode. Double-clicking with the " +"middle mouse button will load the image in fullscreen viewer mode." +msgstr "" +"La vista de navegador muestra las imágenes en la carpeta actual. Una sola " +"pulsación sobre la imagen activa la barra lateral de información para esa " +"imagen. Una pulsación doble sobre la imagen la abre en modo visor. Una " +"pulsación doble con el botón central del ratón cargará la imagen en el visor " +"a pantalla completa." -#: C/shortcuts.page:451(p) -msgid "Scroll upwards through the thumbnails." -msgstr "Desplazarse hacia arriba a través de las miniaturas." +#: C/browser.page:52(item/title) +msgid "Organize Button" +msgstr "Botón Organizar" -#: C/shortcuts.page:457(key) C/shortcuts.page:467(key) -#: C/shortcuts.page:478(key) -msgid "Alt" -msgstr "Alt" - -#: C/shortcuts.page:457(key) -msgid "Left Arrow" -msgstr "Flecha izquierda" +#: C/browser.page:53(item/p) +msgid "" +"The Organize button, just above the browser view, allows you to group images " +"into catalogs." +msgstr "" +"El botón Organizar, justo debajo de la vista del navegador, le permite " +"agrupar las imágenes en catálogos." -#: C/shortcuts.page:461(p) -msgid "Go back to the previously viewed folder." -msgstr "Ir a la carpeta anteriormente visitada." +#: C/browser.page:57(item/title) +msgid "Statusbar" +msgstr "Barra de estado" -#: C/shortcuts.page:467(key) -msgid "Right Arrow" -msgstr "Flecha derecha" +#: C/browser.page:58(item/p) +msgid "On the statusbar you can read:" +msgstr "En la barra de estado puede leer:" -#: C/shortcuts.page:471(p) -msgid "Go forward (after going back to a folder)." -msgstr "Ir hacia adelante (después de retroceder hasta una carpeta)." +#: C/browser.page:61(item/p) +msgid "" +"the total number of images contained in the current folder or catalog and " +"their total size." +msgstr "" +"el número total de imágenes que contiene la carpeta o el catálogo actual y " +"su tamaño total." -#: C/shortcuts.page:479(key) -msgid "Up" -msgstr "Arriba" +#: C/browser.page:65(item/p) +msgid "the number of the selected images and their size." +msgstr "el número de imágenes seleccionadas y su tamaño." -#: C/shortcuts.page:484(p) -msgid "Go up one level." -msgstr "Subir un nivel." +#: C/browser.page:68(item/p) +msgid "some properties of the currently focused image." +msgstr "algunas propiedades de la imagen que actualmente tiene el foco." -#: C/shortcuts.page:491(title) -msgid "Slideshow controls" -msgstr "Controles de las diapositivas" +#: C/browser.page:73(item/title) +msgid "Information Sidebar" +msgstr "Barra lateral de información" -#: C/shortcuts.page:504(key) -msgid "F5" -msgstr "F5" +#: C/browser.page:74(item/p) +msgid "" +"If a single image is selected, the information sidebar (below the folder " +"tree) will display detailed information (such as EXIF or XMP tags) about the " +"selected image." +msgstr "" +"Si se selecciona una sola sola imagen, la barra lateral de información " +"(debajo del árbol de carpetas) mostrará información detallada (etiquetas " +"EXIF o XMP) sobre la imagen seleccionada." -#: C/shortcuts.page:508(p) -msgid "Start a slideshow." -msgstr "Iniciar la muestra de diapositivas." +#: C/browser.page:79(item/title) +msgid "Filter Bar" +msgstr "Barra de filtros" -#: C/shortcuts.page:514(key) -msgid "Space" -msgstr "Espacio" +#: C/browser.page:80(item/p) +msgid "" +"An image filtering tool is provided just below the browser view. This can be " +"used to filter the displayed images. For example, the browser view can be " +"limited to files of a certain size, date, or name pattern, or other " +"characteristics." +msgstr "" +"Se proporciona un filtro de imágenes justo debajo de la vista del navegador. " +"Se puede usar para filtrar las imágenes mostradas. Por ejemplo, la vista del " +"navegador se puede limitar a archivos de cierto tamaño, fecha, patrón de " +"nombre, u otras características." -#: C/shortcuts.page:518(p) -msgid "Pause/Unpause the slideshow." -msgstr "Pausar/Reanudar la muestra de diapositivas." +#: C/batch-rotate.page:6(page/title) +msgid "Rotating Images Losslessly" +msgstr "Rotar imágenes sin pérdidas" -#: C/shortcuts.page:528(p) -msgid "Close the slideshow." -msgstr "Cerrar la muestra de diapositivas." +#: C/batch-rotate.page:8(page/p) +msgid "" +"To rotate one or more images, select the images in the browser view. Then " +"click the Tools button on the main toolbar, and select either " +"ToolsRotate Right or " +"ToolsRotate Left. The images will be " +"rotated." +msgstr "" +"Para rotar una o más imágenes, seleccione las imágenes en la vista de " +"navegador. Pulse el botón Herramientas en la barra de " +"herramientas principal, y seleccione HerramientasRotar a la derecha o HerramientasRotar a la izquierda." -#: C/shortcuts.page:533(p) -msgid "Down Arrow or Right Arrow or Page Down" -msgstr "Flecha abajo o Flecha derecha o AvPág" +#: C/batch-rotate.page:14(page/p) +msgid "Lossless rotation is used for jpeg images, when possible." +msgstr "La rotación sin pérdidas se usa en imágenes jpeg, cuando es posible." -#: C/shortcuts.page:538(p) -msgid "Load the next image." -msgstr "Cargar la siguiente imagen." +#: C/batch-convert-format.page:6(page/title) +msgid "Converting File Formats" +msgstr "Convertir formatos de archivo" -#: C/shortcuts.page:543(p) -msgid "Up Arrow or Left Arrow or Page Up" +#: C/batch-convert-format.page:8(page/p) +msgid "" +"To convert one or more images into a new file format, select the images in " +"the browser view. Then click the Tools button on the main " +"toolbar, and select ToolsConvert Format." msgstr "" -"Flecha arriba o Flecha izquierda o RePág" - -#: C/shortcuts.page:548(p) -msgid "Load the previous image." -msgstr "Cargar la imagen anterior." - -#: C/printing.page:7(title) -msgid "Printing Images" -msgstr "Imprimir imágenes" +"Para convertir una o más imágenes a un formato nuevo, seleccione las " +"imágenes que quiere convertir en el navegador y pulse el botón " +"Herramientas en la barra de herramientas principal y elija " +"HerramientasConvertir formato." -#: C/printing.page:9(p) +#: C/batch-convert-format.page:12(page/p) msgid "" -"To print the current image in the viewer mode, use FilePrint or Ctrlp." +"Select the desired output format and destination folder. Click Execute to complete the process." msgstr "" -"Para imprimir la imagen actual en el modo visor, use ArchivoImprimir o Ctrlp." +"Seleccione el formato de salida deseado y la carpeta de destino. Pulse " +"Ejecutar para completar el proceso." + +#: C/batch-resize.page:6(page/title) +msgid "Resizing Images" +msgstr "Redimensionar imágenes" -#: C/printing.page:13(p) +#: C/batch-resize.page:8(page/p) msgid "" -"To print one or more images from the browser mode, select the desired images " -"and then use FilePrint or " -"Ctrlp." +"To resize one or more images using the same dimensions or scaling factors, " +"select the images in the browser view. Then click the Tools " +"button on the main toolbar, and select ToolsResize " +"Images." msgstr "" -"Para imprimir una o más imágenes desde el modo navegador, seleccione las " -"imágenes y use ArchivoImprimir o " -"Ctrlp." +"Para redimensionar una o más imágenes usando las mismas dimensiones o lo " +"mismos factores de escalado, seleccione las imágenes en la vista de " +"navegador. Pulse en el botón Herramientas y elija " +"HerramientasRedimensionar imágenes." -#: C/printing.page:18(p) +#: C/batch-resize.page:12(page/p) msgid "" -"The printer to use can be selected from the General tab of the " -"print dialog." +"Then select the desired maximum output dimensions, or the desired percentage " +"scaling, and the destination folder. Click Execute to complete " +"the process." msgstr "" -"La impresora que usar se puede seleccionar en la pestaña General " -"del diálogo de impresión." +"Seleccione las dimensiones máximas de salida, o el porcentaje de escalado, y " +"la carpeta de destino. Pulse Ejecutar para completar el proceso." + +#: C/batch-change-date.page:6(page/title) +msgid "Changing Dates" +msgstr "Cambiar fechas" -#: C/printing.page:21(p) +#: C/batch-change-date.page:8(page/p) msgid "" -"The type of paper to use can be selected from the Page Setup tab." +"To change the file modification times, the comment dates, or the Exif " +"DateTimeOriginal tags of multiple files, select the files in the browser " +"view. Then click the Tools button on the main toolbar, and select " +"ToolsChange Date." msgstr "" -"Se puede seleccionar el tipo de papel que usar en la pestaña " -"Configuración de página." +"Para cambiar las horas de modificación del archivo, las fechas de los " +"comentarios, o las etiquetas Exif DateTimeOriginal de varios archivos, " +"seleccione los archivos en la vista de navegador. Entonces pulse el botón " +"Herramientas de la barra de herramientas principal, y elija " +"HerramientasCambiar fecha." -#: C/printing.page:24(p) +#: C/batch-change-date.page:13(page/p) msgid "" -"The Layout tab provides some additional gThumb-" -"specific options. You can set the number of images to include on each page " -"here, and a preview pane is provided. Captions can also be added under the " -"image, in a configurable font. The captions can be chosen from a selection " -"of listed file attributes (like the file name, the date of the photo, camera " -"shutter speed, and others). Each image can be repositioned inside its print " -"area using the controls on this tab." +"Select the desired date options, and click Execute to complete " +"the process." msgstr "" -"La pestaña Apariencia proporciona algunas opciones adicionales " -"específicas de gThumb. Aquí puede configurar el número de " -"imágenes que incluir en cada página, y se proporciona un panel de vista " -"previa. Se pueden elegir los títulos de entre una selección de atributos de " -"archivo listados (como el nombre del archivo, la fecha de la foto, velocidad " -"del disparador de la cámara y otros). Cada imagen se puede reposicionar " -"dentro de su área de impresión usando los controles en esta pestaña." +"Seleccione las opciones de la fecha, y pulse Ejecutar para " +"completar el proceso." -#: C/printing.page:34(p) -msgid "When you are ready to print, press the Print button." -msgstr "Pulse el botón Imprimir cuando esté listo para imprimir." +#: C/batch-scripts.page:6(page/title) +msgid "User-Defined Scripts" +msgstr "Scripts definidos por el usuario" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/filtering.page:17(None) +#: C/batch-scripts.page:8(page/p) msgid "" -"@@image: 'figures/general-filter.png'; md5=818fcb0f12da6496f3c72699f12beb28" +"To define a script (a command-line sequence that gThumb will " +"execute on your files), click the Tools button on the main " +"toolbar, and select ToolsPersonalize." msgstr "" -"@@image: 'figures/general-filter.png'; md5=818fcb0f12da6496f3c72699f12beb28" +"Para definir un script (una secuencia de línea de comandos que gThumb ejecutará en sus archivos), pulse el botón Herramientas de " +"la barra de herramientas principal, y seleccione HerramientasPersonalizar." + +#: C/batch-scripts.page:12(page/p) +msgid "TODO: further documentation is need here." +msgstr "TODO: aquí se necesita documentación adicional." + +#: C/thumbnails.page:6(page/title) +msgid "Thumbnail Sources" +msgstr "Fuente de miniaturas" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/filtering.page:30(None) +#: C/thumbnails.page:8(page/p) msgid "" -"@@image: 'figures/specific-filter.png'; md5=e7036e5b958301c6acb3ab5e4a618bbe" +"The browser window normally shows the thumbnails of the images and movies in " +"the selected folder. Generic icons for other files (audio files, for " +"instance) may also be shown." msgstr "" -"@@image: 'figures/specific-filter.png'; md5=e7036e5b958301c6acb3ab5e4a618bbe" - -#: C/filtering.page:7(title) -msgid "Filtering Files" -msgstr "Filtrar archivos" +"La ventana del navegador normalmente muestra las miniaturas de las imágenes " +"y las películas de la carpeta seleccionada. También se pueden mostrar iconos " +"genéricos para otros archivos (archivos de audio, por ejemplo)." -#: C/filtering.page:9(p) C/thumbnails.page:12(p) +#: C/thumbnails.page:12(page/p) +#| msgid "" +#| "You can select what types of files to show in the browser view using the " +#| "ViewFilter dialog. The default is " +#| "to show all media files (images, movies, audio), but this can be made " +#| "more or less restrictive." msgid "" "You can select what types of files to show in the browser view using the " -"ViewFilter dialog. The default is to " +"ViewFilter dialog. The default is to " "show all media files (images, movies, audio), but this can be made more or " "less restrictive." msgstr "" "Puede seleccionar qué tipos de archivos se mostrarán en la vista de " "navegador usando el diálogo VerFiltro. El predeterminado es mostrar todos los archivos de medios " +"guiseq>. Lo predeterminado es mostrar todos los archivos de medios " "(imágenes, películas, sonido), pero esto se puede hacer más o menos " "restrictivo." -#: C/filtering.page:15(title) -msgid "Enabling Filters" -msgstr "Activar filtros" - -#: C/filtering.page:20(p) +#: C/thumbnails.page:18(page/p) msgid "" -"The figure above shows how to configure gThumb to display media " -"files only, by setting the General Filter." +"The thumbnails may be generated by a number of different methods. " +"gThumb will first check for existing thumbnails in the system " +"cache." msgstr "" -"La siguiente figura muestra cómo configurar gThumb para mostrar " -"sólo archivos de medios, configurando el Filtro general." +"Las miniaturas se pueden generar de diferentes maneras. gThumb " +"comprobará primero las miniaturas existentes en la caché del sistema." -#: C/filtering.page:23(p) +#: C/thumbnails.page:22(page/p) msgid "" -"Also, by enabling Filename in Other Filters, a filter-" -"by-filename ability is added to the filter bar at the bottom of the browser " -"view:" +"If no cached thumbnail is found, and an image file contains an embedded " +"thumbnail (jpeg files generated by digital cameras normally do), " +"gThumb will attempt to use that. gThumb will confirm " +"that the aspect ratio of the thumbnail is similar to that of the main image, " +"and ignore thumbnails that do not appear to match the main image." msgstr "" -"También, activando Nombre de archivo en Otros filtros, " -"se añade un filtro por nombre de archivo a la barra de filtros en la parte " -"inferior de la vista navegador:" - -#: C/filtering.page:28(title) -msgid "Browser Filter Bar" -msgstr "Barra de filtros del navegador" +"Si no se encuentra ninguna miniatura en la caché, y un archivo de imagen " +"contiene una miniatura empotrada (los archivos jpeg generados por cámaras " +"digitales generalmente lo tienen), gThumb intentará usarla. " +"gThumb confirmará que la relación de aspecto de la miniatura es " +"similar a la de la imagen principal, e ignorará las miniaturas que no " +"coinciden con la imagen principal." -#: C/filtering.page:33(p) +#: C/thumbnails.page:29(page/p) msgid "" -"In the above figure, the filename filter has been configured to show only " -"files with \"gen\" in the filename. The matching is case-insensitive." +"If that doesn't work, gThumb will attempt to load the entire file " +"and generate a scaled-down thumbnail." msgstr "" -"En la siguiente figura, el filtro por nombre de archivo se ha configurado " -"para mostrar sólo archivos con «gen» en el nombre del archivo. La " -"coincidencia no es sensible a mayúsculas." - -#: C/sorting.page:7(title) -msgid "Sorting Files" -msgstr "Ordenar archivos" +"Si eso no funciona, gThumb intentará cargar el archivo completo y " +"generar una miniatura a escala reducida." -#: C/sorting.page:9(p) +#: C/thumbnails.page:32(page/p) msgid "" -"Use the ViewSort By menu to select " -"the desired file-sorting method for the browser view. Files can be sorted on " -"the basis of their name, the file size, the file modification date, or the " -"date the photo was taken." +"Lastly, gThumb will use any system-defined scripts for " +"thumbnailing particular media types. For example, some systems may use " +"mplayer or totem or other movie viewers to generate " +"movie thumbnails." msgstr "" -"Use el menú VerOrdenar por para " -"seleccionar el método de ordenación para el modo navegador. Los archivos se " -"pueden ordenar basándose en su nombre, el tamaño del archivo, su fecha de " -"modificación o la fecha en que se tomó la foto." - -#: C/fullscreen.page:8(title) -msgid "Manual Fullscreen Mode" -msgstr "Modo manual a pantalla completa" +"Por último, gThumb usará un sistema de scripts definidos por el " +"sistema para miniaturizar determinados tipos de medios. Por ejemplo, algunos " +"sistemas mplayer o totem u otros visores de películas " +"para generar miniaturas de películas." -#: C/fullscreen.page:10(p) +#: C/thumbnails.page:37(page/p) msgid "" -"Pressing f in the browser or viewer modes will display the " -"current image in fullscreen mode. (In the browser mode, you can also double-" -"click with the middle mouse button.)" +"gThumb will save thumbnails to a system cache, to share them with " +"other applications. By default, Gnome systems prune cached thumbnails when " +"they are older than 180 days, or when the thumbnail cache exceeds 512 MB. " +"Technically-inclined users can explore these settings with gconf-" +"editor. See the /desktop/gnome/thumbnail_cache/maximum_age and /" +"desktop/gnome/thumbnail_cache/maximum_size keys in particular. Certain " +"applications (like F-Spot) may automatically increase these " +"settings greatly." msgstr "" -"Al pulsar f en el modo navegador o visor se mostrará la imagen " -"actual a pantalla completa. (En modo navegador, también puede pulsar dos " -"veces con el botón de en medio del ratón.)" +"gThumb guardará las miniaturas en la caché del sistema, para " +"compartirlas con otras aplicaciones. De manera predeterminada, los sistemas " +"GNOME cortan las miniaturas cacheadas cuando sobrepasan los 180 días, o " +"cuando la caché de miniaturas supera los 512 MB. Los usuarios técnicos puede " +"explorar esta configuración con gconf-editor. En particular, vea " +"las claves «desktop/gnome/thumbnail_cache/maximum_age» y «/desktop/gnome/" +"thumbnail_cache/maximum_size». Ciertas aplicaciones (como F-Spot) " +"pueden incrementar automáticamente estos valores extensamente." -#: C/fullscreen.page:14(p) +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#. +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/thumbnail-pane.page:21(media) C/viewer.page:23(media) +#| msgid "" +#| "@@image: 'figures/thumbnail-pane.png'; " +#| "md5=af28541956094195dac6bc0e11624d64" +msgctxt "_" msgid "" -"Moving the mouse will activate a popup control panel briefly. This can be " -"used to navigate to the next or previous image, or change zoom levels." +"external ref='figures/thumbnail-pane.png' " +"md5='af28541956094195dac6bc0e11624d64'" msgstr "" -"Al mover el ratón se activará brevemente un panel de control emergente. Se " -"puede usar para navegar a la siguiente imagen o a la anterior, o para " -"cambiar los niveles de ampliación." +"external ref='figures/thumbnail-pane.png' " +"md5='af28541956094195dac6bc0e11624d64'" + +#: C/thumbnail-pane.page:6(page/title) +msgid "Thumbnail Pane" +msgstr "Panel de miniaturas" -#: C/fullscreen.page:18(p) +#: C/thumbnail-pane.page:8(page/p) msgid "" -"You can also advance to the next image by pressing PageDown or " -"Space." +"When an image has been opened in the gThumb viewer, the user has " +"the option of enabling or disabling a thumbnail pane, which shows the other " +"images in the folder as thumbnails. This feature can be toggled with the " +"ViewThumbnail Pane command, or by " +"pressing F8." msgstr "" -"Puede avanzar hasta la siguiente imagen pulsando AvPág o " -"Espacio." +"Cuando se ha abierto una imagen en el visor de gThumb, el usuario " +"tiene la opción de activar o desactivar un panel de miniaturas, que muestra " +"el resto de imágenes de la carpeta como miniaturas. Esta características se " +"puede activar con el comando VerPanel de miniaturas o pulsando F8." -#: C/fullscreen.page:21(p) +#: C/thumbnail-pane.page:14(page/p) msgid "" -"You can go back to the previous image by pressing PageUp or " -"Backspace." +"The thumbnail pane may be positioned along the bottom of the main image, or " +"along the side. This is controlled by the settings in EditPreferencesGeneralThumbnails in Viewer." msgstr "" -"Puede volver a la imagen anterior pulsando RePág o " -"Retroceso." +"El panel de miniaturas se puede posicionar a lo largo de la parte inferior " +"de la imagen principal, o a lo largo del lateral. Esto se controla con las " +"preferencias en EditarPreferenciasGeneralMiniaturas en el visor." -#: C/fullscreen.page:24(p) -msgid "This can be used to implement a manually-controlled slideshow." +#: C/thumbnail-pane.page:19(figure/title) +msgid "Thumbnail Pane, Along Bottom of Main Image" msgstr "" -"Esto se puede usar para implementar una presentación de diapositivas " -"controlada manualmente." +"Panel de miniaturas, a lo largo de la parte inferior de la imagen principal" -#: C/fullscreen.page:27(p) -msgid "To exit the fullscreen mode, press f or Escape." +#: C/rename-series.page:8(page/title) +msgid "Renaming Files" +msgstr "Renombrar archivos" + +#: C/rename-series.page:10(page/p) +msgid "" +"To rename one or more images using a name template, select the files in the " +"browser and choose EditRename, or " +"press F2." msgstr "" -"Para salir del modo a pantalla completa, pulse f o Escape." +"Para renombrar una o varias imágenes utilizando una plantilla de nombre, " +"seleccione los archivos en el navegador y elija EditarRenombrar, o pulse F2." -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/viewer.page:23(None) C/thumbnail-pane.page:21(None) +#: C/rename-series.page:15(page/p) msgid "" -"@@image: 'figures/thumbnail-pane.png'; md5=af28541956094195dac6bc0e11624d64" +"The name template is simply a pattern that is used for renaming all of the " +"selected images. You can use some special characters to make the new names " +"differ each other (this is essential if you are renaming more than one " +"image, and optional if you are renaming a single image):" msgstr "" -"@@image: 'figures/thumbnail-pane.png'; md5=af28541956094195dac6bc0e11624d64" +"La plantilla nombre es simplemente un patrón utilizado para renombrar todas " +"las imágenes seleccionadas. Puede utilizar algunos caracteres especiales " +"para hacer que los nombres nuevos sean diferentes de los demás (esto es " +"esencial si renombra más de una imagen y, opcionalmente, si renombra una " +"única imagen):" -#: C/viewer.page:6(title) -msgid "Opening an Image" -msgstr "Abrir una imagen" +#: C/rename-series.page:24(td/p) +msgid "Symbol" +msgstr "Símbolo" + +#: C/rename-series.page:27(td/p) C/shortcuts.page:17(td/p) +#: C/shortcuts.page:94(td/p) C/shortcuts.page:189(td/p) +#: C/shortcuts.page:273(td/p) C/shortcuts.page:498(td/p) +msgid "Description" +msgstr "Descripción" + +#: C/rename-series.page:32(td/p) +msgid "#" +msgstr "#" -#: C/viewer.page:8(p) +#: C/rename-series.page:37(td/p) msgid "" -"The browser view shows the images in the current folder or catalog (see " -"). Double-clicking an image (or pressing " -"Return) in the browser will open it in the viewer mode." +"This symbol will be replaced with the value of a counter that increments " +"itself by 1 passing from one image to another. If you specify this symbols " +"in sequence you'll get leading zeros if the counter value has a lesser " +"number of digits, for example ### will produce the sequence: 001, 002, 003, " +"etc.." msgstr "" -"La vista de navegador muestra las imágenes en la carpeta o el catálogo " -"actual (vea ). Una pulsación doble sobre " -"la imagen ((o pulsar Intro) en el navegador la abrirá en modo " -"visor." +"Este símbolo será reemplazado con el valor de un contador que se " +"autoincrementa en 1 unidad pasando de una imagen a otra. Si especifica estos " +"símbolos secuencialmente obtendrá ceros a la izquierda si el valor del " +"contador tiene un número menor de dígitos, por ejemplo ### generará la " +"secuencia 001, 002, 003, etc." + +#: C/rename-series.page:47(td/p) +msgid "%F" +msgstr "%F" -#: C/viewer.page:13(p) +#: C/rename-series.page:52(td/p) msgid "" -"Pressing Escape will exit the viewer mode, and return the user to " -"the browser mode. A toolbar button (View the folders) is also " -"provided for this purpose." +"This symbol will be replaced with the file's original name, excluding the " +"original extension." msgstr "" -"Pulsando Escape el usuario saldrá del modo visor y volverá al " -"modo navegador. Se proporciona un botón de la barra de herramientas " -"(Ver las carpetas) para este propósito." +"Este símbolo se reemplazará con el nombre original del archivo, exluyendo la " +"extensión original." -#: C/viewer.page:17(p) +#: C/rename-series.page:58(td/p) +msgid "%E" +msgstr "%E" + +#: C/rename-series.page:63(td/p) msgid "" -"A may be displayed in the viewer " -"mode, if desired." +"This symbol will be replaced with the file's original filename extension." msgstr "" -"Si quiere, se puede mostrar un en el " -"modo visor." +"Este símbolo se reemplazará con la extensión original del nombre del archivo." -#: C/viewer.page:21(title) -msgid "Viewer Mode with Thumbnail Pane" -msgstr "Modo visor con panel de miniaturas" +#: C/rename-series.page:69(td/p) +msgid "%N" +msgstr "%N" -#: C/viewer.page:26(p) +#: C/rename-series.page:74(td/p) msgid "" -"In the viewer mode, you can advance to the next image by clicking the " -"Next button, or by pressing Space or Page Down. You can go back to the previous image by clicking the Previous button, or by pressing Backspace or Page Up. You " -"can go also click on thumbnails in the thumbnail pane to open a different " -"image." +"This symbol will be replaced with original image enumerator. For instance, " +"if the original filename was IMG_9876.JPG, this extracts the \"9876\" " +"portion. If the filename has more than one group of digits embedded in it " +"(for example, IMG_123_456.JPG) only the first number will be used (\"123\" " +"in this example)." msgstr "" -"En el modo visor, puede avanzar hasta la siguiente imagen pulsando el botón " -"Siguiente o pulsando Espacio o AvPág. Puede " -"volver a la imagen anterior pulsando el botón Anterior o pulsando " -"Retroceso o RePág. También puede pulsar sobre las " -"miniaturas en el panel de miniaturas para abrir una imagen diferente." +"Este símbolo se reemplazará con el enumerador de la imagen original. Por " +"ejemplo, si el nombre original del archivo era IMG_9876.JPG, esto extrae la " +"parte «9876». Si el nombre del archivo tiene más de un grupo de dígitos en " +"su interior (por ejemplo, IMG_123_456.JPG) sólo se utiliza el primero de " +"ellos («123» en este ejemplo)." -#: C/gimp.page:6(title) -msgid "Launching GIMP" -msgstr "Ejecutar GIMP" +#: C/rename-series.page:84(td/p) +#| msgid "%M{format}" +msgid "%M{format}" +msgstr "%M{formato}" -#: C/gimp.page:7(p) +#: C/rename-series.page:89(td/p) msgid "" -"If you have files selected in the browser, or an image open in the viewer, " -"you can open them in the GNU Image Manipulation Program (GIMP) by " -"pressing g." +"This symbol will be replaced with the file modification date. The formatting " +"of this date (and optionally time) can be specified by adding a standard " +"formatting code in curly braces. For example, \"%M{%Y-%m-%d, %T}\" would be " +"replaced with a date and time like \"2010-04-01, 15:02:01\"." msgstr "" -"Si tiene archivos seleccionados en el navegador, o una imagen abierta en el " -"visor, puede abrirlas en el Programa de manipulación de imágenes de GNU " -"(GIMP) pulsando g." +"Este símbolo se reemplazará con la fecha de modificación del archivo. El " +"formato de esta fecha (y opcionalmente de la hora) se puede especificar " +"añadiendo un código estándar de formato entre corchetes. Por ejemplo, «%M{%Y-" +"%m-%d, %T}» se reemplazará con una fecha y una hora similar a «2010-04-01, " +"15:02:01»." + +#: C/rename-series.page:98(td/p) +#| msgid "%D{format}" +msgid "%D{format}" +msgstr "%D{formato}" -#: C/gimp.page:10(p) +#: C/rename-series.page:103(td/p) msgid "" -"GIMP provides a more sophisticated set of editing tools than that " -"provided with gThumb." +"This symbol will be replaced with the date that the photo was original taken " +"(normally determined from the EXIF datestamps embedded inside the photo). " +"The formatting of this date (and optionally time) can be specified by adding " +"a standard formatting code in curly braces. For example, \"%D{%Y-%m-%d, " +"%T}\" would be replaced with a date and time like \"2010-04-01, 15:02:01\"." msgstr "" -"GIMP proporciona un conjunto de herramientas de edición más " -"sofisticado que el de gThumb." +"Este símbolo se reemplazará con la fecha original en que se tomó la foto " +"(normalmente determinada por las marcas de tiempo EXIF empotradas en la " +"foto). El formato de esta fecha (y, opcionalmente, de la hora) se puede " +"especificar añadiendo un código estándar de formateo entre corchetes. Por " +"ejemplo, «%D{%Y-%m-%d, %T}» se reemplazará con una fecha y una hora " +"similares a «2010-04-01, 15:02:01»." -#: C/extensions.page:6(title) -msgid "Extending gThumb" -msgstr "Ampliar gThumb" +#: C/rename-series.page:114(td/p) +#| msgid "%A{identifier}" +msgid "%A{identifier}" +msgstr "%A{identificador}" -#: C/extensions.page:8(p) +#: C/rename-series.page:119(td/p) msgid "" -"gThumb has a plug-in system for extensions. Some standard " -"features are implemented as extensions and are supplied with the standard " -"distribution. Users may write (and share) additional extensions." +"This symbol will be replaced with the data that has been specified by the " +"identifier. For example, \"%A{ general::dimensions }\" would be replaced " +"with a size like \"320 x 240\"." msgstr "" -"gThumb tiene un sistema de complementos para las extensiones. " -"Algunas características estándar se implementan como extensiones y se " -"proporcionan con la distribución estándar. Los usuarios deben escribir (y " -"compartir) extensiones adicionales." +"Este símbolo se reemplazará con los datos especificados por el " +"identificador. Por ejemplo, «%A{ general::dimensions }» se reemplazará con " +"un tamaño similar a «320 x 240»." -#: C/extensions.page:12(p) +#: C/rename-series.page:127(page/p) msgid "" -"You can enable or disable extensions using EditExtensions. Some extensions will have " -"Preferences that can be modified from this dialog." +"A summary of these special codes may be viewed by clicking on the Help icon " +"inside the template field." msgstr "" -"Puede activar o desactivar extensiones usando EditarExtensiones. Algunas extensiones tendrán " -"Preferencias que se pueden modificar desde este diálogo." +"Se puede ver un resumen de estos códigos especiales pulsando en el icono de " +"Ayuda dentro del campo de la plantilla." -#: C/extensions.page:16(p) +#: C/rename-series.page:130(page/p) msgid "" -"This manual is written with the assumption that the standard extensions are " -"enabled. If you seem to be missing a feature, check to see which extensions " -"are actually enabled." +"The list at the bottom of the dialog displays how the filenames will be " +"renamed." msgstr "" -"Este manual está escrito asumiendo que las extensiones estándar están " -"activadas. Si cree que le falta una funcionalidad, compruebe qué extensiones " -"están activadas actualmente." +"La lista en la parte inferior del diálogo muestra cómo se renombrarán los " +"archivos." -#: C/extensions.page:20(p) +#: C/rename-series.page:133(page/p) +msgid "To rename the images click on Rename." +msgstr "Para renombrar las imágenes, pulse Renombrar." + +#: C/rename-series.page:135(page/p) msgid "" -"If you would like to write your own extension, please visit http://live.gnome.org/gthumb for " -"development information. An example extension is provided in the source " -"code, which you can base your own extension on." +"If the renaming of an image can overwrite an already existing image you will " +"be asked how to proceed, five options are available: overwrite the image; do " +"not overwrite the image; always overwrite; never overwrite; specify a new " +"name." msgstr "" -"Si quiere escribir su propia extensión, visite http://live.gnome.org/gthumb para obtener " -"información acerca del desarrollo. Se proporciona un ejemplo de extensión en " -"el código fuente, en la que puede basarse para escribir su extensión." - -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/edit-redeye.page:7(None) C/edit-resize-crop.page:8(None) -#: C/edit-rotate.page:8(None) C/edit-colors.page:8(None) -#: C/edit-save-undo-redo.page:8(None) C/index.page:33(None) -msgid "@@image: 'figures/palette.png'; md5=32835e7d77efd9833244ca80a4adb48e" -msgstr "@@image: 'figures/palette.png'; md5=32835e7d77efd9833244ca80a4adb48e" +"Si al renombrar una imagen se puede sobreescribir una imagen ya existente, " +"se le preguntará cómo proceder, hay cinco opciones disponibles: " +"sobreescribir la imagen; no sobreescribir la imagen; sobreescribir siempre; " +"no sobreescribir nunca; especificar un nombre nuevo." -#: C/edit-redeye.page:6(title) -msgid "Red Eye Removal" -msgstr "Eliminación de ojos rojos" +#: C/edit-save-undo-redo.page:6(page/title) +msgid "File Save, Undo, Redo" +msgstr "Guardar archivo, deshacer, rehacer" -#: C/edit-redeye.page:7(p) C/edit-resize-crop.page:8(p) -#: C/edit-rotate.page:8(p) C/edit-colors.page:8(p) -#: C/edit-save-undo-redo.page:8(p) +#: C/edit-save-undo-redo.page:8(page/p) C/edit-colors.page:8(page/p) +#: C/edit-rotate.page:8(page/p) C/edit-resize-crop.page:8(page/p) +#: C/edit-redeye.page:7(page/p) msgid "" " To " "access the editing tools, open an image and then click the Edit FileEditar archivo de la barra de herramientas (el icono de la " "paleta)." -#: C/edit-redeye.page:11(p) +#: C/edit-save-undo-redo.page:12(page/p) msgid "" -"gThumb provides a Red Eye Removal tool. To remove a " -"red eye, position the mouse pointer over the red eye and click on it. " -"gThumb will attempt to remove the red region and replace it with " -"a more natural-looking gray region. If the results do not look correct, " -"press Escape and click on the Undo item." +"Multiple changes may be made to an image before saving it. Undo " +"and Redo buttons are provided, and may be used up until the file " +"is saved." msgstr "" -"gThumb proporciona la herramienta Eliminar ojos rojos. " -"Para eliminar los ojos rojos, sitúe el ratón encima del ojo rojo y pulse " -"sobre él. gThumb intentará eliminar la región roja, " -"reemplazándola con una región de color gris más natural. Si el resultado no " -"se ve bien, presione Escape y pulse sobre el elemento " -"Deshacer." +"Se pueden hacer múltiples cambios en una imagen antes de guardarla. Se " +"proporcionan los botones Deshacer y Rehacer, y se " +"pueden usar hasta que se guarda el archivo." -#: C/edit-redeye.page:18(p) +#: C/edit-save-undo-redo.page:16(page/p) msgid "" -"This tool works best when there is a high color contrast between the red eye " -"and the surrounding facial area. It does not work well for \"orange eye\" " -"sometimes seen in photos of children, or if the surrounding skin has a " -"reddish tinge. This tool could use improvement - if you are fiendishly " -"clever, love matrix algebra and open source software, please submit a patch!" +"A modified image may be saved by pressing Save. To save the " +"modified image to a new location instead, leaving the original image " +"unchanged, use Save As." msgstr "" -"Esta herramienta funciona mejor cuando hay un contraste alto de color entre " -"el ojo rojo y el área facial de alrededor. No funciona bien con «ojos " -"naranjas», vistos algunas veces en fotos de niños, o si la piel de alrededor " -"tiene un tinte rojizo. Esta herramienta podría mejorarse; si es " -"diabólicamente inteligente, le gusta el álgebra matricial y el software " -"libre, envíe un " -"parche" +"Se puede guardar una imagen modificada pulsando Guardar. Para " +"guardar la imagen modificada en una ubicación diferente, dejando la imagen " +"original sin cambios, use Guardar como." -#: C/edit-resize-crop.page:6(title) -msgid "Resizing and Cropping" -msgstr "Redimensionar y recortar" +#: C/edit-save-undo-redo.page:20(page/p) +msgid "" +"If you exit the editing mode (by pressing Esc or the View " +"the Folders toolbar button), or navigate away from the current image, " +"you will be prompted to save or discard your changes." +msgstr "" +"Si sale del modo edición (pulsando Esc o el botón de la barra " +"herramientas Ver las carpetas), o deja de navegar por la imagen " +"actual, se le preguntará si quiere guardar o descartar sus cambios." -#: C/edit-resize-crop.page:12(p) -msgid "Two tools are provided to resize and crop images." +#: C/edit-colors.page:6(page/title) +msgid "Color Adjustments" +msgstr "Ajustes de color" + +#: C/edit-colors.page:12(page/p) +msgid "Several tools are provided to manipulate the colors in images." msgstr "" -"Se proporcionan dos herramientas para redimensionar y recortar imágenes." +"Se proporcionan varias herramientas para manipular los colores en las " +"imágenes." -#: C/edit-resize-crop.page:15(gui) -msgid "Resize" -msgstr "Redimensionar" +#: C/edit-colors.page:17(item/title) +#| msgid "Enhance Colors" +msgid "Enhance Colors" +msgstr "Realzar colores" -#: C/edit-resize-crop.page:16(p) +#: C/edit-colors.page:18(item/p) msgid "" -"This allows you to resize the image. The image may be scaled to a certain " -"physical size, or to a certain percentage of the original size. The aspect " -"ratio may be locked to a specific value, or freely adjusted." +"This tool provides automatic white balance correction. No user adjustments " +"are required." msgstr "" -"Esto le permite redimensionar la imagen. La imagen se puede escalar a un " -"tamaño físico determinado, o a un porcentaje determinado del tamaño " -"original. La relación de aspecto se puede bloquear a un valor específico, o " -"ajustarla libremente." +"Esta herramienta proporciona corrección automática del balance de blancos. " +"No se necesita ningún ajuste de usuario." -#: C/edit-resize-crop.page:22(gui) -msgid "Crop" -msgstr "Recortar" +#: C/edit-colors.page:22(item/title) +#| msgid "Adjust Colors" +msgid "Adjust Colors" +msgstr "Ajustar colores" -#: C/edit-resize-crop.page:23(p) +#: C/edit-colors.page:23(item/p) msgid "" -"This allows you to crop the image. Click and drag the mouse over the desired " -"area of the image. The area may be locked to a specific aspect ratio, or it " -"may be freely adjusted. A rule-of-thirds grid or golden-sections grid may be " -"superimposed over the image for composition guidance." +"This tool provides manual color adjustments. Adjustments to the gamma, " +"brightness, contrast, saturation, and the cyan/red, magenta/green, and " +"yellow/blue color balances may be made." msgstr "" -"Esto le permite recortar la imagen. Pulse y arrastre con el ratón sobre el " -"área que quiere de la imagen. El área se puede bloquear a una relación de " -"aspecto determinada, o se puede ajustar libremente. Se puede superponer una " -"rejilla de tercios o una de sección dorada sobre la imagen para orientar la " -"composición." +"Esta herramienta proporciona ajustes manuales del color. Se pueden hacer " +"ajustes de gamma, brillo, contraste, saturación y balances de color cuán/" +"rojo, magenta/verde y amarillo/azul." -#: C/edit-resize-crop.page:31(p) +#: C/edit-colors.page:29(item/title) +msgid "Equalize" +msgstr "Ecualizar" + +#: C/edit-colors.page:30(item/p) msgid "" -"gThumb also offers a batch-mode tool for resizing multiple images " -"simultaneously. See ." +"This tool provides automatic histogram equalization. No user adjustments are " +"required." msgstr "" -"gThumb también ofrece una herramienta de proceso por lotes para " -"redimensionar varias imágenes a la vez. Consulte la sección ." +"Esta herramienta proporciona ecualización automática del histograma. No se " +"necesita ningún ajuste de usuario." + +#: C/edit-colors.page:34(item/title) +#| msgid "Desaturate" +msgid "Desaturate" +msgstr "Desaturar" + +#: C/edit-colors.page:35(item/p) +msgid "" +"This tool converts the image colors into shades of grey. (This does not " +"change this image storage format.)" +msgstr "" +"Esta herramienta convierte los colores de la imagen en escala de grises. " +"(Esto no cambia el formato de almacenamiento de la imagen.)" + +#: C/edit-colors.page:39(item/title) +msgid "Negative" +msgstr "Negativo" + +#: C/edit-colors.page:40(item/p) +msgid "This tool inverts the color levels, providing an image negative." +msgstr "" +"Esta herramienta invierte los niveles de color, proporcionando un negativo " +"de la imagen." -#: C/edit-rotate.page:6(title) +#: C/edit-rotate.page:6(page/title) msgid "Rotations and Flips" msgstr "Rotaciones y volteos" -#: C/edit-rotate.page:12(p) +#: C/edit-rotate.page:12(page/p) msgid "Several tools are provided to manipulate the orientation of images." msgstr "" "Se proporcionan varias herramientas para manipular la orientación de las " "imágenes." -#: C/edit-rotate.page:17(gui) -msgid "Mirror" -msgstr "Espejo" +#: C/edit-rotate.page:17(item/title) +msgid "Mirror" +msgstr "Espejar" -#: C/edit-rotate.page:18(p) +#: C/edit-rotate.page:18(item/p) msgid "" "This flips the image horizontally. The left and right sides are swapped." msgstr "" "Esto voltea imágenes horizontalmente. Se intercambian los lados izquierdo y " "derecho." -#: C/edit-rotate.page:22(gui) -msgid "Flip" -msgstr "Voltear" +#: C/edit-rotate.page:22(item/title) +msgid "Flip" +msgstr "Voltear" -#: C/edit-rotate.page:23(p) +#: C/edit-rotate.page:23(item/p) msgid "This flips the image vertically. The top and bottom are swapped." msgstr "" "Esto voltea la imagen verticalmente. La parte superior y la inferior se " "intercambian." -#: C/edit-rotate.page:27(gui) -msgid "Rotate Right" -msgstr "Rotar a la derecha" +#: C/edit-rotate.page:27(item/title) +#| msgid "Rotate Right" +msgid "Rotate Right" +msgstr "Rotar a la derecha" -#: C/edit-rotate.page:28(p) +#: C/edit-rotate.page:28(item/p) msgid "This rotates the image clockwise." msgstr "Esto rota la imagen en sentido horario." -#: C/edit-rotate.page:31(gui) -msgid "Rotate Left" -msgstr "Rotar a la izquierda" +#: C/edit-rotate.page:31(item/title) +#| msgid "Rotate Left" +msgid "Rotate Left" +msgstr "Rotar a la izquierda" -#: C/edit-rotate.page:32(p) +#: C/edit-rotate.page:32(item/p) msgid "This rotates the image counter-clockwise." msgstr "Esto rota la imagen 90 grados en sentido antihorario." -#: C/edit-rotate.page:36(p) +#: C/edit-rotate.page:36(page/p) msgid "" "The rotations offered in the edit mode act on the image in memory. They are " "not direct file operations. For jpeg images, these means they are not " @@ -1388,1420 +1613,1467 @@ "proporciona herramientas de rotación sin pérdidas. Consulte la ." -#: C/edit-colors.page:6(title) -msgid "Color Adjustments" -msgstr "Ajustes de color" - -#: C/edit-colors.page:12(p) -msgid "Several tools are provided to manipulate the colors in images." -msgstr "" -"Se proporcionan varias herramientas para manipular los colores en las " -"imágenes." - -#: C/edit-colors.page:17(gui) -msgid "Enhance Colors" -msgstr "Realzar colores" +#: C/edit-resize-crop.page:6(page/title) +msgid "Resizing and Cropping" +msgstr "Redimensionar y recortar" -#: C/edit-colors.page:18(p) -msgid "" -"This tool provides automatic white balance correction. No user adjustments " -"are required." +#: C/edit-resize-crop.page:12(page/p) +msgid "Two tools are provided to resize and crop images." msgstr "" -"Esta herramienta proporciona corrección automática del balance de blancos. " -"No se necesita ningún ajuste de usuario." +"Se proporcionan dos herramientas para redimensionar y recortar imágenes." -#: C/edit-colors.page:22(gui) -msgid "Adjust Colors" -msgstr "Ajustar colores" +#: C/edit-resize-crop.page:15(item/title) +msgid "Resize" +msgstr "Redimensionar" -#: C/edit-colors.page:23(p) +#: C/edit-resize-crop.page:16(item/p) msgid "" -"This tool provides manual color adjustments. Adjustments to the gamma, " -"brightness, contrast, saturation, and the cyan/red, magenta/green, and " -"yellow/blue color balances may be made." +"This allows you to resize the image. The image may be scaled to a certain " +"physical size, or to a certain percentage of the original size. The aspect " +"ratio may be locked to a specific value, or freely adjusted." msgstr "" -"Esta herramienta proporciona ajustes manuales del color. Se pueden hacer " -"ajustes de gamma, brillo, contraste, saturación y balances de color cuán/" -"rojo, magenta/verde y amarillo/azul." +"Esto le permite redimensionar la imagen. La imagen se puede escalar a un " +"tamaño físico determinado, o a un porcentaje determinado del tamaño " +"original. La relación de aspecto se puede bloquear a un valor específico, o " +"ajustarla libremente." -#: C/edit-colors.page:29(gui) -msgid "Equalize" -msgstr "Ecualizar" +#: C/edit-resize-crop.page:22(item/title) +msgid "Crop" +msgstr "Recortar" -#: C/edit-colors.page:30(p) +#: C/edit-resize-crop.page:23(item/p) msgid "" -"This tool provides automatic histogram equalization. No user adjustments are " -"required." +"This allows you to crop the image. Click and drag the mouse over the desired " +"area of the image. The area may be locked to a specific aspect ratio, or it " +"may be freely adjusted. A rule-of-thirds grid or golden-sections grid may be " +"superimposed over the image for composition guidance." msgstr "" -"Esta herramienta proporciona ecualización automática del histograma. No se " -"necesita ningún ajuste de usuario." - -#: C/edit-colors.page:34(gui) -msgid "Desaturate" -msgstr "Desaturar" +"Esto le permite recortar la imagen. Pulse y arrastre con el ratón sobre el " +"área que quiere de la imagen. El área se puede bloquear a una relación de " +"aspecto determinada, o se puede ajustar libremente. Se puede superponer una " +"rejilla de tercios o una de sección dorada sobre la imagen para orientar la " +"composición." -#: C/edit-colors.page:35(p) +#: C/edit-resize-crop.page:31(page/p) msgid "" -"This tool converts the image colors into shades of grey. (This does not " -"change this image storage format.)" +"gThumb also offers a batch-mode tool for resizing multiple images " +"simultaneously. See ." msgstr "" -"Esta herramienta convierte los colores de la imagen en escala de grises. " -"(Esto no cambia el formato de almacenamiento de la imagen.)" +"gThumb también ofrece una herramienta de proceso por lotes para " +"redimensionar varias imágenes a la vez. Consulte la sección ." -#: C/edit-colors.page:39(gui) -msgid "Negative" -msgstr "Negativo" +#: C/edit-redeye.page:6(page/title) +msgid "Red Eye Removal" +msgstr "Eliminación de ojos rojos" -#: C/edit-colors.page:40(p) -msgid "This tool inverts the color levels, providing an image negative." +#: C/edit-redeye.page:11(page/p) +msgid "" +"gThumb provides a Red Eye Removal tool. To remove a " +"red eye, position the mouse pointer over the red eye and click on it. " +"gThumb will attempt to remove the red region and replace it with " +"a more natural-looking gray region. If the results do not look correct, " +"press Escape and click on the Undo item." msgstr "" -"Esta herramienta invierte los niveles de color, proporcionando un negativo " -"de la imagen." - -#: C/edit-save-undo-redo.page:6(title) -msgid "File Save, Undo, Redo" -msgstr "Guardar archivo, deshacer, rehacer" +"gThumb proporciona la herramienta Eliminar ojos rojos. " +"Para eliminar los ojos rojos, sitúe el ratón encima del ojo rojo y pulse " +"sobre él. gThumb intentará eliminar la región roja, " +"reemplazándola con una región de color gris más natural. Si el resultado no " +"se ve bien, presione Escape y pulse sobre el elemento " +"Deshacer." -#: C/edit-save-undo-redo.page:12(p) +#: C/edit-redeye.page:18(page/p) msgid "" -"Multiple changes may be made to an image before saving it. Undo " -"and Redo buttons are provided, and may be used up until the file " -"is saved." +"This tool works best when there is a high color contrast between the red eye " +"and the surrounding facial area. It does not work well for \"orange eye\" " +"sometimes seen in photos of children, or if the surrounding skin has a " +"reddish tinge. This tool could use improvement - if you are fiendishly " +"clever, love matrix algebra and open source software, please submit a patch!" msgstr "" -"Se pueden hacer múltiples cambios en una imagen antes de guardarla. Se " -"proporcionan los botones Deshacer y Rehacer, y se " -"pueden usar hasta que se guarda el archivo." +"Esta herramienta funciona mejor cuando hay un contraste alto de color entre " +"el ojo rojo y el área facial de alrededor. No funciona bien con «ojos " +"naranjas», vistos algunas veces en fotos de niños, o si la piel de alrededor " +"tiene un tinte rojizo. Esta herramienta podría mejorarse; si es " +"diabólicamente inteligente, le gusta el álgebra matricial y el software " +"libre, envíe un " +"parche" -#: C/edit-save-undo-redo.page:16(p) +#: C/extensions.page:6(page/title) +msgid "Extending gThumb" +msgstr "Ampliar gThumb" + +#: C/extensions.page:8(page/p) msgid "" -"A modified image may be saved by pressing Save. To save the " -"modified image to a new location instead, leaving the original image " -"unchanged, use Save As." +"gThumb has a plug-in system for extensions. Some standard " +"features are implemented as extensions and are supplied with the standard " +"distribution. Users may write (and share) additional extensions." msgstr "" -"Se puede guardar una imagen modificada pulsando Guardar. Para " -"guardar la imagen modificada en una ubicación diferente, dejando la imagen " -"original sin cambios, use Guardar como." +"gThumb tiene un sistema de complementos para las extensiones. " +"Algunas características estándar se implementan como extensiones y se " +"proporcionan con la distribución estándar. Los usuarios deben escribir (y " +"compartir) extensiones adicionales." -#: C/edit-save-undo-redo.page:20(p) +#: C/extensions.page:12(page/p) msgid "" -"If you exit the editing mode (by pressing Esc or the View " -"the Folders toolbar button), or navigate away from the current image, " -"you will be prompted to save or discard your changes." +"You can enable or disable extensions using EditExtensions. Some extensions will have " +"Preferences that can be modified from this dialog." msgstr "" -"Si sale del modo edición (pulsando Esc o el botón de la barra " -"herramientas Ver las carpetas), o deja de navegar por la imagen " -"actual, se le preguntará si quiere guardar o descartar sus cambios." - -#: C/rename-series.page:8(title) -msgid "Renaming Files" -msgstr "Renombrar archivos" +"Puede activar o desactivar extensiones usando EditarExtensiones. Algunas extensiones tendrán " +"Preferencias que se pueden modificar desde este diálogo." -#: C/rename-series.page:10(p) +#: C/extensions.page:16(page/p) msgid "" -"To rename one or more images using a name template, select the files in the " -"browser and choose EditRename, or " -"press F2." +"This manual is written with the assumption that the standard extensions are " +"enabled. If you seem to be missing a feature, check to see which extensions " +"are actually enabled." msgstr "" -"Para renombrar una o varias imágenes utilizando una plantilla de nombre, " -"seleccione los archivos en el navegador y elija EditarRenombrar, o pulse F2." +"Este manual está escrito asumiendo que las extensiones estándar están " +"activadas. Si cree que le falta una funcionalidad, compruebe qué extensiones " +"están activadas actualmente." -#: C/rename-series.page:15(p) +#: C/extensions.page:20(page/p) msgid "" -"The name template is simply a pattern that is used for renaming all of the " -"selected images. You can use some special characters to make the new names " -"differ each other (this is essential if you are renaming more than one " -"image, and optional if you are renaming a single image):" +"If you would like to write your own extension, please visit http://live.gnome.org/gthumb for " +"development information. An example extension is provided in the source " +"code, which you can base your own extension on." msgstr "" -"La plantilla nombre es simplemente un patrón utilizado para renombrar todas " -"las imágenes seleccionadas. Puede utilizar algunos caracteres especiales " -"para hacer que los nombres nuevos sean diferentes de los demás (esto es " -"esencial si renombra más de una imagen y, opcionalmente, si renombra una " -"única imagen):" - -#: C/rename-series.page:24(p) -msgid "Symbol" -msgstr "Símbolo" +"Si quiere escribir su propia extensión, visite http://live.gnome.org/gthumb para obtener " +"información acerca del desarrollo. Se proporciona un ejemplo de extensión en " +"el código fuente, en la que puede basarse para escribir su extensión." -#: C/rename-series.page:33(key) -msgid "#" -msgstr "#" +#: C/gimp.page:6(page/title) +msgid "Launching GIMP" +msgstr "Ejecutar GIMP" -#: C/rename-series.page:37(p) +#: C/gimp.page:7(page/p) msgid "" -"This symbol will be replaced with the value of a counter that increments " -"itself by 1 passing from one image to another. If you specify this symbols " -"in sequence you'll get leading zeros if the counter value has a lesser " -"number of digits, for example ### will produce the sequence: 001, 002, 003, " -"etc.." +"If you have files selected in the browser, or an image open in the viewer, " +"you can open them in the GNU Image Manipulation Program (GIMP) by " +"pressing g." msgstr "" -"Este símbolo será reemplazado con el valor de un contador que se " -"autoincrementa en 1 unidad pasando de una imagen a otra. Si especifica estos " -"símbolos secuencialmente obtendrá ceros a la izquierda si el valor del " -"contador tiene un número menor de dígitos, por ejemplo ### generará la " -"secuencia 001, 002, 003, etc." - -#: C/rename-series.page:48(key) C/strftime.page:104(p) -msgid "%F" -msgstr "%F" +"Si tiene archivos seleccionados en el navegador, o una imagen abierta en el " +"visor, puede abrirlas en el Programa de manipulación de imágenes de GNU " +"(GIMP) pulsando g." -#: C/rename-series.page:52(p) +#: C/gimp.page:10(page/p) msgid "" -"This symbol will be replaced with the file's original name, excluding the " -"original extension." +"GIMP provides a more sophisticated set of editing tools than that " +"provided with gThumb." msgstr "" -"Este símbolo se reemplazará con el nombre original del archivo, exluyendo la " -"extensión original." +"GIMP proporciona un conjunto de herramientas de edición más " +"sofisticado que el de gThumb." -#: C/rename-series.page:59(key) C/strftime.page:96(p) -msgid "%E" -msgstr "%E" +#: C/viewer.page:6(page/title) +msgid "Opening an Image" +msgstr "Abrir una imagen" -#: C/rename-series.page:63(p) +#: C/viewer.page:8(page/p) msgid "" -"This symbol will be replaced with the file's original filename extension." +"The browser view shows the images in the current folder or catalog (see " +"). Double-clicking an image (or pressing " +"Return) in the browser will open it in the viewer mode." msgstr "" -"Este símbolo se reemplazará con la extensión original del nombre del archivo." +"La vista de navegador muestra las imágenes en la carpeta o el catálogo " +"actual (vea ). Una pulsación doble sobre " +"la imagen ((o pulsar Intro) en el navegador la abrirá en modo " +"visor." -#: C/rename-series.page:70(key) -msgid "%N" -msgstr "%N" +#: C/viewer.page:13(page/p) +msgid "" +"Pressing Escape will exit the viewer mode, and return the user to " +"the browser mode. A toolbar button (View the folders) is also " +"provided for this purpose." +msgstr "" +"Pulsando Escape el usuario saldrá del modo visor y volverá al " +"modo navegador. Se proporciona un botón de la barra de herramientas " +"(Ver las carpetas) para este propósito." -#: C/rename-series.page:74(p) +#: C/viewer.page:17(page/p) msgid "" -"This symbol will be replaced with original image enumerator. For instance, " -"if the original filename was IMG_9876.JPG, this extracts the \"9876\" " -"portion. If the filename has more than one group of digits embedded in it " -"(for example, IMG_123_456.JPG) only the first number will be used (\"123\" " -"in this example)." +"A may be displayed in the viewer " +"mode, if desired." msgstr "" -"Este símbolo se reemplazará con el enumerador de la imagen original. Por " -"ejemplo, si el nombre original del archivo era IMG_9876.JPG, esto extrae la " -"parte «9876». Si el nombre del archivo tiene más de un grupo de dígitos en " -"su interior (por ejemplo, IMG_123_456.JPG) sólo se utiliza el primero de " -"ellos («123» en este ejemplo)." +"Si quiere, se puede mostrar un en el " +"modo visor." -#: C/rename-series.page:85(key) -msgid "%M{format}" -msgstr "%M{formato}" +#: C/viewer.page:21(figure/title) +msgid "Viewer Mode with Thumbnail Pane" +msgstr "Modo visor con panel de miniaturas" -#: C/rename-series.page:89(p) +#: C/viewer.page:26(page/p) msgid "" -"This symbol will be replaced with the file modification date. The formatting " -"of this date (and optionally time) can be specified by adding a standard " -"formatting code in curly braces. For example, \"%M{%Y-%m-%d, %T}\" would be " -"replaced with a date and time like \"2010-04-01, 15:02:01\"." +"In the viewer mode, you can advance to the next image by clicking the " +"Next button, or by pressing Space or Page Down. You can go back to the previous image by clicking the Previous button, or by pressing Backspace or Page Up. You " +"can go also click on thumbnails in the thumbnail pane to open a different " +"image." msgstr "" -"Este símbolo se reemplazará con la fecha de modificación del archivo. El " -"formato de esta fecha (y opcionalmente de la hora) se puede especificar " -"añadiendo un código estándar de formato entre corchetes. Por ejemplo, «%M{%Y-" -"%m-%d, %T}» se reemplazará con una fecha y una hora similar a «2010-04-01, " -"15:02:01»." +"En el modo visor, puede avanzar hasta la siguiente imagen pulsando el botón " +"Siguiente o pulsando Espacio o AvPág. Puede " +"volver a la imagen anterior pulsando el botón Anterior o pulsando " +"Retroceso o RePág. También puede pulsar sobre las " +"miniaturas en el panel de miniaturas para abrir una imagen diferente." -#: C/rename-series.page:99(key) -msgid "%D{format}" -msgstr "%D{formato}" +#: C/fullscreen.page:8(page/title) +msgid "Manual Fullscreen Mode" +msgstr "Modo manual a pantalla completa" -#: C/rename-series.page:103(p) +#: C/fullscreen.page:10(page/p) msgid "" -"This symbol will be replaced with the date that the photo was original taken " -"(normally determined from the EXIF datestamps embedded inside the photo). " -"The formatting of this date (and optionally time) can be specified by adding " -"a standard formatting code in curly braces. For example, \"%D{%Y-%m-%d, " -"%T}\" would be replaced with a date and time like \"2010-04-01, 15:02:01\"." +"Pressing f in the browser or viewer modes will display the " +"current image in fullscreen mode. (In the browser mode, you can also double-" +"click with the middle mouse button.)" msgstr "" -"Este símbolo se reemplazará con la fecha original en que se tomó la foto " -"(normalmente determinada por las marcas de tiempo EXIF empotradas en la " -"foto). El formato de esta fecha (y, opcionalmente, de la hora) se puede " -"especificar añadiendo un código estándar de formateo entre corchetes. Por " -"ejemplo, «%D{%Y-%m-%d, %T}» se reemplazará con una fecha y una hora " -"similares a «2010-04-01, 15:02:01»." - -#: C/rename-series.page:115(key) -msgid "%A{identifier}" -msgstr "%A{identificador}" +"Al pulsar f en el modo navegador o visor se mostrará la imagen " +"actual a pantalla completa. (En modo navegador, también puede pulsar dos " +"veces con el botón de en medio del ratón.)" -#: C/rename-series.page:119(p) +#: C/fullscreen.page:14(page/p) msgid "" -"This symbol will be replaced with the data that has been specified by the " -"identifier. For example, \"%A{ general::dimensions }\" would be replaced " -"with a size like \"320 x 240\"." +"Moving the mouse will activate a popup control panel briefly. This can be " +"used to navigate to the next or previous image, or change zoom levels." msgstr "" -"Este símbolo se reemplazará con los datos especificados por el " -"identificador. Por ejemplo, «%A{ general::dimensions }» se reemplazará con " -"un tamaño similar a «320 x 240»." +"Al mover el ratón se activará brevemente un panel de control emergente. Se " +"puede usar para navegar a la siguiente imagen o a la anterior, o para " +"cambiar los niveles de ampliación." -#: C/rename-series.page:127(p) +#: C/fullscreen.page:18(page/p) msgid "" -"A summary of these special codes may be viewed by clicking on the Help icon " -"inside the template field." +"You can also advance to the next image by pressing PageDown or " +"Space." msgstr "" -"Se puede ver un resumen de estos códigos especiales pulsando en el icono de " -"Ayuda dentro del campo de la plantilla." +"Puede avanzar hasta la siguiente imagen pulsando AvPág o " +"Espacio." -#: C/rename-series.page:130(p) +#: C/fullscreen.page:21(page/p) msgid "" -"The list at the bottom of the dialog displays how the filenames will be " -"renamed." +"You can go back to the previous image by pressing PageUp or " +"Backspace." msgstr "" -"La lista en la parte inferior del diálogo muestra cómo se renombrarán los " -"archivos." +"Puede volver a la imagen anterior pulsando RePág o " +"Retroceso." -#: C/rename-series.page:133(p) -msgid "To rename the images click on Rename." -msgstr "Para renombrar las imágenes, pulse Renombrar." +#: C/fullscreen.page:24(page/p) +msgid "This can be used to implement a manually-controlled slideshow." +msgstr "" +"Esto se puede usar para implementar una presentación de diapositivas " +"controlada manualmente." -#: C/rename-series.page:135(p) -msgid "" -"If the renaming of an image can overwrite an already existing image you will " -"be asked how to proceed, five options are available: overwrite the image; do " -"not overwrite the image; always overwrite; never overwrite; specify a new " -"name." +#: C/fullscreen.page:27(page/p) +msgid "To exit the fullscreen mode, press f or Escape." msgstr "" -"Si al renombrar una imagen se puede sobreescribir una imagen ya existente, " -"se le preguntará cómo proceder, hay cinco opciones disponibles: " -"sobreescribir la imagen; no sobreescribir la imagen; sobreescribir siempre; " -"no sobreescribir nunca; especificar un nombre nuevo." +"Para salir del modo a pantalla completa, pulse f o Escape." -#: C/thumbnail-pane.page:6(title) -msgid "Thumbnail Pane" -msgstr "Panel de miniaturas" +#: C/sorting.page:7(page/title) +msgid "Sorting Files" +msgstr "Ordenar archivos" -#: C/thumbnail-pane.page:8(p) +#: C/sorting.page:9(page/p) msgid "" -"When an image has been opened in the gThumb viewer, the user has " -"the option of enabling or disabling a thumbnail pane, which shows the other " -"images in the folder as thumbnails. This feature can be toggled with the " -"ViewThumbnail Pane command, or by " -"pressing F8." +"Use the ViewSort By menu to select " +"the desired file-sorting method for the browser view. Files can be sorted on " +"the basis of their name, the file size, the file modification date, or the " +"date the photo was taken." msgstr "" -"Cuando se ha abierto una imagen en el visor de gThumb, el usuario " -"tiene la opción de activar o desactivar un panel de miniaturas, que muestra " -"el resto de imágenes de la carpeta como miniaturas. Esta características se " -"puede activar con el comando VerPanel de miniaturas o pulsando F8." +"Use el menú VerOrdenar por para " +"seleccionar el método de ordenación para el modo navegador. Los archivos se " +"pueden ordenar basándose en su nombre, el tamaño del archivo, su fecha de " +"modificación o la fecha en que se tomó la foto." -#: C/thumbnail-pane.page:14(p) +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/filtering.page:17(media) +#| msgid "" +#| "@@image: 'figures/general-filter.png'; " +#| "md5=818fcb0f12da6496f3c72699f12beb28" +msgctxt "_" +msgid "" +"external ref='figures/general-filter.png' " +"md5='818fcb0f12da6496f3c72699f12beb28'" +msgstr "" +"external ref='figures/general-filter.png' " +"md5='818fcb0f12da6496f3c72699f12beb28'" + +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/filtering.page:30(media) +#| msgid "" +#| "@@image: 'figures/specific-filter.png'; " +#| "md5=e7036e5b958301c6acb3ab5e4a618bbe" +msgctxt "_" msgid "" -"The thumbnail pane may be positioned along the bottom of the main image, or " -"along the side. This is controlled by the settings in EditPreferencesGeneralThumbnails in Viewer." +"external ref='figures/specific-filter.png' " +"md5='e7036e5b958301c6acb3ab5e4a618bbe'" msgstr "" -"El panel de miniaturas se puede posicionar a lo largo de la parte inferior " -"de la imagen principal, o a lo largo del lateral. Esto se controla con las " -"preferencias en EditarPreferenciasGeneralMiniaturas en el visor." +"external ref='figures/specific-filter.png' " +"md5='e7036e5b958301c6acb3ab5e4a618bbe'" -#: C/thumbnail-pane.page:19(title) -msgid "Thumbnail Pane, Along Bottom of Main Image" +#: C/filtering.page:7(page/title) +msgid "Filtering Files" +msgstr "Filtrar archivos" + +#: C/filtering.page:9(page/p) +msgid "" +"You can select what types of files to show in the browser view using the " +"ViewFilter dialog. The default is to " +"show all media files (images, movies, audio), but this can be made more or " +"less restrictive." msgstr "" -"Panel de miniaturas, a lo largo de la parte inferior de la imagen principal" +"Puede seleccionar qué tipos de archivos se mostrarán en la vista de " +"navegador usando el diálogo VerFiltro. El predeterminado es mostrar todos los archivos de medios " +"(imágenes, películas, sonido), pero esto se puede hacer más o menos " +"restrictivo." -#: C/thumbnails.page:6(title) -msgid "Thumbnail Sources" -msgstr "Fuente de miniaturas" +#: C/filtering.page:15(figure/title) +msgid "Enabling Filters" +msgstr "Activar filtros" -#: C/thumbnails.page:8(p) +#: C/filtering.page:20(page/p) msgid "" -"The browser window normally shows the thumbnails of the images and movies in " -"the selected folder. Generic icons for other files (audio files, for " -"instance) may also be shown." +"The figure above shows how to configure gThumb to display media " +"files only, by setting the General Filter." msgstr "" -"La ventana del navegador normalmente muestra las miniaturas de las imágenes " -"y las películas de la carpeta seleccionada. También se pueden mostrar iconos " -"genéricos para otros archivos (archivos de audio, por ejemplo)." +"La siguiente figura muestra cómo configurar gThumb para mostrar " +"sólo archivos de medios, configurando el Filtro general." -#: C/thumbnails.page:18(p) +#: C/filtering.page:23(page/p) msgid "" -"The thumbnails may be generated by a number of different methods. " -"gThumb will first check for existing thumbnails in the system " -"cache." +"Also, by enabling Filename in Other Filters, a filter-" +"by-filename ability is added to the filter bar at the bottom of the browser " +"view:" msgstr "" -"Las miniaturas se pueden generar de diferentes maneras. gThumb " -"comprobará primero las miniaturas existentes en la caché del sistema." +"También, activando Nombre de archivo en Otros filtros, " +"se añade un filtro por nombre de archivo a la barra de filtros en la parte " +"inferior de la vista navegador:" -#: C/thumbnails.page:22(p) +#: C/filtering.page:28(figure/title) +msgid "Browser Filter Bar" +msgstr "Barra de filtros del navegador" + +#: C/filtering.page:33(page/p) msgid "" -"If no cached thumbnail is found, and an image file contains an embedded " -"thumbnail (jpeg files generated by digital cameras normally do), " -"gThumb will attempt to use that. gThumb will confirm " -"that the aspect ratio of the thumbnail is similar to that of the main image, " -"and ignore thumbnails that do not appear to match the main image." +"In the above figure, the filename filter has been configured to show only " +"files with \"gen\" in the filename. The matching is case-insensitive." msgstr "" -"Si no se encuentra ninguna miniatura en la caché, y un archivo de imagen " -"contiene una miniatura empotrada (los archivos jpeg generados por cámaras " -"digitales generalmente lo tienen), gThumb intentará usarla. " -"gThumb confirmará que la relación de aspecto de la miniatura es " -"similar a la de la imagen principal, e ignorará las miniaturas que no " -"coinciden con la imagen principal." +"En la siguiente figura, el filtro por nombre de archivo se ha configurado " +"para mostrar sólo archivos con «gen» en el nombre del archivo. La " +"coincidencia no es sensible a mayúsculas." + +#: C/printing.page:7(page/title) +msgid "Printing Images" +msgstr "Imprimir imágenes" -#: C/thumbnails.page:29(p) +#: C/printing.page:9(page/p) msgid "" -"If that doesn't work, gThumb will attempt to load the entire file " -"and generate a scaled-down thumbnail." +"To print the current image in the viewer mode, use FilePrint or Ctrlp." msgstr "" -"Si eso no funciona, gThumb intentará cargar el archivo completo y " -"generar una miniatura a escala reducida." +"Para imprimir la imagen actual en el modo visor, use ArchivoImprimir o Ctrlp." -#: C/thumbnails.page:32(p) +#: C/printing.page:13(page/p) msgid "" -"Lastly, gThumb will use any system-defined scripts for " -"thumbnailing particular media types. For example, some systems may use " -"mplayer or totem or other movie viewers to generate " -"movie thumbnails." +"To print one or more images from the browser mode, select the desired images " +"and then use FilePrint or " +"Ctrlp." msgstr "" -"Por último, gThumb usará un sistema de scripts definidos por el " -"sistema para miniaturizar determinados tipos de medios. Por ejemplo, algunos " -"sistemas mplayer o totem u otros visores de películas " -"para generar miniaturas de películas." +"Para imprimir una o más imágenes desde el modo navegador, seleccione las " +"imágenes y use ArchivoImprimir o " +"Ctrlp." -#: C/thumbnails.page:37(p) +#: C/printing.page:18(page/p) msgid "" -"gThumb will save thumbnails to a system cache, to share them with " -"other applications. By default, Gnome systems prune cached thumbnails when " -"they are older than 180 days, or when the thumbnail cache exceeds 512 MB. " -"Technically-inclined users can explore these settings with gconf-" -"editor. See the /desktop/gnome/thumbnail_cache/maximum_age and /" -"desktop/gnome/thumbnail_cache/maximum_size keys in particular. Certain " -"applications (like F-Spot) may automatically increase these " -"settings greatly." +"The printer to use can be selected from the General tab of the " +"print dialog." msgstr "" -"gThumb guardará las miniaturas en la caché del sistema, para " -"compartirlas con otras aplicaciones. De manera predeterminada, los sistemas " -"GNOME cortan las miniaturas cacheadas cuando sobrepasan los 180 días, o " -"cuando la caché de miniaturas supera los 512 MB. Los usuarios técnicos puede " -"explorar esta configuración con gconf-editor. En particular, vea " -"las claves «desktop/gnome/thumbnail_cache/maximum_age» y «/desktop/gnome/" -"thumbnail_cache/maximum_size». Ciertas aplicaciones (como F-Spot) " -"pueden incrementar automáticamente estos valores extensamente." +"La impresora que usar se puede seleccionar en la pestaña General " +"del diálogo de impresión." -#: C/batch-scripts.page:6(title) -msgid "User-Defined Scripts" -msgstr "Scripts definidos por el usuario" +#: C/printing.page:21(page/p) +msgid "" +"The type of paper to use can be selected from the Page Setup tab." +msgstr "" +"Se puede seleccionar el tipo de papel que usar en la pestaña " +"Configuración de página." -#: C/batch-scripts.page:8(p) +#: C/printing.page:24(page/p) msgid "" -"To define a script (a command-line sequence that gThumb will " -"execute on your files), click the Tools button on the main " -"toolbar, and select ToolsPersonalize." +"The Layout tab provides some additional gThumb-" +"specific options. You can set the number of images to include on each page " +"here, and a preview pane is provided. Captions can also be added under the " +"image, in a configurable font. The captions can be chosen from a selection " +"of listed file attributes (like the file name, the date of the photo, camera " +"shutter speed, and others). Each image can be repositioned inside its print " +"area using the controls on this tab." msgstr "" -"Para definir un script (una secuencia de línea de comandos que gThumb ejecutará en sus archivos), pulse el botón Herramientas de " -"la barra de herramientas principal, y seleccione HerramientasPersonalizar." +"La pestaña Apariencia proporciona algunas opciones adicionales " +"específicas de gThumb. Aquí puede configurar el número de " +"imágenes que incluir en cada página, y se proporciona un panel de vista " +"previa. Se pueden elegir los títulos de entre una selección de atributos de " +"archivo listados (como el nombre del archivo, la fecha de la foto, velocidad " +"del disparador de la cámara y otros). Cada imagen se puede reposicionar " +"dentro de su área de impresión usando los controles en esta pestaña." -#: C/batch-scripts.page:12(p) -msgid "TODO: further documentation is need here." -msgstr "TODO: aquí se necesita documentación adicional." +#: C/printing.page:34(page/p) +msgid "When you are ready to print, press the Print button." +msgstr "Pulse el botón Imprimir cuando esté listo para imprimir." -#: C/batch-change-date.page:6(title) -msgid "Changing Dates" -msgstr "Cambiar fechas" +#: C/shortcuts.page:7(page/title) +msgid "Keyboard Shortcuts" +msgstr "Combinaciones de teclas" -#: C/batch-change-date.page:8(p) -msgid "" -"To change the file modification times, the comment dates, or the Exif " -"DateTimeOriginal tags of multiple files, select the files in the browser " -"view. Then click the Tools button on the main toolbar, and select " -"ToolsChange Date." -msgstr "" -"Para cambiar las horas de modificación del archivo, las fechas de los " -"comentarios, o las etiquetas Exif DateTimeOriginal de varios archivos, " -"seleccione los archivos en la vista de navegador. Entonces pulse el botón " -"Herramientas de la barra de herramientas principal, y elija " -"HerramientasCambiar fecha." +#: C/shortcuts.page:10(section/title) +msgid "Viewing and hiding parts of the user interface" +msgstr "Ver y ocultar partes del interfaz de usuario" + +#: C/shortcuts.page:14(td/p) C/shortcuts.page:91(td/p) +#: C/shortcuts.page:270(td/p) C/shortcuts.page:495(td/p) +msgid "Keyboard Shortcut" +msgstr "Tecla rápida" -#: C/batch-change-date.page:13(p) +#: C/shortcuts.page:22(td/p) +msgid "F9" +msgstr "F9" + +#: C/shortcuts.page:27(td/p) msgid "" -"Select the desired date options, and click Execute to complete " -"the process." +"Show/Hide the sidebar in the browser mode. The sidebar contains the folder " +"tree and the file properties summary (if enabled)." msgstr "" -"Seleccione las opciones de la fecha, y pulse Ejecutar para " -"completar el proceso." +"Mostrar/ocultar la barra lateral en el modo navegador. La barra lateral " +"contiene el árbol de carpetas y el resumen de las propiedades del archivo " +"(si está activado)." + +#: C/shortcuts.page:33(td/p) +msgid "i" +msgstr "i" + +#: C/shortcuts.page:38(td/p) +msgid "Show the file properties summary." +msgstr "Mostrar el resumen de propiedades del archivo" + +#: C/shortcuts.page:43(td/p) +msgid "F8" +msgstr "F8" + +#: C/shortcuts.page:48(td/p) +msgid "Shows/hides the thumbnail pane in the viewer mode." +msgstr "Muestra/oculta el panel de miniaturas en el modo visor." + +#: C/shortcuts.page:53(td/p) +msgid "F11 or f" +msgstr "F11 o f" + +#: C/shortcuts.page:58(td/p) +msgid "Toggles the fullscreen mode." +msgstr "Conmuta el modo a pantalla completa." + +#: C/shortcuts.page:63(td/p) +#| msgid "c or Ctrlm" +msgid "Ctrlt" +msgstr "Ctrlt" + +#: C/shortcuts.page:68(td/p) +msgid "Shows/hides the thumbnails in the browser mode." +msgstr "Muestra/oculta las miniaturas en el modo navegador." + +#: C/shortcuts.page:73(td/p) C/shortcuts.page:523(td/p) +msgid "Esc" +msgstr "Esc" + +#: C/shortcuts.page:78(td/p) +msgid "Closes the viewer or fullscreen mode." +msgstr "Cierra el visor o el modo a pantalla completa." + +#: C/shortcuts.page:87(section/title) +msgid "Editing shortcuts for the browser and viewer" +msgstr "Editar atajos para el explorador y el visor" -#: C/batch-resize.page:6(title) -msgid "Resizing Images" -msgstr "Redimensionar imágenes" +#: C/shortcuts.page:99(td/p) +#| msgid "+ or =" +msgid "e" +msgstr "e" -#: C/batch-resize.page:8(p) -msgid "" -"To resize one or more images using the same dimensions or scaling factors, " -"select the images in the browser view. Then click the Tools " -"button on the main toolbar, and select ToolsResize " -"Images." -msgstr "" -"Para redimensionar una o más imágenes usando las mismas dimensiones o lo " -"mismos factores de escalado, seleccione las imágenes en la vista de " -"navegador. Pulse en el botón Herramientas y elija " -"HerramientasRedimensionar imágenes." +#: C/shortcuts.page:104(td/p) +msgid "Edit the image. Opens the viewer and shows the editing tools." +msgstr "Editar la imagen. Abre el visor y muestra las herramientas de edición." -#: C/batch-resize.page:12(p) -msgid "" -"Then select the desired maximum output dimensions, or the desired percentage " -"scaling, and the destination folder. Click Execute to complete " -"the process." +#: C/shortcuts.page:109(td/p) +msgid "g" +msgstr "g" + +#: C/shortcuts.page:114(td/p) +msgid "Open the image with the GNU Image Manipulation Program (GIMP)." msgstr "" -"Seleccione las dimensiones máximas de salida, o el porcentaje de escalado, y " -"la carpeta de destino. Pulse Ejecutar para completar el proceso." +"Abrir la imagen con el programa de manipulación de imágenes de GNU (GIMP)." -#: C/batch-convert-format.page:6(title) -msgid "Converting File Formats" -msgstr "Convertir formatos de archivo" +#: C/shortcuts.page:119(td/p) +msgid "F2" +msgstr "F2" -#: C/batch-convert-format.page:8(p) -msgid "" -"To convert one or more images into a new file format, select the images in " -"the browser view. Then click the Tools button on the main " -"toolbar, and select ToolsConvert Format." -msgstr "" -"Para convertir una o más imágenes a un formato nuevo, seleccione las " -"imágenes que quiere convertir en el navegador y pulse el botón " -"Herramientas en la barra de herramientas principal y elija " -"HerramientasConvertir formato." +#: C/shortcuts.page:124(td/p) +msgid "Rename the image." +msgstr "Renombrar la imagen." -#: C/batch-convert-format.page:12(p) -msgid "" -"Select the desired output format and destination folder. Click Execute to complete the process." -msgstr "" -"Seleccione el formato de salida deseado y la carpeta de destino. Pulse " -"Ejecutar para completar el proceso." +#: C/shortcuts.page:129(td/p) +msgid "c or Ctrlm" +msgstr "c o Ctrlm" -#: C/batch-rotate.page:6(title) -msgid "Rotating Images Losslessly" -msgstr "Rotar imágenes sin pérdidas" +#: C/shortcuts.page:134(td/p) +msgid "Add comments or metadata to an image." +msgstr "Añadir comentarios o metadatos a una imagen." -#: C/batch-rotate.page:8(p) -msgid "" -"To rotate one or more images, select the images in the browser view. Then " -"click the Tools button on the main toolbar, and select either " -"ToolsRotate Right or " -"ToolsRotate Left. The images will be " -"rotated." +#: C/shortcuts.page:139(td/p) +msgid "]" +msgstr "]" + +#: C/shortcuts.page:144(td/p) +msgid "Rotate right, losslessly if possible. The file is saved automatically." msgstr "" -"Para rotar una o más imágenes, seleccione las imágenes en la vista de " -"navegador. Pulse el botón Herramientas en la barra de " -"herramientas principal, y seleccione HerramientasRotar a la derecha o HerramientasRotar a la izquierda." +"Rotar a la derecha, sin pérdidas si es posible. El archivo se guarda " +"automáticamente." -#: C/batch-rotate.page:14(p) -msgid "Lossless rotation is used for jpeg images, when possible." -msgstr "La rotación sin pérdidas se usa en imágenes jpeg, cuando es posible." +#: C/shortcuts.page:149(td/p) +msgid "[" +msgstr "[" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/browser.page:13(None) -msgid "@@image: 'figures/main-win.png'; md5=93cf84bd05a153ab61951ae12bbe3f26" -msgstr "@@image: 'figures/main-win.png'; md5=93cf84bd05a153ab61951ae12bbe3f26" +#: C/shortcuts.page:154(td/p) +msgid "Rotate left, losslessly if possible. The file is saved automatically." +msgstr "" +"Rotar a la izquierda, sin pérdidas si es posible. El archivo se guarda " +"automáticamente." -#: C/browser.page:6(title) -msgid "Browsing Your Files" -msgstr "Examinar sus archivos" +#: C/shortcuts.page:159(td/p) +msgid "Delete" +msgstr "Supr" -#: C/browser.page:8(p) -msgid "When you start gThumb the following window is displayed:" -msgstr "Cuando inicia gThumb se muestra la siguiente ventana:" +#: C/shortcuts.page:164(td/p) +msgid "Move the selected files to the Trash." +msgstr "Mover los archivos seleccionados a la papelera." -#: C/browser.page:11(title) -msgid "The main window" -msgstr "La ventana principal" +#: C/shortcuts.page:169(td/p) +#| msgid "AltHomeor h" +msgid "ShiftDelete" +msgstr "MayúsSupr" -#: C/browser.page:16(p) -msgid "The gThumb browser contains the following elements:" -msgstr "El navegador gThumb contiene los siguientes elementos:" +#: C/shortcuts.page:174(td/p) +msgid "Delete the selected files permanently." +msgstr "Eliminar permanentemente los archivos seleccionados." -#: C/browser.page:20(title) -msgid "Menubar" -msgstr "Barra de menú" +#: C/shortcuts.page:182(section/title) +msgid "Editing shortcuts for the viewer mode only" +msgstr "Editar atajos para el modo visor solamente" -#: C/browser.page:21(p) -msgid "" -"The menus on the menubar contain all of the commands that you can use in " -"gThumb" -msgstr "" -"Los menús de la barra de menús contienen todos los comandos que puede usar " -"en gThumb" +#: C/shortcuts.page:186(td/p) +msgid "Keyboard Shortcut (Case Sensitive)" +msgstr "Atajos de teclado (sensible a capitalización)" -#: C/browser.page:25(title) -msgid "Toolbar" -msgstr "Barra de herramientas" +#: C/shortcuts.page:194(td/p) +msgid "h" +msgstr "h" -#: C/browser.page:26(p) -msgid "" -"The toolbar contains a subset of the commands that you can access from the " -"menubar. In particular, the Tools button contains functions for batch " -"processing multiple images." -msgstr "" -"La barra de herramientas contiene un subconjunto de comandos a los que puede " -"acceder desde la barra de menús. En particular, el botón Herramientas sirve " -"para procesar en lotes múltiples imágenes." +#: C/shortcuts.page:199(td/p) +msgid "Enhance colors." +msgstr "Realzar colores." -#: C/browser.page:31(title) -msgid "Locationbar" -msgstr "Barra de ubicación" +#: C/shortcuts.page:204(td/p) +msgid "l" +msgstr "l" -#: C/browser.page:32(p) -msgid "The locationbar contains the current folder or catalog name." -msgstr "" -"La barra de lugar contiene el nombre de la carpeta o del catálogo actual." +#: C/shortcuts.page:209(td/p) +msgid "Flip image." +msgstr "Voltear imagen." -#: C/browser.page:36(title) -msgid "Folder Tree" -msgstr "Árbol de carpetas" +#: C/shortcuts.page:214(td/p) +msgid "m" +msgstr "m" -#: C/browser.page:37(p) -msgid "" -"The folder tree allows you to navigate the filesystem. Single-clicking on a " -"folder will load its images in the browser view. Double-clicking a folder, " -"or clicking the expander arrow, will also list folder's subfolders in the " -"tree." -msgstr "" -"El árbol de carpetas le permite navegar por el sistema de archivos. Un sola " -"pulsación sobre una carpeta cargará sus imágenes en la vista del navegador. " -"Una pulsación doble sobre una carpeta, o pulsar la flecha de expansión, " -"listará sus subcarpetas el en árbol." +#: C/shortcuts.page:219(td/p) +msgid "Mirror image." +msgstr "Reflejar imagen." -#: C/browser.page:44(title) -msgid "Browser View" -msgstr "Vista de Navegador" +#: C/shortcuts.page:224(td/p) +#| msgid "+ or =" +msgid "r" +msgstr "r" -#: C/browser.page:45(p) -msgid "" -"The browser view shows the images in the current folder or catalog. Single-" -"clicking an image will enable the Information Sidebar for that image. Double-" -"clicking an image will open it in the viewer mode. Double-clicking with the " -"middle mouse button will load the image in fullscreen viewer mode." -msgstr "" -"La vista de navegador muestra las imágenes en la carpeta actual. Una sola " -"pulsación sobre la imagen activa la barra lateral de información para esa " -"imagen. Una pulsación doble sobre la imagen la abre en modo visor. Una " -"pulsación doble con el botón central del ratón cargará la imagen en el visor " -"a pantalla completa." +#: C/shortcuts.page:229(td/p) +msgid "Rotate right." +msgstr "Rotar a la derecha." -#: C/browser.page:52(title) -msgid "Organize Button" -msgstr "Botón Organizar" +#: C/shortcuts.page:234(td/p) +msgid "R" +msgstr "R" -#: C/browser.page:53(p) -msgid "" -"The Organize button, just above the browser view, allows you to group images " -"into catalogs." -msgstr "" -"El botón Organizar, justo debajo de la vista del navegador, le permite " -"agrupar las imágenes en catálogos." +#: C/shortcuts.page:239(td/p) +msgid "Rotate left." +msgstr "Rotar a la izquierda." -#: C/browser.page:57(title) -msgid "Statusbar" -msgstr "Barra de estado" +#: C/shortcuts.page:244(td/p) +msgid "C" +msgstr "C" -#: C/browser.page:58(p) -msgid "On the statusbar you can read:" -msgstr "En la barra de estado puede leer:" +#: C/shortcuts.page:249(td/p) +msgid "Crop image." +msgstr "Recortar imagen." -#: C/browser.page:61(p) -msgid "" -"the total number of images contained in the current folder or catalog and " -"their total size." -msgstr "" -"el número total de imágenes que contiene la carpeta o el catálogo actual y " -"su tamaño total." +#: C/shortcuts.page:254(td/p) +msgid "S" +msgstr "S" -#: C/browser.page:65(p) -msgid "the number of the selected images and their size." -msgstr "el número de imágenes seleccionadas y su tamaño." +#: C/shortcuts.page:259(td/p) +msgid "Resize image." +msgstr "Redimensionar imagen." -#: C/browser.page:68(p) -msgid "some properties of the currently focused image." -msgstr "algunas propiedades de la imagen que actualmente tiene el foco." +#: C/shortcuts.page:266(section/title) +msgid "Viewer shortcuts" +msgstr "Ver atajos de teclado" -#: C/browser.page:73(title) -msgid "Information Sidebar" -msgstr "Barra lateral de información" +#: C/shortcuts.page:278(td/p) +msgid "Space or Page Down" +msgstr "Espacio o AvPág" -#: C/browser.page:74(p) -msgid "" -"If a single image is selected, the information sidebar (below the folder " -"tree) will display detailed information (such as EXIF or XMP tags) about the " -"selected image." -msgstr "" -"Si se selecciona una sola sola imagen, la barra lateral de información " -"(debajo del árbol de carpetas) mostrará información detallada (etiquetas " -"EXIF o XMP) sobre la imagen seleccionada." +#: C/shortcuts.page:283(td/p) +msgid "View the next image." +msgstr "Ver la siguiente imagen." -#: C/browser.page:79(title) -msgid "Filter Bar" -msgstr "Barra de filtros" +#: C/shortcuts.page:288(td/p) +msgid "Backspace or Page Up" +msgstr "Retroceso o RePág" -#: C/browser.page:80(p) -msgid "" -"An image filtering tool is provided just below the browser view. This can be " -"used to filter the displayed images. For example, the browser view can be " -"limited to files of a certain size, date, or name pattern, or other " -"characteristics." -msgstr "" -"Se proporciona un filtro de imágenes justo debajo de la vista del navegador. " -"Se puede usar para filtrar las imágenes mostradas. Por ejemplo, la vista del " -"navegador se puede limitar a archivos de cierto tamaño, fecha, patrón de " -"nombre, u otras características." +#: C/shortcuts.page:293(td/p) +msgid "View the previous image." +msgstr "Ver la imagen anterior." -#: C/introduction.page:6(title) -msgid "About gThumb" -msgstr "Acerca de gThumb" +#: C/shortcuts.page:298(td/p) C/shortcuts.page:415(td/p) +#| msgid "+ or =" +msgid "Home" +msgstr "Inicio" -#: C/introduction.page:8(p) -msgid "" -"gThumb is an image viewer and browser written for the GNOME " -"environment. It lets you browse your hard disk, showing you thumbnails of " -"image files and view single images of many different formats." -msgstr "" -"gThumb es un visor y explorador de imágenes escrito para el " -"entorno GNOME. Le permite explorar su disco duro mostrando miniaturas de los " -"archivos de imagen y ver imágenes sueltas en muchos formatos diferentes." +#: C/shortcuts.page:303(td/p) +msgid "View the first image." +msgstr "Ver la primera imagen." -#: C/introduction.page:13(p) -msgid "" -"gThumb supports the most common graphics formats, including JPEG, " -"GIF, TIF, and PNG. gThumb will also display other less common " -"image types if the supporting libraries are installed, including TGA, ICO, " -"BMP, XPM, and others." -msgstr "" -"gThumb soporta los formatos de archivo más comunes, incluyendo " -"JPEG, TIF y PNG. gThumb también mostrará otros tipos de imágenes " -"menos comunes si las librerías de soporte están instaladas, incluyendo TGA, " -"ICO, BMP, XPM y otros." +#: C/shortcuts.page:308(td/p) C/shortcuts.page:425(td/p) +msgid "End" +msgstr "Fin" -#: C/introduction.page:18(p) -msgid "" -"Some support for RAW image types is included, especially if the dcraw " -"program is installed on your system." -msgstr "" -"Se incluye algún soporte para imágenes RAW, especialmente si el programa " -"dcraw está instalado en su sistema." +#: C/shortcuts.page:313(td/p) +msgid "View the last image." +msgstr "Ver la última imagen." -#: C/introduction.page:21(p) -msgid "" -"gThumb not only lets you view image files but has many other " -"features such as adding comments to images, organizing images into catalogs, " -"printing images, slideshows, setting your desktop background, and more." -msgstr "" -"gThumb no sólo le permite ver archivos de imágenes, sino que " -"tiene otras muchas características como añadir comentarios a las imágenes, " -"organizar las imágenes en catálogos, imprimir imágenes, ver diapositivas, " -"establecer en fondo de escritorio, y mucho más." +#: C/shortcuts.page:318(td/p) +#| msgid "c or Ctrlm" +msgid " Ctrl D " +msgstr " Ctrl D " -#: C/introduction.page:26(p) -msgid "" -"gThumb includes a tool to import photos from attached cameras and " -"memory card readers." -msgstr "" -"gThumb incluye una herramienta para importar fotos desde cámaras " -"y lectores de tarjetas de memoria." +#: C/shortcuts.page:326(td/p) +msgid "Add the current location to the bookmarks." +msgstr "Añadir la ubicación actual a los marcadores." -#: C/introduction.page:29(p) -msgid "" -"gThumb can read EXIF, XMP, and IPTC metadata that is commonly " -"embedded in files." -msgstr "" -"gThumb puede leer los metadatos EXIF, XMP e IPTC comúnmente " -"incrustados en los archivos." +#: C/shortcuts.page:331(td/p) +msgid "+ or =" +msgstr "+ o =" -#: C/introduction.page:32(p) -msgid "" -"gThumb provides a systems of extensions (or plug-ins), to allow " -"users to extend the functionality of gThumb." -msgstr "" -"gThumb proporciona un sistema de extensiones (o complementos) que " -"permite a los usuarios ampliar la funcionalidad de gThumb." +#: C/shortcuts.page:336(td/p) +msgid "Zoom in." +msgstr "Ampliar." -#: C/introduction.page:34(p) -msgid "" -"More information about these extensions, and about gThumb " -"generally, is available at http://live.gnome.org/gthumb." -msgstr "" -"Dispone de más información sobre esas extensiones, o sobre gThumb " -"en general, en http://live.gnome." -"org/gthumb." +#: C/shortcuts.page:341(td/p) +msgid "-" +msgstr "-" -#: C/strftime.page:6(title) -msgid "Date/Time Format Codes" -msgstr "Códigos de formato de fecha/hora" +#: C/shortcuts.page:346(td/p) +msgid "Zoom out." +msgstr "Alejar." -#: C/strftime.page:8(p) -msgid "" -"This is a summary of standard date/time codes that may be used in format " -"strings:" -msgstr "" -"Esto es un resumen de los códigos de fecha y hora que se pueden usar en " -"cadenas de formato:" +#: C/shortcuts.page:351(td/p) +msgid "1 or z or / (numeric keypad)" +msgstr "1 o z o / (teclado numérico)" -#: C/strftime.page:12(title) -msgid "Valid format codes for custom subfolders" -msgstr "Códigos de formato válidos para subcarpetas personalizadas" +#: C/shortcuts.page:357(td/p) +msgid "Actual size." +msgstr "Tamaño actual." -#: C/strftime.page:15(p) -msgid "%a" -msgstr "%a" +#: C/shortcuts.page:362(td/p) +msgid "x or * (numeric keypad)" +msgstr "x o * (teclado numérico)" -#: C/strftime.page:18(p) -msgid "The abbreviated weekday name according to the current locale." -msgstr "" -"El día de la semana abreviado, de acuerdo con la configuración regional " -"actual." +#: C/shortcuts.page:367(td/p) +msgid "Zoom to fit (scales down only, does not magnify)" +msgstr "Ampliar hasta ajustar (solo reducir, no ampliar)" -#: C/strftime.page:24(p) -msgid "%A" -msgstr "%A" +#: C/shortcuts.page:372(td/p) +#| msgid "c or Ctrlm" +msgid " Shift x " +msgstr " Mayús x " -#: C/strftime.page:27(p) -msgid "The full weekday name according to the current locale." -msgstr "" -"El día de la semana completo de acuerdo con la configuración regional actual." +#: C/shortcuts.page:380(td/p) +msgid "Zoom to fit (scale down or magnify, as required)" +msgstr "Ampliar hasta ajustar (reducir o aumentar, según se requiera)" -#: C/strftime.page:33(p) -msgid "%b" -msgstr "%b" +#: C/shortcuts.page:385(td/p) +msgid "Arrows" +msgstr "Flechas" -#: C/strftime.page:36(p) -msgid "The abbreviated month name according to the current locale." -msgstr "" -"El nombre abreviado del mes, de acuerdo con la configuración regional actual." +#: C/shortcuts.page:390(td/p) +msgid "Scroll the image." +msgstr "Desplazar la imagen." -#: C/strftime.page:42(p) -msgid "%B" -msgstr "%B" +#: C/shortcuts.page:395(td/p) +#| msgid "AltHomeor h" +msgid " Shift Arrows " +msgstr " Mayús Flechas " -#: C/strftime.page:45(p) -msgid "The full month name according to the current locale." -msgstr "El nombre del mes completo de acuerdo con la configuración regional." +#: C/shortcuts.page:403(td/p) +msgid "Scroll the image faster." +msgstr "Desplazar la imagen más rápidamente." -#: C/strftime.page:50(p) -msgid "%c" -msgstr "%c" +#: C/shortcuts.page:410(section/title) +msgid "Browser Navigation" +msgstr "Navegación con explorador" -#: C/strftime.page:53(p) -msgid "The preferred date and time representation for the current locale." -msgstr "" -"La representación favorita de la fecha y la hora de acuerdo con la " -"configuración regional." +#: C/shortcuts.page:420(td/p) +msgid "Go to the first file in the browser view." +msgstr "Ir al primer archivo en la vista de navegador." -#: C/strftime.page:59(p) -msgid "%C" -msgstr "%C" +#: C/shortcuts.page:431(td/p) +msgid "Go to the last file in the browser view." +msgstr "Ir al último archivo en la vista de navegador." -#: C/strftime.page:62(p) -msgid "The century number (year/100) as a 2-digit integer." -msgstr "El número de siglo (año/100) como un entero de 2 dígitos." +#: C/shortcuts.page:436(td/p) +msgid "Down Arrow or Page Down" +msgstr "Flecha abajo o AvPág" -#: C/strftime.page:67(p) -msgid "%d" -msgstr "%d" +#: C/shortcuts.page:441(td/p) +msgid "Scroll downwards through the thumbnails." +msgstr "Desplazarse hacia abajo a través de las miniaturas." -#: C/strftime.page:70(p) -msgid "The day of the month as a decimal number (range 01 to 31)." -msgstr "El día del mes como un número decimal (rango de 01 a 31)." +#: C/shortcuts.page:446(td/p) +msgid "Up Arrow or Page Up" +msgstr "Flecha arriba o RePág" -#: C/strftime.page:76(p) -msgid "%D" -msgstr "%D" +#: C/shortcuts.page:451(td/p) +msgid "Scroll upwards through the thumbnails." +msgstr "Desplazarse hacia arriba a través de las miniaturas." -#: C/strftime.page:79(p) -msgid "" -"Equivalent to %m/%d/%y. (Yecch -- for Americans only. Americans should note " -"that in other countries %d/%m/%y is rather common. This means that in " -"international context this format is ambiguous and should not be used.)" -msgstr "" -"Equivalente a %m/%d/%y. (Yecch -- sólo para Estadounidenses. Los " -"estadounidenses deben tener en cuenta que en otros países %d/%m/%y es más " -"común. Esto significa que en contexto internacional este formato es ambigüo " -"y no debería utilizarse.)" +#: C/shortcuts.page:456(td/p) +#| msgid "AltHomeor h" +msgid "AltLeft Arrow" +msgstr "AltFlecha izquierda" -#: C/strftime.page:87(p) -msgid "%e" -msgstr "%e" +#: C/shortcuts.page:461(td/p) +msgid "Go back to the previously viewed folder." +msgstr "Ir a la carpeta anteriormente visitada." -#: C/strftime.page:90(p) -msgid "" -"Like %d, the day of the month as a decimal number, but a leading zero is " -"replaced by a space." -msgstr "" -"Igual que %d, el día del mes como un número decimal, pero el cero de la " -"izquierda se sustituye por un espacio." +#: C/shortcuts.page:466(td/p) +#| msgid "AltHomeor h" +msgid "AltRight Arrow" +msgstr "AltFlecha derecha" -#: C/strftime.page:99(p) C/strftime.page:208(p) -msgid "Modifier: use alternative format, see below." -msgstr "Modificador: use el formato alternativo, vea debajo." +#: C/shortcuts.page:471(td/p) +msgid "Go forward (after going back to a folder)." +msgstr "Ir hacia adelante (después de retroceder hasta una carpeta)." -#: C/strftime.page:107(p) -msgid "Equivalent to %Y-%m-%d (the ISO 8601 date format). (C99)" -msgstr "Equivalente a %Y-%m-%d (el formato de fecha de ISO 8601). (C99)" +#: C/shortcuts.page:476(td/p) +#| msgid "AltHomeor h" +msgid " Alt Up " +msgstr " Alt Arriba " -#: C/strftime.page:113(p) -msgid "%G" -msgstr "%G" +#: C/shortcuts.page:484(td/p) +msgid "Go up one level." +msgstr "Subir un nivel." -#: C/strftime.page:116(p) -msgid "" -"The ISO 8601 year with century as a decimal number. The 4-digit year " -"corresponding to the ISO week number (see %V). This has the same format and " -"value as %y, except that if the ISO week number belongs to the previous or " -"next year, that year is used instead." -msgstr "" -"El año ISO 8601 con siglo como un número decimal. Los 4 dígitos del año " -"correspondientes al número ISO de la semana (vea %V). Esto tiene el mismo " -"formato y valor que %y, excepto si el número ISO de la semana pertenece al " -"año anterior o siguiente, se utiliza ese año en su lugar." +#: C/shortcuts.page:491(section/title) +msgid "Slideshow controls" +msgstr "Controles de las diapositivas" -#: C/strftime.page:125(p) -msgid "%g" -msgstr "%g" +#: C/shortcuts.page:503(td/p) +msgid "F5" +msgstr "F5" -#: C/strftime.page:128(p) -msgid "Like %G, but without century, i.e., with a 2-digit year (00-99)." -msgstr "Igual que %G, pero sin siglo, ej. con un año de dos dígitos (00-99)." +#: C/shortcuts.page:508(td/p) +msgid "Start a slideshow." +msgstr "Iniciar la muestra de diapositivas." -#: C/strftime.page:134(p) -msgid "%h" -msgstr "%h" +#: C/shortcuts.page:513(td/p) +msgid "Space" +msgstr "Espacio" -#: C/strftime.page:137(p) -msgid "Equivalent to %b." -msgstr "Equivalente a &b." +#: C/shortcuts.page:518(td/p) +msgid "Pause/Unpause the slideshow." +msgstr "Pausar/Reanudar la muestra de diapositivas." -#: C/strftime.page:142(p) -msgid "%H" -msgstr "%H" +#: C/shortcuts.page:528(td/p) +msgid "Close the slideshow." +msgstr "Cerrar la muestra de diapositivas." -#: C/strftime.page:145(p) -msgid "The hour as a decimal number using a 24-hour clock (range 00 to 23)." -msgstr "" -"La hora como un número decimal, utilizando un reloj de 24 horas (rango de 00 " -"a 23)." +#: C/shortcuts.page:533(td/p) +msgid "Down Arrow or Right Arrow or Page Down" +msgstr "Flecha abajo o Flecha derecha o AvPág" -#: C/strftime.page:151(p) -msgid "%I" -msgstr "%I" +#: C/shortcuts.page:538(td/p) +msgid "Load the next image." +msgstr "Cargar la siguiente imagen." -#: C/strftime.page:154(p) -msgid "The hour as a decimal number using a 12-hour clock (range 01 to 12)." +#: C/shortcuts.page:543(td/p) +msgid "Up Arrow or Left Arrow or Page Up" msgstr "" -"La hora como un numero decimal, utilizando un reloj de 12 horas (rango de 01 " -"a 12)." - -#: C/strftime.page:160(p) -msgid "%j" -msgstr "%j" +"Flecha arriba o Flecha izquierda o RePág" -#: C/strftime.page:163(p) -msgid "The day of the year as a decimal number (range 001 to 366)." -msgstr "El día del año como un número decimal (rango de 001 a 366)." +#: C/shortcuts.page:548(td/p) +msgid "Load the previous image." +msgstr "Cargar la imagen anterior." -#: C/strftime.page:169(p) -msgid "%k" -msgstr "%k" +#: C/sharing-disc.page:6(page/title) +msgid "Creating a CD/DVD/ISO" +msgstr "Crear un(a) CD/DVD/ISO" -#: C/strftime.page:172(p) +#: C/sharing-disc.page:7(page/p) +#| msgid "" +#| "To write a series of files to an optical disk (CD or DVD), or to create " +#| "an ISO disk image file, use the FileExport ToOptical Disc menu item." msgid "" -"The hour (24-hour clock) as a decimal number (range 0 to 23); single digits " -"are preceded by a blank. (See also %H.)" +"To write a series of files to an optical disk (CD or DVD), or to create an " +"ISO disk image file, use the File Export ToOptical Disc menu item." msgstr "" -"La hora (formato de 24 horas) como un número decimal (rango de 0 a 23); los " -"dígitos simples van precedidos por un espacio el blanco. (Vea también %H.)" +"Para escribir una serie de archivos en un disco óptico (CD o DVD), o para " +"crear un archivo de imagen ISO, use el elemento de menú " +"ArchivoExportar aDisco óptico." -#: C/strftime.page:179(p) -msgid "%l" -msgstr "%l" +#: C/sharing-disc.page:13(page/p) +msgid "" +"You will be offered the choice of writing the currently selected files, the " +"entire current folder, or the entire current folder and its subfolders. " +"Click OK when you have made the appropriate selection." +msgstr "" +"Se le ofrecerá escribir los archivos actualmente seleccionados, la carpeta " +"actual entera o la carpeta actual entera y sus subcarpetas. Pulse " +"Aceptar cuando haya hecho la selección apropiada." -#: C/strftime.page:182(p) +#: C/sharing-disc.page:19(page/p) msgid "" -"The hour (12-hour clock) as a decimal number (range 1 to 12); single digits " -"are preceded by a blank. (See also %I.)" +"The next dialog will select the destination disk, or the ISO file to save. " +"When you are ready to complete the process, click Create Image. " +"The optical disk writing process will then commence, or the ISO file will be " +"written, completing the process." msgstr "" -"La hora (formato de 12 horas) como un número decimal (rango de 1 a 12); los " -"dígitos simples están precedidos por un espacio en blanco. (Vea también %I.)" +"El siguiente diálogo seleccionará el disco de destino, o el archivo ISO que " +"salvar. Cuando esté listo para completar el proceso, pulse en Crear " +"imagen. El proceso de escritura del disco óptico comenzará, o se " +"escribirá el archivo ISO, completando el proceso" -#: C/strftime.page:189(p) -msgid "%m" -msgstr "%m" +#: C/sharing-social.page:6(page/title) +msgid "Uploading to Photo-Sharing Web Sites" +msgstr "Subir fotos a sitios web de compartición de fotos" -#: C/strftime.page:192(p) -msgid "The month as a decimal number (range 01 to 12)." -msgstr "El mes como un número decimal (rango de 01 a 12)." +#: C/sharing-social.page:7(page/p) +msgid "" +"gThumb is provided with a number of extensions for uploading photos to " +"various \"social media\" web sites. By default, uploaders for Facebook, " +"Flickr, Picasa, and Photobucket are enabled." +msgstr "" +"gThumb se proporciona con ciertas extensiones para subir fotos a sitios web " +"«sociales». De manera predeterminada, los cargadores activados son Facebook, " +"Flickr, Picasa y Photobucket." -#: C/strftime.page:197(p) -msgid "%M" -msgstr "%M" +#: C/sharing-social.page:13(page/p) +msgid "" +"To upload a series of photos, select the images in the browser view, and " +"click the Share button in the toolbar. Select the appropriate web " +"site from the menu that appears." +msgstr "" +"Para subir una serie de fotos, seleccione las imágenes en la vista de " +"navegador y pulse el botón Compartir en la barra de herramientas. " +"Seleccione el sitio web apropiado en el menú que aparece." -#: C/strftime.page:200(p) -msgid "The minute as a decimal number (range 00 to 59)." -msgstr "El minuto como un numero decimal (rango de 00 a 59)." +#: C/sharing-social.page:17(page/p) +msgid "" +"You may be prompted for additional information specific to the destination " +"site, like an album name. You may also be prompted for your user name and " +"password for the site. It may be necessary for gThumb to open a web browser, " +"where you complete the required authentication steps. Once you have " +"completed the required authentication steps in the browser, return to gThumb " +"and continue the upload." +msgstr "" +"Se le puede pedir información adicional sobre el sitio de destino, como el " +"nombre de un álbum. También se le puede pedir su nombre de usuario y su " +"contraseña para el sitio. Puede ser necesario que gThumb abra un navegador " +"web, donde usted tenga que introducir los pasos de autenticación requeridos. " +"Una vez que los haya completado, vuelva a gThumb y continúe la subida." + +#: C/sharing-social.page:26(page/p) +msgid "" +"If you do not see the expected upload sites in the Share menu, " +"check that the appropriate exporter extensions are enabled in " +"EditExtensions." +msgstr "" +"Si no ve los sitios de subida esperados en el menú Compartir, " +"compruebe que las extensiones de exportación apropiadas están activadas en " +"EditarExtensiones." -#: C/strftime.page:205(p) -msgid "%O" -msgstr "%O" +#: C/sharing-social.page:31(page/p) +msgid "" +"For some sites, gThumb also supports downloading photos from the site into " +"gThumb. See the FileImport From menu " +"for the available download options." +msgstr "" +"Para algunos sitios, gThumb también soporta la descarga de fotos del sitio " +"en gThumb. Consulte en el menú ArchivoImportar " +"desde las opciones de descarga disponibles." -#: C/strftime.page:213(p) -msgid "%p" -msgstr "%p" +#: C/wallpaper.page:6(page/title) +msgid "Desktop Wallpaper" +msgstr "Fondo del escritorio" -#: C/strftime.page:216(p) +#: C/wallpaper.page:7(page/p) msgid "" -"Either 'AM' or 'PM' according to the given time value, or the corresponding " -"strings for the current locale. Noon is treated as 'pm' and midnight as 'am'." +"To set an image as the system desktop wallpaper, right-click on the image " +"and select Set as Desktop Background from the " +"pop-up menu. The desktop background will change, and the Gnome Appearance " +"Preferences dialog will appear. You can use this dialog to make adjustments " +"to the background settings (positioning, stretching, tiling, et cetera.)." msgstr "" -"O «AM» o «PM» de acuerdo con el valor dado del tiempo, o las cadenas " -"correspondientes la para la localización actual. Mediodía es tratado como " -"«pm» y y medianoche como «am»." +"Para establecer una imagen como fondo del escritorio del sistema, pulse con " +"el botón derecho sobre la imagen y seleccione Establecer como " +"fondo de escritorio en el menú emergente. El fondo del " +"escritorio cambiará, y aparecerá el diálogo de Preferencias de apariencia de " +"GNOME. Puede usar este diálogo para hacer ajustes en la configuración del " +"fondo de escritorio (posición, estirar, mosaico, etc.)." -#: C/strftime.page:223(p) -msgid "%P" -msgstr "%P" +#: C/bookmarks.page:6(page/title) +msgid "Using Bookmarks" +msgstr "Usar marcadores" -#: C/strftime.page:226(p) +#: C/bookmarks.page:8(page/p) msgid "" -"Like %p but in lowercase: 'am' or 'pm' or a corresponding string for the " -"current locale." +"Frequently-used folders can be added to the bookmark list for rapid access. " +"To add the current folder to the bookmark list, press CtrlD or use the command BookmarksAdd Bookmark." msgstr "" -"Similar %p pero en minúsculas: «am» o «pm» o la cadena correspondiente a la " -"configuración regional actual." - -#: C/strftime.page:232(p) -msgid "%r" -msgstr "%r" +"Las carpetas usadas frecuentemente se pueden añadir a la lista de marcadores " +"para un rápido acceso. Para añadir la carpeta actual a los marcadores pulse " +"CtrlD o use el comando " +"MarcadoresAñadir marcador." -#: C/strftime.page:235(p) +#: C/bookmarks.page:13(page/p) msgid "" -"The time in a.m. or p.m. notation. In the POSIX locale this is equivalent to " -"'%I:%M:%S %p'." +"To remove or rearrange bookmarks in a different order use the " +"BookmarksEdit Bookmarks command." msgstr "" -"La hora en notación am o pm. En la configuración regional POSIX esto es " -"equivalente a «%I:%M:%S %p»." +"Para quitar o reordenar marcadores de forma diferente use el comando " +"MarcadoresEditar marcadores." -#: C/strftime.page:241(p) -msgid "%R" -msgstr "%R" +#: C/bookmarks.page:16(page/p) +msgid "" +"BookmarksSystem Bookmarks provides " +"access to the system bookmarks that have been defined in Nautilus " +"or the file-chooser dialog used in most Gnome applications." +msgstr "" +"MarcadoresMarcadores del sistema " +"proporciona acceso a los marcadores del sistema que se han definido en " +"Nautilus o en el diálogo de selección de archivos en la mayoría " +"de aplicaciones de GNOME." -#: C/strftime.page:244(p) +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/import.page:21(media) +#| msgid "@@image: 'figures/import.png'; md5=aab2ba4d889d170b219c554294d69b0f" +msgctxt "_" +msgid "" +"external ref='figures/import.png' md5='aab2ba4d889d170b219c554294d69b0f'" +msgstr "" +"external ref='figures/import.png' md5='aab2ba4d889d170b219c554294d69b0f'" + +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/import.page:43(media) +#| msgid "" +#| "@@image: 'figures/import-pref-auto-folder.png'; " +#| "md5=0a41de83da83b762e37f3962a7e4c042" +msgctxt "_" +msgid "" +"external ref='figures/import-pref-auto-folder.png' " +"md5='0a41de83da83b762e37f3962a7e4c042'" +msgstr "" +"external ref='figures/import-pref-auto-folder.png' " +"md5='0a41de83da83b762e37f3962a7e4c042'" + +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/import.page:75(media) +#| msgid "" +#| "@@image: 'figures/import-pref-custom-format.png'; " +#| "md5=989ca536c873ec926a4a71c876004b9f" +msgctxt "_" msgid "" -"The time in 24-hour notation (%H:%M). For a version including the seconds, " -"see %T below." +"external ref='figures/import-pref-custom-format.png' " +"md5='989ca536c873ec926a4a71c876004b9f'" msgstr "" -"La hora en notación de 24 horas (%H:%M). Para una versión que incluya los " -"segundos, vea %T más abajo." +"external ref='figures/import-pref-custom-format.png' " +"md5='989ca536c873ec926a4a71c876004b9f'" -#: C/strftime.page:250(p) -msgid "%s" -msgstr "%s" +#: C/import.page:8(page/title) +msgid "Importing From a Camera" +msgstr "Importar desde una cámara" -#: C/strftime.page:253(p) +#: C/import.page:10(page/p) msgid "" -"The number of seconds since the Epoch, i.e., since 1970-01-01 00:00:00 UTC." +"On most systems, gThumb will automatically launch the import " +"dialog when a digital camera is connected to the computer, or a memory card " +"with photos is plugged into a card reader. (It does this because it is " +"registered as the default handler for x-content/image-dcf and x-content/" +"image-picturecd mime types.)" msgstr "" -"El número de segundos desde Epoch, por ejemplo, desde 1970-01-01 00:00:00 " -"UTC." - -#: C/strftime.page:259(p) -msgid "%S" -msgstr "%S" +"En la mayoría de los sistemas, gThumb lanzará automáticamente el " +"diálogo de importación cuando se conecta una cámara digital al equipo, o " +"cuando se inserta una tarjeta de memoria con fotos en el lector de tarjetas. " +"(Esto lo hace porque está registrado como el manejador predeterminado de los " +"tipos mime x-content/image-dcf and x-content/image-picturecd.)" -#: C/strftime.page:262(p) +#: C/import.page:16(page/p) msgid "" -"The second as a decimal number (range 00 to 60). (The range is up to 60 to " -"allow for occasional leap seconds.)" +"To manually launch the import dialog, use FileImport " +"FromRemovable Device." msgstr "" -"Los segundos como un número decimal (rango de 00 a 60). (El rango es " -"superior a 60 para permitir saltos ocasionales en los segundos.)" +"Para lanzar manualmente el diálogo de importación, use ArchivoImportar desdeDispositivo extraíble." -#: C/strftime.page:269(p) -msgid "%T" -msgstr "%T" +#: C/import.page:20(figure/title) +msgid "The Import Dialog" +msgstr "El diálogo Importar" -#: C/strftime.page:272(p) -msgid "The time in 24-hour notation (%H:%M:%S)." -msgstr "La hora en formato 24 horas (%H:%M:%S)." +#: C/import.page:24(page/p) +msgid "" +"The import dialog shows thumbnails of the photos available on the selected " +"device. The user can select one of more photos using normal keyboard or " +"mouse techniques (for example, Ctrl+click to add a photo to the selection, " +"or click and drag the mouse over the desired photos.) If no photos are " +"explicitly selected, all will be imported." +msgstr "" +"El diálogo de importación muestra miniaturas de las fotos disponibles en el " +"dispositivo seleccionado. El usuario puede seleccionar una o más fotos " +"usando los métodos habituales del teclado o el ratón (por ejemplo, Ctrl" +"+pulsación para añadir una foto a la selección, o pulsar y arrastrar el " +"ratón sobre las fotos que quiera). Si no hay fotos seleccionadas " +"explícitamente, se importarán todas." -#: C/strftime.page:277(p) -msgid "%u" -msgstr "%u" +#: C/import.page:30(page/p) +msgid "" +"Tags may optionally be associated with the imported photos, using the " +"Tags control below the thumbnail window. Click the drop-down " +"control to see the predefined tags." +msgstr "" +"Las etiquetas pueden estar asociadas opcionalmente con las fotos importadas, " +"usando el control Etiquetas debajo de la ventana de la miniatura. " +"Pulse el control desplegable para ver las etiquetas predefinidas." -#: C/strftime.page:280(p) +#: C/import.page:34(page/p) msgid "" -"The day of the week as a decimal number, range 1 to 7, Monday being 1. See " -"also %w." +"An event name may also be optionally associated with the photos. This event " +"name can be used to generate an automatic subfolder name (possibly " +"incorporating a date) as described below. For example, if the base " +"destination folder is \"/photos\", and you enter \"Wedding-Jennifer\" in the " +"Event field, you can configure generation of automatic subfolders " +"like \"/photos/2010-07-31, Wedding-Jennifer\"." msgstr "" -"El día de la semana como un número decimal, rango de 1 a 7, siendo 1 el " -"lunes. Vea también %w." +"El nombre de un evento se puede asociar opcionalmente con las fotos. Este " +"nombre de evento se puede usar para generar un nombre automático de " +"subcarpeta (posiblemente incorporando una fecha) como se muestra a " +"continuación. Por ejemplo, si la carpeta base de destino es «/fotos», e " +"introduce «Boda-Sara» en el campo Event, puede configurar la " +"generación automática se subcarpetas como «/fotos/2010-07-31, Boda-Sara»." -#: C/strftime.page:286(p) -msgid "%U" -msgstr "%U" +#: C/import.page:42(figure/title) +msgid "Standard Date-Based Subfolders" +msgstr "Subcarpetas estándar basadas en la fecha" -#: C/strftime.page:289(p) +#: C/import.page:46(page/p) msgid "" -"The week number of the current year as a decimal number, range 00 to 53, " -"starting with the first Sunday as the first day of week 01. See also %V and " -"%W." +"As mentioned above, subfolders for imported photos can be automatically " +"generated based on event names and dates. This is enabled or disabled by " +"clicking on the destination foldername in the import dialog. This opens a " +"second dialog, where the base folder for imports may be selected (the " +"Destination folder). To generate automatic subfolders, select " +"Automatic subfolder." msgstr "" -"El número de semana del año actual como un número decimal, rango de 00 a 53, " -"empezando con el primer domingo como primer día de la semana 01. Vea también " -"%V y %W." +"Como se ha mencionado anteriormente, las subcarpetas de las fotos importadas " +"se pueden generar automáticamente basándose en nombres de eventos y fechas. " +"Esto se activa o se desactiva pulsando en el nombre de la carpeta destino en " +"el diálogo de importación. Esto abre un segundo diálogo, donde se puede " +"seleccionar la carpeta base de importaciones (la carpeta Destino). Para generar subcarpetas automáticamente, seleccione Subcarpeta " +"automática." -#: C/strftime.page:296(p) -msgid "%V" -msgstr "%V" +#: C/import.page:52(page/p) +msgid "" +"You can select either the File Date or the Current Date to use as the basis for subfolder naming. (The File Date " +"examines the dates embedded in the file metadata to determine when the photo " +"was taken.) A variety of standard date formats are available (year-" +"month for example). The as single subfolder checkbox " +"controls whether a \"deep\" or \"shallow\" hierarchy of files is made (for " +"example, with year-month, you can have year subfolders with month " +"subfolders under them, or all subfolders can be at the same level in the " +"filesystem, with the year and name both the folder name." +msgstr "" +"Puede seleccionar si usar la Fecha del archivo o la Fecha " +"actual como base para el nombrado de las subcarpetas. (La Fecha " +"del archivo examina las fechas empotradas en los metadatos del archivo " +"para determinar cuando se tomó la foto). Hay una variedad de formatos " +"estándar de fecha disponibles (año-mes por ejemplo). La casilla " +"como una sola subcarpeta controla si se hace una jerarquía " +"«profunda» o «poco profunda» (por ejemplo, con año-mes, puede " +"tener subcarpetas con el año y subcarpetas con el mes dentro de ellas, o " +"todas las subcarpetas puede estar al mismo nivel en el sistema de archivos, " +"con el año y el nombre, ambos como nombre de la carpeta)." -#: C/strftime.page:299(p) +#: C/import.page:61(page/p) msgid "" -"The ISO 8601:1988 week number of the current year as a decimal number, range " -"01 to 53, where week 1 is the first week that has at least 4 days in the " -"current year, and with Monday as the first day of the week. See also %U and " -"%W." +"It is not necessary to use the predefined date formats. If you select " +"custom format, standard date codes can be used. Click on the help " +"icon to the right of the custom format field for a list of format codes. \"%E" +"\" is a special code that will embed the Event name defined in " +"the main import dialog." msgstr "" -"El número de semana ISO 8601:1988 del año actual como un número decimal, " -"rango de 01 a 53, donde la semana 1 es la primera semana que tenga al menos " -"4 días en el año actual, y con el lunes como primer día de la semana. Vea " -"también %U y % W." +"No es necesario usar formatos de fecha predefinidos. Si selecciona " +"formato personalizado, se pueden usar códigos de fecha estándar. " +"Pulse en el icono de ayuda a la derecha del campo de formato personalizado " +"para obtener una lista de códigos de formato. «%E» es un código especial que " +"empotrará el nombre del Evento definido en el diálogo de " +"importación principal." -#: C/strftime.page:308(p) -msgid "%w" -msgstr "%w" +#: C/import.page:67(page/p) +msgid "See for more date format codes." +msgstr "" +"Para ver más códigos de formato de fechas vea ." -#: C/strftime.page:311(p) +#: C/import.page:69(page/p) msgid "" -"The day of the week as a decimal, range 0 to 6, Sunday being 0. See also %u." +"If you use automatic subfolder naming, the Destination field in " +"the main import dialog will show the automatic portion of the folder in red. " +"(For date-based formats, dummy data may be shown in the red portion.)" msgstr "" -"El día de la semana como un decimal, rango de 0 a 6, siendo 0 el Domingo. " -"Vea también %u." +"Si usa renombrado automático de subcarpetas, el campo Destino en " +"el diálogo principal de importación mostrará en rojo la parte automática de " +"la carpeta. (Para formatos basados en la fecha, se mostrarán datos falsos en " +"la parte roja.)" -#: C/strftime.page:317(p) -msgid "%W" -msgstr "%W" +#: C/import.page:74(figure/title) +msgid "Using Custom Formats" +msgstr "Usar formatos personalizados" + +#: C/slideshow.page:7(page/title) +msgid "Automatic Slideshow" +msgstr "Muestra automática de diapositivas" -#: C/strftime.page:320(p) +#: C/slideshow.page:9(page/p) msgid "" -"The week number of the current year as a decimal number, range 00 to 53, " -"starting with the first Monday as the first day of week 01." +"A slideshow of the currently selected images can be started from the image " +"browser by pressing F5, by clicking the slideshow toolbar icon, " +"or by clicking ViewSlideshow. If no " +"images are selected, all images in the folder will be included." msgstr "" -"El número de semana del año actual como un número decimal, rango de 00 a 53, " -"comenzando con el primer lunes como primer día de la semana 01." +"Se puede iniciar una presentación de las imágenes seleccionadas desde la " +"imagen del navegador pulsando F5, el icono de presentación de la " +"barra de herramientas o pulsando VerMostrar " +"diapositivas. Si no hay imágenes seleccionadas, se incluirán " +"todas las imágenes de la carpeta." -#: C/strftime.page:327(p) -msgid "%x" -msgstr "%x" +#: C/slideshow.page:15(page/p) +msgid "" +"The transition effects and the time each image is shown can be modified from " +"the EditPreferencesSlideshow dialog." +msgstr "" +"Los efectos de transición y la hora en que se muestra cada imagen se pueden " +"modificar desde el diálogo EditarPreferenciasDiapositivas." -#: C/strftime.page:330(p) +#: C/slideshow.page:19(page/p) msgid "" -"The preferred date representation for the current locale without the time." +"Some graphics cards and drivers may experience problems (crashes) if " +"transition effects are enabled. If you experience such difficulties, set the " +"Transition effect preference to None." msgstr "" -"La representación preferida de la fecha para la configuración regional " -"actual, sin la hora." +"Algunas tarjetas gráficas y controladores pueden experimentar problemas " +"(cuelgues) si se activan los efectos de transición. Si tiene estos " +"problemas, configure la preferencia Efecto de transición a " +"Ninguno." -#: C/strftime.page:336(p) -msgid "%X" -msgstr "%X" +#: C/slideshow.page:23(page/p) +msgid "" +"You can advance manually to the next image by pressing Down Arrow, Right Arrow, Page Down or Space." +msgstr "" +"Puede avanzar manualmente hasta la siguiente imagen pulsando Flecha " +"abajo o Flecha derecha o Av Pág o Espacio." -#: C/strftime.page:339(p) +#: C/slideshow.page:27(page/p) msgid "" -"The preferred time representation for the current locale without the date." +"You can go back to the previous image by pressing Up Arrow, " +"Left Arrow or Page Up." msgstr "" -"La representación preferida de la hora para la configuración regional " -"actual, sin la fecha." +"Puede volver a la imagen anterior pulsando Flecha arriba o " +"Flecha izquierda o Re Pág." -#: C/strftime.page:345(p) -msgid "%y" -msgstr "%y" +#: C/slideshow.page:30(page/p) +msgid "You can pause or un-pause the slideshow by pressing p." +msgstr "" +"Puede pausar o reanudar la muestra de diapositivas pulsando p." -#: C/strftime.page:348(p) -msgid "The year as a decimal number without a century (range 00 to 99)." -msgstr "El año como número decimal, excluyendo el siglo (rango de 00 a 99)." +#: C/slideshow.page:32(page/p) +msgid "To exit the slideshow, press Escape or F5." +msgstr "" +"Para salir de la muestra de diapositivas, pulse Escape o F5." -#: C/strftime.page:354(p) -msgid "%Y" -msgstr "%Y" +#: C/file-copy-move.page:6(page/title) +msgid "Copying and Moving Files" +msgstr "Copiar y mover archivos" -#: C/strftime.page:357(p) -msgid "The year as a decimal number including the century." -msgstr "El año como número decimal, incluyendo el siglo." +#: C/file-copy-move.page:8(page/p) +msgid "There are three ways to copy or move files in gThumb." +msgstr "Hay tres maneras de copiar y mover archivos en gThumb." -#: C/strftime.page:362(p) -msgid "%z" -msgstr "%z" +#: C/file-copy-move.page:12(item/title) +msgid "Cut and Paste" +msgstr "Cortar y pegar" -#: C/strftime.page:365(p) +#: C/file-copy-move.page:13(item/p) msgid "" -"The time-zone as hour offset from GMT. Required to emit RFC 822-conformant " -"dates (using \"%a, %d %b %Y %H:%M:%S %z\")." +"To copy a file in the browser view, use EditCopy, or press CtrlC. To " +"move a file, use EditCut, or press " +"CtrlX. Then navigate to the " +"destination folder using the folder tree. Use EditPaste, or press CtrlV, to complete the file transfer." msgstr "" -"La zona horaria como diferencia horaria respecto a GTM. Requerido para " -"emitir fechas conformes a la RFC 822 (utilizando «%a, %d %b %Y %H:%M:%S %z»)." - -#: C/strftime.page:372(p) -msgid "%Z" -msgstr "%Z" +"Para copiar un archivo en la vista de navegador, useEditarCopiar, o pulse CtrlC. Para mover un archivo, use EditarCortar, o pulse CtrlX. " +"Entonces navegue hasta la carpeta de destino usando el árbol de carpetas. " +"Use EditarPegar, o pulse " +"CtrlV para completar la transferencia " +"del archivo." -#: C/strftime.page:375(p) -msgid "The time zone or name or abbreviation." -msgstr "La zona horaria o el nombre o la abreviatura." +#: C/file-copy-move.page:26(item/title) +msgid "Drag and Drop" +msgstr "Arrastrar y soltar" -#: C/strftime.page:380(p) +#: C/file-copy-move.page:27(item/p) msgid "" -"Some conversion specifications can be modified by preceding the conversion " -"specifier character by the E or O modifier to indicate that an alternative " -"format should be used. If the alternative format or specification does not " -"exist for the current locale, the behaviour will be as if the unmodified " -"conversion specification were used. The Single Unix Specification mentions " -"%Ec, %EC, %Ex, %EX, %Ey, %EY, %Od, %Oe, %OH, %OI, %Om, %OM, %OS, %Ou, %OU, " -"%OV, %Ow, %OW, %Oy, where the effect of the O modifier is to use alternative " -"numeric symbols (say, roman numerals), and that of the E modifier is to use " -"a locale-dependent alternative representation." +"To copy a file to another folder, simply drag the file (with a sustained " +"left-mouse click) to the destination folder visible in the folder tree. To " +"move a file, hold down the Shift key while dragging." msgstr "" -"Se pueden modificar algunas especificaciones de conversión precediendo el " -"carácter especificador de conversión por el modificador E u O para indicar " -"que se debe utilizar un formato alternativo. Si el formato alternativo no " -"existe para a configuración regional actual, el comportamiento será igual " -"que si se hubiese usado la especificación de conversión sin modificar. La " -"especificación única de Unix menciona %Ec, %EC, %Ex, %EX, %Ey, %EY, %Od, " -"%Oe, %OH, %OI, %Om, %OM, %OS, %Ou, %OU, %OV, %Ow, %OW, %Oy, donde el " -"modificador O es para utilizar símbolos numéricos alternativos (números " -"romanos), y que el modificador E es para utilizar una representación " -"alternativa dependiente de la configuración regional." - -#: C/attributes.page:6(title) -msgid "Attribute Codes" -msgstr "Códigos de atributos" +"Para copiar un archivo a otra carpeta, simplemente arrastre el archivo " +"(manteniendo pulsado el botón izquierdo del ratón) a la carpeta de destino " +"visible en el árbol de carpetas. Para mover un archivo, mantenga pulsada la " +"tecla Mayús mientras arrastra." -#: C/attributes.page:7(p) +#: C/file-copy-move.page:31(item/p) msgid "" -"gThumb stores many different attributes for each file. Extensions " -"may add more. The list below is a summary of some of the more common " -"attributes:" +"You can also use the middle mouse button to drag files. In this case, " +"gThumb will ask you if you wish to copy the files, move the " +"files, or cancel the operation." msgstr "" -"gThumb almacena diferentes atributos para cada archivo. Las " -"extensiones pueden añadir más. La siguiente lista es un resumen de algunos " -"de los atributos más comunes:" - -#: C/attributes.page:12(p) -msgid "gth::file::display-size" -msgstr "gth::file::display-size" - -#: C/attributes.page:15(p) -msgid "standard::fast-content-type" -msgstr "standard::fast-content-type" - -#: C/attributes.page:18(p) -msgid "general::dimensions" -msgstr "general::dimensions" +"También puede usar el botón central del ratón para arrastrar los archivos. " +"En este caso, gThumb le preguntará si quiere copiar los archivos, " +"moverlos o cancelar la operación." -#: C/attributes.page:21(p) -msgid "general::format" -msgstr "general::format" +#: C/file-copy-move.page:37(item/title) +msgid "File Copy / Move Dialog" +msgstr "Diálogo copiar / mover archivo" -#: C/attributes.page:24(p) -msgid "general::location" -msgstr "general::location" +#: C/file-copy-move.page:38(item/p) +msgid "" +"Select the files to be transferred, right-click on the selection, and choose " +"Copy to... or Move to.... This will open a folder-selection dialog, where you can choose the " +"destination folder. At the bottom of the dialog, you can enable the " +"View the destination option if you want to go to " +"the destination folder after the file transfer is complete." +msgstr "" +"Seleccione los archivos que transferir, pulse con el botón derecho sobre la " +"selección y elija Copiar a... o " +"Mover a.... Esto abrirá un diálogo de selección " +"de carpeta, donde puede elegir la carpeta de destino. Al final de diálogo, " +"puede activar la opción Ver el destino si quiere " +"ir a la carpeta de destino después de que complete la transferencia del " +"archivo." -#: C/attributes.page:27(p) -msgid "general::datetime" -msgstr "general::datetime" +#: C/legal.xml:4(p/link) +msgid "Creative Commons Attribution-Share Alike 3.0 Unported License" +msgstr "Creative Commons Atribución - Compartir igual 3.0 sin soporte" -#: C/attributes.page:30(p) -msgid "general::rating" -msgstr "general::rating" +#: C/legal.xml:3(license/p) +msgid "This work is licensed under a <_:link-1/>." +msgstr "Este trabajo está licenciado bajo la <_:link-1/>." -#: C/attributes.page:33(p) -msgid "Exif::Image::Make" -msgstr "Exif::Image::Make" +#: C/legal.xml:6(license/p) +msgid "" +"As a special exception, the copyright holders give you permission to copy, " +"modify, and distribute the example code contained in this document under the " +"terms of your choosing, without restriction." +msgstr "" +"Como excepción especial, los poseedores de los derechos de autor le dan " +"permiso para copiar, modificar y distribuir el código de ejemplo contenido " +"en este documento bajo los términos que usted elija, sin restricción." -#: C/attributes.page:36(p) -msgid "Exif::Image::Model" -msgstr "Exif::Image::Model" +#~ msgid "F9" +#~ msgstr "F9" -#: C/attributes.page:39(p) -msgid "Exif::Image::Software" -msgstr "Exif::Image::Software" +#~ msgid "i" +#~ msgstr "i" -#: C/attributes.page:42(p) -msgid "Exif::Image::Artist" -msgstr "Exif::Image::Artist" +#~ msgid "F8" +#~ msgstr "F8" -#: C/attributes.page:45(p) -msgid "Exif::Image::Copyright" -msgstr "Exif::Image::Copyright" +#~ msgid "Ctrl" +#~ msgstr "Ctrl" -#: C/attributes.page:48(p) -msgid "Exif::Photo::ISOSpeedRatings" -msgstr "Exif::Photo::ISOSpeedRatings" +#~ msgid "t" +#~ msgstr "t" -#: C/attributes.page:51(p) -msgid "Exif::Photo::BrightnessValue" -msgstr "Exif::Photo::BrightnessValue" +#~ msgid "Esc" +#~ msgstr "Esc" -#: C/attributes.page:54(p) -msgid "Exif::Photo::FNumber" -msgstr "Exif::Photo::FNumber" +#~ msgid "e" +#~ msgstr "e" -#: C/attributes.page:57(p) -msgid "Exif::Photo::ApertureValue" -msgstr "Exif::Photo::ApertureValue" +#~ msgid "g" +#~ msgstr "g" -#: C/attributes.page:60(p) -msgid "Exif::Photo::MaxApertureValue" -msgstr "Exif::Photo::MaxApertureValue" +#~ msgid "F2" +#~ msgstr "F2" -#: C/attributes.page:63(p) -msgid "Exif::Photo::ExposureTime" -msgstr "Exif::Photo::ExposureTime" +#~ msgid "]" +#~ msgstr "]" -#: C/attributes.page:66(p) -msgid "Exif::Photo::ExposureProgram" -msgstr "Exif::Photo::ExposureProgram" +#~ msgid "[" +#~ msgstr "[" -#: C/attributes.page:69(p) -msgid "Exif::Photo::ExposureIndex" -msgstr "Exif::Photo::ExposureIndex" +#~ msgid "Delete" +#~ msgstr "Borrar" -#: C/attributes.page:72(p) -msgid "Exif::Photo::ExposureBiasValue" -msgstr "Exif::Photo::ExposureBiasValue" +#~ msgid "Shift" +#~ msgstr "Mayús" -#: C/attributes.page:75(p) -msgid "Exif::Photo::ExposureMode" -msgstr "Exif::Photo::ExposureMode" +#~ msgid "h" +#~ msgstr "h" -#: C/attributes.page:78(p) -msgid "Exif::Photo::ShutterSpeedValue" -msgstr "Exif::Photo::ShutterSpeedValue" +#~ msgid "l" +#~ msgstr "l" -#: C/attributes.page:81(p) -msgid "Exif::Photo::MeteringMode" -msgstr "Exif::Photo::MeteringMode" +#~ msgid "m" +#~ msgstr "m" -#: C/attributes.page:84(p) -msgid "Exif::Photo::LightSource" -msgstr "Exif::Photo::LightSource" +#~ msgid "r" +#~ msgstr "r" -#: C/attributes.page:87(p) -msgid "Exif::Photo::WhiteBalance" -msgstr "Exif::Photo::WhiteBalance" +#~ msgid "R" +#~ msgstr "R" -#: C/attributes.page:90(p) -msgid "Exif::Photo::Flash" -msgstr "Exif::Photo::Flash" +#~ msgid "C" +#~ msgstr "C" -#: C/attributes.page:93(p) -msgid "Exif::Photo::FocalLength" -msgstr "Exif::Photo::FocalLength" +#~ msgid "S" +#~ msgstr "S" -#: C/attributes.page:96(p) -msgid "Exif::Photo::SubjectArea" -msgstr "Exif::Photo::SubjectArea" +#~ msgid "Home" +#~ msgstr "Inicio" -#: C/attributes.page:99(p) -msgid "Exif::Photo::Contrast" -msgstr "Exif::Photo::Contrast" +#~ msgid "End" +#~ msgstr "Fin" -#: C/attributes.page:102(p) -msgid "Exif::Photo::Saturation" -msgstr "Exif::Photo::Saturation" +#~ msgid "D" +#~ msgstr "D" -#: C/attributes.page:105(p) -msgid "Exif::Photo::Sharpness" -msgstr "Exif::Photo::Sharpness" +#~ msgid "-" +#~ msgstr "-" -#: C/index.page:7(name) -msgid "Paolo Bacchilega" -msgstr "Paolo Bacchilega" +#~ msgid "x" +#~ msgstr "x" -#: C/index.page:8(email) -msgid "paobac@src.gnome.org" -msgstr "paobac@src.gnome.org" +#~ msgid "Arrows" +#~ msgstr "Flechas" -#: C/index.page:12(name) -msgid "Michael J. Chudobiak" -msgstr "Michael J. Chudobiak" +#~ msgid "Alt" +#~ msgstr "Alt" -#: C/index.page:13(email) -msgid "mjc@avtechpulse.com" -msgstr "mjc@avtechpulse.com" +#~ msgid "Left Arrow" +#~ msgstr "Flecha izquierda" -#: C/index.page:20(title) -#| msgid "gThumb" -msgid "gThumb Help" -msgstr "Ayuda de gThumb" +#~ msgid "Right Arrow" +#~ msgstr "Flecha derecha" -#: C/index.page:23(title) -msgid "Welcome" -msgstr "Bienvenido" +#~ msgid "Up" +#~ msgstr "Arriba" -#: C/index.page:27(title) -msgid "File Management" -msgstr "Gestión de archivos" +#~ msgid "F5" +#~ msgstr "F5" -#: C/index.page:31(title) -msgid "Editing Mode" -msgstr "Modo de edición" +#~ msgid "Space" +#~ msgstr "Espacio" -#: C/index.page:32(p) -msgid "" -" " -"Numerous editing tools are provided for touching-up individual photos. Undo " -"and redo functions are provided, up until the photo is saved. To access the " -"editing tools, open an image and then click the Edit File toolbar " -"button (the palette icon), or press e." -msgstr "" -" Se " -"proporcionan numerosas herramientas de edición para retocar fotos " -"individuales. Se proporcionan las funcionas Deshacer y Rehacer, hasta que se " -"guarda la foto. Para acceder a las herramientas de edición, abra una imagen " -"y pulse en el botón de la barra de herramientas Editar archivo " -"(el icono de la paleta), o pulse e." +#~ msgid "Resize" +#~ msgstr "Redimensionar" -#: C/index.page:42(title) -msgid "Batch Tools" -msgstr "Herramientas avanzadas" +#~ msgid "Crop" +#~ msgstr "Recortar" -#: C/index.page:43(p) -msgid "" -"Batch tools are provided to modify multiple images simultaneously. Changes " -"are written immediately, and are not undoable." -msgstr "" -"Las herramientas de proceso por lotes se proporcionan para modificar " -"múltiples imágenes simultáneamente. Los cambios se escriben inmediatamente, " -"y no se pueden deshacer." +#~ msgid "Mirror" +#~ msgstr "Espejo" -#: C/index.page:49(title) -msgid "Slideshows" -msgstr "Diapositivas" +#~ msgid "Flip" +#~ msgstr "Voltear" -#: C/index.page:53(title) -msgid "Importing" -msgstr "Importar" +#~ msgid "Equalize" +#~ msgstr "Ecualizar" -#: C/index.page:57(title) -msgid "Sharing" -msgstr "Compartir" +#~ msgid "Negative" +#~ msgstr "Negativo" -#: C/index.page:61(title) -msgid "Organizing" -msgstr "Organizar" +#~ msgid "#" +#~ msgstr "#" -#: C/index.page:65(title) -msgid "Other Tools" -msgstr "Otras herramientas" +#~ msgid "%N" +#~ msgstr "%N" -#: C/index.page:69(title) -msgid "Reference" -msgstr "Referencia" +#~ msgid "paobac@src.gnome.org" +#~ msgstr "paobac@src.gnome.org" -#. Put one translator per line, in the form of NAME , YEAR1, YEAR2 -#: C/index.page:0(None) -msgid "translator-credits" -msgstr "" -"Daniel Mustieles , 2008-2010\n" -"Jorge González , 2007-2008" +#~ msgid "mjc@avtechpulse.com" +#~ msgstr "mjc@avtechpulse.com" #~ msgid "gThumbHelp" #~ msgstr "Ayuda de gThumb" @@ -2815,16 +3087,6 @@ #~ "org/licenses/by-sa/3.0/us/\">Licencia Creative Commons atribución - " #~ "compartir igual 3.0 sin soporte." -#~ msgid "" -#~ "As a special exception, the copyright holders give you permission to " -#~ "copy, modify, and distribute the example code contained in this document " -#~ "under the terms of your choosing, without restriction." -#~ msgstr "" -#~ "Como excepción especial, los poseedores de los derechos de autor le dan " -#~ "permiso para copiar, modificar y distribuir el código de ejemplo " -#~ "contenido en este documento bajo los términos que usted elija, sin " -#~ "restricción." - #~ msgid "TODO: this list is out of date, and needs to be checked." #~ msgstr "TODO: esta lista está desactualizada y debe revisarse." @@ -2837,9 +3099,6 @@ #~ msgid "yes" #~ msgstr "sí" -#~ msgid "AltHomeor h" -#~ msgstr "AltInicio o h" - #~ msgid "Go to your Home folder." #~ msgstr "Ir a su carpeta personal." @@ -2977,7 +3236,7 @@ #~ "under the terms of the GNU Free Documentation License (GFDL), Version 1.1 " #~ "or any later version published by the Free Software Foundation with no " #~ "Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You " -#~ "can find a copy of the GFDL at this link or in the file COPYING-DOCS distributed with this manual." #~ msgstr "" #~ "Se otorga permiso para copiar, distribuir y/o modificar este documento " @@ -2985,7 +3244,7 @@ #~ "1.1 o cualquier otra versión posterior publicada por la Free Software " #~ "Foundation; sin Secciones Invariantes ni Textos de Cubierta Delantera ni " #~ "Textos de Cubierta Trasera. Puede encontrar una copia de la licencia GFDL " -#~ "en este enlace o en el " +#~ "en este enlace o en el " #~ "archivo COPYING-DOCS distribuido con este manual." #~ msgid "" diff -Nru gthumb-3.0.2/help/es/extensions.page gthumb-3.2.3/help/es/extensions.page --- gthumb-3.0.2/help/es/extensions.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/extensions.page 2013-06-18 17:54:23.000000000 +0000 @@ -2,6 +2,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Ampliar gThumb diff -Nru gthumb-3.0.2/help/es/file-copy-move.page gthumb-3.2.3/help/es/file-copy-move.page --- gthumb-3.0.2/help/es/file-copy-move.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/file-copy-move.page 2013-06-18 17:54:24.000000000 +0000 @@ -2,6 +2,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Copiar y mover archivos diff -Nru gthumb-3.0.2/help/es/filtering.page gthumb-3.2.3/help/es/filtering.page --- gthumb-3.0.2/help/es/filtering.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/filtering.page 2013-06-18 17:54:23.000000000 +0000 @@ -2,6 +2,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Filtrar archivos diff -Nru gthumb-3.0.2/help/es/fullscreen.page gthumb-3.2.3/help/es/fullscreen.page --- gthumb-3.0.2/help/es/fullscreen.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/fullscreen.page 2013-06-18 17:54:23.000000000 +0000 @@ -3,6 +3,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Modo manual a pantalla completa diff -Nru gthumb-3.0.2/help/es/gimp.page gthumb-3.2.3/help/es/gimp.page --- gthumb-3.0.2/help/es/gimp.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/gimp.page 2013-06-18 17:54:23.000000000 +0000 @@ -2,6 +2,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Ejecutar GIMP

Si tiene archivos seleccionados en el navegador, o una imagen abierta en el visor, puede abrirlas en el Programa de manipulación de imágenes de GNU (GIMP) pulsando g.

diff -Nru gthumb-3.0.2/help/es/import.page gthumb-3.2.3/help/es/import.page --- gthumb-3.0.2/help/es/import.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/import.page 2013-06-18 17:54:24.000000000 +0000 @@ -3,6 +3,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Importar desde una cámara diff -Nru gthumb-3.0.2/help/es/index.page gthumb-3.2.3/help/es/index.page --- gthumb-3.0.2/help/es/index.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/index.page 2013-06-18 17:54:22.000000000 +0000 @@ -15,6 +15,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Ayuda de gThumb diff -Nru gthumb-3.0.2/help/es/introduction.page gthumb-3.2.3/help/es/introduction.page --- gthumb-3.0.2/help/es/introduction.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/introduction.page 2013-06-18 17:54:23.000000000 +0000 @@ -2,6 +2,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Acerca de gThumb diff -Nru gthumb-3.0.2/help/es/legal.xml gthumb-3.2.3/help/es/legal.xml --- gthumb-3.0.2/help/es/legal.xml 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/es/legal.xml 2013-06-18 17:54:24.000000000 +0000 @@ -1,9 +1,5 @@ -

This work is licensed under a -Creative Commons -Attribution-Share Alike 3.0 Unported License.

-

As a special exception, the copyright holders give you permission to copy, -modify, and distribute the example code contained in this document under the -terms of your choosing, without restriction.

+

Este trabajo está licenciado bajo la Creative Commons Atribución - Compartir igual 3.0 sin soporte.

+

Como excepción especial, los poseedores de los derechos de autor le dan permiso para copiar, modificar y distribuir el código de ejemplo contenido en este documento bajo los términos que usted elija, sin restricción.

 diff -Nru gthumb-3.0.2/help/es/printing.page gthumb-3.2.3/help/es/printing.page --- gthumb-3.0.2/help/es/printing.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/printing.page 2013-06-18 17:54:24.000000000 +0000 @@ -2,6 +2,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Imprimir imágenes diff -Nru gthumb-3.0.2/help/es/rename-series.page gthumb-3.2.3/help/es/rename-series.page --- gthumb-3.0.2/help/es/rename-series.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/rename-series.page 2013-06-18 17:54:23.000000000 +0000 @@ -4,6 +4,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Renombrar archivos @@ -22,9 +34,7 @@ diff -Nru gthumb-3.0.2/help/es/thumbnail-pane.page gthumb-3.2.3/help/es/thumbnail-pane.page --- gthumb-3.0.2/help/es/thumbnail-pane.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/thumbnail-pane.page 2013-06-18 17:54:23.000000000 +0000 @@ -2,6 +2,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Panel de miniaturas diff -Nru gthumb-3.0.2/help/es/thumbnails.page gthumb-3.2.3/help/es/thumbnails.page --- gthumb-3.0.2/help/es/thumbnails.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/thumbnails.page 2013-06-18 17:54:23.000000000 +0000 @@ -2,12 +2,24 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Fuente de miniaturas

La ventana del navegador normalmente muestra las miniaturas de las imágenes y las películas de la carpeta seleccionada. También se pueden mostrar iconos genéricos para otros archivos (archivos de audio, por ejemplo).

-

Puede seleccionar qué tipos de archivos se mostrarán en la vista de navegador usando el diálogo VerFiltro. El predeterminado es mostrar todos los archivos de medios (imágenes, películas, sonido), pero esto se puede hacer más o menos restrictivo.

+

Puede seleccionar qué tipos de archivos se mostrarán en la vista de navegador usando el diálogo VerFiltro. Lo predeterminado es mostrar todos los archivos de medios (imágenes, películas, sonido), pero esto se puede hacer más o menos restrictivo.

Las miniaturas se pueden generar de diferentes maneras. gThumb comprobará primero las miniaturas existentes en la caché del sistema.

diff -Nru gthumb-3.0.2/help/es/viewer.page gthumb-3.2.3/help/es/viewer.page --- gthumb-3.0.2/help/es/viewer.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/viewer.page 2013-06-18 17:54:23.000000000 +0000 @@ -2,6 +2,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Abrir una imagen diff -Nru gthumb-3.0.2/help/es/wallpaper.page gthumb-3.2.3/help/es/wallpaper.page --- gthumb-3.0.2/help/es/wallpaper.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/wallpaper.page 2013-06-18 17:54:24.000000000 +0000 @@ -2,6 +2,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Fondo del escritorio

Para establecer una imagen como fondo del escritorio del sistema, pulse con el botón derecho sobre la imagen y seleccione Establecer como fondo de escritorio en el menú emergente. El fondo del escritorio cambiará, y aparecerá el diálogo de Preferencias de apariencia de GNOME. Puede usar este diálogo para hacer ajustes en la configuración del fondo de escritorio (posición, estirar, mosaico, etc.).

diff -Nru gthumb-3.0.2/help/eu/edit-colors.page gthumb-3.2.3/help/eu/edit-colors.page --- gthumb-3.0.2/help/eu/edit-colors.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/eu/edit-colors.page 2013-06-18 17:54:24.000000000 +0000 @@ -11,23 +11,23 @@ - <gui>Hobetu koloreak</gui> + <gui>Enhance Colors</gui>

Tresna honek zuri-balantzearen zuzenketa automatikoa hornitzen du. Erabiltzaileak ez du doikuntzarik egin behar.

 - <gui>Doitu koloreak</gui> + <gui>Adjust Colors</gui>

Tresna honek eskuzko kolore-doikuntzak hornitzen ditu. Hainbat doikuntza egin daitezke: gamman, distiran, kontrastean, saturazioan eta cyanaren/gorriaren, magentaren/berdearen eta horiaren/urdinaren kolore-balantzeetan.

 - <gui>Ekualizatu</gui> + <gui>Equalize</gui>

Tresna honek histograma-ekualizazio automatikoa hornitzen du. Erabiltzaileak ez du doikuntzarik egin behar.

 - <gui>Desasetu</gui> + <gui>Desaturate</gui>

Tresna honek irudiko koloreak grisaren itzalak bihurtzen ditu. (Honek ez du aldatzen irudia gordetzeko formatua).

 - <gui>Negatiboa</gui> + <gui>Negative</gui>

Tresna honek kolore mailak alderantzikatzen ditu, eta irudi negatiboa erakusten du.

 diff -Nru gthumb-3.0.2/help/eu/edit-resize-crop.page gthumb-3.2.3/help/eu/edit-resize-crop.page --- gthumb-3.0.2/help/eu/edit-resize-crop.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/eu/edit-resize-crop.page 2013-06-18 17:54:24.000000000 +0000 @@ -10,11 +10,11 @@

Bi tresna hornitzen dira irudien tamaina aldatzeko eta irudiak mozteko.

- <gui>Aldatu tamaina</gui> + <gui>Resize</gui>

Honek aukera ematen dizu irudiaren tamaina aldatzeko. Irudia tamaina fisiko jakin batera eskala daiteke, edo jatorrizko tamainaren ehuneko jakin batera. Aspektu-erlazioa balio espezifiko batekin blokea daiteke, edo nahi bezala doitu.

 - <gui>Moztu</gui> + <gui>Crop</gui>

Honek aukera ematen dizu irudia mozteko. Egin klik eta arrastatu sagua nahi duzun irudiko arean. Area aspektu-erlazio espezifiko batekin blokea daiteke, edo nahi bezala doitu. Herenen arauaren edo urrezko sekzioen sareta gaininprimatuko da irudiaren gainean, lanerako gida gisa.

 diff -Nru gthumb-3.0.2/help/eu/edit-rotate.page gthumb-3.2.3/help/eu/edit-rotate.page --- gthumb-3.0.2/help/eu/edit-rotate.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/eu/edit-rotate.page 2013-06-18 17:54:24.000000000 +0000 @@ -11,19 +11,19 @@ - <gui>Ispilua</gui> + <gui>Mirror</gui>

Irudia horizontalki iraultzen du. Ezkerreko eta eskuineko aldeak trukatzen dira.

 - <gui>Irauli</gui> + <gui>Flip</gui>

Irudia bertikalki iraultzen du. Goiko eta beheko aldeak trukatzen dira.

 - <gui>Biratu eskuinera</gui> + <gui>Rotate Right</gui>

Irudia erlojuaren noranzkoan biratzen du.

 - <gui>Biratu ezkerrera</gui> + <gui>Rotate Left</gui>

Irudia erlojuaren kontrako noranzkoan biratzen du.

 Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/help/eu/figures/comment.png and /tmp/43kzZNuclK/gthumb-3.2.3/help/eu/figures/comment.png differ Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/help/eu/figures/general-filter.png and /tmp/43kzZNuclK/gthumb-3.2.3/help/eu/figures/general-filter.png differ Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/help/eu/figures/main-win.png and /tmp/43kzZNuclK/gthumb-3.2.3/help/eu/figures/main-win.png differ Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/help/eu/figures/nav-button.png and /tmp/43kzZNuclK/gthumb-3.2.3/help/eu/figures/nav-button.png differ Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/help/eu/figures/preferences.png and /tmp/43kzZNuclK/gthumb-3.2.3/help/eu/figures/preferences.png differ Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/help/eu/figures/specific-filter.png and /tmp/43kzZNuclK/gthumb-3.2.3/help/eu/figures/specific-filter.png differ Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/help/eu/figures/thumbnail-pane.png and /tmp/43kzZNuclK/gthumb-3.2.3/help/eu/figures/thumbnail-pane.png differ diff -Nru gthumb-3.0.2/help/eu/legal.xml gthumb-3.2.3/help/eu/legal.xml --- gthumb-3.0.2/help/eu/legal.xml 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/eu/legal.xml 2013-06-18 17:54:25.000000000 +0000 @@ -1,5 +1,7 @@ -

Creative Commons Attribution-Share Alike 3.0 Unported License lizentziapean banatzen da lan hau.

+

This work is licensed under a +Creative Commons +Attribution-Share Alike 3.0 Unported License.

Salbuespen berezi gisa, copyrightaren jabeek baimena ematen dizute dokumentu honetako adibide-kodea kopiatzeko, aldatzeko eta banatzeko, zuk aukeratutako baldintzen arabera eta murrizketarik gabe.

 diff -Nru gthumb-3.0.2/help/eu/shortcuts.page gthumb-3.2.3/help/eu/shortcuts.page --- gthumb-3.0.2/help/eu/shortcuts.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/eu/shortcuts.page 2013-06-18 17:54:25.000000000 +0000 @@ -58,7 +58,7 @@ @@ -408,7 +408,7 @@ @@ -445,7 +445,7 @@ @@ -502,7 +502,7 @@ @@ -413,7 +413,7 @@ diff -Nru gthumb-3.0.2/help/sl/batch-convert-format.page gthumb-3.2.3/help/sl/batch-convert-format.page --- gthumb-3.0.2/help/sl/batch-convert-format.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/sl/batch-convert-format.page 2013-06-18 17:54:26.000000000 +0000 @@ -5,7 +5,9 @@ Pretvarjanje vrste slik -

Za pretvorbo ene ali več slik v drugo vrsto izberite slike, ki jih želite pretvoriti in izberite gumb Orodja in izberite OrodjaPretvori vrsto datoteke

+

To convert one or more images into a new file format, select + the images in the browser view. Then click the Tools button + on the main toolbar, and select ToolsConvert Format.

Izberite željen zapis izhoda in ciljno mapo. Kliknite Izvedi za dokončanje opravila.

diff -Nru gthumb-3.0.2/help/sl/batch-scripts.page gthumb-3.2.3/help/sl/batch-scripts.page --- gthumb-3.0.2/help/sl/batch-scripts.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/sl/batch-scripts.page 2013-06-18 17:54:26.000000000 +0000 @@ -5,7 +5,9 @@ Uporabniško-določeni skripti -

Za določitev skripta (zaporedja ukazne vrstice, ki ga bo gThumb izvedel na vaših datotekah), kliknite gumb Orodja v glavni orodni vrstici in izberite Orodja.>Poosebi.

+

To define a script (a command-line sequence that gThumb will + execute on your files), click the Tools button on the main toolbar, + and select ToolsPersonalize.

TODO:tukaj je treba napisati dodatno dokumentacijo.

diff -Nru gthumb-3.0.2/help/sl/bookmarks.page gthumb-3.2.3/help/sl/bookmarks.page --- gthumb-3.0.2/help/sl/bookmarks.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/sl/bookmarks.page 2013-06-18 17:54:27.000000000 +0000 @@ -9,6 +9,9 @@

Za odstranjevanje ali ponovno razporejanje zaznamkov v drugem vrstnem redu uporabite ukaz ZaznamkiUredi zaznamke.

-

ZaznamkiSistemski zaznamki zagotavlja dostop do sistemskih zaznamkov, ki so bili določeni v Nautilusuali v izbirniku datotek, ki ga uporablja ve

+

BookmarksSystem Bookmarks + provides access to the system bookmarks that have been defined + in Nautilus or the file-chooser dialog used in most Gnome + applications.

diff -Nru gthumb-3.0.2/help/sl/edit-colors.page gthumb-3.2.3/help/sl/edit-colors.page --- gthumb-3.0.2/help/sl/edit-colors.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/sl/edit-colors.page 2013-06-18 17:54:26.000000000 +0000 @@ -11,23 +11,23 @@ - <gui>Izboljšaj barve</gui> + <gui>Enhance Colors</gui>

To orodje zagotavlja samodejno popravljanje ravnotežja bele barve. Uporabniške prilagoditve niso zahtevane.

 - <gui>Prilagodi barve</gui> + <gui>Adjust Colors</gui>

To orodje zagotavlja ročne prilagoditve barve. Mogoče je prilagoditi gamo, svetlost, kontrast, nasičenje in ravnotežje sinje/rdeče, škrlatne/zelene in rumene/modre barve.

 - <gui>Izenači histogram</gui> + <gui>Equalize</gui>

To orodje zagotavlja samodejno izenačenje histograma. Uporabniške prilagoditve niso zahtevane.

 - <gui>Zmanjšanje nasičenja</gui> + <gui>Desaturate</gui>

To orodje pretvori sliko v sivine. (To ne spremeni vrste shrambe slike).

 - <gui>Negativ</gui> + <gui>Negative</gui>

To orodje obrne barvne ravni in pretvori sliko v negativ.

 diff -Nru gthumb-3.0.2/help/sl/edit-redeye.page gthumb-3.2.3/help/sl/edit-redeye.page --- gthumb-3.0.2/help/sl/edit-redeye.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/sl/edit-redeye.page 2013-06-18 17:54:26.000000000 +0000 @@ -8,6 +8,11 @@

gThumb zagotavlja orodje odstranjevanja rdečih oči. Za odstranitev rdečega očesa postavite miškin kazalec nad rdeče oko in kliknite nanj. gThumb bo poskusil odstraniti rdeče področje in ga zamenjati s sivim področjem bolj naravnega videza. V primeru, da rezultati niso videti pravilno, pritisnite Esc in kliknite na predmet Razveljavi.

-

To orodje deluje najboljše, ko je med rdečim očesom in bližnjim področjem obraza visok kontrast. Ne deluje dobro za "oranžno oko", ki ga je včasih mogoče videti na fotografijah otrok ali če ima koža v bližini rdeč pridih. To orodje bi lahko uporabilo izboljšave - če ste kruto pametni, ljubite algebro matrik in odprtokodne programe, link href="http://live.gnome.org/gthumb/development">pošljite popravek!

+

This tool works best when there is a high color contrast between the + red eye and the surrounding facial area. It does not work well for + "orange eye" sometimes seen in photos of children, or if the surrounding + skin has a reddish tinge. This tool could use improvement - if you + are fiendishly clever, love matrix algebra and open source software, please + submit a patch!

diff -Nru gthumb-3.0.2/help/sl/edit-resize-crop.page gthumb-3.2.3/help/sl/edit-resize-crop.page --- gthumb-3.0.2/help/sl/edit-resize-crop.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/sl/edit-resize-crop.page 2013-06-18 17:54:26.000000000 +0000 @@ -10,11 +10,11 @@

Za spremembo velikosti in obrezovanje slik sta na voljo dve orodji.

- <gui>Spremeni velikost</gui> + <gui>Resize</gui>

To vam omogoča spremembo velikosti slik. Velikost slike je mogoče spremeniti na določeno velikosti ali pa določen odstotek izvirne slike. Razmerje velikosti stranic je mogoče zakleniti na določeno vrednost ali prosti prilagajati.

 - <gui>Obreži</gui> + <gui>Crop</gui>

To vam omogoča obrez slike. Kliknite in povlecite miško nad želeno področje slike. Področje je mogoče zakleniti na določene razmerje velikosti ali prosto prilagajati. Na sliko je mogoče narisati mrežo pravila tretjin ali mrežo zlatega reza za vodstvo sestave.

 diff -Nru gthumb-3.0.2/help/sl/edit-rotate.page gthumb-3.2.3/help/sl/edit-rotate.page --- gthumb-3.0.2/help/sl/edit-rotate.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/sl/edit-rotate.page 2013-06-18 17:54:26.000000000 +0000 @@ -11,19 +11,19 @@ - <gui>Zrcaljenje</gui> + <gui>Mirror</gui>

To zrcali sliko vodoravno. Leva in desna stran sta zamenjani.

 - <gui>Obrni</gui> + <gui>Flip</gui>

To zrcali sliko navpično. Zgornja in spodnja stran sta zamenjani.

 - <gui>Vrtenje desno</gui> + <gui>Rotate Right</gui>

Zavrti sliko za v smeri urinega kazalca.

 - <gui>Vrtenje levo</gui> + <gui>Rotate Left</gui>

Zavrti sliko za v nasprotni smeri urinega kazalca.

 diff -Nru gthumb-3.0.2/help/sl/edit-save-undo-redo.page gthumb-3.2.3/help/sl/edit-save-undo-redo.page --- gthumb-3.0.2/help/sl/edit-save-undo-redo.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/sl/edit-save-undo-redo.page 2013-06-18 17:54:26.000000000 +0000 @@ -11,6 +11,9 @@

Spremenjeno sliko je mogoče shraniti s pritiskom na Shrani. Za shranjevanje spremenjene slike na novo mesto in puščanje nespremenjene izvorne slike uporabite Shrani kot.

-

V primeru, da končate način urejanja (s pritiskom Esc ali gumba orodne vrstice Ogled map) ali krmarite vstran od trenutne slike, boste bili pozvani k shranjevanju ali zavrzitvi svojih sprememb.

+

If you exit the editing mode (by pressing Esc or the + View the Folders toolbar button), or navigate away from + the current image, you will be prompted to save or discard your + changes.

diff -Nru gthumb-3.0.2/help/sl/extensions.page gthumb-3.2.3/help/sl/extensions.page --- gthumb-3.0.2/help/sl/extensions.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/sl/extensions.page 2013-06-18 17:54:26.000000000 +0000 @@ -11,6 +11,9 @@

Ta priročnik je napisan s predpostavko, da so običajne razširitve omogočene. Če se vam zdi, da zmožnost manjka, preverite in si oglejte, katere razširitve so dejansko omogočene.

-

V primeru, da želite napisati svojo razširitve, obiščite http://live.gnome.org/gthumb za razvijalske podatke. Primer raz

+

If you would like to write your own extension, please visit + http://live.gnome.org/gthumb + for development information. An example extension is provided in the source + code, which you can base your own extension on.

diff -Nru gthumb-3.0.2/help/sl/fullscreen.page gthumb-3.2.3/help/sl/fullscreen.page --- gthumb-3.0.2/help/sl/fullscreen.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/sl/fullscreen.page 2013-06-18 17:54:26.000000000 +0000 @@ -13,7 +13,8 @@

K naslednji sliki greste lahko s pritiskom na Preslednico ali Stran dol

-

Nazaj k prejšnji sliki greste lahko s klikom na gumb Stran gor ali Vra.

+

You can go back to the previous image by pressing + PageUp or Backspace.

To je mogoče uporabiti za podporo ročno nadzorovane predstavitve.

diff -Nru gthumb-3.0.2/help/sl/import.page gthumb-3.2.3/help/sl/import.page --- gthumb-3.0.2/help/sl/import.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/sl/import.page 2013-06-18 17:54:27.000000000 +0000 @@ -9,7 +9,8 @@

Na večini sistemov gThumb samodejno zažene pogovorno okno uvoza, ko je digitalni fotoaparat povezan z računalnikom ali ko je spominska kartica s fotografijami vklopljena v bralnik kartic (to stori, kjer je privzeti upravljalnik za mime vrsti x-content/image-dcf in x-content/image-picturecd.)

-

Za ročen zagon pogovornega okna uvoza uporabite DatotekaUvozi izOdstranljiva naprava.

+

To manually launch the import dialog, use + FileImport FromRemovable Device.

Pogovorno okno uvoza diff -Nru gthumb-3.0.2/help/sl/rename-series.page gthumb-3.2.3/help/sl/rename-series.page --- gthumb-3.0.2/help/sl/rename-series.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/sl/rename-series.page 2013-06-18 17:54:26.000000000 +0000 @@ -63,7 +63,7 @@
@@ -397,7 +397,7 @@ @@ -434,7 +434,7 @@ @@ -491,7 +491,7 @@ diff -Nru gthumb-3.0.2/help/sv/sv.po gthumb-3.2.3/help/sv/sv.po --- gthumb-3.0.2/help/sv/sv.po 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/sv/sv.po 2013-04-30 16:56:13.000000000 +0000 @@ -51,8 +51,8 @@ msgstr "Dokumentationsprojekt för GNOME" #: C/gthumb.xml:2(para) -msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this link or in the file COPYING-DOCS distributed with this manual." -msgstr "Tillstånd att kopiera, distribuera och/eller modifiera detta dokument ges under villkoren i GNU Free Documentation License (GFDL), version 1.1 eller senare, utgivet av Free Software Foundation utan standardavsnitt och omslagstexter. En kopia av GFDL finns att hämta på denna länk eller i filen COPYING-DOCS som medföljer denna handbok." +msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this link or in the file COPYING-DOCS distributed with this manual." +msgstr "Tillstånd att kopiera, distribuera och/eller modifiera detta dokument ges under villkoren i GNU Free Documentation License (GFDL), version 1.1 eller senare, utgivet av Free Software Foundation utan standardavsnitt och omslagstexter. En kopia av GFDL finns att hämta på denna länk eller i filen COPYING-DOCS som medföljer denna handbok." #: C/gthumb.xml:12(para) msgid "This manual is part of a collection of GNOME manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license." diff -Nru gthumb-3.0.2/help/zh_CN/attributes.page gthumb-3.2.3/help/zh_CN/attributes.page --- gthumb-3.0.2/help/zh_CN/attributes.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/attributes.page 2013-06-18 17:54:27.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru gthumb-3.0.2/help/zh_CN/batch-change-date.page gthumb-3.2.3/help/zh_CN/batch-change-date.page --- gthumb-3.0.2/help/zh_CN/batch-change-date.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/batch-change-date.page 2013-06-18 17:54:27.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru gthumb-3.0.2/help/zh_CN/batch-convert-format.page gthumb-3.2.3/help/zh_CN/batch-convert-format.page --- gthumb-3.0.2/help/zh_CN/batch-convert-format.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/batch-convert-format.page 2013-06-18 17:54:27.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru gthumb-3.0.2/help/zh_CN/batch-resize.page gthumb-3.2.3/help/zh_CN/batch-resize.page --- gthumb-3.0.2/help/zh_CN/batch-resize.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/batch-resize.page 2013-06-18 17:54:27.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru gthumb-3.0.2/help/zh_CN/batch-rotate.page gthumb-3.2.3/help/zh_CN/batch-rotate.page --- gthumb-3.0.2/help/zh_CN/batch-rotate.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/batch-rotate.page 2013-06-18 17:54:27.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru gthumb-3.0.2/help/zh_CN/batch-scripts.page gthumb-3.2.3/help/zh_CN/batch-scripts.page --- gthumb-3.0.2/help/zh_CN/batch-scripts.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/batch-scripts.page 2013-06-18 17:54:28.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru gthumb-3.0.2/help/zh_CN/bookmarks.page gthumb-3.2.3/help/zh_CN/bookmarks.page --- gthumb-3.0.2/help/zh_CN/bookmarks.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/bookmarks.page 2013-06-18 17:54:28.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru gthumb-3.0.2/help/zh_CN/browser.page gthumb-3.2.3/help/zh_CN/browser.page --- gthumb-3.0.2/help/zh_CN/browser.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/browser.page 2013-06-18 17:54:27.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru gthumb-3.0.2/help/zh_CN/edit-colors.page gthumb-3.2.3/help/zh_CN/edit-colors.page --- gthumb-3.0.2/help/zh_CN/edit-colors.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/edit-colors.page 2013-06-18 17:54:28.000000000 +0000 @@ -1,5 +1,5 @@ - + @@ -31,12 +31,12 @@ user adjustments are required.

- <gui>去色</gui> + <gui>Desaturate</gui>

This tool converts the image colors into shades of grey. (This does not change this image storage format.)

 - <gui>反色</gui> + <gui>Negative</gui>

This tool inverts the color levels, providing an image negative.

 diff -Nru gthumb-3.0.2/help/zh_CN/edit-redeye.page gthumb-3.2.3/help/zh_CN/edit-redeye.page --- gthumb-3.0.2/help/zh_CN/edit-redeye.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/edit-redeye.page 2013-06-18 17:54:28.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru gthumb-3.0.2/help/zh_CN/edit-resize-crop.page gthumb-3.2.3/help/zh_CN/edit-resize-crop.page --- gthumb-3.0.2/help/zh_CN/edit-resize-crop.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/edit-resize-crop.page 2013-06-18 17:54:28.000000000 +0000 @@ -1,5 +1,5 @@ - + @@ -12,14 +12,14 @@

Two tools are provided to resize and crop images.

- <gui>调整大小</gui> + <gui>Resize</gui>

This allows you to resize the image. The image may be scaled to a certain physical size, or to a certain percentage of the original size. The aspect ratio may be locked to a specific value, or freely adjusted.

 - <gui>裁剪</gui> + <gui>Crop</gui>

This allows you to crop the image. Click and drag the mouse over the desired area of the image. The area may be locked to a specific aspect ratio, or it may be freely adjusted. A rule-of-thirds diff -Nru gthumb-3.0.2/help/zh_CN/edit-rotate.page gthumb-3.2.3/help/zh_CN/edit-rotate.page --- gthumb-3.0.2/help/zh_CN/edit-rotate.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/edit-rotate.page 2013-06-18 17:54:28.000000000 +0000 @@ -1,5 +1,5 @@ - + @@ -14,21 +14,21 @@ - <gui>镜像</gui> + <gui>Mirror</gui>

This flips the image horizontally. The left and right sides are swapped.

 - <gui>翻转</gui> + <gui>Flip</gui>

This flips the image vertically. The top and bottom are swapped.

 - <gui>右旋转</gui> + <gui>Rotate Right</gui>

This rotates the image clockwise.

 - <gui>向左旋转</gui> + <gui>Rotate Left</gui>

This rotates the image counter-clockwise.

 diff -Nru gthumb-3.0.2/help/zh_CN/edit-save-undo-redo.page gthumb-3.2.3/help/zh_CN/edit-save-undo-redo.page --- gthumb-3.0.2/help/zh_CN/edit-save-undo-redo.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/edit-save-undo-redo.page 2013-06-18 17:54:28.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru gthumb-3.0.2/help/zh_CN/extensions.page gthumb-3.2.3/help/zh_CN/extensions.page --- gthumb-3.0.2/help/zh_CN/extensions.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/extensions.page 2013-06-18 17:54:28.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru gthumb-3.0.2/help/zh_CN/file-copy-move.page gthumb-3.2.3/help/zh_CN/file-copy-move.page --- gthumb-3.0.2/help/zh_CN/file-copy-move.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/file-copy-move.page 2013-06-18 17:54:28.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru gthumb-3.0.2/help/zh_CN/filtering.page gthumb-3.2.3/help/zh_CN/filtering.page --- gthumb-3.0.2/help/zh_CN/filtering.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/filtering.page 2013-06-18 17:54:28.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru gthumb-3.0.2/help/zh_CN/fullscreen.page gthumb-3.2.3/help/zh_CN/fullscreen.page --- gthumb-3.0.2/help/zh_CN/fullscreen.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/fullscreen.page 2013-06-18 17:54:28.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru gthumb-3.0.2/help/zh_CN/gimp.page gthumb-3.2.3/help/zh_CN/gimp.page --- gthumb-3.0.2/help/zh_CN/gimp.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/gimp.page 2013-06-18 17:54:28.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru gthumb-3.0.2/help/zh_CN/import.page gthumb-3.2.3/help/zh_CN/import.page --- gthumb-3.0.2/help/zh_CN/import.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/import.page 2013-06-18 17:54:28.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru gthumb-3.0.2/help/zh_CN/index.page gthumb-3.2.3/help/zh_CN/index.page --- gthumb-3.0.2/help/zh_CN/index.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/index.page 2013-06-18 17:54:27.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru gthumb-3.0.2/help/zh_CN/introduction.page gthumb-3.2.3/help/zh_CN/introduction.page --- gthumb-3.0.2/help/zh_CN/introduction.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/introduction.page 2013-06-18 17:54:27.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru gthumb-3.0.2/help/zh_CN/printing.page gthumb-3.2.3/help/zh_CN/printing.page --- gthumb-3.0.2/help/zh_CN/printing.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/printing.page 2013-06-18 17:54:28.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru gthumb-3.0.2/help/zh_CN/rename-series.page gthumb-3.2.3/help/zh_CN/rename-series.page --- gthumb-3.0.2/help/zh_CN/rename-series.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/rename-series.page 2013-06-18 17:54:28.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru gthumb-3.0.2/help/zh_CN/sharing-disc.page gthumb-3.2.3/help/zh_CN/sharing-disc.page --- gthumb-3.0.2/help/zh_CN/sharing-disc.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/sharing-disc.page 2013-06-18 17:54:28.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru gthumb-3.0.2/help/zh_CN/sharing-social.page gthumb-3.2.3/help/zh_CN/sharing-social.page --- gthumb-3.0.2/help/zh_CN/sharing-social.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/sharing-social.page 2013-06-18 17:54:28.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru gthumb-3.0.2/help/zh_CN/shortcuts.page gthumb-3.2.3/help/zh_CN/shortcuts.page --- gthumb-3.0.2/help/zh_CN/shortcuts.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/shortcuts.page 2013-06-18 17:54:28.000000000 +0000 @@ -1,5 +1,5 @@ - + @@ -157,7 +157,7 @@ diff -Nru gthumb-3.0.2/help/zh_CN/slideshow.page gthumb-3.2.3/help/zh_CN/slideshow.page --- gthumb-3.0.2/help/zh_CN/slideshow.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/slideshow.page 2013-06-18 17:54:28.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru gthumb-3.0.2/help/zh_CN/sorting.page gthumb-3.2.3/help/zh_CN/sorting.page --- gthumb-3.0.2/help/zh_CN/sorting.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/sorting.page 2013-06-18 17:54:28.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru gthumb-3.0.2/help/zh_CN/strftime.page gthumb-3.2.3/help/zh_CN/strftime.page --- gthumb-3.0.2/help/zh_CN/strftime.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/strftime.page 2013-06-18 17:54:27.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru gthumb-3.0.2/help/zh_CN/thumbnail-pane.page gthumb-3.2.3/help/zh_CN/thumbnail-pane.page --- gthumb-3.0.2/help/zh_CN/thumbnail-pane.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/thumbnail-pane.page 2013-06-18 17:54:28.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru gthumb-3.0.2/help/zh_CN/thumbnails.page gthumb-3.2.3/help/zh_CN/thumbnails.page --- gthumb-3.0.2/help/zh_CN/thumbnails.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/thumbnails.page 2013-06-18 17:54:28.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru gthumb-3.0.2/help/zh_CN/viewer.page gthumb-3.2.3/help/zh_CN/viewer.page --- gthumb-3.0.2/help/zh_CN/viewer.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/viewer.page 2013-06-18 17:54:28.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru gthumb-3.0.2/help/zh_CN/wallpaper.page gthumb-3.2.3/help/zh_CN/wallpaper.page --- gthumb-3.0.2/help/zh_CN/wallpaper.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/zh_CN/wallpaper.page 2013-06-18 17:54:28.000000000 +0000 @@ -1,5 +1,5 @@ - + diff -Nru gthumb-3.0.2/m4/Makefile.in gthumb-3.2.3/m4/Makefile.in --- gthumb-3.0.2/m4/Makefile.in 2012-08-20 19:54:19.000000000 +0000 +++ gthumb-3.2.3/m4/Makefile.in 2013-07-10 13:33:52.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = m4 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(m4datadir)" DATA = $(m4data_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -381,11 +415,9 @@ @list='$(m4data_DATA)'; test -n "$(m4datadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(m4datadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -526,16 +558,17 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-m4dataDATA install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-m4dataDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-m4dataDATA install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-m4dataDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/m4/gnome-doc-utils.m4 gthumb-3.2.3/m4/gnome-doc-utils.m4 --- gthumb-3.0.2/m4/gnome-doc-utils.m4 2012-08-18 17:23:11.000000000 +0000 +++ gthumb-3.2.3/m4/gnome-doc-utils.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ -dnl Do not call GNOME_DOC_DEFINES directly. It is split out from -dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself. -AC_DEFUN([GNOME_DOC_DEFINES], -[ -AC_ARG_WITH([help-dir], - AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),, - [with_help_dir='${datadir}/gnome/help']) -HELP_DIR="$with_help_dir" -AC_SUBST(HELP_DIR) - -AC_ARG_WITH([omf-dir], - AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),, - [with_omf_dir='${datadir}/omf']) -OMF_DIR="$with_omf_dir" -AC_SUBST(OMF_DIR) - -AC_ARG_WITH([help-formats], - AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),, - [with_help_formats='']) -DOC_USER_FORMATS="$with_help_formats" -AC_SUBST(DOC_USER_FORMATS) - -AC_ARG_ENABLE([scrollkeeper], - [AC_HELP_STRING([--disable-scrollkeeper], - [do not make updates to the scrollkeeper database])],, - enable_scrollkeeper=yes) -AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"]) - -dnl disable scrollkeeper automatically for distcheck -DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS" -AC_SUBST(DISTCHECK_CONFIGURE_FLAGS) - -AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) -]) - -# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) -# -AC_DEFUN([GNOME_DOC_INIT], -[AC_REQUIRE([AC_PROG_LN_S])dnl - -if test -z "$AM_DEFAULT_VERBOSITY"; then - AM_DEFAULT_VERBOSITY=1 -fi -AC_SUBST([AM_DEFAULT_VERBOSITY]) - -ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1]) - -AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required]) -PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required], - [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no]) - -if test "$gdu_cv_have_gdu" = "yes"; then - AC_MSG_RESULT([yes]) - ifelse([$2],,[:],[$2]) -else - AC_MSG_RESULT([no]) - ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3]) -fi - -GNOME_DOC_DEFINES -]) diff -Nru gthumb-3.0.2/missing gthumb-3.2.3/missing --- gthumb-3.0.2/missing 2012-08-18 17:23:16.000000000 +0000 +++ gthumb-3.2.3/missing 2013-04-30 17:08:00.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.18; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996-2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -29,61 +29,33 @@ exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, 'missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file 'aclocal.m4' - autoconf touch file 'configure' - autoheader touch file 'config.h.in' - autom4te touch the output file, or create a stub one - automake touch all 'Makefile.in' files - bison create 'y.tab.[ch]', if possible, from existing .[ch] - flex create 'lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create 'lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create 'y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and 'g' are ignored when checking the name. @@ -98,228 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown '$1' option" + echo 1>&2 "$0: unknown '$1' option" echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running '$TOOL --version' or '$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'acinclude.m4' or '${configure_ac}'. You might want - to install the Automake and Perl packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified '${configure_ac}'. You might want to install the - Autoconf and GNU m4 packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'acconfig.h' or '${configure_ac}'. You might want - to install the Autoconf and GNU m4 packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - automake*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. - You might want to install the Automake and Perl packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: '$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get '$1' as part of Autoconf from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: '$1' $msg. You should only need it if - you modified a '.y' file. You may need the Bison package - in order for those modifications to take effect. You can get - Bison from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a '.l' file. You may need the Flex package - in order for those modifications to take effect. You can get - Flex from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - Help2man package in order for those modifications to take - effect. You can get Help2man from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a '.texi' or '.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy 'make' (AIX, - DU, IRIX). You might want to install the Texinfo package or - the GNU make package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - *) - echo 1>&2 "\ -WARNING: '$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the 'README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing '$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -Nru gthumb-3.0.2/mkinstalldirs gthumb-3.2.3/mkinstalldirs --- gthumb-3.0.2/mkinstalldirs 2012-08-18 17:23:28.000000000 +0000 +++ gthumb-3.2.3/mkinstalldirs 1970-01-01 00:00:00.000000000 +0000 @@ -1,162 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy - -scriptversion=2009-04-28.21; # UTC - -# Original author: Noah Friedman -# Created: 1993-05-16 -# Public domain. -# -# This file is maintained in Automake, please report -# bugs to or send patches to -# . - -nl=' -' -IFS=" "" $nl" -errstatus=0 -dirmode= - -usage="\ -Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... - -Create each directory DIR (with mode MODE, if specified), including all -leading file name components. - -Report bugs to ." - -# process command line arguments -while test $# -gt 0 ; do - case $1 in - -h | --help | --h*) # -h for help - echo "$usage" - exit $? - ;; - -m) # -m PERM arg - shift - test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } - dirmode=$1 - shift - ;; - --version) - echo "$0 $scriptversion" - exit $? - ;; - --) # stop option processing - shift - break - ;; - -*) # unknown option - echo "$usage" 1>&2 - exit 1 - ;; - *) # first non-opt arg - break - ;; - esac -done - -for file -do - if test -d "$file"; then - shift - else - break - fi -done - -case $# in - 0) exit 0 ;; -esac - -# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and -# mkdir -p a/c at the same time, both will detect that a is missing, -# one will create a, then the other will try to create a and die with -# a "File exists" error. This is a problem when calling mkinstalldirs -# from a parallel make. We use --version in the probe to restrict -# ourselves to GNU mkdir, which is thread-safe. -case $dirmode in - '') - if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - else - # On NextStep and OpenStep, the 'mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because '.' already - # exists. - test -d ./-p && rmdir ./-p - test -d ./--version && rmdir ./--version - fi - ;; - *) - if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && - test ! -d ./--version; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - else - # Clean up after NextStep and OpenStep mkdir. - for d in ./-m ./-p ./--version "./$dirmode"; - do - test -d $d && rmdir $d - done - fi - ;; -esac - -for file -do - case $file in - /*) pathcomp=/ ;; - *) pathcomp= ;; - esac - oIFS=$IFS - IFS=/ - set fnord $file - shift - IFS=$oIFS - - for d - do - test "x$d" = x && continue - - pathcomp=$pathcomp$d - case $pathcomp in - -*) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - lasterr= - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi - fi - fi - - pathcomp=$pathcomp/ - done -done - -exit $errstatus - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff -Nru gthumb-3.0.2/po/LINGUAS gthumb-3.2.3/po/LINGUAS --- gthumb-3.0.2/po/LINGUAS 2012-08-14 16:25:43.000000000 +0000 +++ gthumb-3.2.3/po/LINGUAS 2013-04-30 16:56:13.000000000 +0000 @@ -2,7 +2,6 @@ am ar az -be bg ca ca@valencia @@ -55,6 +54,7 @@ sl sq sr +sr@latin sr@Latn sv th diff -Nru gthumb-3.0.2/po/POTFILES.in gthumb-3.2.3/po/POTFILES.in --- gthumb-3.0.2/po/POTFILES.in 2012-08-14 16:25:43.000000000 +0000 +++ gthumb-3.2.3/po/POTFILES.in 2013-04-30 16:56:13.000000000 +0000 @@ -19,6 +19,7 @@ data/org.gnome.gthumb.crop.gschema.xml.in data/org.gnome.gthumb.facebook.gschema.xml.in data/org.gnome.gthumb.file-manager.gschema.xml.in +data/org.gnome.gthumb.flickr.gschema.xml.in data/org.gnome.gthumb.gschema.xml.in data/org.gnome.gthumb.gstreamer-tools.gschema.xml.in data/org.gnome.gthumb.image-print.gschema.xml.in @@ -66,14 +67,36 @@ extensions/burn_disc/gth-burn-task.c extensions/burn_disc/gth-burn-task.h extensions/burn_disc/main.c +extensions/cairo_io/cairo-image-surface-jpeg.c +extensions/cairo_io/cairo-image-surface-jpeg.h +extensions/cairo_io/cairo-image-surface-png.c +extensions/cairo_io/cairo-image-surface-png.h +extensions/cairo_io/cairo-image-surface-svg.c +extensions/cairo_io/cairo-image-surface-svg.h +extensions/cairo_io/cairo-image-surface-webp.c +extensions/cairo_io/cairo-image-surface-webp.h +extensions/cairo_io/cairo-image-surface-xcf.c +extensions/cairo_io/cairo-image-surface-xcf.h [type: gettext/ini]extensions/cairo_io/cairo_io.extension.in.in -extensions/cairo_io/cairo-io-jpeg.c -extensions/cairo_io/cairo-io-jpeg.h -extensions/cairo_io/cairo-io-png.c -extensions/cairo_io/cairo-io-png.h -extensions/cairo_io/cairo-io-svg.c -extensions/cairo_io/cairo-io-svg.h +[type: gettext/glade]extensions/cairo_io/data/ui/jpeg-options.ui +[type: gettext/glade]extensions/cairo_io/data/ui/png-options.ui +[type: gettext/glade]extensions/cairo_io/data/ui/save-options-preferences.ui +[type: gettext/glade]extensions/cairo_io/data/ui/tga-options.ui +[type: gettext/glade]extensions/cairo_io/data/ui/tiff-options.ui +[type: gettext/glade]extensions/cairo_io/data/ui/webp-options.ui +extensions/cairo_io/gth-image-saver-jpeg.c +extensions/cairo_io/gth-image-saver-jpeg.h +extensions/cairo_io/gth-image-saver-png.c +extensions/cairo_io/gth-image-saver-png.h +extensions/cairo_io/gth-image-saver-tga.c +extensions/cairo_io/gth-image-saver-tga.h +extensions/cairo_io/gth-image-saver-tiff.c +extensions/cairo_io/gth-image-saver-tiff.h +extensions/cairo_io/gth-image-saver-webp.c +extensions/cairo_io/gth-image-saver-webp.h extensions/cairo_io/main.c +extensions/cairo_io/preferences.c +extensions/cairo_io/preferences.h extensions/catalogs/actions.c extensions/catalogs/actions.h extensions/catalogs/callbacks.c @@ -204,36 +227,23 @@ extensions/facebook/callbacks.c extensions/facebook/callbacks.h [type: gettext/glade]extensions/facebook/data/ui/export-to-facebook.ui -[type: gettext/glade]extensions/facebook/data/ui/facebook-account-chooser.ui -[type: gettext/glade]extensions/facebook/data/ui/facebook-account-manager.ui [type: gettext/glade]extensions/facebook/data/ui/facebook-album-properties.ui -[type: gettext/glade]extensions/facebook/data/ui/facebook-ask-authorization.ui -[type: gettext/glade]extensions/facebook/data/ui/facebook-complete-authorization.ui [type: gettext/glade]extensions/facebook/data/ui/facebook-export-completed.ui +[type: gettext/glade]extensions/facebook/data/ui/import-from-facebook.ui extensions/facebook/dlg-export-to-facebook.c extensions/facebook/dlg-export-to-facebook.h -extensions/facebook/facebook-account.c -extensions/facebook/facebook-account-chooser-dialog.c -extensions/facebook/facebook-account-chooser-dialog.h -extensions/facebook/facebook-account.h -extensions/facebook/facebook-account-manager-dialog.c -extensions/facebook/facebook-account-manager-dialog.h +extensions/facebook/dlg-import-from-facebook.c +extensions/facebook/dlg-import-from-facebook.h extensions/facebook/facebook-album.c extensions/facebook/facebook-album.h extensions/facebook/facebook-album-properties-dialog.c extensions/facebook/facebook-album-properties-dialog.h -extensions/facebook/facebook-authentication.c -extensions/facebook/facebook-authentication.h -extensions/facebook/facebook-connection.c -extensions/facebook/facebook-connection.h [type: gettext/ini]extensions/facebook/facebook.extension.in.in extensions/facebook/facebook-photo.c extensions/facebook/facebook-photo.h extensions/facebook/facebook-service.c extensions/facebook/facebook-service.h extensions/facebook/facebook-types.h -extensions/facebook/facebook-user.c -extensions/facebook/facebook-user.h extensions/facebook/main.c extensions/facebook/preferences.h extensions/file_manager/actions.c @@ -259,22 +269,23 @@ extensions/file_tools/callbacks.h [type: gettext/glade]extensions/file_tools/data/ui/adjust-colors-options.ui [type: gettext/glade]extensions/file_tools/data/ui/crop-options.ui +[type: gettext/glade]extensions/file_tools/data/ui/grayscale-options.ui [type: gettext/glade]extensions/file_tools/data/ui/resize-options.ui [type: gettext/glade]extensions/file_tools/data/ui/rotate-options.ui [type: gettext/glade]extensions/file_tools/data/ui/sharpen-options.ui [type: gettext/ini]extensions/file_tools/file_tools.extension.in.in extensions/file_tools/gth-file-tool-adjust-colors.c extensions/file_tools/gth-file-tool-adjust-colors.h +extensions/file_tools/gth-file-tool-adjust-contrast.c +extensions/file_tools/gth-file-tool-adjust-contrast.h extensions/file_tools/gth-file-tool-crop.c extensions/file_tools/gth-file-tool-crop.h -extensions/file_tools/gth-file-tool-desaturate.c -extensions/file_tools/gth-file-tool-desaturate.h -extensions/file_tools/gth-file-tool-enhance.c -extensions/file_tools/gth-file-tool-enhance.h extensions/file_tools/gth-file-tool-equalize.c extensions/file_tools/gth-file-tool-equalize.h extensions/file_tools/gth-file-tool-flip.c extensions/file_tools/gth-file-tool-flip.h +extensions/file_tools/gth-file-tool-grayscale.c +extensions/file_tools/gth-file-tool-grayscale.h extensions/file_tools/gth-file-tool-mirror.c extensions/file_tools/gth-file-tool-mirror.h extensions/file_tools/gth-file-tool-negative.c @@ -301,6 +312,8 @@ extensions/file_tools/gth-image-line-tool.h extensions/file_tools/gth-image-rotator.c extensions/file_tools/gth-image-rotator.h +extensions/file_tools/gth-preview-tool.c +extensions/file_tools/gth-preview-tool.h extensions/file_tools/main.c extensions/file_tools/preferences.h [type: gettext/ini]extensions/file_viewer/file_viewer.extension.in.in @@ -329,11 +342,8 @@ [type: gettext/ini]extensions/flicker/flicker.extension.in.in extensions/flicker/main.c [type: gettext/glade]extensions/flicker_utils/data/ui/export-to-flickr.ui -[type: gettext/glade]extensions/flicker_utils/data/ui/flicker-account-chooser.ui -[type: gettext/glade]extensions/flicker_utils/data/ui/flicker-account-manager.ui -[type: gettext/glade]extensions/flicker_utils/data/ui/flicker-ask-authorization.ui -[type: gettext/glade]extensions/flicker_utils/data/ui/flicker-complete-authorization.ui [type: gettext/glade]extensions/flicker_utils/data/ui/flicker-export-completed.ui +[type: gettext/glade]extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui [type: gettext/glade]extensions/flicker_utils/data/ui/import-from-flickr.ui extensions/flicker_utils/dlg-export-to-flickr.c extensions/flicker_utils/dlg-export-to-flickr.h @@ -341,15 +351,9 @@ extensions/flicker_utils/dlg-import-from-flickr.h [type: gettext/ini]extensions/flicker_utils/flicker_utils.extension.in.in extensions/flicker_utils/flickr-account.c -extensions/flicker_utils/flickr-account-chooser-dialog.c -extensions/flicker_utils/flickr-account-chooser-dialog.h extensions/flicker_utils/flickr-account.h -extensions/flicker_utils/flickr-account-manager-dialog.c -extensions/flicker_utils/flickr-account-manager-dialog.h -extensions/flicker_utils/flickr-authentication.c -extensions/flicker_utils/flickr-authentication.h -extensions/flicker_utils/flickr-connection.c -extensions/flicker_utils/flickr-connection.h +extensions/flicker_utils/flickr-consumer.c +extensions/flicker_utils/flickr-consumer.h extensions/flicker_utils/flickr-photo.c extensions/flicker_utils/flickr-photo.h extensions/flicker_utils/flickr-photoset.c @@ -357,9 +361,8 @@ extensions/flicker_utils/flickr-service.c extensions/flicker_utils/flickr-service.h extensions/flicker_utils/flickr-types.h -extensions/flicker_utils/flickr-user.c -extensions/flicker_utils/flickr-user.h extensions/flicker_utils/main.c +extensions/flicker_utils/preferences.h extensions/gstreamer_tools/actions.c extensions/gstreamer_tools/actions.h [type: gettext/glade]extensions/gstreamer_tools/data/ui/mediabar.ui @@ -374,8 +377,6 @@ extensions/gstreamer_utils/gstreamer-utils.c [type: gettext/ini]extensions/gstreamer_utils/gstreamer_utils.extension.in.in extensions/gstreamer_utils/gstreamer-utils.h -extensions/gstreamer_utils/gstscreenshot.c -extensions/gstreamer_utils/gstscreenshot.h extensions/gstreamer_utils/main.c extensions/image_print/actions.c extensions/image_print/actions.h @@ -471,7 +472,6 @@ [type: gettext/glade]extensions/oauth/data/ui/oauth-account-chooser.ui [type: gettext/glade]extensions/oauth/data/ui/oauth-account-manager.ui [type: gettext/glade]extensions/oauth/data/ui/oauth-ask-authorization.ui -[type: gettext/glade]extensions/oauth/data/ui/oauth-complete-authorization.ui extensions/oauth/main.c extensions/oauth/oauth-account.c extensions/oauth/oauth-account-chooser-dialog.c @@ -479,11 +479,16 @@ extensions/oauth/oauth-account.h extensions/oauth/oauth-account-manager-dialog.c extensions/oauth/oauth-account-manager-dialog.h -extensions/oauth/oauth-authentication.c -extensions/oauth/oauth-authentication.h -extensions/oauth/oauth-connection.c -extensions/oauth/oauth-connection.h +extensions/oauth/oauth-ask-authorization-dialog.c +extensions/oauth/oauth-ask-authorization-dialog.h +extensions/oauth/oauth-consumer.c +extensions/oauth/oauth-consumer.h [type: gettext/ini]extensions/oauth/oauth.extension.in.in +extensions/oauth/oauth.h +extensions/oauth/oauth-service.c +extensions/oauth/oauth-service.h +extensions/oauth/web-service.c +extensions/oauth/web-service.h extensions/photobucket/actions.c extensions/photobucket/actions.h extensions/photobucket/callbacks.c @@ -524,24 +529,13 @@ extensions/picasaweb/callbacks.h [type: gettext/glade]extensions/picasaweb/data/ui/export-to-picasaweb.ui [type: gettext/glade]extensions/picasaweb/data/ui/import-from-picasaweb.ui -[type: gettext/glade]extensions/picasaweb/data/ui/picasa-web-account-chooser.ui -[type: gettext/glade]extensions/picasaweb/data/ui/picasa-web-account-manager.ui -[type: gettext/glade]extensions/picasaweb/data/ui/picasa-web-account-properties.ui [type: gettext/glade]extensions/picasaweb/data/ui/picasa-web-album-properties.ui [type: gettext/glade]extensions/picasaweb/data/ui/picasa-web-export-completed.ui extensions/picasaweb/dlg-export-to-picasaweb.c extensions/picasaweb/dlg-export-to-picasaweb.h extensions/picasaweb/dlg-import-from-picasaweb.c extensions/picasaweb/dlg-import-from-picasaweb.h -extensions/picasaweb/google-connection.c -extensions/picasaweb/google-connection.h extensions/picasaweb/main.c -extensions/picasaweb/picasa-account-chooser-dialog.c -extensions/picasaweb/picasa-account-chooser-dialog.h -extensions/picasaweb/picasa-account-manager-dialog.c -extensions/picasaweb/picasa-account-manager-dialog.h -extensions/picasaweb/picasa-account-properties-dialog.c -extensions/picasaweb/picasa-account-properties-dialog.h extensions/picasaweb/picasa-album-properties-dialog.c extensions/picasaweb/picasa-album-properties-dialog.h extensions/picasaweb/picasa-web-album.c @@ -552,26 +546,7 @@ extensions/picasaweb/picasa-web-service.c extensions/picasaweb/picasa-web-service.h extensions/picasaweb/picasa-web-types.h -extensions/picasaweb/picasa-web-user.c -extensions/picasaweb/picasa-web-user.h extensions/picasaweb/preferences.h -[type: gettext/glade]extensions/pixbuf_savers/data/ui/jpeg-options.ui -[type: gettext/glade]extensions/pixbuf_savers/data/ui/png-options.ui -[type: gettext/glade]extensions/pixbuf_savers/data/ui/save-options-preferences.ui -[type: gettext/glade]extensions/pixbuf_savers/data/ui/tga-options.ui -[type: gettext/glade]extensions/pixbuf_savers/data/ui/tiff-options.ui -extensions/pixbuf_savers/gth-jpeg-saver.c -extensions/pixbuf_savers/gth-jpeg-saver.h -extensions/pixbuf_savers/gth-png-saver.c -extensions/pixbuf_savers/gth-png-saver.h -extensions/pixbuf_savers/gth-tga-saver.c -extensions/pixbuf_savers/gth-tga-saver.h -extensions/pixbuf_savers/gth-tiff-saver.c -extensions/pixbuf_savers/gth-tiff-saver.h -extensions/pixbuf_savers/main.c -[type: gettext/ini]extensions/pixbuf_savers/pixbuf_savers.extension.in.in -extensions/pixbuf_savers/preferences.c -extensions/pixbuf_savers/preferences.h extensions/raw_files/main.c [type: gettext/ini]extensions/raw_files/raw_files.extension.in.in [type: gettext/glade]extensions/red_eye_removal/data/ui/red-eye-removal-options.ui @@ -661,6 +636,8 @@ extensions/webalbums/main.c extensions/webalbums/preferences.h [type: gettext/ini]extensions/webalbums/webalbums.extension.in.in +gthumb/cairo-scale.c +gthumb/cairo-scale.h gthumb/cairo-utils.c gthumb/cairo-utils.h gthumb/dlg-location.c @@ -675,11 +652,9 @@ gthumb/dlg-sort-order.h gthumb/dom.c gthumb/dom.h -gthumb/eggfileformatchooser.c -gthumb/eggfileformatchooser.h -gthumb/egg-macros.h gthumb/gedit-message-area.c gthumb/gedit-message-area.h +gthumb/gfixed.h gthumb/gio-utils.c gthumb/gio-utils.h gthumb/glib-utils.c @@ -701,6 +676,8 @@ gthumb/gth-browser-ui.h gthumb/gth-buffer-data.c gthumb/gth-buffer-data.h +gthumb/gth-color-scale.c +gthumb/gth-color-scale.h gthumb/gth-dumb-notebook.c gthumb/gth-dumb-notebook.h gthumb/gth-duplicable.c @@ -759,14 +736,22 @@ gthumb/gth-image.h gthumb/gth-image-history.c gthumb/gth-image-history.h +gthumb/gth-image-list-task.c +gthumb/gth-image-list-task.h gthumb/gth-image-loader.c gthumb/gth-image-loader.h gthumb/gth-image-navigator.c gthumb/gth-image-navigator.h gthumb/gth-image-preloader.c gthumb/gth-image-preloader.h +gthumb/gth-image-saver.c +gthumb/gth-image-saver.h gthumb/gth-image-selector.c gthumb/gth-image-selector.h +gthumb/gth-image-task.c +gthumb/gth-image-task.h +gthumb/gth-image-utils.c +gthumb/gth-image-utils.h gthumb/gth-image-viewer.c gthumb/gth-image-viewer.h gthumb/gth-image-viewer-tool.c @@ -802,12 +787,8 @@ gthumb/gth-multipage.h gthumb/gth-overwrite-dialog.c gthumb/gth-overwrite-dialog.h -gthumb/gth-pixbuf-list-task.c -gthumb/gth-pixbuf-list-task.h -gthumb/gth-pixbuf-saver.c -gthumb/gth-pixbuf-saver.h -gthumb/gth-pixbuf-task.c -gthumb/gth-pixbuf-task.h +gthumb/gth-paned.c +gthumb/gth-paned.h gthumb/gth-preferences.c gthumb/gth-preferences.h gthumb/gth-progress-dialog.c @@ -816,6 +797,8 @@ gthumb/gth-request-dialog.h gthumb/gth-save-file-data-task.c gthumb/gth-save-file-data-task.h +gthumb/gth-save-image-task.c +gthumb/gth-save-image-task.h gthumb/gth-screensaver.c gthumb/gth-screensaver.h gthumb/gth-sidebar.c @@ -880,6 +863,7 @@ gthumb/pixbuf-io.h gthumb/pixbuf-utils.c gthumb/pixbuf-utils.h +[type: gettext/glade]gthumb/resources/message-dialog.ui gthumb/typedefs.h gthumb/zlib-utils.c gthumb/zlib-utils.h diff -Nru gthumb-3.0.2/po/be.po gthumb-3.2.3/po/be.po --- gthumb-3.0.2/po/be.po 2012-08-14 16:25:43.000000000 +0000 +++ gthumb-3.2.3/po/be.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,3679 +0,0 @@ -# Беларускі пераклад gthumb.HEAD. -# Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc. -# Ales Nyakhaychyk , 2003, 2004. -# -msgid "" -msgstr "" -"Project-Id-Version: gthumb.HEAD\n" -"POT-Creation-Date: 2003-12-19 10:15+0100\n" -"PO-Revision-Date: 2004-01-07 15:38+0200\n" -"Last-Translator: Ales Nyakhaychyk \n" -"Language-Team: Belarusian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" -"X-Generator: KBabel 1.0.2\n" - -#: components/catalog-view/GNOME_GThumb_CatalogView.server.in.in.h:1 -msgid "Catalog" -msgstr "Каталёг" - -#: components/catalog-view/GNOME_GThumb_CatalogView.server.in.in.h:2 -msgid "GThumb Catalog View" -msgstr "Каталёг GThumb" - -#: components/catalog-view/GNOME_GThumb_CatalogView.server.in.in.h:3 -msgid "View as Catalog" -msgstr "Выгляд каталёга відарысаў" - -#: components/catalog-view/GNOME_GThumb_CatalogView.xml.in.h:1 -#: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:7 -#: src/gthumb-ui.xml.h:90 -msgid "Print the current image" -msgstr "Надрукаваць бягучы відарыс" - -#: components/catalog-view/GNOME_GThumb_CatalogView.xml.in.h:2 -#: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:24 -msgid "_Print" -msgstr "Над_рукаваць" - -#: components/image-viewer/GNOME_GThumb_Viewer.server.in.in.h:1 -msgid "GThumb Image" -msgstr "Відарыс Джы-Самб" - -#: components/image-viewer/GNOME_GThumb_Viewer.server.in.in.h:2 -msgid "GThumb Viewer" -msgstr "Праглядальнік Джы-Самб" - -#: components/image-viewer/GNOME_GThumb_Viewer.server.in.in.h:3 -msgid "View with GThumb" -msgstr "Прагляд з Джы-Самб" - -#: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:1 -msgid "Flip" -msgstr "Дагары нагамі" - -#: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:2 -msgid "Flip the image" -msgstr "Павярнуць відарыс дагары нагамі" - -#: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:3 -msgid "High" -msgstr "Высокі" - -#: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:4 -msgid "Low" -msgstr "Нізкі" - -#: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:5 -msgid "Mirror" -msgstr "Люстэрка" - -#: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:6 -msgid "Mirror the image" -msgstr "Люстраны адбітак відарыса" - -#: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:8 -#: src/gthumb-ui.xml.h:118 -msgid "Rotate" -msgstr "Перавярнуць" - -#: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:9 -msgid "Rotate 180 _Degrees" -msgstr "Павянуць на 1_80°" - -#: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:10 -msgid "Rotate the image clockwise" -msgstr "Павярнуць відарыс па-гадзіньніку" - -#: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:11 -msgid "Rotate the image of 180 degrees" -msgstr "Павянуць відарыс на 180°" - -#: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:12 -#: src/gthumb-ui.xml.h:126 -msgid "Save _As..." -msgstr "Захаваць _як..." - -#: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:13 -#: src/gthumb-ui.xml.h:127 -msgid "Save current image" -msgstr "Захаваць бягучы відарыс" - -#: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:14 -#: src/gthumb-ui.xml.h:143 -msgid "Start or stop current animation" -msgstr "Пачаць ці спыніць бягучую анімацыю" - -#: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:15 -msgid "Start/Stop _Animation" -msgstr "Пачаць/Спыніць _анімацыю" - -#: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:16 -msgid "Transparency T_ype" -msgstr "Від пра_зрыстасьці" - -#: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:17 -#: src/gthumb-ui.xml.h:158 -msgid "View next animation frame" -msgstr "Паглядзець наступны кадар анімацыі" - -#: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:18 -#: src/gthumb-ui.xml.h:185 -msgid "_Black" -msgstr "Ч_орны" - -#: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:19 -#: src/gthumb-ui.xml.h:190 -msgid "_Checked" -msgstr "Пазна_чаны" - -#: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:20 -#: src/gthumb-ui.xml.h:204 -msgid "_Flip" -msgstr "Да_гары нагамі" - -#: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:21 -#: src/gthumb-ui.xml.h:215 -msgid "_Image" -msgstr "В_ідарыс" - -#: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:22 -#: src/gthumb-ui.xml.h:221 -msgid "_Mirror" -msgstr "_Люстэрка" - -#: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:23 -#: src/gthumb-ui.xml.h:226 -msgid "_None" -msgstr "Н_яма" - -#: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:25 -msgid "_Rotate Clockwise" -msgstr "Павярнуць па-гадз_іньніку" - -#: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:26 -msgid "_Step Animation" -msgstr "Па_крокавая анімацыя" - -#: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:27 -#: src/gthumb-ui.xml.h:255 src/gthumb_search.glade.h:31 -#: src/gthumb_tools.glade.h:48 -msgid "_View" -msgstr "_Прагляд" - -#: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:28 -#: src/gthumb-ui.xml.h:256 -msgid "_White" -msgstr "Б_елы" - -#: components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:29 -msgid "_Zoom Quality" -msgstr "_Якасьць павелічэньня" - -#: components/image-viewer/viewer-stream.c:90 src/dlg-file-utils.c:524 -msgid "%d %b %Y, %H:%M" -msgstr "%d %b %Y, %H:%M" - -#: components/image-viewer/viewer-stream.c:98 src/catalog-png-exporter.c:813 -#: src/dlg-image-prop.c:445 src/fullscreen.c:216 -#: src/gth-exif-data-viewer.c:450 src/gthumb-window.c:395 -#, c-format -msgid "%d x %d pixels" -msgstr "%d x %d піксаляў" - -#: data/albumthemes/BlueStripes/image.xml.in.h:1 -#: data/albumthemes/Clean/image.xml.in.h:1 -#: data/albumthemes/Classic/image.xml.in.h:2 -#: data/albumthemes/ClassicClips/image.xml.in.h:2 -#: data/albumthemes/NeatRound/image.xml.in.h:2 -#: data/albumthemes/NeatSquare/image.xml.in.h:2 -msgid "Aperture value" -msgstr "Значэньне дзіркі" - -#: data/albumthemes/BlueStripes/image.xml.in.h:2 -#: data/albumthemes/Clean/image.xml.in.h:2 -#: data/albumthemes/Classic/image.xml.in.h:3 -#: data/albumthemes/ClassicClips/image.xml.in.h:3 -#: data/albumthemes/NeatRound/image.xml.in.h:3 -#: data/albumthemes/NeatSquare/image.xml.in.h:3 src/dlg-image-prop.c:638 -#: src/gth-exif-data-viewer.c:478 -msgid "Bytes" -msgstr "Байтаў" - -#: data/albumthemes/BlueStripes/image.xml.in.h:3 -#: data/albumthemes/Clean/image.xml.in.h:3 -#: data/albumthemes/Classic/image.xml.in.h:4 -#: data/albumthemes/ClassicClips/image.xml.in.h:4 -#: data/albumthemes/NeatRound/image.xml.in.h:4 -#: data/albumthemes/NeatSquare/image.xml.in.h:4 -msgid "Camera model" -msgstr "Мадэль камэры" - -#: data/albumthemes/BlueStripes/image.xml.in.h:4 -#: data/albumthemes/Clean/image.xml.in.h:4 -#: data/albumthemes/Classic/image.xml.in.h:5 -#: data/albumthemes/ClassicClips/image.xml.in.h:5 -#: data/albumthemes/NeatRound/image.xml.in.h:5 -#: data/albumthemes/NeatSquare/image.xml.in.h:5 -msgid "Date" -msgstr "Дата" - -#: data/albumthemes/BlueStripes/image.xml.in.h:5 -#: data/albumthemes/Clean/image.xml.in.h:5 -#: data/albumthemes/Classic/image.xml.in.h:6 -#: data/albumthemes/ClassicClips/image.xml.in.h:6 -#: data/albumthemes/NeatRound/image.xml.in.h:6 -#: data/albumthemes/NeatSquare/image.xml.in.h:6 -msgid "Dimensions" -msgstr "Памеры" - -#: data/albumthemes/BlueStripes/image.xml.in.h:6 -#: data/albumthemes/Clean/image.xml.in.h:6 -#: data/albumthemes/Classic/image.xml.in.h:7 -#: data/albumthemes/ClassicClips/image.xml.in.h:7 -#: data/albumthemes/NeatRound/image.xml.in.h:7 -#: data/albumthemes/NeatSquare/image.xml.in.h:7 -msgid "Exposure mode" -msgstr "Рэжым экспазыцыі" - -#: data/albumthemes/BlueStripes/image.xml.in.h:7 -#: data/albumthemes/Clean/image.xml.in.h:7 -#: data/albumthemes/Classic/image.xml.in.h:8 -#: data/albumthemes/ClassicClips/image.xml.in.h:8 -#: data/albumthemes/NeatRound/image.xml.in.h:8 -#: data/albumthemes/NeatSquare/image.xml.in.h:8 -msgid "Exposure time" -msgstr "Час экспазыцыі" - -#: data/albumthemes/BlueStripes/image.xml.in.h:8 -#: data/albumthemes/Clean/image.xml.in.h:8 -#: data/albumthemes/Classic/image.xml.in.h:9 -#: data/albumthemes/ClassicClips/image.xml.in.h:9 -#: data/albumthemes/NeatRound/image.xml.in.h:9 -#: data/albumthemes/NeatSquare/image.xml.in.h:9 -msgid "Flash" -msgstr "Маланка" - -#: data/albumthemes/BlueStripes/image.xml.in.h:9 -#: data/albumthemes/Clean/image.xml.in.h:9 -#: data/albumthemes/Classic/image.xml.in.h:10 -#: data/albumthemes/ClassicClips/image.xml.in.h:10 -#: data/albumthemes/NeatRound/image.xml.in.h:10 -#: data/albumthemes/NeatSquare/image.xml.in.h:10 -msgid "Focal length" -msgstr "" - -#: data/albumthemes/BlueStripes/image.xml.in.h:10 -#: data/albumthemes/Clean/image.xml.in.h:10 -#: data/albumthemes/Classic/image.xml.in.h:11 -#: data/albumthemes/ClassicClips/image.xml.in.h:11 -#: data/albumthemes/NeatRound/image.xml.in.h:11 -#: data/albumthemes/NeatSquare/image.xml.in.h:11 src/dlg-duplicates.c:264 -msgid "Image" -msgstr "Відарыс" - -#: data/albumthemes/BlueStripes/image.xml.in.h:11 -#: data/albumthemes/Clean/image.xml.in.h:11 -#: data/albumthemes/Classic/image.xml.in.h:12 -#: data/albumthemes/ClassicClips/image.xml.in.h:12 -#: data/albumthemes/NeatRound/image.xml.in.h:12 -#: data/albumthemes/NeatSquare/image.xml.in.h:12 -msgid "Shutter speed" -msgstr "Хуткасьць затвора" - -#: data/albumthemes/BlueStripes/image.xml.in.h:12 -#: data/albumthemes/Clean/image.xml.in.h:12 src/gthumb_edit.glade.h:33 -#: src/gthumb_web_exporter.glade.h:53 -msgid "pixels" -msgstr "піксалі" - -#: data/albumthemes/Classic/image.xml.in.h:1 -#: data/albumthemes/ClassicClips/image.xml.in.h:1 -#: data/albumthemes/NeatRound/image.xml.in.h:1 -#: data/albumthemes/NeatSquare/image.xml.in.h:1 -msgid "(click on the image to view it at original size)" -msgstr "(пстрыкніце па відарысу, каб пабачыць яго зыходны памер)" - -#: gthumb.desktop.in.h:1 -msgid "View and organize your images" -msgstr "Дазваляе праглядаць і ўтвараць зборы відарысаў" - -#: gthumb.desktop.in.h:2 -msgid "gThumb Image Viewer" -msgstr "Зьбіральнік відарысаў" - -#: libgthumb/catalog.c:89 -msgid "Library not empty" -msgstr "Бібліятэка не пустая" - -#: libgthumb/catalog.c:98 -#, c-format -msgid "Cannot remove library \"%s\": %s" -msgstr "Немагчыма выдаліць бібліятэку \"%s\": %s" - -#: libgthumb/catalog.c:125 -#, c-format -msgid "Cannot remove catalog \"%s\": %s" -msgstr "Немагчыма выдаліць каталёг \"%s\": %s" - -#: libgthumb/catalog.c:250 libgthumb/catalog.c:418 -#, c-format -msgid "Cannot open catalog \"%s\": %s" -msgstr "Немагчыма адчыніць каталёг \"%s\": %s" - -#: libgthumb/catalog.c:395 -#, c-format -msgid "Cannot save catalog \"%s\": %s" -msgstr "Немагчыма захаваць каталёг \"%s\": %s" - -#: libgthumb/comments.c:402 -msgid "Deleting all comments, wait please..." -msgstr "Выдаленьне ўсіх камэнтараў, калі ласка, пачакайце..." - -#: libgthumb/comments.c:404 -msgid "Deleting old comments, wait please..." -msgstr "Выдаленьне старых камэнтараў, калі ласка, пачакайце..." - -#: libgthumb/comments.c:763 -msgid "%d %B %Y" -msgstr "%d %B %Y" - -#: libgthumb/comments.c:765 src/catalog-web-exporter.c:47 -#: src/dlg-duplicates.c:550 src/dlg-image-prop.c:465 src/fullscreen.c:223 -#: src/gth-exif-data-viewer.c:454 src/gthumb-window.c:392 -msgid "%d %B %Y, %H:%M" -msgstr "%d %B %Y, %H:%M" - -#: libgthumb/comments.c:775 -msgid "(No Comment)" -msgstr "(без камэнтару)" - -#: libgthumb/dlg-save-image.c:119 src/commands-impl.c:289 -#: src/dlg-convert.c:308 -#, c-format -msgid "An image named \"%s\" is already present. Do you want to overwrite it?" -msgstr "Відарыс пад назвай \"%s\" ужо йснуе. Ці жадаеце вы перазапісаць яго?" - -#: libgthumb/dlg-save-image.c:175 -#, c-format -msgid "Image type not supported: %s" -msgstr "Від відарыса не падтрымліваецца: %s" - -#: libgthumb/dlg-save-image.c:193 -msgid "Determine by extension" -msgstr "Вызначаць па канчатках" - -#: libgthumb/dlg-save-image.c:228 -msgid "Save Image" -msgstr "Захаваць відарыс" - -#: libgthumb/dlg-save-image.c:242 -msgid "Image type:" -msgstr "Від відарыса:" - -#: libgthumb/gnome-print-font-dialog.c:114 -msgid "_Insert a new preview phrase." -msgstr "" - -#: libgthumb/gnome-print-font-dialog.c:119 -msgid "Modify preview phrase..." -msgstr "" - -#: libgthumb/gnome-print-font-dialog.c:173 -msgid "Preview" -msgstr "Перадпрагляд" - -#: libgthumb/gnome-print-font-dialog.c:186 -msgid "_Modify preview phrase..." -msgstr "" - -#: libgthumb/gnome-print-font-dialog.c:244 -msgid "Font Selection" -msgstr "Вылучэньне шрыфта" - -#: libgthumb/gnome-print-font-picker.c:92 -msgid "Sans Regular 12" -msgstr "Sans Regular 12" - -#: libgthumb/gnome-print-font-picker.c:93 -msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz" -msgstr "" - -#: libgthumb/gnome-print-font-picker.c:94 -msgid "Pick a Font" -msgstr "Захапіць шрыфт" - -#: libgthumb/gnome-print-font-picker.c:179 -msgid "Title" -msgstr "Загаловак" - -#: libgthumb/gnome-print-font-picker.c:180 -msgid "The title of the selection dialog box" -msgstr "Загаловак дыялёга выбару" - -#: libgthumb/gnome-print-font-picker.c:200 -msgid "Font name" -msgstr "Назва шрыфта" - -#: libgthumb/gnome-print-font-picker.c:201 -msgid "Name of the selected font" -msgstr "Назва вылучанага шрыфта" - -#: libgthumb/gnome-print-font-picker.c:209 -msgid "Preview text" -msgstr "Прыклад тэксту" - -#: libgthumb/gnome-print-font-picker.c:210 -msgid "Preview text shown in the dialog" -msgstr "Тэкст прыкладу, які паказаны ў дыялёгу" - -#: libgthumb/gnome-print-font-picker.c:218 -msgid "Use font in label" -msgstr "Выкарыстоўваць шрыфт у адмеціне" - -#: libgthumb/gnome-print-font-picker.c:219 -msgid "Use font in the label in font info mode" -msgstr "" - -#: libgthumb/gnome-print-font-picker.c:227 -msgid "Font size for label" -msgstr "" - -#: libgthumb/gnome-print-font-picker.c:228 -msgid "Font size for label in font info mode" -msgstr "" - -#: libgthumb/gnome-print-font-picker.c:238 -msgid "Show size" -msgstr "" - -#: libgthumb/gnome-print-font-picker.c:239 -msgid "Show size in font info mode" -msgstr "" - -#: libgthumb/gnome-print-font-picker.c:1018 -msgid "Font" -msgstr "Шрыфт" - -#: libgthumb/gth-file-view-list.c:1376 src/gthumb-ui.xml.h:25 -#: src/gthumb_comments.glade.h:8 -msgid "Comment" -msgstr "Камэнтар" - -#: libgthumb/gth-file-view-list.c:1383 src/dlg-duplicates.c:371 -#: src/dlg-image-prop.c:623 src/gth-exif-data-viewer.c:464 -msgid "Name" -msgstr "Назва" - -#: libgthumb/print-callbacks.c:933 libgthumb/print-callbacks.c:1514 -#, c-format -msgid "Print %s" -msgstr "Друк %s" - -#: libgthumb/print-callbacks.c:936 -msgid "Print Image" -msgstr "Друк відарыса" - -#: libgthumb/thumb-cache.c:483 -msgid "Deleting all thumbnails, wait please..." -msgstr "Выдаленьне ўсіх мініяцюр, калі ласка, пачакайце..." - -#: libgthumb/thumb-cache.c:485 -msgid "Deleting old thumbnails, wait please..." -msgstr "Выдаленьне старых мініяцюр, калі ласка, пачакайце..." - -#: src/bookmark-list.c:169 src/catalog-list.c:436 src/catalog-list.c:468 -#: src/dir-list.c:218 src/dir-list.c:461 src/dlg-rename-series.c:295 -#: src/dlg-rename-series.c:299 src/gthumb-window.c:539 -#: src/gthumb-window.c:1283 src/gthumb-window.c:1290 src/gthumb-window.c:1298 -msgid "(Invalid Name)" -msgstr "(нерэчаісная назва)" - -#: src/catalog-png-exporter.c:1334 -#, c-format -msgid "Loading image: %s" -msgstr "Загрузка відарыса: %s" - -#: src/catalog-png-exporter.c:1555 -#, c-format -msgid "Creating image: %s.%s" -msgstr "Стварэньне відарыса: %s.%s" - -#: src/catalog-web-exporter.c:1522 -msgid "Saving thumbnails" -msgstr "Захаваньне мініяцюр" - -#: src/catalog-web-exporter.c:1588 -msgid "Saving HTML pages: Images" -msgstr "Захаваньне HTML старонак: відарысы" - -#: src/catalog-web-exporter.c:1663 -msgid "Saving HTML pages: Indexes" -msgstr "Захаваньне HTML старонак: індэксы" - -#: src/catalog-web-exporter.c:1786 src/catalog-web-exporter.c:1845 -#: src/catalog-web-exporter.c:1984 -msgid "Saving images" -msgstr "Захаваньне відарысаў" - -#: src/catalog-web-exporter.c:2193 -msgid "Could not create a temporary folder" -msgstr "Немагчыма стварыць часовы каталёг" - -#. Load thumbnails. -#: src/catalog-web-exporter.c:2230 -msgid "Loading images" -msgstr "Загрузка відарысаў" - -#: src/commands-impl.c:251 src/commands-impl.c:996 src/commands-impl.c:1573 -msgid "Enter the new name: " -msgstr "Увядзіце новую назву:" - -#: src/commands-impl.c:255 src/commands-impl.c:1000 src/commands-impl.c:1577 -#: src/gthumb-ui.xml.h:234 src/gthumb_tools.glade.h:45 -msgid "_Rename" -msgstr "_Перайменаваць" - -#: src/commands-impl.c:269 src/commands-impl.c:902 src/commands-impl.c:1014 -#: src/commands-impl.c:1593 src/commands-impl.c:1688 -#, c-format -msgid "" -"The name \"%s\" is not valid because it contains the character \"/\". Please " -"use a different name." -msgstr "" -"Назва \"%s\" зьяўляецца нерэчаіснай, бо яна ўтрымлівае знак \"/\". Калі " -"ласка, задайце іншую назву." - -#: src/commands-impl.c:296 src/dlg-convert.c:314 -msgid "_Overwrite" -msgstr "_Перазапісаць" - -#: src/commands-impl.c:316 src/commands-impl.c:331 -#, c-format -msgid "Could not rename the image \"%s\": %s" -msgstr "Немагчыма перайменаваць відарыс \"%s\": %s" - -#: src/commands-impl.c:318 src/commands-impl.c:1036 src/commands-impl.c:1345 -msgid "source and destination are the same" -msgstr "зыходны пункт і пункт прызначэньне аднолькавыя" - -#: src/commands-impl.c:432 -#, fuzzy, c-format -msgid "Could not duplicate the image \"%s\": %s" -msgstr "Ня атрымалася стварыць каталёг %s : %s\n" - -#: src/commands-impl.c:440 -msgid "Stop" -msgstr "Спыніць" - -#: src/commands-impl.c:441 -msgid "Continue" -msgstr "Працягнуць" - -#: src/commands-impl.c:516 -msgid "The selected images will be moved to the Trash, are you sure?" -msgstr "Вылучаныя відарысы будуць перанесены ў сьметніцу; вы ўпэўненыя?" - -#: src/commands-impl.c:536 -msgid "The image will be moved to the Trash, are you sure?" -msgstr "Відарыс будзе перанесены ў сьметніцу; вы ўпэўненыя?" - -#: src/commands-impl.c:771 -msgid "The image will be removed from the catalog, are you sure?" -msgstr "" - -#: src/commands-impl.c:813 -msgid "The selected images will be removed from the catalog, are you sure?" -msgstr "" - -#: src/commands-impl.c:889 src/dlg-catalog.c:86 src/dlg-catalog.c:131 -#: src/dlg-categories.c:200 src/dlg-file-utils.c:90 -msgid "C_reate" -msgstr "" - -#: src/commands-impl.c:918 src/commands-impl.c:1044 src/commands-impl.c:1615 -#: src/commands-impl.c:1707 -#, c-format -msgid "The name \"%s\" is already used. Please use a different name." -msgstr "" - -#: src/commands-impl.c:946 -msgid "New Folder" -msgstr "" - -#: src/commands-impl.c:947 -msgid "Enter the folder name: " -msgstr "" - -#: src/commands-impl.c:948 -#, fuzzy, c-format -msgid "Could not create the folder \"%s\": %s" -msgstr "Ня атрымалася стварыць каталёг %s : %s\n" - -#: src/commands-impl.c:959 -#, fuzzy -msgid "New Library" -msgstr "Бібліятэкі" - -#: src/commands-impl.c:960 src/dlg-catalog.c:127 -msgid "Enter the library name: " -msgstr "" - -#: src/commands-impl.c:961 -#, fuzzy, c-format -msgid "Could not create the library \"%s\": %s" -msgstr "Ня атрымалася стварыць каталёг %s : %s\n" - -#: src/commands-impl.c:1034 src/commands-impl.c:1071 -#, fuzzy, c-format -msgid "Could not rename the folder \"%s\": %s" -msgstr "Ня атрымалася стварыць каталёг %s : %s\n" - -#: src/commands-impl.c:1140 -#, fuzzy, c-format -msgid "Could not delete the folder \"%s\": %s" -msgstr "Ня атрымалася стварыць каталёг %s : %s\n" - -#: src/commands-impl.c:1171 -#, c-format -msgid "\"%s\" cannot be moved to the Trash. Do you want to delete it permanently?" -msgstr "" - -#: src/commands-impl.c:1179 src/dlg-file-utils.c:227 -msgid "_Do not display this message again" -msgstr "" - -#: src/commands-impl.c:1212 -msgid "The selected folder will be moved to the Trash, are you sure?" -msgstr "" - -#: src/commands-impl.c:1214 src/dlg-file-utils.c:281 -msgid "_Move" -msgstr "" - -#: src/commands-impl.c:1280 src/commands-impl.c:1335 -#, fuzzy, c-format -msgid "Could not copy the folder \"%s\": %s" -msgstr "Ня атрымалася стварыць каталёг %s : %s\n" - -#: src/commands-impl.c:1335 src/dlg-file-utils.c:2433 -#: src/dlg-file-utils.c:2435 -#, fuzzy, c-format -msgid "Could not move the folder \"%s\": %s" -msgstr "Ня атрымалася стварыць каталёг %s : %s\n" - -#: src/commands-impl.c:1356 -msgid "source contains destination" -msgstr "" - -#: src/commands-impl.c:1367 -msgid "a folder with that name is already present." -msgstr "" - -#: src/commands-impl.c:1454 src/dlg-file-utils.c:367 src/dlg-file-utils.c:456 -msgid "Choose the destination folder" -msgstr "" - -#: src/commands-impl.c:1626 -#, fuzzy, c-format -msgid "Could not rename the library \"%s\": %s" -msgstr "Ня атрымалася стварыць каталёг %s : %s\n" - -#: src/commands-impl.c:1626 -#, fuzzy, c-format -msgid "Could not rename the catalog \"%s\": %s" -msgstr "Ня атрымалася стварыць каталёг %s : %s\n" - -#: src/commands-impl.c:1672 src/dlg-catalog.c:82 -msgid "Enter the catalog name: " -msgstr "" - -#: src/commands-impl.c:1673 -msgid "New Catalog" -msgstr "" - -#: src/commands-impl.c:1718 -#, fuzzy, c-format -msgid "Could not create the catalog \"%s\": %s" -msgstr "Ня атрымалася стварыць каталёг %s : %s\n" - -#: src/commands-impl.c:1782 -msgid "The selected library will be removed, are you sure?" -msgstr "" - -#: src/commands-impl.c:1784 -msgid "The selected catalog will be removed, are you sure?" -msgstr "" - -#: src/commands-impl.c:2713 src/dlg-categories.c:337 src/dlg-change-date.c:151 -#: src/dlg-comment.c:265 src/dlg-convert.c:434 src/dlg-jpegtran.c:638 -#: src/dlg-maintenance.c:273 src/dlg-preferences.c:175 -#: src/dlg-rename-series.c:338 src/dlg-search.c:443 -#, c-format -msgid "Could not display help: %s" -msgstr "Немагчыма адлюстраваць даведку: %s" - -#: src/commands-impl.c:2764 -msgid "translator_credits" -msgstr "Алесь Няхайчык " - -#: src/commands-impl.c:2773 src/gthumb-window.c:557 src/gthumb-window.c:4830 -#: src/main.c:125 -msgid "gThumb" -msgstr "gThumb" - -#: src/commands-impl.c:2776 -msgid "An image viewer and browser for GNOME." -msgstr "Вандроўнік і праглядальнік відарысаў для GNOME." - -#: src/dlg-catalog.c:446 -msgid "Move Catalog to..." -msgstr "Перамясьціць каталёг у..." - -#: src/dlg-categories.c:196 -msgid "Enter the new category name" -msgstr "Увядзіце назву новае катэгорыі" - -#: src/dlg-categories.c:207 -#, c-format -msgid "" -"The name \"%s\" is not valid because it contains the character \",\". Please " -"use a different name." -msgstr "" -"Назва \"%s\" не зьяўляецца рэчаіснай, бо яна ўтрымлівае знак \",\". Калі ласка, " -"скарыстайце іншую назву." - -#: src/dlg-categories.c:212 -#, c-format -msgid "The category \"%s\" is already present. Please use a different name." -msgstr "Катэгорыя \"%s\" ужо прысутнічае. Калі ласка, скарыстайце іншую назву." - -#: src/dlg-convert.c:162 -#, c-format -msgid "Converting image: %s" -msgstr "Пераўтварэньне відарыса: %s" - -#: src/dlg-convert.c:185 -#, c-format -msgid "An image named \"%s\" is already present. Please specify a different name." -msgstr "Відарыс з назвай \"%s\" ужо прысутнічае. Калі ласка, задайце іншую назву." - -#: src/dlg-convert.c:313 src/gthumb_convert.glade.h:17 -msgid "Skip" -msgstr "Прапусцiць" - -#: src/dlg-duplicates.c:278 src/dlg-duplicates.c:649 -#, fuzzy -msgid "Duplicates" -msgstr "Дастасаваньні" - -#: src/dlg-duplicates.c:293 -msgid "Duplicates Size" -msgstr "" - -#: src/dlg-duplicates.c:399 -msgid "Last modified" -msgstr "Апошняе зьмяненьне" - -#: src/dlg-duplicates.c:414 src/dlg-image-prop.c:643 -msgid "Location" -msgstr "Знаходжаньне" - -#: src/dlg-duplicates.c:754 -msgid "Checked images will be moved to the Trash, are you sure?" -msgstr "Пазначаныя відарысы будуць перанесены ў сьметніцу, вы ўпэўнены?" - -#: src/dlg-file-utils.c:88 -msgid "The destination folder does not exist. Do you want to create it?" -msgstr "Тэчка прызначаэньня не йснуе. Жадаеце стварыць яе?" - -#: src/dlg-file-utils.c:104 -#, c-format -msgid "Could not create folder \"%s\": %s." -msgstr "Немагчыма стварыць тэчку \"%s\": %s." - -#: src/dlg-file-utils.c:118 -#, c-format -msgid "You don't have the right permissions to create images in the folder \"%s\"" -msgstr "Вы ня маеце неабходных правоў на стварэньне відарысаў у гэтае тэчцы \"%s\"" - -#: src/dlg-file-utils.c:201 -msgid "Could not delete the images:" -msgstr "Немагчыма выдаліць відарысы:" - -#: src/dlg-file-utils.c:224 -msgid "" -"The images cannot be moved to the Trash. Do you want to delete them " -"permanently?" -msgstr "Немагчыма перанесьці відарысы ў сьметніцу. Жадаеце выдаліць іх назусім?" - -#: src/dlg-file-utils.c:758 src/dlg-file-utils.c:859 -msgid "You didn't enter the new name" -msgstr "Вы не ўвялі новую назву" - -#: src/dlg-file-utils.c:770 src/dlg-file-utils.c:871 -#, c-format -msgid "The name \"%s\" is already used in this folder. Please use a different name." -msgstr "" -"Назва \"%s\" ужо выкарыстоўваецца у гэтае тэчцы. Калі ласка, скарыстайце іншую " -"назву." - -#: src/dlg-file-utils.c:1010 -msgid "Could not rename the image:" -msgstr "Немагчыма перайменаваць відарыс:" - -#: src/dlg-file-utils.c:1012 -msgid "Could not rename the following images:" -msgstr "Немагчыма перайменаваць наступныя відарысы:" - -#: src/dlg-file-utils.c:1146 -msgid "Could not move the image:" -msgstr "Немагчыма перанесьці відарыс:" - -#: src/dlg-file-utils.c:1148 -msgid "Could not copy the image:" -msgstr "Немагчыма скапіяваць відарыс:" - -#: src/dlg-file-utils.c:1172 src/dlg-file-utils.c:2456 -msgid "_Abort" -msgstr "_Пра" - -#: src/dlg-file-utils.c:1173 src/dlg-file-utils.c:2457 -msgid "_Continue" -msgstr "_Працяг" - -#: src/dlg-file-utils.c:1347 -#, c-format -msgid "Copying file %d of %d" -msgstr "Капіяваньне файла %d з %d" - -#: src/dlg-file-utils.c:1775 src/dlg-file-utils.c:2003 -msgid "Collecting images info" -msgstr "Збор зьвестак відарысаў" - -#: src/dlg-file-utils.c:1778 src/dlg-file-utils.c:2016 -#, c-format -msgid "Deleting file %ld of %ld" -msgstr "Выдаленьне файла %ld з %ld" - -#: src/dlg-file-utils.c:2006 -#, c-format -msgid "Copying file %ld of %ld" -msgstr "Капіяваньне файла %ld з %ld" - -#: src/dlg-file-utils.c:2011 -#, c-format -msgid "Moving file %ld of %ld" -msgstr "Перамяшчэньне файла %ld з %ld" - -#: src/dlg-image-prop.c:628 src/gth-exif-data-viewer.c:471 -msgid "Size" -msgstr "Памер" - -#: src/dlg-image-prop.c:633 -msgid "Type" -msgstr "Від" - -#: src/dlg-image-prop.c:648 src/gth-exif-data-viewer.c:485 -msgid "Modified" -msgstr "Зьменены" - -#: src/dlg-image-prop.c:653 -msgid "Information on Channel" -msgstr "Зьвесткі канала" - -#: src/dlg-image-prop.c:751 -#, c-format -msgid "%s Properties" -msgstr "Уласьцівасьці %s" - -#: src/dlg-maintenance.c:71 -msgid "All comments will be removed, are you sure?" -msgstr "Усе камэнтары будуць выдаленыя. Вы ўпэўненыя?" - -#: src/dlg-maintenance.c:102 -msgid "All thumbnails will be deleted, are you sure?" -msgstr "Усе мініяцюры будуць выдаленыя. Вы ўпэўненыя?" - -#: src/dlg-maintenance.c:163 src/dlg-maintenance.c:233 -msgid "Specify the backup file" -msgstr "Задайце запасны файл" - -#: src/dlg-png-exporter.c:999 -msgid "Image Caption" -msgstr "" - -#: src/dlg-png-exporter.c:1052 -msgid "Header" -msgstr "Загаловак" - -#: src/dlg-png-exporter.c:1065 src/dlg-png-exporter.c:1071 -msgid "Footer" -msgstr "Падвал" - -#: src/dlg-rename-series.c:408 -msgid "Old Name" -msgstr "Старая назва" - -#: src/dlg-rename-series.c:416 -msgid "New Name" -msgstr "Новая назва" - -#: src/dlg-search.c:330 -msgid "Search Result" -msgstr "Вынік пошуку" - -#: src/dlg-search.c:625 -msgid "Filename" -msgstr "Назва файла" - -#: src/dlg-search.c:634 src/gth-folder-selection-dialog.c:381 -msgid "Folder" -msgstr "Тэчка" - -#: src/dlg-web-exporter.c:658 -msgid "Select Album Theme" -msgstr "Вылучыце тэму альбома" - -#: src/fullscreen.c:783 src/gthumb-ui.xml.h:113 -msgid "Restore Normal View" -msgstr "Вярнуць звычайны выгляд" - -#: src/fullscreen.c:801 -msgid "Image Info" -msgstr "Зьвесткі" - -#: src/fullscreen.c:819 src/gthumb-window.c:4096 -msgid "Back" -msgstr "Назад" - -#: src/fullscreen.c:837 src/gthumb-ui.xml.h:52 -msgid "Forward" -msgstr "Наперад" - -#: src/gth-exif-data-viewer.c:127 -msgid "Field" -msgstr "Поле" - -#: src/gth-exif-data-viewer.c:137 -msgid "Value " -msgstr "Значэньне" - -#: src/gth-folder-selection-dialog.c:403 -msgid "_Browse..." -msgstr "Аг_ледзіць..." - -#: src/gth-folder-selection-dialog.c:412 -msgid "_Recents:" -msgstr "Апо_шнія:" - -#: src/gth-folder-selection-dialog.c:443 src/gthumb.glade.h:27 -msgid "_Bookmarks:" -msgstr "_Закладкі:" - -#: src/gthumb-ui.xml.h:1 -msgid "1:1" -msgstr "1:1" - -#: src/gthumb-ui.xml.h:2 -msgid "Actual size" -msgstr "Сапраўдны памер" - -#: src/gthumb-ui.xml.h:3 -msgid "Add a comment to selected images" -msgstr "Дадаць камэнтар да вылучанага відарыса" - -#: src/gthumb-ui.xml.h:4 -msgid "Add a comment to the image" -msgstr "Дадаць камэнтар да відарыса" - -#: src/gthumb-ui.xml.h:5 -msgid "Add current location to bookmarks" -msgstr "Дадаць бягучае знаходжаньне ў закладкі" - -#: src/gthumb-ui.xml.h:6 -msgid "Add selected images to a catalog" -msgstr "Дадаць вылучаныя відарысы ў каталёг" - -#: src/gthumb-ui.xml.h:7 -msgid "Adjust brightness and contrast" -msgstr "" - -#: src/gthumb-ui.xml.h:8 -msgid "Adjust color balance" -msgstr "" - -#: src/gthumb-ui.xml.h:9 -msgid "Adjust hue and saturation" -msgstr "" - -#: src/gthumb-ui.xml.h:10 -msgid "Apply threshold" -msgstr "" - -#: src/gthumb-ui.xml.h:11 -msgid "Assign categories to selected images" -msgstr "" - -#: src/gthumb-ui.xml.h:12 -msgid "Assign categories to the image" -msgstr "" - -#: src/gthumb-ui.xml.h:13 -msgid "Auto" -msgstr "" - -#: src/gthumb-ui.xml.h:14 -msgid "Automatically normalize the contrast" -msgstr "" - -#: src/gthumb-ui.xml.h:15 -msgid "Automatically stretch the contrast" -msgstr "" - -#: src/gthumb-ui.xml.h:16 -msgid "Ca_talog" -msgstr "" - -#: src/gthumb-ui.xml.h:17 -msgid "Ca_tegories" -msgstr "" - -#: src/gthumb-ui.xml.h:18 src/gthumb-window.c:4197 -msgid "Catalogs" -msgstr "" - -#: src/gthumb-ui.xml.h:19 src/gthumb_comments.glade.h:5 -#: src/gthumb_search.glade.h:10 -msgid "Categories" -msgstr "" - -#: src/gthumb-ui.xml.h:20 -msgid "Change _Date" -msgstr "" - -#: src/gthumb-ui.xml.h:21 -msgid "Change images last modified date" -msgstr "" - -#: src/gthumb-ui.xml.h:22 -msgid "Close all windows and exit" -msgstr "" - -#: src/gthumb-ui.xml.h:23 -msgid "Close this window" -msgstr "" - -#: src/gthumb-ui.xml.h:24 src/gthumb.glade.h:12 -msgid "Comm_ent" -msgstr "" - -#: src/gthumb-ui.xml.h:26 -msgid "Convert" -msgstr "Пераўтварыць" - -#: src/gthumb-ui.xml.h:27 -msgid "Convert F_ormat" -msgstr "" - -#: src/gthumb-ui.xml.h:28 -msgid "Convert image format" -msgstr "" - -#: src/gthumb-ui.xml.h:29 -msgid "Copy current folder" -msgstr "" - -#: src/gthumb-ui.xml.h:30 -msgid "Copy selected folder" -msgstr "" - -#: src/gthumb-ui.xml.h:31 -msgid "Copy selected images to another location" -msgstr "" - -#: src/gthumb-ui.xml.h:32 -msgid "Copy this image to another location" -msgstr "" - -#: src/gthumb-ui.xml.h:33 -msgid "Create _Index Image" -msgstr "" - -#: src/gthumb-ui.xml.h:34 -msgid "Create _Web Album" -msgstr "" - -#: src/gthumb-ui.xml.h:35 -msgid "Create a new catalog" -msgstr "" - -#: src/gthumb-ui.xml.h:36 -msgid "Create a new catalog library" -msgstr "" - -#: src/gthumb-ui.xml.h:37 -msgid "Create a new folder" -msgstr "" - -#: src/gthumb-ui.xml.h:38 -msgid "Create a new window" -msgstr "" - -#: src/gthumb-ui.xml.h:39 -msgid "Crop image" -msgstr "" - -#: src/gthumb-ui.xml.h:40 -msgid "D_uplicate" -msgstr "" - -#: src/gthumb-ui.xml.h:41 -msgid "Delete the list of visited locations" -msgstr "" - -#: src/gthumb-ui.xml.h:42 -msgid "Duplicate selected image" -msgstr "" - -#: src/gthumb-ui.xml.h:43 -msgid "Duplicate this image" -msgstr "" - -#: src/gthumb-ui.xml.h:44 -msgid "E_xit" -msgstr "" - -#: src/gthumb-ui.xml.h:45 -msgid "Edit Search" -msgstr "" - -#: src/gthumb-ui.xml.h:46 -msgid "Edit bookmarks" -msgstr "Рэдагаваць закладкі" - -#: src/gthumb-ui.xml.h:47 -msgid "Edit various preferences" -msgstr "Рэдагаваньне розныя перавагі" - -#: src/gthumb-ui.xml.h:48 -msgid "Fi_nd Duplicates..." -msgstr "" - -#: src/gthumb-ui.xml.h:49 -msgid "Find images" -msgstr "Пошук відарысаў" - -#: src/gthumb-ui.xml.h:50 -msgid "Fit" -msgstr "" - -#: src/gthumb-ui.xml.h:51 src/gthumb-window.c:4147 -msgid "Folders" -msgstr "Каталёгі" - -#: src/gthumb-ui.xml.h:53 -msgid "Full Screen" -msgstr "На ўвесь экран" - -#: src/gthumb-ui.xml.h:54 -msgid "Go to the folder that contains the selected image" -msgstr "" - -#: src/gthumb-ui.xml.h:55 -msgid "Go to the home folder" -msgstr "Перайсьці ў свойскі каталёг" - -#: src/gthumb-ui.xml.h:56 -msgid "Go to the next visited location" -msgstr "" - -#: src/gthumb-ui.xml.h:57 src/gthumb-window.c:4115 -msgid "Go to the previous visited location" -msgstr "" - -#: src/gthumb-ui.xml.h:58 -msgid "Go up one level" -msgstr "" - -#: src/gthumb-ui.xml.h:59 -msgid "Home" -msgstr "" - -#: src/gthumb-ui.xml.h:60 -msgid "Image Toolbar" -msgstr "" - -#: src/gthumb-ui.xml.h:61 -msgid "Image _Comment" -msgstr "" - -#: src/gthumb-ui.xml.h:62 -msgid "In" -msgstr "" - -#: src/gthumb-ui.xml.h:63 -msgid "Main Toolbar" -msgstr "" - -#: src/gthumb-ui.xml.h:64 -msgid "Modify search criteria" -msgstr "" - -#: src/gthumb-ui.xml.h:65 -msgid "Move current catalog to another location" -msgstr "" - -#: src/gthumb-ui.xml.h:66 -msgid "Move current folder" -msgstr "" - -#: src/gthumb-ui.xml.h:67 -msgid "Move selected catalog to another location" -msgstr "" - -#: src/gthumb-ui.xml.h:68 -msgid "Move selected folder" -msgstr "" - -#: src/gthumb-ui.xml.h:69 -msgid "Move selected images to another location" -msgstr "" - -#: src/gthumb-ui.xml.h:70 -msgid "Move the current folder to the Trash" -msgstr "" - -#: src/gthumb-ui.xml.h:71 -msgid "Move the selected folder to the Trash" -msgstr "" - -#: src/gthumb-ui.xml.h:72 -msgid "Move the selected images to the Trash" -msgstr "" - -#: src/gthumb-ui.xml.h:73 -msgid "Move this image to another location" -msgstr "" - -#: src/gthumb-ui.xml.h:74 -msgid "Move this image to the Trash" -msgstr "" - -#: src/gthumb-ui.xml.h:75 src/gthumb_tools.glade.h:30 -msgid "Move to _Trash" -msgstr "" - -#: src/gthumb-ui.xml.h:76 -msgid "New _Library..." -msgstr "" - -#: src/gthumb-ui.xml.h:77 -msgid "New _Window" -msgstr "" - -#: src/gthumb-ui.xml.h:78 -#, fuzzy -msgid "Next" -msgstr "NetBSD" - -#: src/gthumb-ui.xml.h:79 -msgid "Open current folder with the Nautilus file manager" -msgstr "" - -#: src/gthumb-ui.xml.h:80 -msgid "Open selected images with an application" -msgstr "" - -#: src/gthumb-ui.xml.h:81 -msgid "" -"Open the selected folder with the Nautilus file\n" -"\t manager" -msgstr "" - -#: src/gthumb-ui.xml.h:83 -msgid "Open this image with an application" -msgstr "" - -#: src/gthumb-ui.xml.h:84 -msgid "Open with the File Manager" -msgstr "" - -#: src/gthumb-ui.xml.h:85 -msgid "Open with the _File Manager" -msgstr "" - -#: src/gthumb-ui.xml.h:86 -msgid "Out" -msgstr "" - -#: src/gthumb-ui.xml.h:87 -msgid "Play _Animation" -msgstr "" - -#: src/gthumb-ui.xml.h:88 -msgid "Previous" -msgstr "" - -#: src/gthumb-ui.xml.h:89 src/gthumb_print.glade.h:20 -#, fuzzy -msgid "Print" -msgstr "Друк" - -#: src/gthumb-ui.xml.h:91 -msgid "Proper_ties" -msgstr "" - -#: src/gthumb-ui.xml.h:92 -msgid "Redo Search" -msgstr "" - -#: src/gthumb-ui.xml.h:93 -msgid "Redo _Search" -msgstr "" - -#: src/gthumb-ui.xml.h:94 -msgid "Redo the search" -msgstr "" - -#: src/gthumb-ui.xml.h:95 -msgid "Reduce number of colors" -msgstr "" - -#: src/gthumb-ui.xml.h:96 -msgid "Reduce the number of colors" -msgstr "" - -#: src/gthumb-ui.xml.h:97 -msgid "Reload the current location" -msgstr "" - -#: src/gthumb-ui.xml.h:98 -#, fuzzy -msgid "Rem_ove" -msgstr "Аддаленыя" - -#: src/gthumb-ui.xml.h:99 -#, fuzzy -msgid "Rem_ove Comment" -msgstr "Распрацоўка" - -#: src/gthumb-ui.xml.h:100 -msgid "Remo_ve from Catalog" -msgstr "" - -#: src/gthumb-ui.xml.h:101 -msgid "Remove comments of selected images" -msgstr "" - -#: src/gthumb-ui.xml.h:102 -msgid "Remove current catalog" -msgstr "Выдаліць бягучы каталёг" - -#: src/gthumb-ui.xml.h:103 -msgid "Remove selected catalog" -msgstr "Выдаліць вылучаны каталёг" - -#: src/gthumb-ui.xml.h:104 -msgid "Remove selected images from the catalog" -msgstr "Выдаліць вылучаныя відарысы з каталёга" - -#: src/gthumb-ui.xml.h:105 -msgid "Remove the comment" -msgstr "Выдаліць камэнтар" - -#: src/gthumb-ui.xml.h:106 -msgid "Rename current catalog" -msgstr "Перайменаваць бягучы каталёг" - -#: src/gthumb-ui.xml.h:107 -msgid "Rename current folder" -msgstr "Перайменаваць бягучы каталёг" - -#: src/gthumb-ui.xml.h:108 -msgid "Rename selected catalog" -msgstr "Перайменаваць вылучаны каталёг" - -#: src/gthumb-ui.xml.h:109 -msgid "Rename selected folder" -msgstr "" - -#: src/gthumb-ui.xml.h:110 -msgid "Rename selected image" -msgstr "" - -#: src/gthumb-ui.xml.h:111 -msgid "Rename this image" -msgstr "" - -#: src/gthumb-ui.xml.h:112 -msgid "Resize image" -msgstr "Зьмяніць памеры відарыса" - -#: src/gthumb-ui.xml.h:114 -msgid "Restore the original desktop wallpaper" -msgstr "" - -#: src/gthumb-ui.xml.h:115 -msgid "Reverse images order" -msgstr "" - -#: src/gthumb-ui.xml.h:116 -msgid "Revert" -msgstr "" - -#: src/gthumb-ui.xml.h:117 -msgid "Revert to saved image" -msgstr "" - -#: src/gthumb-ui.xml.h:119 -msgid "Rotate Ri_ght" -msgstr "" - -#: src/gthumb-ui.xml.h:120 -msgid "Rotate _JPEG" -msgstr "" - -#: src/gthumb-ui.xml.h:121 -msgid "Rotate _Left" -msgstr "" - -#: src/gthumb-ui.xml.h:122 -msgid "Rotate image" -msgstr "" - -#: src/gthumb-ui.xml.h:123 -msgid "Rotate jpeg images without loss of quality" -msgstr "" - -#: src/gthumb-ui.xml.h:124 -#, fuzzy -msgid "S_ort Images" -msgstr "Сховішча" - -#: src/gthumb-ui.xml.h:125 -msgid "Save" -msgstr "" - -#: src/gthumb-ui.xml.h:128 -#, fuzzy -msgid "Search" -msgstr "Размова" - -#: src/gthumb-ui.xml.h:129 -msgid "Select all images" -msgstr "" - -#: src/gthumb-ui.xml.h:130 -msgid "Set Image as _Wallpaper" -msgstr "" - -#: src/gthumb-ui.xml.h:131 -msgid "Set the image as desktop background (centered)" -msgstr "" - -#: src/gthumb-ui.xml.h:132 -msgid "Set the image as desktop background (scaled keeping aspect ratio)" -msgstr "" - -#: src/gthumb-ui.xml.h:133 -msgid "Set the image as desktop background (stretched)" -msgstr "" - -#: src/gthumb-ui.xml.h:134 -msgid "Set the image as desktop background (tiled)" -msgstr "" - -#: src/gthumb-ui.xml.h:135 -msgid "Show information about gThumb" -msgstr "" - -#: src/gthumb-ui.xml.h:136 -msgid "Show/_Hide" -msgstr "" - -#: src/gthumb-ui.xml.h:137 src/gthumb_preferences.glade.h:52 -msgid "Slide Show" -msgstr "Фотапаказ" - -#: src/gthumb-ui.xml.h:138 -msgid "Sort images by file size" -msgstr "Упарадкоўваць відарысы па памерах" - -#: src/gthumb-ui.xml.h:139 -msgid "Sort images by modification time" -msgstr "Упарадкоўваць відарысы па часу зьмяненьня" - -#: src/gthumb-ui.xml.h:140 -msgid "Sort images by name" -msgstr "Упарадкоўваць відарысы па назвах" - -#: src/gthumb-ui.xml.h:141 -msgid "Sort images by path" -msgstr "Упарадкоўваць відарысы па шляхах" - -#: src/gthumb-ui.xml.h:142 -msgid "Specify a location to visit" -msgstr "Задайце знаходжаньне для наведваньня" - -#: src/gthumb-ui.xml.h:144 -msgid "Step A_nimation" -msgstr "Пакр_окавая анімацыя" - -#: src/gthumb-ui.xml.h:145 -msgid "Stop loading current location" -msgstr "Спыніць загрузку бягучага знаходжаньня" - -#: src/gthumb-ui.xml.h:146 -msgid "Str_etched" -msgstr "" - -#: src/gthumb-ui.xml.h:147 -msgid "Up" -msgstr "" - -#: src/gthumb-ui.xml.h:148 -msgid "Use black as transparency" -msgstr "" - -#: src/gthumb-ui.xml.h:149 -msgid "Use checks as transparency" -msgstr "" - -#: src/gthumb-ui.xml.h:150 -msgid "Use gray as transparency" -msgstr "" - -#: src/gthumb-ui.xml.h:151 -msgid "Use high quality zoom" -msgstr "" - -#: src/gthumb-ui.xml.h:152 -msgid "Use low quality zoom" -msgstr "Выкарыстоўваць нізкаякаснае маштабаваньне" - -#: src/gthumb-ui.xml.h:153 -msgid "Use white as transparency" -msgstr "Выкарыстоўваць белы колер як празрыстасьць" - -#: src/gthumb-ui.xml.h:154 -msgid "View as a slide show" -msgstr "Выгляд фотапаказа" - -#: src/gthumb-ui.xml.h:155 -msgid "View image comment" -msgstr "" - -#: src/gthumb-ui.xml.h:156 -msgid "View image in fullscreen mode" -msgstr "" - -#: src/gthumb-ui.xml.h:157 -msgid "View image properties" -msgstr "" - -#: src/gthumb-ui.xml.h:159 -msgid "View next image" -msgstr "" - -#: src/gthumb-ui.xml.h:160 -msgid "View or hide the statusbar of this window" -msgstr "" - -#: src/gthumb-ui.xml.h:161 -msgid "View or hide the toolbar of this window" -msgstr "" - -#: src/gthumb-ui.xml.h:162 -msgid "View previous image" -msgstr "" - -#: src/gthumb-ui.xml.h:163 src/gthumb-window.c:4203 -msgid "View the catalogs" -msgstr "" - -#: src/gthumb-ui.xml.h:164 src/gthumb-window.c:4153 -msgid "View the folders" -msgstr "" - -#: src/gthumb-ui.xml.h:165 -msgid "View the image" -msgstr "" - -#: src/gthumb-ui.xml.h:166 -msgid "View the image flipped" -msgstr "" - -#: src/gthumb-ui.xml.h:167 -msgid "View the image in black and white" -msgstr "" - -#: src/gthumb-ui.xml.h:168 -msgid "View the image mirrored" -msgstr "" - -#: src/gthumb-ui.xml.h:169 -msgid "View the image rotated clockwise" -msgstr "" - -#: src/gthumb-ui.xml.h:170 -msgid "View the image rotated counter-clockwise" -msgstr "" - -#: src/gthumb-ui.xml.h:171 -msgid "View the image with negative colors" -msgstr "" - -#: src/gthumb-ui.xml.h:172 -msgid "View thumbnails" -msgstr "" - -#: src/gthumb-ui.xml.h:173 -msgid "Zoom _In" -msgstr "" - -#: src/gthumb-ui.xml.h:174 -msgid "Zoom _Out" -msgstr "" - -#: src/gthumb-ui.xml.h:175 -msgid "Zoom in" -msgstr "" - -#: src/gthumb-ui.xml.h:176 -msgid "Zoom out" -msgstr "" - -#: src/gthumb-ui.xml.h:177 -msgid "Zoom to _Fit" -msgstr "" - -#: src/gthumb-ui.xml.h:178 -msgid "Zoom to fit window" -msgstr "" - -#: src/gthumb-ui.xml.h:179 -msgid "_About" -msgstr "" - -#: src/gthumb-ui.xml.h:180 -msgid "_Actual Size" -msgstr "_Сапраўдны памер" - -#: src/gthumb-ui.xml.h:181 -msgid "_Add Bookmark" -msgstr "_Дадаць закладку" - -#: src/gthumb-ui.xml.h:182 -msgid "_Add to Catalog..." -msgstr "" - -#: src/gthumb-ui.xml.h:183 -msgid "_Adjust Color Levels" -msgstr "" - -#: src/gthumb-ui.xml.h:184 -#, fuzzy -msgid "_Back" -msgstr "Рэзэрвовае капіяваньне" - -#: src/gthumb-ui.xml.h:186 -msgid "_Bookmarks" -msgstr "_Закладкі" - -#: src/gthumb-ui.xml.h:187 -msgid "_Brightness-Contrast" -msgstr "" - -#: src/gthumb-ui.xml.h:188 -msgid "_Catalogs" -msgstr "" - -#: src/gthumb-ui.xml.h:189 -msgid "_Centered" -msgstr "" - -#: src/gthumb-ui.xml.h:191 -#, fuzzy -msgid "_Close" -msgstr "Гадзіньнікі" - -#: src/gthumb-ui.xml.h:192 -msgid "_Color Balance" -msgstr "" - -#: src/gthumb-ui.xml.h:193 -msgid "_Contents" -msgstr "" - -#: src/gthumb-ui.xml.h:194 -msgid "_Copy..." -msgstr "" - -#: src/gthumb-ui.xml.h:195 -msgid "_Crop" -msgstr "" - -#: src/gthumb-ui.xml.h:196 -msgid "_Delete History" -msgstr "" - -#: src/gthumb-ui.xml.h:197 -msgid "_Desaturate" -msgstr "" - -#: src/gthumb-ui.xml.h:198 -#, fuzzy -msgid "_Edit" -msgstr "Рэдагаваньне" - -#: src/gthumb-ui.xml.h:199 -msgid "_Edit Bookmarks" -msgstr "Рэдагаваць за_кладкі" - -#: src/gthumb-ui.xml.h:200 src/gthumb_search.glade.h:25 -msgid "_Edit Search" -msgstr "" - -#: src/gthumb-ui.xml.h:201 -msgid "_Equalize" -msgstr "" - -#: src/gthumb-ui.xml.h:202 -msgid "_File" -msgstr "" - -#: src/gthumb-ui.xml.h:203 -msgid "_Find..." -msgstr "" - -#: src/gthumb-ui.xml.h:205 -msgid "_Folder" -msgstr "" - -#: src/gthumb-ui.xml.h:206 -msgid "_Folders" -msgstr "" - -#: src/gthumb-ui.xml.h:207 -#, fuzzy -msgid "_Forward" -msgstr "Настольныя" - -#: src/gthumb-ui.xml.h:208 -msgid "_Full Screen" -msgstr "" - -#: src/gthumb-ui.xml.h:209 -msgid "_Go" -msgstr "" - -#: src/gthumb-ui.xml.h:210 -msgid "_Go to the Image Folder" -msgstr "" - -#: src/gthumb-ui.xml.h:211 -msgid "_Help" -msgstr "_Даведка" - -#: src/gthumb-ui.xml.h:212 -msgid "_High Quality" -msgstr "_Высокая якасьць" - -#: src/gthumb-ui.xml.h:213 -msgid "_Home" -msgstr "_Свойскую тэчку" - -#: src/gthumb-ui.xml.h:214 -msgid "_Hue-Saturation" -msgstr "" - -#: src/gthumb-ui.xml.h:216 -msgid "_Image Preview" -msgstr "Перадпра_гляд відарыса" - -#: src/gthumb-ui.xml.h:217 -msgid "_Keyboard Shortcuts" -msgstr "Га_рачыя клявішы" - -#: src/gthumb-ui.xml.h:218 -msgid "_Location..." -msgstr "_Знаходжаньне..." - -#: src/gthumb-ui.xml.h:219 -msgid "_Low Quality" -msgstr "_Нізкая якасьць" - -#: src/gthumb-ui.xml.h:220 -msgid "_Maintenance" -msgstr "" - -#: src/gthumb-ui.xml.h:222 -msgid "_Move..." -msgstr "" - -#: src/gthumb-ui.xml.h:223 -msgid "_Negative" -msgstr "" - -#: src/gthumb-ui.xml.h:224 -msgid "_New Catalog..." -msgstr "" - -#: src/gthumb-ui.xml.h:225 -msgid "_New Folder..." -msgstr "" - -#: src/gthumb-ui.xml.h:227 -msgid "_Normalize" -msgstr "" - -#: src/gthumb-ui.xml.h:228 -msgid "_Open With" -msgstr "" - -#: src/gthumb-ui.xml.h:229 -msgid "_Posterize" -msgstr "" - -#: src/gthumb-ui.xml.h:230 src/gthumb_png_exporter.glade.h:66 -#, fuzzy -msgid "_Preferences" -msgstr "Уласьцівасьці" - -#: src/gthumb-ui.xml.h:231 -msgid "_Print..." -msgstr "" - -#: src/gthumb-ui.xml.h:232 -msgid "_Reduce Colors" -msgstr "" - -#: src/gthumb-ui.xml.h:233 -msgid "_Reload" -msgstr "" - -#: src/gthumb-ui.xml.h:235 -msgid "_Rename Series" -msgstr "" - -#: src/gthumb-ui.xml.h:236 -msgid "_Rename..." -msgstr "" - -#: src/gthumb-ui.xml.h:237 -msgid "_Resize" -msgstr "" - -#: src/gthumb-ui.xml.h:238 -msgid "_Restore" -msgstr "" - -#: src/gthumb-ui.xml.h:239 -msgid "_Reversed Order" -msgstr "" - -#: src/gthumb-ui.xml.h:240 -msgid "_Revert" -msgstr "" - -#: src/gthumb-ui.xml.h:241 -#, fuzzy -msgid "_Rotate" -msgstr "Аддаленыя" - -#: src/gthumb-ui.xml.h:242 -msgid "_Scaled" -msgstr "" - -#: src/gthumb-ui.xml.h:243 -msgid "_Select All" -msgstr "" - -#: src/gthumb-ui.xml.h:244 -msgid "_Slide Show" -msgstr "" - -#: src/gthumb-ui.xml.h:245 -msgid "_Statusbar" -msgstr "" - -#: src/gthumb-ui.xml.h:246 -msgid "_Stop" -msgstr "" - -#: src/gthumb-ui.xml.h:247 -msgid "_Stretch Contrast" -msgstr "" - -#: src/gthumb-ui.xml.h:248 -msgid "_Threshold" -msgstr "" - -#: src/gthumb-ui.xml.h:249 src/gthumb_preferences.glade.h:65 -#, fuzzy -msgid "_Thumbnails" -msgstr "Тэрміналы" - -#: src/gthumb-ui.xml.h:250 -msgid "_Tiled" -msgstr "" - -#: src/gthumb-ui.xml.h:251 -msgid "_Toolbar" -msgstr "" - -#: src/gthumb-ui.xml.h:252 -msgid "_Tools" -msgstr "_Сродкі" - -#: src/gthumb-ui.xml.h:253 -msgid "_Transform" -msgstr "_Трансфармаваньне" - -#: src/gthumb-ui.xml.h:254 -msgid "_Up" -msgstr "У_гору" - -#: src/gthumb-ui.xml.h:257 -msgid "_Zoom" -msgstr "Ма_штаб" - -#: src/gthumb-ui.xml.h:258 -msgid "by _Name" -msgstr "Па _назвах" - -#: src/gthumb-ui.xml.h:259 -msgid "by _Path" -msgstr "Па _шляхах" - -#: src/gthumb-ui.xml.h:260 -msgid "by _Size" -msgstr "Па па_мерах" - -#: src/gthumb-ui.xml.h:261 -msgid "by _Time" -msgstr "Па _часу" - -#: src/gthumb-window.c:436 -msgid "[Press 'c' to add a comment]" -msgstr "[Націсьніце \"c\", каб дадаць камэнтар]" - -#: src/gthumb-window.c:510 src/gthumb-window.c:532 -msgid "[modified]" -msgstr "[зьменены]" - -#: src/gthumb-window.c:616 -msgid "No image" -msgstr "Відарыс адсутнічае" - -#: src/gthumb-window.c:618 -#, c-format -msgid "1 image (%s)" -msgstr "1 відарыс (%s)" - -#: src/gthumb-window.c:621 -#, c-format -msgid "%d images (%s)" -msgstr "%d відарысаў (%s)" - -#: src/gthumb-window.c:628 -#, c-format -msgid "1 selected (%s)" -msgstr "1 вылучаны (%s)" - -#: src/gthumb-window.c:631 -#, c-format -msgid "%d selected (%s)" -msgstr "%d вылучана (%s)" - -#: src/gthumb-window.c:3170 -msgid "Dragged Images" -msgstr "Перацягнутыя відарысы" - -#: src/gthumb-window.c:3369 -msgid "Could not move the items:" -msgstr "Немагчыма перамясьціць элемэнты:" - -#: src/gthumb-window.c:5162 -msgid "Image comment" -msgstr "Камэнтар відарыса" - -#: src/gthumb-window.c:5176 -msgid "Image data" -msgstr "Даньні відарыса" - -#: src/gthumb-window.c:5190 -msgid "Image preview" -msgstr "Перадпрагляд відарыса" - -#: src/gthumb-window.c:6395 -#, c-format -msgid "Cannot load folder \"%s\": %s\n" -msgstr "Немагчыма загрузіць тэчку \"%s\": %s\n" - -#: src/gthumb-window.c:6664 -msgid "The specified catalog does not exist." -msgstr "Пазначаны каталёг не йснуе." - -#: src/gthumb-window.c:8141 -msgid "Wait please..." -msgstr "Пачакайце, калі ласка..." - -#: src/gthumb.glade.h:1 src/gthumb_comments.glade.h:1 -#: src/gthumb_convert.glade.h:1 src/gthumb_edit.glade.h:1 -#: src/gthumb_png_exporter.glade.h:1 src/gthumb_preferences.glade.h:1 -#: src/gthumb_print.glade.h:1 src/gthumb_tools.glade.h:1 -#: src/gthumb_web_exporter.glade.h:1 -msgid " " -msgstr " " - -#: src/gthumb.glade.h:2 src/gthumb_comments.glade.h:2 -#: src/gthumb_convert.glade.h:2 src/gthumb_png_exporter.glade.h:3 -#: src/gthumb_preferences.glade.h:3 src/gthumb_search.glade.h:1 -#: src/gthumb_tools.glade.h:3 src/gthumb_web_exporter.glade.h:3 -msgid "*" -msgstr "*" - -#: src/gthumb.glade.h:3 -msgid "Categories:" -msgstr "Катэгорыі:" - -#: src/gthumb.glade.h:4 -msgid "Information on Channel:" -msgstr "" - -#: src/gthumb.glade.h:5 -msgid "Overwrite the old image with the new one?" -msgstr "" - -#: src/gthumb.glade.h:6 -#, fuzzy -msgid "A_vailable applications:" -msgstr "Дастасаваньні" - -#: src/gthumb.glade.h:7 -msgid "Alpha" -msgstr "" - -#: src/gthumb.glade.h:8 -msgid "Blue" -msgstr "" - -#: src/gthumb.glade.h:9 -msgid "Bookmarks" -msgstr "Закладкі" - -#: src/gthumb.glade.h:10 -msgid "C_atalogs:" -msgstr "" - -#: src/gthumb.glade.h:11 -msgid "Choose a Catalog" -msgstr "" - -#: src/gthumb.glade.h:13 -msgid "Do not overwrite _the old image" -msgstr "" - -#: src/gthumb.glade.h:14 -msgid "Green" -msgstr "" - -#: src/gthumb.glade.h:15 -msgid "New Image:" -msgstr "" - -#: src/gthumb.glade.h:16 -msgid "New _Library" -msgstr "" - -#: src/gthumb.glade.h:17 -msgid "Old Image:" -msgstr "" - -#: src/gthumb.glade.h:18 -msgid "Open Images" -msgstr "" - -#: src/gthumb.glade.h:19 -msgid "Over_write the old image" -msgstr "" - -#: src/gthumb.glade.h:20 -msgid "Overwrite Image" -msgstr "" - -#: src/gthumb.glade.h:21 -msgid "Overwrite _all images" -msgstr "" - -#: src/gthumb.glade.h:22 -msgid "Photo _Data (EXIF)" -msgstr "" - -#: src/gthumb.glade.h:23 -#, fuzzy -msgid "R_ecent applications:" -msgstr "Дастасаваньні" - -#: src/gthumb.glade.h:24 -#, fuzzy -msgid "Red" -msgstr "Red Hat" - -#: src/gthumb.glade.h:25 -msgid "Value" -msgstr "" - -#: src/gthumb.glade.h:26 -#, fuzzy -msgid "_Application:" -msgstr "Дастасаваньні" - -#: src/gthumb.glade.h:28 -msgid "_Do not overwrite any image" -msgstr "" - -#: src/gthumb.glade.h:29 -#, fuzzy -msgid "_General" -msgstr "Агульнае" - -#: src/gthumb.glade.h:30 -msgid "_Histogram" -msgstr "" - -#: src/gthumb.glade.h:31 -msgid "_New Catalog" -msgstr "" - -#: src/gthumb.glade.h:32 -msgid "_Next" -msgstr "" - -#: src/gthumb.glade.h:33 -msgid "_Previous" -msgstr "" - -#: src/gthumb.glade.h:34 -#, fuzzy -msgid "_Remove" -msgstr "Аддаленыя" - -#: src/gthumb.glade.h:35 -msgid "_Save the new image as:" -msgstr "" - -#: src/gthumb.schemas.in.h:1 -msgid "" -"Images over this size (in bytes) will not be thumbnailed. Use 0 if you want " -"to generate thumbnails for all images." -msgstr "" - -#: src/gthumb.schemas.in.h:2 -msgid "Possible values are: 1, 2, 3, 4." -msgstr "" - -#: src/gthumb.schemas.in.h:3 -msgid "Possible values are: actual_size, fit, keep_prev, fit_if_larger." -msgstr "" - -#: src/gthumb.schemas.in.h:4 -msgid "Possible values are: ascending, descending." -msgstr "" - -#: src/gthumb.schemas.in.h:5 -msgid "Possible values are: forward, backward." -msgstr "" - -#: src/gthumb.schemas.in.h:6 -msgid "Possible values are: high, low." -msgstr "" - -#: src/gthumb.schemas.in.h:7 -msgid "Possible values are: image, data, comment." -msgstr "" - -#: src/gthumb.schemas.in.h:8 -msgid "Possible values are: jpeg, png, tga, tiff." -msgstr "" - -#: src/gthumb.schemas.in.h:9 -msgid "Possible values are: light, midtone, dark." -msgstr "" - -#: src/gthumb.schemas.in.h:10 -msgid "Possible values are: list, thumbnails." -msgstr "" - -#: src/gthumb.schemas.in.h:11 -msgid "Possible values are: mm, in." -msgstr "" - -#: src/gthumb.schemas.in.h:12 -msgid "Possible values are: name, path, size, time." -msgstr "" - -#: src/gthumb.schemas.in.h:13 -msgid "Possible values are: name, size, time." -msgstr "" - -#: src/gthumb.schemas.in.h:14 -msgid "Possible values are: nautilus, single, double." -msgstr "" - -#: src/gthumb.schemas.in.h:15 -msgid "Possible values are: none, deflate, jpeg." -msgstr "" - -#: src/gthumb.schemas.in.h:16 -msgid "Possible values are: none, name, path, size, time." -msgstr "" - -#: src/gthumb.schemas.in.h:17 -msgid "" -"Possible values are: none, simple, simple_with_shadow, shadow, slide, " -"shadow_in, shadow_out." -msgstr "" - -#: src/gthumb.schemas.in.h:18 -msgid "Possible values are: pixels, percentage." -msgstr "Магчымыя значэньні: pixels (піксалі), percentage (адсоткі)." - -#: src/gthumb.schemas.in.h:19 -msgid "Possible values are: png, jpeg." -msgstr "Магчымыя значэньні: png, jpeg." - -#: src/gthumb.schemas.in.h:20 -msgid "Possible values are: skip, rename, ask, overwrite." -msgstr "" - -#: src/gthumb.schemas.in.h:21 -msgid "Possible values are: small, medium, large." -msgstr "" - -#: src/gthumb.schemas.in.h:22 -msgid "Possible values are: system, text_below, text_beside, text_only, icons_only." -msgstr "" - -#: src/gthumb.schemas.in.h:23 -msgid "Possible values are: white, black, checked, none." -msgstr "" - -#: src/gthumb.schemas.in.h:24 -msgid "Whether to always use a black background." -msgstr "" - -#: src/gthumb_comments.glade.h:3 src/gthumb_search.glade.h:5 -msgid "A_vailable categories:" -msgstr "" - -#: src/gthumb_comments.glade.h:4 src/gthumb_tools.glade.h:10 -msgid "C_urrent date" -msgstr "" - -#: src/gthumb_comments.glade.h:6 -msgid "Choose Date" -msgstr "" - -#: src/gthumb_comments.glade.h:7 src/gthumb_search.glade.h:12 -msgid "Co_mment:" -msgstr "" - -#: src/gthumb_comments.glade.h:9 -msgid "Create a new category" -msgstr "" - -#: src/gthumb_comments.glade.h:10 -msgid "Current date" -msgstr "" - -#: src/gthumb_comments.glade.h:11 src/gthumb_tools.glade.h:25 -msgid "Image c_reation date" -msgstr "" - -#: src/gthumb_comments.glade.h:12 -#, fuzzy -msgid "Image creation date" -msgstr "па часу зьмяненьня" - -#: src/gthumb_comments.glade.h:13 -#, fuzzy -msgid "No date" -msgstr "Аддаленыя" - -#: src/gthumb_comments.glade.h:14 src/gthumb_tools.glade.h:32 -msgid "P_hoto digitalization date (From EXIF data)" -msgstr "" - -#: src/gthumb_comments.glade.h:15 -msgid "Photo digitalization date (From EXIF data)" -msgstr "" - -#: src/gthumb_comments.glade.h:16 -msgid "Remove selected category" -msgstr "" - -#: src/gthumb_comments.glade.h:17 -msgid "Save only cha_nged fields" -msgstr "" - -#: src/gthumb_comments.glade.h:18 src/gthumb_tools.glade.h:42 -msgid "The _following date:" -msgstr "" - -#: src/gthumb_comments.glade.h:19 -msgid "The following date" -msgstr "" - -#: src/gthumb_comments.glade.h:20 src/gthumb_search.glade.h:24 -msgid "_Date:" -msgstr "" - -#: src/gthumb_comments.glade.h:21 -#, fuzzy -msgid "_Delete" -msgstr "Telnet" - -#: src/gthumb_comments.glade.h:22 -#, fuzzy -msgid "_New" -msgstr "Навіны" - -#: src/gthumb_comments.glade.h:23 -#, fuzzy -msgid "_No date" -msgstr "Аддаленыя" - -#: src/gthumb_comments.glade.h:24 src/gthumb_search.glade.h:27 -msgid "_Place:" -msgstr "" - -#: src/gthumb_comments.glade.h:25 src/gthumb_search.glade.h:30 -msgid "_Selected categories:" -msgstr "" - -#: src/gthumb_convert.glade.h:3 -#, fuzzy -msgid "Compression" -msgstr "Сьцісканьне" - -#: src/gthumb_convert.glade.h:4 -msgid "Image type" -msgstr "" - -#: src/gthumb_convert.glade.h:5 -msgid "Resolution" -msgstr "" - -#: src/gthumb_convert.glade.h:6 -msgid "Ask" -msgstr "" - -#: src/gthumb_convert.glade.h:7 -#, fuzzy -msgid "Compression _level:" -msgstr "Сьцісканьне" - -#: src/gthumb_convert.glade.h:8 -msgid "Convert Format" -msgstr "" - -#: src/gthumb_convert.glade.h:9 -msgid "JPEG Options" -msgstr "" - -#: src/gthumb_convert.glade.h:10 -msgid "No_rmal (Deflate)" -msgstr "" - -#: src/gthumb_convert.glade.h:11 -msgid "Opti_mize" -msgstr "" - -#: src/gthumb_convert.glade.h:12 -msgid "Overwrite" -msgstr "" - -#: src/gthumb_convert.glade.h:13 -msgid "Overwrite mode:" -msgstr "" - -#: src/gthumb_convert.glade.h:14 -msgid "PNG Options" -msgstr "" - -#: src/gthumb_convert.glade.h:15 -msgid "R_emove original" -msgstr "" - -#: src/gthumb_convert.glade.h:16 -#, fuzzy -msgid "Rename" -msgstr "Аддаленыя" - -#: src/gthumb_convert.glade.h:18 -#, fuzzy -msgid "TGA Options" -msgstr "Дастасаваньні" - -#: src/gthumb_convert.glade.h:19 -msgid "TIFF Options" -msgstr "" - -#: src/gthumb_convert.glade.h:20 -msgid "T_GA" -msgstr "" - -#: src/gthumb_convert.glade.h:21 src/gthumb_png_exporter.glade.h:64 -msgid "_Horizontal:" -msgstr "" - -#: src/gthumb_convert.glade.h:22 -msgid "_JPEG" -msgstr "" - -#: src/gthumb_convert.glade.h:23 -msgid "_Loss compression (JPEG)" -msgstr "" - -#: src/gthumb_convert.glade.h:24 -#, fuzzy -msgid "_No compression" -msgstr "Сьцісканьне" - -#: src/gthumb_convert.glade.h:25 -msgid "_PNG" -msgstr "" - -#: src/gthumb_convert.glade.h:26 -#, fuzzy -msgid "_Progressive" -msgstr "Праграмы" - -#: src/gthumb_convert.glade.h:27 -msgid "_Quality:" -msgstr "" - -#: src/gthumb_convert.glade.h:28 -#, fuzzy -msgid "_RLE compression" -msgstr "Сьцісканьне" - -#: src/gthumb_convert.glade.h:29 -msgid "_Smoothing:" -msgstr "" - -#: src/gthumb_convert.glade.h:30 -msgid "_TIFF" -msgstr "" - -#: src/gthumb_convert.glade.h:31 src/gthumb_png_exporter.glade.h:70 -msgid "_Vertical:" -msgstr "" - -#: src/gthumb_convert.glade.h:32 -msgid "dpi" -msgstr "" - -#: src/gthumb_edit.glade.h:2 src/gthumb_png_exporter.glade.h:2 -#: src/gthumb_preferences.glade.h:2 src/gthumb_tools.glade.h:2 -#: src/gthumb_web_exporter.glade.h:2 -msgid " " -msgstr "" - -#: src/gthumb_edit.glade.h:4 src/gthumb_print.glade.h:3 -#, no-c-format -msgid "%" -msgstr "" - -#: src/gthumb_edit.glade.h:5 -msgid "Color levels" -msgstr "" - -#: src/gthumb_edit.glade.h:6 -msgid "New dimensions" -msgstr "" - -#: src/gthumb_edit.glade.h:7 -msgid "Original dimensions" -msgstr "" - -#: src/gthumb_edit.glade.h:8 -msgid "Scale ratio" -msgstr "" - -#: src/gthumb_edit.glade.h:9 -msgid "Brightness - Contrast" -msgstr "" - -#: src/gthumb_edit.glade.h:10 -msgid "Color Balance" -msgstr "" - -#: src/gthumb_edit.glade.h:11 -msgid "Con_trast:" -msgstr "" - -#: src/gthumb_edit.glade.h:12 -msgid "Cyan-_Red:" -msgstr "" - -#: src/gthumb_edit.glade.h:13 -msgid "Height:" -msgstr "" - -#: src/gthumb_edit.glade.h:14 -msgid "High _quality" -msgstr "" - -#: src/gthumb_edit.glade.h:15 -msgid "Hue - Saturation" -msgstr "" - -#: src/gthumb_edit.glade.h:16 -msgid "Posterize" -msgstr "" - -#: src/gthumb_edit.glade.h:17 -msgid "Preserve l_uminosity" -msgstr "" - -#: src/gthumb_edit.glade.h:18 -msgid "Scale Image" -msgstr "" - -#: src/gthumb_edit.glade.h:19 -msgid "Width:" -msgstr "" - -#: src/gthumb_edit.glade.h:20 -msgid "_Brightness:" -msgstr "" - -#: src/gthumb_edit.glade.h:21 src/gthumb_print.glade.h:24 -msgid "_Height:" -msgstr "" - -#: src/gthumb_edit.glade.h:22 -msgid "_Hue:" -msgstr "" - -#: src/gthumb_edit.glade.h:23 -msgid "_Keep aspect ratio" -msgstr "" - -#: src/gthumb_edit.glade.h:24 -msgid "_Levels:" -msgstr "" - -#: src/gthumb_edit.glade.h:25 -msgid "_Lightness:" -msgstr "" - -#: src/gthumb_edit.glade.h:26 -msgid "_Magenta-Green:" -msgstr "" - -#: src/gthumb_edit.glade.h:27 -msgid "_Preview" -msgstr "" - -#: src/gthumb_edit.glade.h:28 -msgid "_Reset" -msgstr "" - -#: src/gthumb_edit.glade.h:29 -#, fuzzy -msgid "_Saturation:" -msgstr "Сымулятары" - -#: src/gthumb_edit.glade.h:30 -msgid "_Scale" -msgstr "" - -#: src/gthumb_edit.glade.h:31 src/gthumb_print.glade.h:26 -msgid "_Width:" -msgstr "" - -#: src/gthumb_edit.glade.h:32 -msgid "_Yellow-Blue:" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:4 -msgid "112" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:5 -msgid "128" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:6 -msgid "164" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:7 -msgid "200" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:8 -msgid "256" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:9 -msgid "48" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:10 -msgid "64" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:11 -msgid "75" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:12 -msgid "85" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:13 -msgid "95" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:14 -msgid "Background style" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:15 -msgid "Caption" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:16 -msgid "Destination folder" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:17 -msgid "Footer" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:18 -msgid "Header and footer" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:19 -msgid "Header" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:20 -msgid "Index images" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:21 -msgid "Page size" -msgstr "Памер аркуша" - -#: src/gthumb_png_exporter.glade.h:22 -msgid "Examples:" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:23 -msgid "Choose destination folder" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:24 src/gthumb_web_exporter.glade.h:18 -msgid "Co_mment" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:25 src/gthumb_web_exporter.glade.h:19 -msgid "Col_umns:" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:26 -msgid "Colo_r:" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:27 -msgid "Create Index Image" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:28 -msgid "Create _HTML image map" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:29 src/gthumb_web_exporter.glade.h:22 -msgid "F_ooter:" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:30 src/gthumb_web_exporter.glade.h:23 -msgid "File _name" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:31 -msgid "File pa_th" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:32 src/gthumb_web_exporter.glade.h:24 -msgid "File si_ze" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:33 -msgid "Frame _style:" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:34 -msgid "Frame co_lor:" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:35 src/gthumb_web_exporter.glade.h:26 -msgid "H_eader:" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:36 -msgid "Header/Footer" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:37 -msgid "Hei_ght:" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:38 src/gthumb_web_exporter.glade.h:28 -msgid "Image dim_ensions" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:39 -msgid "Images" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:40 -msgid "Index Image Properties" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:41 -msgid "Page" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:42 -#, fuzzy -msgid "Pi_xels" -msgstr "Мікшары" - -#: src/gthumb_png_exporter.glade.h:43 src/gthumb_web_exporter.glade.h:30 -msgid "Re_verse order" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:44 -msgid "Rows a_nd columns" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:45 -msgid "Select a color" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:46 -msgid "Shadow in" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:47 -msgid "Shadow only" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:48 -msgid "Shadow out" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:49 -msgid "Simple" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:50 -msgid "Simple with shadow" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:51 -#, fuzzy -msgid "Slide" -msgstr "Відэа" - -#: src/gthumb_png_exporter.glade.h:52 -#, fuzzy -msgid "Sor_t images:" -msgstr "Сховішча" - -#: src/gthumb_png_exporter.glade.h:53 -msgid "Sort" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:54 src/gthumb_search.glade.h:23 -#: src/gthumb_tools.glade.h:41 -msgid "Start _at:" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:55 -msgid "Style Preview" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:56 -msgid "Use #'s to specify positions used by numeric enumerator." -msgstr "" - -#: src/gthumb_png_exporter.glade.h:58 -#, no-c-format -msgid "" -"Use %p to insert the page number, and %n to insert the total number of " -"pages." -msgstr "" - -#: src/gthumb_png_exporter.glade.h:59 -msgid "Wi_dth:" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:60 -msgid "_All pages with the same size" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:61 -msgid "_Draw frame" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:62 -#, fuzzy -msgid "_Font:" -msgstr "Шрыфты" - -#: src/gthumb_png_exporter.glade.h:63 -msgid "_Gradient" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:65 -msgid "_Image size:" -msgstr "Па_мер відарыса:" - -#: src/gthumb_png_exporter.glade.h:67 src/gthumb_web_exporter.glade.h:45 -msgid "_Rows:" -msgstr "_Радкі:" - -#: src/gthumb_png_exporter.glade.h:68 -msgid "_Solid color" -msgstr "Су_цэльны колер" - -#: src/gthumb_png_exporter.glade.h:69 src/gthumb_tools.glade.h:47 -msgid "_Template:" -msgstr "_Узор:" - -#: src/gthumb_png_exporter.glade.h:71 src/gthumb_web_exporter.glade.h:49 -msgid "by name" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:72 src/gthumb_web_exporter.glade.h:50 -msgid "by path" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:73 src/gthumb_web_exporter.glade.h:51 -msgid "by size" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:74 -msgid "by time" -msgstr "" - -#: src/gthumb_png_exporter.glade.h:75 -msgid "jpeg" -msgstr "jpeg" - -#: src/gthumb_png_exporter.glade.h:76 -msgid "png" -msgstr "png" - -#: src/gthumb_preferences.glade.h:4 -msgid "112 x 112" -msgstr "112 x 112" - -#: src/gthumb_preferences.glade.h:5 -msgid "128 x 128" -msgstr "128 x 128" - -#: src/gthumb_preferences.glade.h:6 -msgid "164 x 164" -msgstr "164 x 164" - -#: src/gthumb_preferences.glade.h:7 -msgid "200 x 200" -msgstr "200 x 200" - -#: src/gthumb_preferences.glade.h:8 -msgid "256 x 256" -msgstr "256 x 256" - -#: src/gthumb_preferences.glade.h:9 -msgid "48 x 48" -msgstr "48 x 48" - -#: src/gthumb_preferences.glade.h:10 -msgid "64 x 64" -msgstr "64 x 64" - -#: src/gthumb_preferences.glade.h:11 -msgid "85 x 85" -msgstr "85 x 85" - -#: src/gthumb_preferences.glade.h:12 -msgid "95 x 95" -msgstr "95 x 95" - -#: src/gthumb_preferences.glade.h:13 -msgid "Direction" -msgstr "Накірунак" - -#: src/gthumb_preferences.glade.h:14 -msgid "Hide/Show" -msgstr "Схаваць/Паказаць" - -#: src/gthumb_preferences.glade.h:15 -msgid "Interface" -msgstr "Спалучэньне" - -#: src/gthumb_preferences.glade.h:16 -msgid "On startup:" -msgstr "Пад час запуску:" - -#: src/gthumb_preferences.glade.h:17 -msgid "Other" -msgstr "Іншае" - -#: src/gthumb_preferences.glade.h:18 -msgid "Slide show" -msgstr "" - -#: src/gthumb_preferences.glade.h:19 -msgid "View images as" -msgstr "" - -#: src/gthumb_preferences.glade.h:20 -msgid "Viewer" -msgstr "" - -#: src/gthumb_preferences.glade.h:21 -msgid "Zoom quality" -msgstr "" - -#: src/gthumb_preferences.glade.h:22 -msgid "Activate items with a double click" -msgstr "" - -#: src/gthumb_preferences.glade.h:23 -msgid "Activate items with a single click" -msgstr "" - -#: src/gthumb_preferences.glade.h:24 -msgid "After _loading an image:" -msgstr "" - -#: src/gthumb_preferences.glade.h:25 -msgid "As_k confirmation before deleting images or catalogs" -msgstr "" - -#: src/gthumb_preferences.glade.h:26 -msgid "Black" -msgstr "Чорны" - -#: src/gthumb_preferences.glade.h:27 -msgid "Browser" -msgstr "" - -#: src/gthumb_preferences.glade.h:28 -msgid "C_lick policy:" -msgstr "" - -#: src/gthumb_preferences.glade.h:29 -msgid "Checked" -msgstr "" - -#: src/gthumb_preferences.glade.h:30 -msgid "Choose startup folder" -msgstr "" - -#: src/gthumb_preferences.glade.h:31 -msgid "Co_mments" -msgstr "" - -#: src/gthumb_preferences.glade.h:32 -msgid "D_elay before changing image:" -msgstr "" - -#: src/gthumb_preferences.glade.h:33 -msgid "D_etermine image type from content (slower)" -msgstr "" - -#: src/gthumb_preferences.glade.h:34 -msgid "Do _not change folder" -msgstr "" - -#: src/gthumb_preferences.glade.h:35 -msgid "Fit image to window" -msgstr "" - -#: src/gthumb_preferences.glade.h:36 -msgid "Fit to window if larger" -msgstr "" - -#: src/gthumb_preferences.glade.h:37 -msgid "Follow Nautilus behaviour" -msgstr "" - -#: src/gthumb_preferences.glade.h:38 -msgid "For_ward" -msgstr "На_перад" - -#: src/gthumb_preferences.glade.h:39 -msgid "General" -msgstr "Агульныя" - -#: src/gthumb_preferences.glade.h:40 -msgid "Go to last _visited folder or catalog" -msgstr "Ісьці да ап_ошняе наведанае тэчкі ці каталёга" - -#: src/gthumb_preferences.glade.h:41 -msgid "Go to this _folder:" -msgstr "Ісьці да _гэтае тэчкі:" - -#: src/gthumb_preferences.glade.h:42 -msgid "H_igh" -msgstr "В_ысокая" - -#: src/gthumb_preferences.glade.h:43 -msgid "Icons only" -msgstr "толькі значкі" - -#: src/gthumb_preferences.glade.h:44 -msgid "Keep previous zoom" -msgstr "пакінуць ранейшае павелічэньне" - -#: src/gthumb_preferences.glade.h:45 -msgid "Layout:" -msgstr "Разьмеркаваньне:" - -#: src/gthumb_preferences.glade.h:46 -msgid "Lo_w" -msgstr "Н_ізкая" - -#: src/gthumb_preferences.glade.h:47 -msgid "None" -msgstr "няма" - -#: src/gthumb_preferences.glade.h:48 -msgid "Re_verse" -msgstr "На_зад" - -#: src/gthumb_preferences.glade.h:49 -msgid "Resta_rt when finished" -msgstr "Перазап_усьціць пасьля завяршэньня" - -#: src/gthumb_preferences.glade.h:50 -msgid "Set image to actual size" -msgstr "усталяваць відарыс у сапраўдны памер" - -#: src/gthumb_preferences.glade.h:51 -msgid "Set to C_urrent" -msgstr "Бяг_учая тэчка" - -#: src/gthumb_preferences.glade.h:53 -msgid "Switch to _full screen" -msgstr "Пераключыцца ў п_оўнаэкранны рэжым" - -#: src/gthumb_preferences.glade.h:54 -msgid "System settings" -msgstr "сыстэмныя ўсталёўкі" - -#: src/gthumb_preferences.glade.h:55 -msgid "Text below icons" -msgstr "тэкст пад значкамі" - -#: src/gthumb_preferences.glade.h:56 -msgid "Text beside icons" -msgstr "тэкст побач са значкамі" - -#: src/gthumb_preferences.glade.h:57 -msgid "Text only" -msgstr "толькі тэкст" - -#: src/gthumb_preferences.glade.h:58 -msgid "Th_umbnail size:" -msgstr "Памер мініяц_юр:" - -#: src/gthumb_preferences.glade.h:59 -msgid "Transparency _type:" -msgstr "Від пра_зрыстасьці:" - -#: src/gthumb_preferences.glade.h:60 -msgid "Viewer" -msgstr "Праглядальнік" - -#: src/gthumb_preferences.glade.h:61 -msgid "White" -msgstr "Белы" - -#: src/gthumb_preferences.glade.h:62 -msgid "_Filenames" -msgstr "_Назвы файлаў" - -#: src/gthumb_preferences.glade.h:63 -msgid "_List" -msgstr "_Сьпіс" - -#: src/gthumb_preferences.glade.h:64 -msgid "_Slides" -msgstr "" - -#: src/gthumb_preferences.glade.h:66 -msgid "_Toolbar style:" -msgstr "Від панэлі _сродкаў:" - -#: src/gthumb_preferences.glade.h:67 -msgid "gThumb Preferences" -msgstr "Перавагі gThumb" - -#: src/gthumb_preferences.glade.h:68 -msgid "seconds" -msgstr "сэкунды" - -#: src/gthumb_print.glade.h:4 -msgid "Image" -msgstr "Відарыс" - -#: src/gthumb_print.glade.h:5 -msgid "Orientation" -msgstr "Спагляданьне" - -#: src/gthumb_print.glade.h:6 -msgid "Size" -msgstr "Памер" - -#: src/gthumb_print.glade.h:7 -msgid "" -"Drag the image to move\n" -"it in the page." -msgstr "" - -#: src/gthumb_print.glade.h:9 -msgid "A_4" -msgstr "A_4" - -#: src/gthumb_print.glade.h:10 -msgid "C_ustom:" -msgstr "" - -#: src/gthumb_print.glade.h:11 -msgid "Center _on Page" -msgstr "" - -#: src/gthumb_print.glade.h:12 -msgid "Comment _font:" -msgstr "Шрыфт ка_мэнтару:" - -#: src/gthumb_print.glade.h:13 -msgid "I_nclude comment" -msgstr "" - -#: src/gthumb_print.glade.h:14 -msgid "Inches" -msgstr "Цалі" - -#: src/gthumb_print.glade.h:15 -msgid "Lan_dscape" -msgstr "_Гарызантальнае" - -#: src/gthumb_print.glade.h:16 -msgid "Layout" -msgstr "Разьмеркаваньне" - -#: src/gthumb_print.glade.h:17 -msgid "Millimeters" -msgstr "Мілімэтры" - -#: src/gthumb_print.glade.h:18 -msgid "P_ortrait" -msgstr "_Вэртыкальнае" - -#: src/gthumb_print.glade.h:19 -msgid "Paper Details" -msgstr "" - -#: src/gthumb_print.glade.h:21 -msgid "US E_xecutive" -msgstr "" - -#: src/gthumb_print.glade.h:22 -msgid "US L_egal" -msgstr "" - -#: src/gthumb_print.glade.h:23 -msgid "US _Letter" -msgstr "" - -#: src/gthumb_print.glade.h:25 -msgid "_Scale:" -msgstr "" - -#: src/gthumb_search.glade.h:2 src/gthumb_web_exporter.glade.h:4 -msgid "..." -msgstr "" - -#: src/gthumb_search.glade.h:3 -msgid "Search criteria" -msgstr "" - -#: src/gthumb_search.glade.h:4 -msgid "Search scope" -msgstr "" - -#: src/gthumb_search.glade.h:6 -msgid "After" -msgstr "Пасьля" - -#: src/gthumb_search.glade.h:7 -msgid "Any" -msgstr "Любы" - -#: src/gthumb_search.glade.h:8 -msgid "Before" -msgstr "Перад" - -#: src/gthumb_search.glade.h:9 -msgid "Ca_tegories:" -msgstr "Са_тэгорыі:" - -#: src/gthumb_search.glade.h:11 -msgid "Choose categories from the saved list" -msgstr "Абярыце катэгорыі з захаванага сьпіса" - -#: src/gthumb_search.glade.h:13 -msgid "Equal to" -msgstr "" - -#: src/gthumb_search.glade.h:14 -msgid "File _name:" -msgstr "Наз_ва файла:" - -#: src/gthumb_search.glade.h:15 -msgid "Find" -msgstr "Шукаць" - -#: src/gthumb_search.glade.h:16 -msgid "Found images:" -msgstr "Пошук відарысаў:" - -#: src/gthumb_search.glade.h:17 -msgid "Match a_ll selected categories" -msgstr "" - -#: src/gthumb_search.glade.h:18 -msgid "Match a_ny selected category" -msgstr "" - -#: src/gthumb_search.glade.h:19 -msgid "New _Search..." -msgstr "" - -#: src/gthumb_search.glade.h:20 -msgid "No images found" -msgstr "" - -#: src/gthumb_search.glade.h:21 -msgid "Search Progress" -msgstr "" - -#: src/gthumb_search.glade.h:22 src/gthumb_tools.glade.h:40 -msgid "Searching in:" -msgstr "" - -#: src/gthumb_search.glade.h:26 src/gthumb_tools.glade.h:44 -msgid "_Include sub-folders" -msgstr "" - -#: src/gthumb_search.glade.h:28 -msgid "_Save" -msgstr "_Захаваць" - -#: src/gthumb_search.glade.h:29 -#, fuzzy -msgid "_Search" -msgstr "Размова" - -#: src/gthumb_tools.glade.h:4 -msgid "Comments" -msgstr "" - -#: src/gthumb_tools.glade.h:5 -msgid "File list order" -msgstr "" - -#: src/gthumb_tools.glade.h:6 -msgid "Specify a template to use for renaming images" -msgstr "" - -#: src/gthumb_tools.glade.h:7 -msgid "Thumbnails" -msgstr "" - -#: src/gthumb_tools.glade.h:8 -msgid "Apply to _all images" -msgstr "" - -#: src/gthumb_tools.glade.h:9 -msgid "Backup Comments" -msgstr "" - -#: src/gthumb_tools.glade.h:11 -msgid "Change Date" -msgstr "" - -#: src/gthumb_tools.glade.h:12 -msgid "Change the last modified date to:" -msgstr "" - -#: src/gthumb_tools.glade.h:13 -msgid "Check _All" -msgstr "" - -#: src/gthumb_tools.glade.h:14 -msgid "Check _None" -msgstr "" - -#: src/gthumb_tools.glade.h:15 -msgid "Checking image:" -msgstr "" - -#: src/gthumb_tools.glade.h:16 -msgid "Delete ALL Comments" -msgstr "" - -#: src/gthumb_tools.glade.h:17 -msgid "Delete ALL Thumbnails" -msgstr "" - -#: src/gthumb_tools.glade.h:18 -#, fuzzy -msgid "Delete Old Comments" -msgstr "Распрацоўка" - -#: src/gthumb_tools.glade.h:19 -msgid "Delete Old Thumbnails" -msgstr "" - -#: src/gthumb_tools.glade.h:20 -msgid "Delete comments of no more existing images" -msgstr "" - -#: src/gthumb_tools.glade.h:21 -msgid "Delete thumbnails of no more existing images" -msgstr "" - -#: src/gthumb_tools.glade.h:22 -msgid "Equal images:" -msgstr "" - -#: src/gthumb_tools.glade.h:23 -msgid "Find Duplicates" -msgstr "" - -#: src/gthumb_tools.glade.h:24 -msgid "Found duplicates:" -msgstr "" - -#: src/gthumb_tools.glade.h:26 -msgid "JPEG Lossless Transformation" -msgstr "" - -#: src/gthumb_tools.glade.h:27 -msgid "Maintenance" -msgstr "" - -#: src/gthumb_tools.glade.h:28 -msgid "Mirror image horizontally (left-right)" -msgstr "" - -#: src/gthumb_tools.glade.h:29 -msgid "Mirror image vertically (top-bottom)" -msgstr "" - -#: src/gthumb_tools.glade.h:31 -msgid "New names _preview:" -msgstr "" - -#: src/gthumb_tools.glade.h:33 -msgid "Re_verse Order" -msgstr "" - -#: src/gthumb_tools.glade.h:34 -msgid "Rename Series" -msgstr "" - -#: src/gthumb_tools.glade.h:35 -msgid "Restore Comments From a Backup File" -msgstr "" - -#: src/gthumb_tools.glade.h:36 -msgid "Revert changes" -msgstr "" - -#: src/gthumb_tools.glade.h:37 -msgid "Rotate image 90 degrees clockwise" -msgstr "" - -#: src/gthumb_tools.glade.h:38 -msgid "Rotate image 90 degrees counter-clockwise" -msgstr "" - -#: src/gthumb_tools.glade.h:39 -msgid "Search terminated, no duplicates found." -msgstr "" - -#: src/gthumb_tools.glade.h:43 -msgid "" -"Use #'s to specify positions used by numeric enumerator. Use * to insert the " -"original filename. Use ? to insert the image date. Use ! to insert the image " -"size" -msgstr "" - -#: src/gthumb_tools.glade.h:46 -msgid "_Sort original list:" -msgstr "" - -#: src/gthumb_tools.glade.h:49 -msgid "by Modification date" -msgstr "па часу зьмяненьня" - -#: src/gthumb_tools.glade.h:50 -msgid "by Name" -msgstr "па назвах" - -#: src/gthumb_tools.glade.h:51 -msgid "by Size" -msgstr "па памерах" - -#: src/gthumb_web_exporter.glade.h:5 -msgid "1024 x 768" -msgstr "1024 x 768" - -#: src/gthumb_web_exporter.glade.h:5 -msgid "1024 x 1024" -msgstr "1024 x 1024" - -#: src/gthumb_web_exporter.glade.h:6 -msgid "1280 x 960" -msgstr "1280 x 960" - -#: src/gthumb_web_exporter.glade.h:6 -msgid "1280 x 1280" -msgstr "1280 x 1280" - -#: src/gthumb_web_exporter.glade.h:7 -msgid "320 x 200" -msgstr "320 x 200" - -#: src/gthumb_web_exporter.glade.h:7 -msgid "320 x 320" -msgstr "320 x 320" - -#: src/gthumb_web_exporter.glade.h:8 -msgid "640 x 480" -msgstr "640 x 480" - -#: src/gthumb_web_exporter.glade.h:8 -msgid "640 x 640" -msgstr "640 x 640" - -#: src/gthumb_web_exporter.glade.h:9 -msgid "800 x 600" -msgstr "800 x 600" - -#: src/gthumb_web_exporter.glade.h:9 -msgid "800 x 800" -msgstr "800 x 800" - -#: src/gthumb_web_exporter.glade.h:10 -msgid "Album" -msgstr "Альбом" - -#: src/gthumb_web_exporter.glade.h:11 -msgid "Index Layout" -msgstr "" - -#: src/gthumb_web_exporter.glade.h:12 -msgid "Personalize theme" -msgstr "" - -#: src/gthumb_web_exporter.glade.h:13 -msgid "Photo data" -msgstr "Фота даньні" - -#: src/gthumb_web_exporter.glade.h:14 -msgid "Saving" -msgstr "Захаваньне" - -#: src/gthumb_web_exporter.glade.h:15 -msgid "Theme" -msgstr "Тэма" - -#: src/gthumb_web_exporter.glade.h:16 -msgid "Came_ra Model" -msgstr "Мадэля кам_эры" - -#: src/gthumb_web_exporter.glade.h:17 -#, fuzzy -msgid "Caption" -msgstr "Навучаньне" - -#: src/gthumb_web_exporter.glade.h:20 -msgid "E_xposure mode" -msgstr "" - -#: src/gthumb_web_exporter.glade.h:21 -msgid "Exposure _time" -msgstr "" - -#: src/gthumb_web_exporter.glade.h:25 -msgid "Focal _length" -msgstr "" - -#: src/gthumb_web_exporter.glade.h:27 -msgid "I_mage Caption..." -msgstr "" - -#: src/gthumb_web_exporter.glade.h:29 -msgid "Inde_x file:" -msgstr "Файл кл_ючоў:" - -#: src/gthumb_web_exporter.glade.h:31 -msgid "Resi_ze images if larger than:" -msgstr "Зьмяняць па_меры відарысаў, калі яны большыя за:" - -#: src/gthumb_web_exporter.glade.h:32 -msgid "Sor_t:" -msgstr "Упар_адкаваньне:" - -#: src/gthumb_web_exporter.glade.h:33 -msgid "Th_eme:" -msgstr "Т_эма:" - -#: src/gthumb_web_exporter.glade.h:35 -#, no-c-format -msgid "Use %d to insert current date" -msgstr "Скарыстаць %d каб уставіць бягучую дату" - -#: src/gthumb_web_exporter.glade.h:36 -msgid "Web Album" -msgstr "Альбом для павуціньня" - -#: src/gthumb_web_exporter.glade.h:37 -msgid "Web Album Theme" -msgstr "Тэма альбома для павуціньня" - -#: src/gthumb_web_exporter.glade.h:38 -msgid "_Aperture value" -msgstr "Значэньне дзі_ркі" - -#: src/gthumb_web_exporter.glade.h:39 -msgid "_Copy images to destination" -msgstr "_Капіяваць відарысы ў пункт прызначэньня" - -#: src/gthumb_web_exporter.glade.h:40 -msgid "_Date and Time" -msgstr "_Дата ды час" - -#: src/gthumb_web_exporter.glade.h:41 -msgid "_Destination:" -msgstr "П_рызначэньне:" - -#: src/gthumb_web_exporter.glade.h:42 -msgid "_Flash" -msgstr "_Маланка" - -#: src/gthumb_web_exporter.glade.h:43 -msgid "_Go to Theme Folder" -msgstr "Перай_сьці ў каталёг тэмы" - -#: src/gthumb_web_exporter.glade.h:44 -msgid "_Install Theme..." -msgstr "Ус_таляваць тэму..." - -#: src/gthumb_web_exporter.glade.h:46 -msgid "_Shutter speed" -msgstr "Хуткасьць за_твора" - -#: src/gthumb_web_exporter.glade.h:47 -#, fuzzy -msgid "_Thumbnail Caption..." -msgstr "Тэрміналы" - -#: src/gthumb_web_exporter.glade.h:48 -msgid "by modified time" -msgstr "па часе зьмяненьня" - -#: src/gthumb_web_exporter.glade.h:52 -msgid "index.html" -msgstr "index.html" - -#: src/main.c:81 -msgid "Start in fullscreen mode" -msgstr "Пачынаць працу ў поўнаэкранным рэжыме" - -#: src/main.c:85 -msgid "Automatically start a slideshow" -msgstr "Аўтаматычна пачынаць фотапаказ" - -#: src/main.c:164 -msgid "Holidays" -msgstr "Адпачынак" - -#: src/main.c:165 -msgid "Temporary" -msgstr "Часовае" - -#: src/main.c:166 -msgid "Screenshots" -msgstr "Здымкі экрана" - -#: src/main.c:167 -msgid "Science" -msgstr "Навука" - -#: src/main.c:168 -msgid "Favourite" -msgstr "Аблюбаванае" - -#: src/main.c:169 -msgid "Important" -msgstr "Важнае" - -#: src/main.c:170 -msgid "GNOME" -msgstr "GNOME" - -#: src/main.c:171 -msgid "Games" -msgstr "Гульні" - -#: src/main.c:172 -msgid "Party" -msgstr "Вечарына" - -#: src/main.c:173 -msgid "Birthday" -msgstr "Дзень народзінаў" - -#: src/main.c:174 -msgid "Astronomy" -msgstr "Астраномія" - -#: src/main.c:175 -msgid "Family" -msgstr "Сям'я" - -#: src/main.c:312 src/main.c:394 -msgid "Command Line" -msgstr "Загадны радок" - diff -Nru gthumb-3.0.2/po/cs.po gthumb-3.2.3/po/cs.po --- gthumb-3.0.2/po/cs.po 2012-08-14 16:25:43.000000000 +0000 +++ gthumb-3.2.3/po/cs.po 2013-04-30 17:06:23.000000000 +0000 @@ -7,22 +7,23 @@ # Miloslav Trmac , 2003, 2004, 2005, 2006. # Jakub Friedl , 2006, 2007. # Kamil Páral , 2008. -# Marek Černocký , 2010, 2011, 2012. +# Marek Černocký , 2010, 2011, 2012, 2013. # msgid "" msgstr "" "Project-Id-Version: gthumb\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gthumb&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-03-25 20:21+0000\n" -"PO-Revision-Date: 2012-03-28 12:30+0200\n" +"POT-Creation-Date: 2013-01-19 18:36+0000\n" +"PO-Revision-Date: 2013-01-21 22:06+0100\n" "Last-Translator: Marek Černocký \n" -"Language-Team: Czech \n" +"Language-Team: čeština \n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Gtranslator 2.91.6\n" #: ../copy-n-paste/eggdesktopfile.c:165 #, c-format @@ -93,8 +94,8 @@ msgstr "Zobrazit volby správy sezení" #. manually set name and icon -#: ../data/gthumb.desktop.in.in.h:1 ../gthumb/gth-browser.c:529 -#: ../gthumb/gth-progress-dialog.c:388 ../gthumb/main.c:313 +#: ../data/gthumb.desktop.in.in.h:1 ../gthumb/gth-browser.c:578 +#: ../gthumb/gth-progress-dialog.c:390 ../gthumb/main.c:315 msgid "gThumb" msgstr "gThumb" @@ -195,8 +196,8 @@ msgstr "_Musí platit" #. limit label -#: ../data/ui/filter-editor.ui.h:3 ../gthumb/gth-filter.c:270 -#: ../gthumb/gth-filter.c:342 +#: ../data/ui/filter-editor.ui.h:3 ../gthumb/gth-filter.c:269 +#: ../gthumb/gth-filter.c:337 msgid "_Limit to" msgstr "O_mezit na" @@ -235,7 +236,6 @@ msgstr "Vybráno:" #: ../data/ui/location.ui.h:1 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 msgid "_Location:" msgstr "U_místění:" @@ -252,7 +252,6 @@ msgstr "Název souboru:" #: ../data/ui/overwrite-dialog.ui.h:4 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 #: ../extensions/image_print/data/ui/print-layout.ui.h:23 msgid "Size:" msgstr "Velikost:" @@ -399,7 +398,7 @@ #: ../data/ui/preferences.ui.h:25 #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 -#: ../extensions/edit_metadata/gth-edit-general-page.c:473 +#: ../extensions/edit_metadata/gth-edit-general-page.c:481 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 #: ../gthumb/gth-main-default-metadata.c:33 msgid "General" @@ -517,7 +516,6 @@ #: ../extensions/image_viewer/image_viewer.extension.in.in.h:3 #: ../extensions/list_tools/list_tools.extension.in.in.h:3 #: ../extensions/photo_importer/photo_importer.extension.in.in.h:3 -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:3 #: ../extensions/raw_files/raw_files.extension.in.in.h:3 #: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:3 #: ../extensions/rename_series/rename_series.extension.in.in.h:3 @@ -611,16 +609,128 @@ msgid "Write to Disc" msgstr "Zapsat na disk" -#: ../extensions/cairo_io/cairo-io-jpeg.c:62 +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:62 #, c-format msgid "Error interpreting JPEG image file: %s" msgstr "Chyba při interpretaci souboru s obrázkem JPEG: %s" -#: ../extensions/cairo_io/cairo-io-jpeg.c:482 +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:483 #, c-format msgid "Unknown JPEG color space (%d)" msgstr "Neznámý barevný prostor JPEG (%d)" +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:1 +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:1 +msgid "_Default extension:" +msgstr "_Výchozí přípona:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:2 +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:1 +msgid "_Quality:" +msgstr "_Kvalita:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:3 +msgid "_Smoothing:" +msgstr "Vy_hlazování:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:4 +msgid "Opti_mize" +msgstr "Opti_malizovat" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:5 +msgid "_Progressive" +msgstr "_Progresivní" + +#: ../extensions/cairo_io/data/ui/png-options.ui.h:1 +msgid "Compression _level:" +msgstr "Úroveň _komprimace:" + +#: ../extensions/cairo_io/data/ui/save-options-preferences.ui.h:1 +msgid "Default options:" +msgstr "Výchozí volby:" + +#: ../extensions/cairo_io/data/ui/tga-options.ui.h:1 +msgid "_RLE compression" +msgstr "Komprimace _RLE" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:2 +msgid "Compression" +msgstr "Komprimace" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:3 +msgid "_No compression" +msgstr "_Bez komprimace" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:4 +msgid "No_rmal (Deflate)" +msgstr "Běžná (_Deflace)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:5 +msgid "_Loss compression (JPEG)" +msgstr "_Ztrátová komprimace (JPEG)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:6 +msgid "Resolution" +msgstr "Rozlišení" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:7 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 +msgid "_Horizontal:" +msgstr "Vo_dorovně:" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:8 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 +msgid "_Vertical:" +msgstr "S_visle:" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:9 +msgid "dpi" +msgstr "dpi" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:2 +msgid "_Method:" +msgstr "_Metoda:" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:3 +msgid "_Lossless" +msgstr "_Bezeztrátový" + +#: ../extensions/cairo_io/gth-image-saver-jpeg.c:516 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:140 +msgid "JPEG" +msgstr "JPEG" + +#: ../extensions/cairo_io/gth-image-saver-png.c:353 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:110 +msgid "PNG" +msgstr "PNG" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:257 +#: ../extensions/cairo_io/gth-image-saver-tiff.c:435 +#: ../gthumb/gth-buffer-data.c:84 +msgid "Insufficient memory" +msgstr "Nedostatek paměti" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:344 +msgid "TGA" +msgstr "TGA" + +#: ../extensions/cairo_io/gth-image-saver-tiff.c:559 +msgid "TIFF" +msgstr "TIFF" + +#: ../extensions/cairo_io/gth-image-saver-webp.c:382 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:165 +msgid "WebP" +msgstr "WebP" + +#: ../extensions/cairo_io/preferences.c:134 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 +msgid "Saving" +msgstr "Ukládání" + #: ../extensions/catalogs/actions.c:92 ../extensions/catalogs/actions.c:213 #: ../extensions/catalogs/dlg-add-to-catalog.c:274 #: ../extensions/catalogs/dlg-add-to-catalog.c:394 @@ -688,15 +798,16 @@ msgstr "Přid_at do katalogu" #: ../extensions/catalogs/callbacks.c:105 +#: ../extensions/selections/callbacks.c:80 msgid "Open _Folder" msgstr "Otevřít s_ložku" #: ../extensions/catalogs/callbacks.c:106 +#: ../extensions/selections/callbacks.c:81 msgid "Go to the folder that contains the selected file" msgstr "Přejít do složky obsahující vybrané soubory" #: ../extensions/catalogs/callbacks.c:110 -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:85 msgid "Other..." msgstr "Jiné…" @@ -732,36 +843,36 @@ msgid "Rena_me" msgstr "Přej_menovat" -#: ../extensions/catalogs/callbacks.c:279 -#: ../extensions/catalogs/callbacks.c:282 +#: ../extensions/catalogs/callbacks.c:281 +#: ../extensions/catalogs/callbacks.c:284 msgid "Command Line" msgstr "Příkazový řádek" -#: ../extensions/catalogs/callbacks.c:497 -#: ../extensions/catalogs/callbacks.c:502 +#: ../extensions/catalogs/callbacks.c:496 +#: ../extensions/catalogs/callbacks.c:501 #: ../extensions/photo_importer/dlg-photo-importer.c:364 #: ../extensions/photo_importer/dlg-photo-importer.c:404 -#: ../gthumb/gth-file-list.c:43 ../gthumb/gth-folder-tree.c:883 +#: ../gthumb/gth-file-list.c:43 ../gthumb/gth-folder-tree.c:1093 msgid "(Empty)" msgstr "(Prázdné)" -#: ../extensions/catalogs/callbacks.c:697 +#: ../extensions/catalogs/callbacks.c:700 msgid "Catalog Properties" msgstr "Vlastnosti katalogu" -#: ../extensions/catalogs/callbacks.c:711 +#: ../extensions/catalogs/callbacks.c:714 msgid "Organize" msgstr "Uspořádat" -#: ../extensions/catalogs/callbacks.c:712 +#: ../extensions/catalogs/callbacks.c:715 msgid "Automatically organize files by date" msgstr "Automaticky uspořádat soubory podle data" #: ../extensions/catalogs/catalogs.extension.in.in.h:1 #: ../extensions/catalogs/gth-catalog.c:611 #: ../extensions/catalogs/gth-catalog.c:662 -#: ../extensions/catalogs/gth-catalog.c:1024 -#: ../extensions/catalogs/gth-catalog.c:1025 +#: ../extensions/catalogs/gth-catalog.c:1016 +#: ../extensions/catalogs/gth-catalog.c:1017 msgid "Catalogs" msgstr "Katalogy" @@ -787,12 +898,12 @@ #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:5 #: ../extensions/file_manager/actions.c:945 -#: ../extensions/webalbums/gth-web-exporter.c:1842 +#: ../extensions/webalbums/gth-web-exporter.c:1840 msgid "_View the destination" msgstr "_Zobrazit cíl" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:1 -#: ../gthumb/gth-file-properties.c:212 +#: ../gthumb/gth-file-properties.c:209 msgid "Properties" msgstr "Vlastnosti" @@ -841,7 +952,7 @@ msgstr "Ná_hled katalogu:" #: ../extensions/catalogs/data/ui/organize-files.ui.h:1 -#: ../extensions/edit_metadata/gth-edit-general-page.c:550 +#: ../extensions/edit_metadata/gth-edit-general-page.c:558 #: ../gthumb/gth-main-default-tests.c:300 msgid "Date photo was taken" msgstr "Datum pořízení fotografie" @@ -852,7 +963,7 @@ msgstr "Datum změny souboru" #: ../extensions/catalogs/data/ui/organize-files.ui.h:3 -#: ../extensions/comments/main.c:159 +#: ../extensions/comments/main.c:182 msgid "Tag" msgstr "Štítek" @@ -911,7 +1022,7 @@ "Soubory budou uspořádány v katalogu. Na disku žádné soubory přesouvány " "nebudou." -#: ../extensions/catalogs/gth-catalog.c:1122 ../extensions/comments/main.c:44 +#: ../extensions/catalogs/gth-catalog.c:1114 ../extensions/comments/main.c:45 #: ../extensions/edit_metadata/callbacks.c:106 #: ../gthumb/gth-main-default-metadata.c:53 msgid "Tags" @@ -948,15 +1059,15 @@ msgid "Copying files to '%s'" msgstr "Kopírují se soubory do „%s“" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1388 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1322 msgid "Could not remove the files from the catalog" msgstr "Nelze odstranit vybrané soubory z katalogu" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1446 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:685 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:694 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:723 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:1228 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1380 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:746 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:755 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:785 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:1320 #: ../extensions/search/gth-search.c:265 msgid "Invalid file format" msgstr "Neplatný formát souboru" @@ -983,70 +1094,66 @@ msgstr "Změna data u souborů." #: ../extensions/change_date/data/ui/change-date.ui.h:1 +msgid "+" +msgstr "+" + +#: ../extensions/change_date/data/ui/change-date.ui.h:2 +msgid "-" +msgstr "-" + +#: ../extensions/change_date/data/ui/change-date.ui.h:3 msgid "Change Date" msgstr "Změna data" -#: ../extensions/change_date/data/ui/change-date.ui.h:2 +#: ../extensions/change_date/data/ui/change-date.ui.h:4 msgid "Change the following values:" msgstr "Změnit následující hodnoty:" -#: ../extensions/change_date/data/ui/change-date.ui.h:3 +#: ../extensions/change_date/data/ui/change-date.ui.h:5 msgid "_Last modified date" msgstr "Datum _poslední změny" -#: ../extensions/change_date/data/ui/change-date.ui.h:4 +#: ../extensions/change_date/data/ui/change-date.ui.h:6 msgid "Co_mment date" msgstr "Datum ko_mentáře" -#: ../extensions/change_date/data/ui/change-date.ui.h:5 -msgid "Exif DateTimeOriginal tag" -msgstr "Značku Exif DateTimeOriginal (datum a čas originálu)" - -#: ../extensions/change_date/data/ui/change-date.ui.h:6 +#: ../extensions/change_date/data/ui/change-date.ui.h:7 msgid "Change to:" msgstr "Změnit na:" -#: ../extensions/change_date/data/ui/change-date.ui.h:7 +#: ../extensions/change_date/data/ui/change-date.ui.h:8 msgid "The _following date:" msgstr "_Následující datum:" -#: ../extensions/change_date/data/ui/change-date.ui.h:8 +#: ../extensions/change_date/data/ui/change-date.ui.h:9 msgid "File _modified date" msgstr "Datum z_měny souboru" -#: ../extensions/change_date/data/ui/change-date.ui.h:9 +#: ../extensions/change_date/data/ui/change-date.ui.h:10 msgid "File c_reation date" msgstr "Datum vytvoření soubo_ru" -#: ../extensions/change_date/data/ui/change-date.ui.h:10 +#: ../extensions/change_date/data/ui/change-date.ui.h:11 msgid "Date p_hoto was taken" msgstr "Datum pořízení _fotografie" -#: ../extensions/change_date/data/ui/change-date.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:12 msgid "A_djust by" msgstr "Po_sunout o" -#: ../extensions/change_date/data/ui/change-date.ui.h:12 +#: ../extensions/change_date/data/ui/change-date.ui.h:13 msgid "hours" msgstr "hodin" -#: ../extensions/change_date/data/ui/change-date.ui.h:13 +#: ../extensions/change_date/data/ui/change-date.ui.h:14 msgid "minutes" msgstr "minut" -#: ../extensions/change_date/data/ui/change-date.ui.h:14 +#: ../extensions/change_date/data/ui/change-date.ui.h:15 #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:6 msgid "seconds" msgstr "sekund" -#: ../extensions/change_date/data/ui/change-date.ui.h:15 -msgid "+" -msgstr "+" - -#: ../extensions/change_date/data/ui/change-date.ui.h:16 -msgid "-" -msgstr "-" - #: ../extensions/comments/callbacks.c:46 msgid "Import Embedded Metadata" msgstr "Importovat vložená metadata" @@ -1073,16 +1180,16 @@ msgid "_Synchronize with the embedded metadata" msgstr "_Synchronizovat s vloženými metadaty" -#: ../extensions/comments/main.c:34 +#: ../extensions/comments/main.c:35 #: ../extensions/edit_metadata/callbacks.c:100 msgid "Comment" msgstr "Komentář" -#: ../extensions/comments/main.c:40 ../gthumb/gth-main-default-metadata.c:46 +#: ../extensions/comments/main.c:41 ../gthumb/gth-main-default-metadata.c:46 msgid "Title" msgstr "Název" -#: ../extensions/comments/main.c:41 ../extensions/comments/main.c:143 +#: ../extensions/comments/main.c:42 ../extensions/comments/main.c:166 #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 #: ../extensions/image_print/data/ui/print-layout.ui.h:8 @@ -1094,16 +1201,16 @@ msgid "Description" msgstr "Popis" -#: ../extensions/comments/main.c:42 ../extensions/comments/main.c:151 +#: ../extensions/comments/main.c:43 ../extensions/comments/main.c:174 #: ../gthumb/gth-main-default-metadata.c:50 msgid "Place" msgstr "Umístění" -#: ../extensions/comments/main.c:43 ../gthumb/gth-main-default-metadata.c:51 +#: ../extensions/comments/main.c:44 ../gthumb/gth-main-default-metadata.c:51 msgid "Date" msgstr "Datum" -#: ../extensions/comments/main.c:45 ../gthumb/gth-main-default-metadata.c:54 +#: ../extensions/comments/main.c:46 ../gthumb/gth-main-default-metadata.c:54 msgid "Rating" msgstr "Hodnocení" @@ -1137,10 +1244,10 @@ msgstr "Vytváření indexu obrázků v podobě náhledů vybraných souborů." #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:1 -#: ../extensions/file_tools/gth-file-tool-crop.c:424 -#: ../extensions/file_tools/gth-file-tool-crop.c:454 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 -#: ../extensions/file_tools/gth-file-tool-rotate.c:415 +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:446 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 +#: ../extensions/file_tools/gth-file-tool-rotate.c:397 #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:14 #: ../extensions/slideshow/main.c:277 msgid "None" @@ -1182,16 +1289,6 @@ msgid "_Gradient" msgstr "Přecho_d" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 -msgid "_Horizontal:" -msgstr "Vo_dorovně:" - -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 -msgid "_Vertical:" -msgstr "S_visle:" - #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:14 msgid "Select a color" msgstr "Výběr barvy" @@ -1279,6 +1376,7 @@ #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:6 #: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 #: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 @@ -1310,13 +1408,6 @@ msgid "Create _HTML image map" msgstr "Vytvořit obrázkovou mapu _HTML" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 -#: ../extensions/pixbuf_savers/preferences.c:134 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 -msgid "Saving" -msgstr "Ukládání" - #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 msgid "Create a new theme" msgstr "Vytvořit nový motiv" @@ -1393,21 +1484,21 @@ msgid "Image Wall" msgstr "Stěna s obrázky" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:486 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:498 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:512 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:481 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:492 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:506 msgid "Could not save the theme" msgstr "Nelze uložit motiv" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:657 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:651 msgid "Could not delete the theme" msgstr "Nelze smazat motiv" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:248 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:247 msgid "Creating images" msgstr "Vytvářejí se obrázky" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:897 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:896 msgid "Generating thumbnails" msgstr "Generují se náhledy" @@ -1465,16 +1556,16 @@ msgid "_Use the original image folder" msgstr "Po_užít původní složku obrázku" -#: ../extensions/convert_format/dlg-convert-format.c:93 +#: ../extensions/convert_format/dlg-convert-format.c:95 msgid "Converting images" msgstr "Převádí se obrázky" -#: ../extensions/desktop_background/actions.c:162 +#: ../extensions/desktop_background/actions.c:158 msgid "Could not show the desktop background properties" msgstr "Nelze zobrazit vlastnosti pozadí pracovní plochy" -#: ../extensions/desktop_background/actions.c:228 -#: ../extensions/desktop_background/actions.c:246 +#: ../extensions/desktop_background/actions.c:224 +#: ../extensions/desktop_background/actions.c:242 msgid "Could not set the desktop background" msgstr "Nelze nastavit pozadí pracovní plochy" @@ -1569,7 +1660,8 @@ #: ../extensions/edit_metadata/gth-edit-comment-dialog.c:66 #: ../extensions/edit_metadata/gth-edit-tags-dialog.c:83 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:335 +#: ../extensions/facebook/dlg-import-from-facebook.c:319 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:324 #, c-format msgid "%d file" msgid_plural "%d files" @@ -1578,7 +1670,7 @@ msgstr[2] "%d souborů" #: ../extensions/edit_metadata/gth-edit-comment-dialog.c:144 -#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:192 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:197 msgid "Sa_ve and Close" msgstr "Uložit a za_vřít" @@ -1586,28 +1678,28 @@ msgid "Save only cha_nged fields" msgstr "Uložit pouze změ_něná pole" -#: ../extensions/edit_metadata/gth-edit-general-page.c:547 +#: ../extensions/edit_metadata/gth-edit-general-page.c:555 msgid "No date" msgstr "Datum neuvedeno" -#: ../extensions/edit_metadata/gth-edit-general-page.c:548 +#: ../extensions/edit_metadata/gth-edit-general-page.c:556 msgid "The following date" msgstr "Následující datum" -#: ../extensions/edit_metadata/gth-edit-general-page.c:549 +#: ../extensions/edit_metadata/gth-edit-general-page.c:557 #: ../extensions/importer/gth-import-preferences-dialog.c:331 msgid "Current date" msgstr "Dnešní datum" -#: ../extensions/edit_metadata/gth-edit-general-page.c:551 +#: ../extensions/edit_metadata/gth-edit-general-page.c:559 msgid "Last modified date" msgstr "Datum poslední změny" -#: ../extensions/edit_metadata/gth-edit-general-page.c:552 +#: ../extensions/edit_metadata/gth-edit-general-page.c:560 msgid "File creation date" msgstr "Datum vytvoření souboru" -#: ../extensions/edit_metadata/gth-edit-general-page.c:553 +#: ../extensions/edit_metadata/gth-edit-general-page.c:561 msgid "Do not modify" msgstr "Neměnit" @@ -1617,20 +1709,20 @@ msgid "%s Tags" msgstr "Štítky souboru %s" -#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:184 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:189 msgid "Assign Tags" msgstr "Přiřadit štítky" -#: ../extensions/edit_metadata/gth-tag-task.c:115 -#: ../extensions/edit_metadata/gth-tag-task.c:132 +#: ../extensions/edit_metadata/gth-tag-task.c:119 +#: ../extensions/edit_metadata/gth-tag-task.c:136 msgid "Assigning tags to the selected files" msgstr "Přiřazují se štítky k vybraným souborům" -#: ../extensions/edit_metadata/gth-tag-task.c:115 +#: ../extensions/edit_metadata/gth-tag-task.c:119 msgid "Writing files" msgstr "Zapisují se soubory" -#: ../extensions/edit_metadata/gth-tag-task.c:132 +#: ../extensions/edit_metadata/gth-tag-task.c:136 msgid "Reading files" msgstr "Čtou se soubory" @@ -1746,7 +1838,7 @@ msgid "XMP Attached" msgstr "Přiložené XMP" -#: ../extensions/exiv2_tools/main.c:256 +#: ../extensions/exiv2_tools/main.c:272 msgid "date photo was taken" msgstr "data pořízení fotografie" @@ -1754,47 +1846,52 @@ msgid "Share" msgstr "Sdílet" -#: ../extensions/facebook/callbacks.c:54 +#: ../extensions/facebook/callbacks.c:59 ../extensions/facebook/callbacks.c:64 msgid "Face_book..." msgstr "Face_book…" -#: ../extensions/facebook/callbacks.c:55 +#: ../extensions/facebook/callbacks.c:60 +msgid "Download photos from Facebook" +msgstr "Stáhnout fotografie ze sociální sítě Facebook" + +#: ../extensions/facebook/callbacks.c:65 msgid "Upload photos to Facebook" -msgstr "Odeslat fotografie na Facebook" +msgstr "Odeslat fotografie do sociální sítě Facebook" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:1 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 msgid "Export to Flickr" msgstr "Export na Flickr" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:2 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 #: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 msgid "_Upload" msgstr "_Odeslat" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:3 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 msgid "_Account:" msgstr "Úč_et:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:4 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:3 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 #: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 #: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 msgid "Edit accounts" msgstr "Upravit účty" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 msgid "A_lbum:" msgstr "A_lbum:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 msgid "Add a new album" msgstr "Přidat nové album" @@ -1803,9 +1900,12 @@ msgstr "Změnit velikost obrázku, když je větší než tato" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:8 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 -msgid "_Resize to:" -msgstr "Změnit _velikost na:" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 +msgid "_Resize if larger than:" +msgstr "Z_menšit, je-li větší než:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:9 msgid "720 x 720" @@ -1827,30 +1927,13 @@ msgid "2048 x 2048" msgstr "2048 × 2048" -#: ../extensions/facebook/data/ui/facebook-account-chooser.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-account-chooser.ui.h:1 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 -#: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 -#: ../extensions/picasaweb/data/ui/picasa-web-account-chooser.ui.h:1 -msgid "A_ccount:" -msgstr "Úč_et:" - -#: ../extensions/facebook/data/ui/facebook-account-manager.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-account-manager.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-account-manager.ui.h:1 -#: ../extensions/picasaweb/data/ui/picasa-web-account-manager.ui.h:1 -msgid "A_ccounts:" -msgstr "Úč_ty:" - #: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 msgid "Public photos" msgstr "Veřejné fotografie" #: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 msgid "Private photos, visible to friends" msgstr "Soukromé fotografie, viditelné pro přátele" @@ -1864,25 +1947,6 @@ msgid "_Visibility:" msgstr "_Viditelnost:" -#: ../extensions/facebook/data/ui/facebook-ask-authorization.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-ask-authorization.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-ask-authorization.ui.h:1 -msgid "_Authorize..." -msgstr "_Ověřit…" - -#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:1 -#: ../extensions/facebook/facebook-authentication.c:472 -#: ../extensions/flicker_utils/flickr-authentication.c:408 -#: ../extensions/oauth/oauth-authentication.c:423 -msgid "Once you're done, click the 'Continue' button below." -msgstr "Až budete hotovi, klikněte na tlačítko „Pokračovat“ níže." - -#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 -#: ../extensions/flicker_utils/data/ui/flicker-complete-authorization.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-complete-authorization.ui.h:1 -msgid "C_ontinue" -msgstr "P_okračovat" - #: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:1 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:1 @@ -1894,70 +1958,92 @@ #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:2 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:2 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:2 -#: ../extensions/webalbums/gth-web-exporter.c:1841 +#: ../extensions/webalbums/gth-web-exporter.c:1839 msgid "_Open in the Browser" msgstr "_Otevřít v prohlížeči" -#: ../extensions/facebook/dlg-export-to-facebook.c:130 -#: ../extensions/facebook/dlg-export-to-facebook.c:335 -#: ../extensions/facebook/facebook-authentication.c:192 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 +msgid "Import from Picasa Web Album" +msgstr "Importovat z webového alba Picasa" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:2 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 +msgid "_Import" +msgstr "_Import" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:4 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 +#: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 +msgid "A_ccount:" +msgstr "Úč_et:" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:5 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 +msgid "_Album:" +msgstr "_Album:" + +#: ../extensions/facebook/dlg-export-to-facebook.c:123 +#: ../extensions/facebook/dlg-export-to-facebook.c:326 +#: ../extensions/facebook/dlg-import-from-facebook.c:226 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:138 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:399 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:237 -#: ../extensions/flicker_utils/flickr-authentication.c:191 -#: ../extensions/oauth/oauth-authentication.c:187 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:414 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:231 +#: ../extensions/oauth/web-service.c:380 #: ../extensions/photobucket/dlg-export-to-photobucket.c:131 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:376 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:139 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:424 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:380 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:375 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:124 msgid "Could not connect to the server" msgstr "Nelze se připojit k serveru" -#: ../extensions/facebook/dlg-export-to-facebook.c:182 +#: ../extensions/facebook/dlg-export-to-facebook.c:175 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:246 #: ../extensions/photobucket/dlg-export-to-photobucket.c:182 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:192 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:176 msgid "Could not upload the files" msgstr "Nelze odeslat soubory" -#: ../extensions/facebook/dlg-export-to-facebook.c:412 +#: ../extensions/facebook/dlg-export-to-facebook.c:397 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:188 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:223 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:462 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:717 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:457 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:309 msgid "Could not create the album" msgstr "Nelze vytvořit album" -#: ../extensions/facebook/dlg-export-to-facebook.c:481 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:534 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:783 +#: ../extensions/facebook/dlg-export-to-facebook.c:465 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:528 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:375 msgid "New Album" msgstr "Nové album" -#: ../extensions/facebook/dlg-export-to-facebook.c:561 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:557 -#: ../extensions/image_print/gth-image-print-job.c:1789 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:614 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1002 +#: ../extensions/facebook/dlg-export-to-facebook.c:557 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:583 +#: ../extensions/image_print/gth-image-print-job.c:1739 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:607 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:597 msgid "No valid file selected." msgstr "Není vybrán žádný platný soubor." -#: ../extensions/facebook/dlg-export-to-facebook.c:562 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:558 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:615 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1003 +#: ../extensions/facebook/dlg-export-to-facebook.c:558 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:584 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:608 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:598 msgid "Could not export the files" msgstr "Nelze exportovat soubory" -#: ../extensions/facebook/dlg-export-to-facebook.c:570 -#: ../extensions/find_duplicates/gth-find-duplicates.c:255 -#: ../extensions/find_duplicates/gth-find-duplicates.c:347 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:566 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:623 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1010 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:803 -#: ../gthumb/gth-browser.c:1005 +#: ../extensions/facebook/dlg-export-to-facebook.c:566 +#: ../extensions/find_duplicates/gth-find-duplicates.c:277 +#: ../extensions/find_duplicates/gth-find-duplicates.c:470 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:592 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:616 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:605 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:254 +#: ../gthumb/gth-browser.c:1116 #, c-format msgid "%d file (%s)" msgid_plural "%d files (%s)" @@ -1965,99 +2051,35 @@ msgstr[1] "%d soubory (%s)" msgstr[2] "%d souborů (%s)" -#: ../extensions/facebook/dlg-export-to-facebook.c:591 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:589 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:642 +#: ../extensions/facebook/dlg-export-to-facebook.c:587 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:615 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:635 #, c-format msgid "Export to %s" msgstr "Export do %s" -#: ../extensions/facebook/facebook-account-chooser-dialog.c:200 -#: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:200 -#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 -msgid "New authentication..." -msgstr "Nové ověření…" - -#: ../extensions/facebook/facebook-authentication.c:194 -#: ../extensions/flicker_utils/flickr-authentication.c:193 -#: ../extensions/oauth/oauth-authentication.c:189 -msgid "Choose _Account..." -msgstr "Vybr_at účet…" +#: ../extensions/facebook/dlg-import-from-facebook.c:344 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:349 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:279 +msgid "Could not get the photo list" +msgstr "Nelze získat seznam fotografií" -#: ../extensions/facebook/facebook-authentication.c:471 -#: ../extensions/flicker_utils/flickr-authentication.c:407 -#: ../extensions/oauth/oauth-authentication.c:422 -#, c-format -msgid "" -"Return to this window when you have finished the authorization process on %s" -msgstr "Až dokončíte proces ověření pro %s, tak se vraťte do tohoto okna" +#: ../extensions/facebook/dlg-import-from-facebook.c:378 +#: ../extensions/facebook/dlg-import-from-facebook.c:533 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:386 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:551 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:313 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:586 +msgid "No album selected" +msgstr "Není vybráno žádné album" -#: ../extensions/facebook/facebook-authentication.c:556 -#: ../extensions/flicker_utils/flickr-authentication.c:487 -#: ../extensions/oauth/oauth-authentication.c:502 -#, c-format -msgid "gthumb requires your authorization to upload the photos to %s" -msgstr "gtbumb vyžaduje vaše ověření k odeslání fotografií na %s" - -#: ../extensions/facebook/facebook-authentication.c:557 -#: ../extensions/flicker_utils/flickr-authentication.c:488 -#: ../extensions/oauth/oauth-authentication.c:503 +#: ../extensions/facebook/dlg-import-from-facebook.c:551 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:569 #, c-format -msgid "" -"Click 'Authorize' to open your web browser and authorize gthumb to upload " -"photos to %s. When you're finished, return to this window to complete the " -"authorization." -msgstr "" -"Kliknutím na „Ověřit“ otevřete svůj webový prohlížeč, ve kterém proveďte " -"ověření pro aplikaci gthumb k odesílání fotografií na %s. Až budete hotovi, " -"tak se vraťte do tohoto okna, kde se ověření dokončí." - -#: ../extensions/facebook/facebook-authentication.c:652 -#: ../extensions/flicker_utils/flickr-authentication.c:588 -#: ../extensions/oauth/oauth-authentication.c:605 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:820 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:684 -msgid "Choose Account" -msgstr "Vybrat účet" - -#: ../extensions/facebook/facebook-authentication.c:761 -#: ../extensions/flicker_utils/flickr-authentication.c:697 -#: ../extensions/oauth/oauth-authentication.c:714 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:881 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:745 -msgid "Edit Accounts" -msgstr "Upravit účty" - -#: ../extensions/facebook/facebook-connection.c:275 -#: ../extensions/facebook/facebook-connection.c:435 -#: ../extensions/facebook/facebook-service.c:162 -#: ../extensions/facebook/facebook-service.c:265 -#: ../extensions/facebook/facebook-service.c:468 -#: ../extensions/flicker_utils/flickr-connection.c:266 -#: ../extensions/flicker_utils/flickr-connection.c:413 -#: ../extensions/flicker_utils/flickr-service.c:195 -#: ../extensions/flicker_utils/flickr-service.c:398 -#: ../extensions/photobucket/photobucket-consumer.c:74 -#: ../extensions/photobucket/photobucket-consumer.c:79 -#: ../extensions/photobucket/photobucket-consumer.c:115 -#: ../extensions/photobucket/photobucket-consumer.c:170 -msgid "Unknown error" -msgstr "Neznámá chyba" - -#: ../extensions/facebook/facebook-connection.c:310 -#: ../extensions/facebook/facebook-connection.c:461 -#: ../extensions/facebook/facebook-service.c:188 -#: ../extensions/facebook/facebook-service.c:290 -#: ../extensions/flicker_utils/flickr-connection.c:292 -#: ../extensions/flicker_utils/flickr-connection.c:439 -#: ../extensions/flicker_utils/flickr-service.c:219 -#: ../extensions/oauth/oauth-connection.c:356 -#: ../extensions/oauth/oauth-connection.c:431 -#: ../extensions/oauth/oauth-connection.c:535 -#: ../extensions/picasaweb/google-connection.c:344 -msgid "Connecting to the server" -msgstr "Připojuje se k serveru" +msgid "Import from %s" +msgstr "Importovat z %s" +#: ../extensions/facebook/dlg-import-from-facebook.c:551 #: ../extensions/facebook/facebook.extension.in.in.h:1 msgid "Facebook" msgstr "Facebook" @@ -2066,58 +2088,49 @@ msgid "Upload images to Facebook" msgstr "Odesílání obrázků na Facebook" -#: ../extensions/facebook/facebook-service.c:188 -#: ../extensions/facebook/facebook-service.c:290 -#: ../extensions/flicker_utils/flickr-service.c:219 -#: ../extensions/oauth/oauth-connection.c:356 -#: ../extensions/oauth/oauth-connection.c:431 -#: ../extensions/oauth/oauth-connection.c:535 -msgid "Getting account information" -msgstr "Získávají se informace účtu" - -#: ../extensions/facebook/facebook-service.c:396 -#: ../extensions/flicker_utils/flickr-service.c:323 -#: ../extensions/photobucket/photobucket-service.c:207 -#: ../extensions/picasaweb/picasa-web-service.c:209 +#: ../extensions/facebook/facebook-service.c:462 +#: ../extensions/flicker_utils/flickr-service.c:863 +#: ../extensions/photobucket/photobucket-service.c:310 +#: ../extensions/picasaweb/picasa-web-service.c:711 msgid "Getting the album list" msgstr "Získává se seznam alb" -#: ../extensions/facebook/facebook-service.c:525 -#: ../extensions/flicker_utils/flickr-service.c:426 -#: ../extensions/flicker_utils/flickr-service.c:546 -#: ../extensions/flicker_utils/flickr-service.c:584 -#: ../extensions/photobucket/photobucket-service.c:316 -#: ../extensions/picasaweb/picasa-web-service.c:300 +#: ../extensions/facebook/facebook-service.c:584 +#: ../extensions/flicker_utils/flickr-service.c:965 +#: ../extensions/flicker_utils/flickr-service.c:1087 +#: ../extensions/flicker_utils/flickr-service.c:1126 +#: ../extensions/photobucket/photobucket-service.c:423 +#: ../extensions/picasaweb/picasa-web-service.c:805 msgid "Creating the new album" msgstr "Vytváří se nové album" -#: ../extensions/facebook/facebook-service.c:584 -#: ../extensions/flicker_utils/flickr-service.c:634 -#: ../extensions/photobucket/photobucket-service.c:373 -#: ../extensions/picasaweb/picasa-web-service.c:357 +#: ../extensions/facebook/facebook-service.c:645 +#: ../extensions/flicker_utils/flickr-service.c:1176 +#: ../extensions/photobucket/photobucket-service.c:485 +#: ../extensions/picasaweb/picasa-web-service.c:860 #, c-format msgid "Could not upload '%s': %s" msgstr "Nelze odeslat „%s“: %s" #. Translators: %s is a filename -#: ../extensions/facebook/facebook-service.c:670 -#: ../extensions/flicker_utils/flickr-service.c:745 -#: ../extensions/photobucket/photobucket-service.c:430 -#: ../extensions/picasaweb/picasa-web-service.c:412 +#: ../extensions/facebook/facebook-service.c:710 +#: ../extensions/flicker_utils/flickr-service.c:1287 +#: ../extensions/photobucket/photobucket-service.c:542 +#: ../extensions/picasaweb/picasa-web-service.c:917 #, c-format msgid "Uploading '%s'" msgstr "Odesílá se „%s“" -#: ../extensions/facebook/facebook-service.c:886 -#: ../extensions/flicker_utils/flickr-service.c:914 -#: ../extensions/photobucket/photobucket-service.c:599 -#: ../extensions/picasaweb/picasa-web-service.c:605 +#: ../extensions/facebook/facebook-service.c:923 +#: ../extensions/flicker_utils/flickr-service.c:1482 +#: ../extensions/photobucket/photobucket-service.c:714 +#: ../extensions/picasaweb/picasa-web-service.c:1138 msgid "Uploading the files to the server" msgstr "Odesílají se soubory na server" -#: ../extensions/facebook/facebook-service.c:1003 -#: ../extensions/flicker_utils/flickr-service.c:1077 -#: ../extensions/picasaweb/picasa-web-service.c:718 +#: ../extensions/facebook/facebook-service.c:1022 +#: ../extensions/flicker_utils/flickr-service.c:1651 +#: ../extensions/picasaweb/picasa-web-service.c:1257 msgid "Getting the photo list" msgstr "Získává se seznam fotografií" @@ -2131,13 +2144,13 @@ #: ../extensions/file_manager/actions.c:400 #: ../extensions/file_manager/callbacks.c:380 -#: ../extensions/file_manager/callbacks.c:842 +#: ../extensions/file_manager/callbacks.c:838 msgid "Could not move the files" msgstr "Nelze přesunout soubory" #: ../extensions/file_manager/actions.c:401 #: ../extensions/file_manager/callbacks.c:381 -#: ../extensions/file_manager/callbacks.c:843 +#: ../extensions/file_manager/callbacks.c:839 msgid "" "Files cannot be moved to the current location, as alternative you can choose " "to copy them." @@ -2227,6 +2240,7 @@ #: ../extensions/file_manager/callbacks.c:187 #: ../extensions/file_manager/callbacks.c:223 #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:5 +#: ../gthumb/gth-tags-entry.c:871 msgid "_Delete" msgstr "_Smazat" @@ -2278,9 +2292,10 @@ msgid "Move the selected files to another folder" msgstr "Přesunout vybrané soubory do jiné složky" -#: ../extensions/file_manager/callbacks.c:1003 -#: ../extensions/find_duplicates/gth-find-duplicates.c:581 -#: ../gthumb/gth-browser.c:4939 ../gthumb/gth-browser.c:4973 +#: ../extensions/file_manager/callbacks.c:999 +#: ../extensions/find_duplicates/gth-find-duplicates.c:766 +#: ../gthumb/gth-browser.c:5234 ../gthumb/gth-browser.c:5268 +#: ../gthumb/gth-progress-dialog.c:406 msgid "Could not perform the operation" msgstr "Nelze provést tuto operaci" @@ -2297,6 +2312,7 @@ msgstr "Mažou se soubory" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:1 +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:5 msgid "_Preview" msgstr "Ná_hled" @@ -2338,81 +2354,96 @@ msgstr "Půvo_dní" #: ../extensions/file_tools/data/ui/crop-options.ui.h:1 -msgid "_Position:" -msgstr "_Poloha:" +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +msgid "Selection" +msgstr "Výběr" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 +msgid "_Width:" +msgstr "Šíř_ka:" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:3 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 +msgid "Heigh_t:" +msgstr "_Výška:" -#. this is used to separate the dimensions, for example: 120 × 250 #: ../extensions/file_tools/data/ui/crop-options.ui.h:4 -msgid "×" -msgstr "×" +msgid "_Position:" +msgstr "_Poloha:" #: ../extensions/file_tools/data/ui/crop-options.ui.h:5 -msgid "_Grid:" -msgstr "_Mřížka:" - -#: ../extensions/file_tools/data/ui/crop-options.ui.h:6 msgid "Maximize" msgstr "Maximalizovat" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:6 msgid "Center" msgstr "Vystředit" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 -msgid "Selection" -msgstr "Výběr" - -#: ../extensions/file_tools/data/ui/crop-options.ui.h:9 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 #: ../extensions/file_tools/data/ui/resize-options.ui.h:5 +msgid "Aspect ratio" +msgstr "Poměr stran" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 msgid "I_nvert aspect ratio" msgstr "Obrátit poměr stra_n" #. after the colon there is a control to select the size in pixels -#: ../extensions/file_tools/data/ui/crop-options.ui.h:11 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:10 msgid "M_ultiple of:" msgstr "Náso_bek:" #. abbreviation of pixel -#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:12 msgid "px" msgstr "px" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 +#: ../gthumb/gth-file-chooser-dialog.c:252 +msgid "Options" +msgstr "Volby" + #: ../extensions/file_tools/data/ui/crop-options.ui.h:14 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 -msgid "Aspect ratio" -msgstr "Poměr stran" +msgid "_Grid:" +msgstr "_Mřížka:" #: ../extensions/file_tools/data/ui/crop-options.ui.h:15 msgid "C_rop" msgstr "_Oříznout" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 -msgid "_Width:" -msgstr "Šíř_ka:" +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:1 +msgid "Method" +msgstr "Metoda" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:2 +msgid "_Brightness" +msgstr "_Jas" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:3 +msgid "_Saturation" +msgstr "_Sytost" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:4 +msgid "_Average" +msgstr "_Průměr" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 -msgid "Heigh_t:" -msgstr "_Výška:" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 -msgid "Set the image size to this value" -msgstr "Nastavit velikost obrázku na tuto hodnotu" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 #: ../gthumb/gth-main-default-metadata.c:47 msgid "Dimensions" msgstr "Rozměry" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 -msgid "High _quality" -msgstr "Vysoká _kvalita" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +msgid "Set the image size to this value" +msgstr "Nastavit velikost obrázku na tuto hodnotu" #: ../extensions/file_tools/data/ui/resize-options.ui.h:8 -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 -msgid "Options" -msgstr "Volby" +msgid "High _quality" +msgstr "Vysoká _kvalita" #: ../extensions/file_tools/data/ui/resize-options.ui.h:9 msgid "Original dimensions:" @@ -2438,45 +2469,45 @@ msgstr "%" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:1 -msgid "Align" -msgstr "Vyrovnat" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 msgid "Angle" msgstr "Úhel" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 +msgid "Align" +msgstr "Vyrovnat" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 +msgid "Image size" +msgstr "Velikost obrázku" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 msgid "Point 1:" msgstr "Bod 1:" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 msgid "Point 2:" msgstr "Bod 2:" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 msgid "Keep aspect ratio" msgstr "Zachovat poměr stran" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 -msgid "Image size" -msgstr "Velikost obrázku" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 msgid "Grid:" msgstr "Mřížka:" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 +msgid "_Background:" +msgstr "_Pozadí:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 msgid "Pick a background color" msgstr "Výběr barvy pozadí" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 msgid "_Transparent" msgstr "Průh_ledné" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 -msgid "_Background:" -msgstr "_Pozadí:" - #: ../extensions/file_tools/data/ui/rotate-options.ui.h:12 msgid "Reset" msgstr "Vynulovat" @@ -2538,140 +2569,134 @@ msgid "Basic tools to modify images." msgstr "Základní nástroje pro úpravu obrázků." -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:372 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:272 +#: ../extensions/file_tools/gth-file-tool-grayscale.c:248 +#: ../extensions/file_tools/gth-file-tool-negative.c:68 +msgid "Applying changes" +msgstr "Uplatňují se změny" + +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 msgid "Adjust Colors..." msgstr "Upravit barvy…" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 msgid "Adjust Colors" msgstr "Úprava barev" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:531 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:619 msgid "Change brightness, contrast, saturation and gamma level of the image" msgstr "Změnit jas, kontrast, sytost a úroveň gamy obrázku" -#: ../extensions/file_tools/gth-file-tool-crop.c:424 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:304 +msgid "Adjust Contrast" +msgstr "Upravit kontrast" + +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:305 +msgid "Automatic contrast adjustment" +msgstr "Automaticky upravit kontrast" + +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 msgid "Square" msgstr "Čtverec" -#: ../extensions/file_tools/gth-file-tool-crop.c:425 -#: ../extensions/file_tools/gth-file-tool-resize.c:499 +#: ../extensions/file_tools/gth-file-tool-crop.c:417 +#: ../extensions/file_tools/gth-file-tool-resize.c:590 #, c-format msgid "%d x %d (Image)" msgstr "%d × %d (Obrázek)" -#: ../extensions/file_tools/gth-file-tool-crop.c:428 -#: ../extensions/file_tools/gth-file-tool-resize.c:503 +#: ../extensions/file_tools/gth-file-tool-crop.c:420 +#: ../extensions/file_tools/gth-file-tool-resize.c:594 #, c-format msgid "%d x %d (Screen)" msgstr "%d × %d (Obrazovka)" -#: ../extensions/file_tools/gth-file-tool-crop.c:432 -#: ../extensions/file_tools/gth-file-tool-resize.c:508 +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-resize.c:599 msgid "5:4" msgstr "5:4" -#: ../extensions/file_tools/gth-file-tool-crop.c:433 -#: ../extensions/file_tools/gth-file-tool-resize.c:509 +#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-resize.c:600 msgid "4:3 (DVD, Book)" msgstr "4:3 (DVD, kniha)" -#: ../extensions/file_tools/gth-file-tool-crop.c:434 -#: ../extensions/file_tools/gth-file-tool-resize.c:510 +#: ../extensions/file_tools/gth-file-tool-crop.c:426 +#: ../extensions/file_tools/gth-file-tool-resize.c:601 msgid "7:5" msgstr "7:5" -#: ../extensions/file_tools/gth-file-tool-crop.c:435 -#: ../extensions/file_tools/gth-file-tool-resize.c:511 +#: ../extensions/file_tools/gth-file-tool-crop.c:427 +#: ../extensions/file_tools/gth-file-tool-resize.c:602 msgid "3:2 (Postcard)" msgstr "3:2 (Pohlednice)" -#: ../extensions/file_tools/gth-file-tool-crop.c:436 -#: ../extensions/file_tools/gth-file-tool-resize.c:512 +#: ../extensions/file_tools/gth-file-tool-crop.c:428 +#: ../extensions/file_tools/gth-file-tool-resize.c:603 msgid "16:10" msgstr "16:10" -#: ../extensions/file_tools/gth-file-tool-crop.c:437 -#: ../extensions/file_tools/gth-file-tool-resize.c:513 +#: ../extensions/file_tools/gth-file-tool-crop.c:429 +#: ../extensions/file_tools/gth-file-tool-resize.c:604 msgid "16:9 (DVD)" msgstr "16:9 (DVD)" -#: ../extensions/file_tools/gth-file-tool-crop.c:438 -#: ../extensions/file_tools/gth-file-tool-resize.c:514 +#: ../extensions/file_tools/gth-file-tool-crop.c:430 +#: ../extensions/file_tools/gth-file-tool-resize.c:605 msgid "1.85:1" msgstr "1,85:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:439 -#: ../extensions/file_tools/gth-file-tool-resize.c:515 +#: ../extensions/file_tools/gth-file-tool-crop.c:431 +#: ../extensions/file_tools/gth-file-tool-resize.c:606 msgid "2.39:1" msgstr "2,39:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:440 -#: ../extensions/file_tools/gth-file-tool-resize.c:516 +#: ../extensions/file_tools/gth-file-tool-crop.c:432 +#: ../extensions/file_tools/gth-file-tool-resize.c:607 #: ../extensions/image_print/data/ui/print-layout.ui.h:2 #: ../extensions/rename_series/gth-template-selector.c:234 msgid "Custom" msgstr "Vlastní" -#: ../extensions/file_tools/gth-file-tool-crop.c:455 -#: ../extensions/file_tools/gth-file-tool-rotate.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:447 +#: ../extensions/file_tools/gth-file-tool-rotate.c:398 msgid "Rule of Thirds" msgstr "Pravidlo třetin" -#: ../extensions/file_tools/gth-file-tool-crop.c:456 -#: ../extensions/file_tools/gth-file-tool-rotate.c:417 +#: ../extensions/file_tools/gth-file-tool-crop.c:448 +#: ../extensions/file_tools/gth-file-tool-rotate.c:399 msgid "Golden Sections" msgstr "Zlatý řez" -#: ../extensions/file_tools/gth-file-tool-crop.c:457 -#: ../extensions/file_tools/gth-file-tool-rotate.c:418 +#: ../extensions/file_tools/gth-file-tool-crop.c:449 +#: ../extensions/file_tools/gth-file-tool-rotate.c:400 msgid "Center Lines" msgstr "Středové čáry" -#: ../extensions/file_tools/gth-file-tool-crop.c:458 -#: ../extensions/file_tools/gth-file-tool-rotate.c:419 +#: ../extensions/file_tools/gth-file-tool-crop.c:450 +#: ../extensions/file_tools/gth-file-tool-rotate.c:401 msgid "Uniform" msgstr "Rovnoměrná" -#: ../extensions/file_tools/gth-file-tool-crop.c:614 +#: ../extensions/file_tools/gth-file-tool-crop.c:608 msgid "Crop..." msgstr "Oříznout…" -#: ../extensions/file_tools/gth-file-tool-crop.c:614 +#: ../extensions/file_tools/gth-file-tool-crop.c:608 msgid "Crop" msgstr "Oříznutí" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:68 -#: ../extensions/file_tools/gth-file-tool-negative.c:68 -msgid "Applying changes" -msgstr "Uplatňují se změny" - -#: ../extensions/file_tools/gth-file-tool-desaturate.c:203 -msgid "Desaturate" -msgstr "Odstíny šedi" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:119 -msgid "White balance correction" -msgstr "Oprava vyvážení bílé" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:342 -msgid "Enhance Colors" -msgstr "Zvýraznit barvy" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:343 -msgid "Automatic white balance correction" -msgstr "Automatická oprava vyvážení bílé" - -#: ../extensions/file_tools/gth-file-tool-equalize.c:86 +#: ../extensions/file_tools/gth-file-tool-equalize.c:45 msgid "Equalizing image histogram" msgstr "Vyrovnává se histogram obrázku" -#: ../extensions/file_tools/gth-file-tool-equalize.c:275 +#: ../extensions/file_tools/gth-file-tool-equalize.c:230 msgid "Equalize" msgstr "Vyrovnat" -#: ../extensions/file_tools/gth-file-tool-equalize.c:276 +#: ../extensions/file_tools/gth-file-tool-equalize.c:231 msgid "Equalize image histogram" msgstr "Vyrovnat histogram obrázku" @@ -2683,6 +2708,14 @@ msgid "Flip the image vertically" msgstr "Překlopit obrázek svisle" +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale..." +msgstr "Stupně šedi…" + +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale" +msgstr "Stupně šedi" + #: ../extensions/file_tools/gth-file-tool-mirror.c:87 msgid "Mirror" msgstr "Zrcadlit" @@ -2699,23 +2732,28 @@ msgid "Redo" msgstr "Znovu" -#: ../extensions/file_tools/gth-file-tool-resize.c:680 +#: ../extensions/file_tools/gth-file-tool-resize.c:214 +#: ../extensions/resize_images/dlg-resize-images.c:180 +msgid "Resizing images" +msgstr "Mění se velikost obrázků" + +#: ../extensions/file_tools/gth-file-tool-resize.c:808 msgid "Resize..." msgstr "Změnit velikost…" -#: ../extensions/file_tools/gth-file-tool-resize.c:680 +#: ../extensions/file_tools/gth-file-tool-resize.c:808 msgid "Resize" msgstr "Změna velikosti" -#: ../extensions/file_tools/gth-file-tool-rotate.c:636 +#: ../extensions/file_tools/gth-file-tool-rotate.c:628 msgid "Rotate..." msgstr "Otočit…" -#: ../extensions/file_tools/gth-file-tool-rotate.c:636 +#: ../extensions/file_tools/gth-file-tool-rotate.c:628 msgid "Rotate" msgstr "Otočení" -#: ../extensions/file_tools/gth-file-tool-rotate.c:637 +#: ../extensions/file_tools/gth-file-tool-rotate.c:629 msgid "Freely rotate the image" msgstr "Volně otočit obrázek" @@ -2745,15 +2783,15 @@ msgid "Save" msgstr "Uložit" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:100 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:101 msgid "Sharpening image" msgstr "Doostřuje se obrázek" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 msgid "Enhance Focus..." msgstr "Zvýšit ostrost…" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 msgid "Enhance Focus" msgstr "Zvýšení ostrosti" @@ -2813,28 +2851,28 @@ msgid "Find duplicated files." msgstr "Hledání duplicitních souborů." -#: ../extensions/find_duplicates/gth-find-duplicates.c:53 +#: ../extensions/find_duplicates/gth-find-duplicates.c:65 msgid "leave the newest duplicates" msgstr "nechat nejnovější duplikát" -#: ../extensions/find_duplicates/gth-find-duplicates.c:54 +#: ../extensions/find_duplicates/gth-find-duplicates.c:66 msgid "leave the oldest duplicates" msgstr "nechat nejstarší duplikát" -#: ../extensions/find_duplicates/gth-find-duplicates.c:55 +#: ../extensions/find_duplicates/gth-find-duplicates.c:67 msgid "by folder..." msgstr "podle složky…" -#: ../extensions/find_duplicates/gth-find-duplicates.c:56 +#: ../extensions/find_duplicates/gth-find-duplicates.c:68 msgid "all files" msgstr "všechny soubory" -#: ../extensions/find_duplicates/gth-find-duplicates.c:57 +#: ../extensions/find_duplicates/gth-find-duplicates.c:69 msgid "no file" msgstr "žádný soubor" -#: ../extensions/find_duplicates/gth-find-duplicates.c:397 -#: ../extensions/find_duplicates/gth-find-duplicates.c:492 +#: ../extensions/find_duplicates/gth-find-duplicates.c:560 +#: ../extensions/find_duplicates/gth-find-duplicates.c:668 #, c-format msgid "%d duplicate" msgid_plural "%d duplicates" @@ -2842,15 +2880,15 @@ msgstr[1] "%d duplicity" msgstr[2] "%d duplicit" -#: ../extensions/find_duplicates/gth-find-duplicates.c:536 +#: ../extensions/find_duplicates/gth-find-duplicates.c:712 msgid "Search completed" msgstr "Hledání dokončeno" -#: ../extensions/find_duplicates/gth-find-duplicates.c:548 +#: ../extensions/find_duplicates/gth-find-duplicates.c:725 msgid "Searching for duplicates" msgstr "Vyhledávají se duplicity" -#: ../extensions/find_duplicates/gth-find-duplicates.c:551 +#: ../extensions/find_duplicates/gth-find-duplicates.c:728 #: ../gthumb/gth-load-file-data-task.c:106 #: ../gthumb/gth-save-file-data-task.c:100 #, c-format @@ -2860,15 +2898,15 @@ msgstr[1] "Zbývají %d soubory" msgstr[2] "Zbývá %d souborů" -#: ../extensions/find_duplicates/gth-find-duplicates.c:634 +#: ../extensions/find_duplicates/gth-find-duplicates.c:830 msgid "Getting the file list" msgstr "Získává se seznam souborů" -#: ../extensions/find_duplicates/gth-find-duplicates.c:740 +#: ../extensions/find_duplicates/gth-find-duplicates.c:1016 msgid "Duplicates" msgstr "Duplicity" -#: ../extensions/find_duplicates/gth-find-duplicates.c:997 +#: ../extensions/find_duplicates/gth-find-duplicates.c:1306 msgid "Select" msgstr "Vybrat" @@ -2893,7 +2931,7 @@ msgstr "Odesílání obrázků do služby Flicker." #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 #: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 msgid "Free space:" msgstr "Volné místo:" @@ -2915,69 +2953,93 @@ msgid "_Safety:" msgstr "_Ochrana:" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 msgid "Private photos, visible to family and friends" msgstr "Soukromé fotografie, viditelné pro rodinu a přátele" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 msgid "Private photos, visible to family" msgstr "Soukromé fotografie, viditelné pro rodinu" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 msgid "Private photos" msgstr "Soukromé fotografie" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 msgid "Safe content" msgstr "Zabezpečený obsah" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 msgid "Moderate content" msgstr "Moderovat obsah" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:17 msgid "Restricted content" msgstr "Chráněný obsah" -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 -msgid "_Import" -msgstr "_Import" +#: ../extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui.h:1 +msgid "C_ontinue" +msgstr "P_okračovat" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:360 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:830 -msgid "Could not get the photo list" -msgstr "Nelze získat seznam fotografií" +#: ../extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui.h:2 +msgid "_Authorize..." +msgstr "_Ověřit…" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:397 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:561 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:864 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1026 -msgid "No album selected" -msgstr "Není vybráno žádné album" +#: ../extensions/flicker_utils/flickr-consumer.c:124 +#: ../extensions/flicker_utils/flickr-service.c:237 +#: ../extensions/flicker_utils/flickr-service.c:348 +#: ../extensions/flicker_utils/flickr-service.c:672 +#: ../extensions/flicker_utils/flickr-service.c:937 +#: ../extensions/oauth/oauth-service.c:154 +#: ../extensions/photobucket/photobucket-consumer.c:74 +#: ../extensions/photobucket/photobucket-consumer.c:82 +#: ../extensions/photobucket/photobucket-consumer.c:149 +#: ../extensions/photobucket/photobucket-service.c:132 +msgid "Unknown error" +msgstr "Neznámá chyba" + +#: ../extensions/flicker_utils/flickr-service.c:502 +#, c-format +msgid "" +"Return to this window when you have finished the authorization process on %s" +msgstr "Až dokončíte proces ověření pro %s, tak se vraťte do tohoto okna" + +#: ../extensions/flicker_utils/flickr-service.c:503 +msgid "Once you're done, click the 'Continue' button below." +msgstr "Až budete hotovi, klikněte na tlačítko „Pokračovat“ níže." -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:579 +#: ../extensions/flicker_utils/flickr-service.c:571 #, c-format -msgid "Import from %s" -msgstr "Importovat z %s" +msgid "gThumb requires your authorization to upload the photos to %s" +msgstr "gTbumb vyžaduje vaše ověření k odeslání fotografií na %s" + +#: ../extensions/flicker_utils/flickr-service.c:572 +#, c-format +msgid "" +"Click 'Authorize' to open your web browser and authorize gthumb to upload " +"photos to %s. When you're finished, return to this window to complete the " +"authorization." +msgstr "" +"Kliknutím na „Ověřit“ otevřete svůj webový prohlížeč, ve kterém proveďte " +"ověření pro aplikaci gthumb k odesílání fotografií na %s. Až budete hotovi, " +"tak se vraťte do tohoto okna, kde se ověření dokončí." #: ../extensions/gstreamer_tools/actions.c:66 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1080 -#: ../gthumb/gth-browser.c:2008 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1072 +#: ../gthumb/gth-browser.c:2175 msgid "Could not save the file" msgstr "Nelze uložit soubor" -#: ../extensions/gstreamer_tools/actions.c:126 +#: ../extensions/gstreamer_tools/actions.c:130 msgid "Could not take a screenshot" msgstr "Nelze pořídit snímek obrazovky" -#: ../extensions/gstreamer_tools/actions.c:132 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1248 +#: ../extensions/gstreamer_tools/actions.c:136 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1245 msgid "Save Image" msgstr "Uložení obrázku" -#: ../extensions/gstreamer_tools/actions.c:152 +#: ../extensions/gstreamer_tools/actions.c:156 msgctxt "Filename" msgid "Screenshot" msgstr "Snímek obrazovky" @@ -2987,7 +3049,7 @@ msgstr "Pomaleji" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:686 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:699 msgid "Play" msgstr "Přehrát" @@ -3033,11 +3095,11 @@ msgid "Take a screenshot" msgstr "Pořídit snímek obrazovky" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:663 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 msgid "Playing video" msgstr "Přehrávání videa" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:689 msgid "Pause" msgstr "Pozastavit" @@ -3096,20 +3158,19 @@ msgid "Sample rate" msgstr "Vzorkovací rychlost" -#: ../extensions/gstreamer_utils/gstreamer-utils.c:363 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:362 msgid "Stereo" msgstr "Stereo" -#: ../extensions/gstreamer_utils/gstreamer-utils.c:363 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:362 msgid "Mono" msgstr "Mono" #. Translators: this is an image size, such as 1024 × 768 -#: ../extensions/gstreamer_utils/gstreamer-utils.c:396 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1303 -#: ../extensions/image_viewer/gth-metadata-provider-image.c:190 -#: ../extensions/webalbums/dlg-web-exporter.c:442 -#: ../extensions/webalbums/gth-web-exporter.c:2446 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:395 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1300 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:209 +#: ../extensions/webalbums/gth-web-exporter.c:2446 ../gthumb/gtk-utils.c:1027 #, c-format msgid "%d × %d" msgstr "%d × %d" @@ -3118,7 +3179,7 @@ msgid "Could not print the selected files" msgstr "Nelze vytisknout vybrané soubory" -#: ../extensions/image_print/callbacks.c:54 +#: ../extensions/image_print/callbacks.c:65 msgid "Print the selected images" msgstr "Vytisknout vybrané obrázky" @@ -3191,25 +3252,26 @@ msgid "Fonts" msgstr "Písma" -#: ../extensions/image_print/gth-image-print-job.c:971 +#: ../extensions/image_print/gth-image-print-job.c:914 #: ../extensions/webalbums/data/albumthemes/text.h:31 #, c-format msgid "Page %d of %d" msgstr "Strana %d z %d" -#: ../extensions/image_print/gth-image-print-job.c:1734 -#: ../extensions/image_print/gth-image-print-job.c:1861 -#: ../extensions/image_print/gth-image-print-job.c:1898 +#: ../extensions/image_print/gth-image-print-job.c:1680 +#: ../extensions/image_print/gth-image-print-job.c:1845 +#: ../extensions/image_print/gth-image-print-job.c:1888 msgid "Could not print" msgstr "Nelze tisknout" -#: ../extensions/image_print/gth-image-print-job.c:1796 +#: ../extensions/image_print/gth-image-print-job.c:1746 #: ../gthumb/gth-main-default-tests.c:240 msgid "Images" msgstr "Obrázky" -#: ../extensions/image_print/gth-image-print-job.c:1863 -#: ../gthumb/gth-image-loader.c:204 ../gthumb/gth-image-loader.c:278 +#: ../extensions/image_print/gth-image-print-job.c:1847 +#: ../gthumb/gth-image-loader.c:197 ../gthumb/gth-image-loader.c:304 +#: ../gthumb/gth-image-utils.c:131 ../gthumb/gth-image-utils.c:137 msgid "No suitable loader available for this file type" msgstr "" "Pro tento typ souboru není k dispozici žádný vhodný modul, který by jej " @@ -3222,7 +3284,7 @@ msgstr "Načítá se „%s“" #: ../extensions/image_print/gth-load-image-info-task.c:166 -#: ../extensions/webalbums/gth-web-exporter.c:2685 +#: ../extensions/webalbums/gth-web-exporter.c:2719 msgid "Loading images" msgstr "Načítají se obrázky" @@ -3265,7 +3327,7 @@ #: ../extensions/image_rotation/gth-reset-orientation-task.c:111 #: ../extensions/image_rotation/gth-transform-task.c:141 -#: ../extensions/webalbums/gth-web-exporter.c:2339 +#: ../extensions/webalbums/gth-web-exporter.c:2338 #: ../extensions/webalbums/gth-web-exporter.c:2423 msgid "Saving images" msgstr "Ukládám obrázky" @@ -3510,39 +3572,39 @@ msgid "custom format" msgstr "vlastní formát" -#: ../extensions/importer/gth-import-task.c:442 -#: ../extensions/importer/gth-import-task.c:477 -#: ../extensions/importer/gth-import-task.c:648 +#: ../extensions/importer/gth-import-task.c:426 +#: ../extensions/importer/gth-import-task.c:461 +#: ../extensions/importer/gth-import-task.c:671 msgid "Importing files" msgstr "Importují se soubory" -#: ../extensions/importer/gth-import-task.c:598 +#: ../extensions/importer/gth-import-task.c:620 msgid "No file imported" msgstr "Nebyl importován žádný soubor" -#: ../extensions/importer/gth-import-task.c:599 +#: ../extensions/importer/gth-import-task.c:621 msgid "The selected files are already present in the destination." msgstr "Vybrané soubory se již v cíli vyskytují." -#: ../extensions/importer/gth-import-task.c:622 +#: ../extensions/importer/gth-import-task.c:644 #: ../gthumb/gth-file-source-vfs.c:694 msgid "Could not delete the files" msgstr "Nelze smazat soubory" -#: ../extensions/importer/gth-import-task.c:623 +#: ../extensions/importer/gth-import-task.c:645 msgid "Delete operation not supported." msgstr "Operace mazání není podporována." -#: ../extensions/importer/gth-import-task.c:709 +#: ../extensions/importer/gth-import-task.c:732 msgid "Last imported" msgstr "Naposledy importováno" -#: ../extensions/importer/gth-import-task.c:815 +#: ../extensions/importer/gth-import-task.c:838 msgid "No file specified." msgstr "Není zadán žádný soubor." #. Translators: For example: Not enough free space in '/home/user/Images'.\n1.3 GB of space is required but only 300 MB is available. -#: ../extensions/importer/gth-import-task.c:852 +#: ../extensions/importer/gth-import-task.c:875 #, c-format msgid "" "Not enough free space in '%s'.\n" @@ -3551,7 +3613,7 @@ "Nedostatek volného místa na „%s“.\n" "Je požadováno %s místa, ale k dispozici je jen %s." -#: ../extensions/list_tools/callbacks.c:76 ../gthumb/gth-filterbar.c:304 +#: ../extensions/list_tools/callbacks.c:76 ../gthumb/gth-filterbar.c:311 msgid "Personalize..." msgstr "Přizpůsobit…" @@ -3694,9 +3756,9 @@ msgstr "Zadejte hodnotu:" #: ../extensions/list_tools/gth-script.c:745 -#: ../extensions/webalbums/gth-web-exporter.c:560 -#: ../extensions/webalbums/gth-web-exporter.c:572 -#: ../extensions/webalbums/gth-web-exporter.c:580 +#: ../extensions/webalbums/gth-web-exporter.c:558 +#: ../extensions/webalbums/gth-web-exporter.c:570 +#: ../extensions/webalbums/gth-web-exporter.c:578 msgid "Malformed command" msgstr "Nesprávně zadaný přikaz" @@ -3762,6 +3824,47 @@ msgid "View the photo position on the map" msgstr "Zobrazit polohu fotografie na mapě" +#: ../extensions/oauth/data/ui/oauth-account-manager.ui.h:1 +msgid "A_ccounts:" +msgstr "Úč_ty:" + +#: ../extensions/oauth/data/ui/oauth-ask-authorization.ui.h:1 +#: ../gthumb/gth-folder-tree.c:1067 +msgid "Loading..." +msgstr "Načítá se…" + +#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 +msgid "New authentication..." +msgstr "Nové ověření…" + +#: ../extensions/oauth/oauth-ask-authorization-dialog.c:191 +msgid "Authorization Required" +msgstr "Požadováno ověření" + +#: ../extensions/oauth/web-service.c:382 +msgid "Choose _Account..." +msgstr "Vybr_at účet…" + +#: ../extensions/oauth/web-service.c:660 +msgid "Choose Account" +msgstr "Vybrat účet" + +#: ../extensions/oauth/web-service.c:777 +msgid "Edit Accounts" +msgstr "Upravit účty" + +#: ../extensions/oauth/web-service.c:795 ../extensions/oauth/web-service.c:812 +msgid "Connecting to the server" +msgstr "Připojuje se k serveru" + +#: ../extensions/oauth/web-service.c:796 +msgid "Asking authorization" +msgstr "Dotazuje se na ověření" + +#: ../extensions/oauth/web-service.c:813 +msgid "Getting account information" +msgstr "Získávají se informace účtu" + #: ../extensions/photobucket/callbacks.c:54 msgid "Photobucket..." msgstr "Photobucket…" @@ -3770,68 +3873,68 @@ msgid "Upload photos to Photobucket" msgstr "Odeslat fotografie na Photobucket" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +msgid "_Scramble filenames" +msgstr "_Změnit názvy souborů" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 msgid "Tiny ( 100 x 75 )" msgstr "Velmi malá (100 × 75)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 msgid "Small ( 160 x 120 )" msgstr "Malá (160 × 120)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 msgid "Medium ( 320 x 240 )" msgstr "Střední (320 × 240)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 msgid "Large ( 640 x 480 )" msgstr "Velká (640 × 480)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 msgid "15ʺ screen ( 800 x 600 )" msgstr "15ʺ obrazovka (800 × 600)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 msgid "17ʺ screen ( 1024 x 768 )" msgstr "17ʺ obrazovka (1024 × 768)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 msgid "1 megabyte file size" msgstr "Velikost souboru 1 megabajt" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 -msgid "_Scramble filenames" -msgstr "_Změnit názvy souborů" - #: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 msgid "_Container:" msgstr "_Kontejner:" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:290 msgid "Tiny ( 100 × 75 )" msgstr "Velmi malá (100 × 75)" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 msgid "Small ( 160 × 120 )" msgstr "Malá (160 × 120)" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 msgid "Medium ( 320 × 240 )" msgstr "Střední (320 × 240)" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 msgid "Large ( 640 × 480 )" msgstr "Velká (640 × 480)" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 msgid "15ʺ screen ( 800 × 600 )" msgstr "15ʺ obrazovka (800 × 600)" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 msgid "17ʺ screen ( 1024 × 768 )" msgstr "17ʺ obrazovka (1024 × 768)" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:304 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:303 msgid "2 megabyte file size" msgstr "Velikost souboru 2 megabajty" @@ -3873,7 +3976,7 @@ #. view label #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 -#: ../gthumb/gth-filterbar.c:414 +#: ../gthumb/gth-filterbar.c:421 msgid "S_how:" msgstr "_Zobrazit:" @@ -3890,7 +3993,7 @@ msgstr "_Smazat importované obrázky ze zdrojového místa" #: ../extensions/photo_importer/dlg-photo-importer.c:227 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:174 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:149 msgid "Could not import the files" msgstr "Nelze importovat soubory" @@ -3905,7 +4008,7 @@ msgstr "Nelze načíst složku" #: ../extensions/photo_importer/dlg-photo-importer.c:369 -#: ../gthumb/gth-browser.c:1921 +#: ../gthumb/gth-browser.c:2089 msgid "Getting folder listing..." msgstr "Získává se výpis složky…" @@ -3950,52 +4053,15 @@ msgid "_Albums:" msgstr "_Alba:" -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 -msgid "Import from Picasa Web Album" -msgstr "Importovat z webového alba Picasa" - -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 -msgid "_Album:" -msgstr "_Album:" - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:1 -msgid "_E-Mail:" -msgstr "_E-mail:" - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 -msgid "" -"Type the characters you see in the picture below. Letters are not case-" -"sensitive." -msgstr "" -"Opište znaky, které vidíte na obrázku níže. Velikost písmen není důležitá." - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:3 -msgid "_Password:" -msgstr "_Heslo:" - #: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 msgid "Public" msgstr "Veřejné" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:354 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:310 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:458 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:469 msgid "Could not get the album list" msgstr "Nelze získat seznam alb" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:438 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:394 -msgid "Picasa Web Album" -msgstr "Webové album Picasa" - -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:525 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:481 -msgid "Account" -msgstr "Účet" - -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:104 -msgid "Could not load the file" -msgstr "Nelze načíst soubor" - #: ../extensions/picasaweb/picasaweb.extension.in.in.h:1 msgid "Picasa Web Albums" msgstr "Webová alba Picasa" @@ -4004,92 +4070,6 @@ msgid "Upload images to Picasa Web Albums" msgstr "Odesílání obrázků do webových alb Picasa." -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:1 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:1 -msgid "_Default extension:" -msgstr "_Výchozí přípona:" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:2 -msgid "_Quality:" -msgstr "_Kvalita:" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 -msgid "_Smoothing:" -msgstr "Vy_hlazování:" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 -msgid "Opti_mize" -msgstr "Opti_malizovat" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:5 -msgid "_Progressive" -msgstr "_Progresivní" - -#: ../extensions/pixbuf_savers/data/ui/png-options.ui.h:1 -msgid "Compression _level:" -msgstr "Úroveň _komprimace:" - -#: ../extensions/pixbuf_savers/data/ui/save-options-preferences.ui.h:1 -msgid "Default options:" -msgstr "Výchozí volby:" - -#: ../extensions/pixbuf_savers/data/ui/tga-options.ui.h:1 -msgid "_RLE compression" -msgstr "Komprimace _RLE" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:2 -msgid "_No compression" -msgstr "_Bez komprimace" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:3 -msgid "No_rmal (Deflate)" -msgstr "Běžná (_Deflace)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 -msgid "_Loss compression (JPEG)" -msgstr "_Ztrátová komprimace (JPEG)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 -msgid "Compression" -msgstr "Komprimace" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 -msgid "dpi" -msgstr "dpi" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:9 -msgid "Resolution" -msgstr "Rozlišení" - -#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:519 -msgid "JPEG" -msgstr "JPEG" - -#: ../extensions/pixbuf_savers/gth-png-saver.c:140 -msgid "PNG" -msgstr "PNG" - -#: ../extensions/pixbuf_savers/gth-tga-saver.c:286 -#: ../gthumb/gth-buffer-data.c:84 -msgid "Insufficient memory" -msgstr "Nedostatek paměti" - -#: ../extensions/pixbuf_savers/gth-tga-saver.c:373 -msgid "TGA" -msgstr "TGA" - -#: ../extensions/pixbuf_savers/gth-tiff-saver.c:537 -msgid "TIFF" -msgstr "TIFF" - -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:1 -msgid "Save images" -msgstr "Uložení obrázků" - -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:2 -msgid "Save images in common file formats such as JPEG, PNG and TIFF" -msgstr "Uložení obrázků v běžných formátech, jako jsou JPEG, PNG a TIFF." - #: ../extensions/raw_files/raw_files.extension.in.in.h:1 msgid "Raw format support" msgstr "Podpora formátu RAW" @@ -4098,11 +4078,11 @@ msgid "Allow to load raw format images." msgstr "Umožňuje načítat formát obrázků RAW." -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 msgid "_X:" msgstr "_X:" -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 msgid "_Y:" msgstr "_Y:" @@ -4224,36 +4204,36 @@ msgid "File attribute" msgstr "Atribut souboru" -#: ../extensions/rename_series/dlg-rename-series.c:552 -#: ../extensions/rename_series/dlg-rename-series.c:683 +#: ../extensions/rename_series/dlg-rename-series.c:558 +#: ../extensions/rename_series/dlg-rename-series.c:689 msgid "Could not rename the files" msgstr "Nelze přejmenovat soubory" -#: ../extensions/rename_series/dlg-rename-series.c:780 +#: ../extensions/rename_series/dlg-rename-series.c:786 msgid "Could not save the template" msgstr "Nelze uložit šablonu" -#: ../extensions/rename_series/dlg-rename-series.c:798 +#: ../extensions/rename_series/dlg-rename-series.c:804 msgid "Edit Template" msgstr "Úprava šablony" -#: ../extensions/rename_series/dlg-rename-series.c:856 +#: ../extensions/rename_series/dlg-rename-series.c:862 msgid "Old Name" msgstr "Starý název" -#: ../extensions/rename_series/dlg-rename-series.c:867 +#: ../extensions/rename_series/dlg-rename-series.c:873 msgid "New Name" msgstr "Nový název" -#: ../extensions/rename_series/dlg-rename-series.c:944 +#: ../extensions/rename_series/dlg-rename-series.c:950 msgid "Keep original case" msgstr "Zachovat původní velikost písmen" -#: ../extensions/rename_series/dlg-rename-series.c:945 +#: ../extensions/rename_series/dlg-rename-series.c:951 msgid "Convert to lower-case" msgstr "Převést na malá písmena" -#: ../extensions/rename_series/dlg-rename-series.c:946 +#: ../extensions/rename_series/dlg-rename-series.c:952 msgid "Convert to upper-case" msgstr "Převést na velká písmena" @@ -4302,11 +4282,7 @@ msgid "pixel" msgstr "bodů" -#: ../extensions/resize_images/dlg-resize-images.c:168 -msgid "Resizing images" -msgstr "Mění se velikost obrázků" - -#: ../extensions/resize_images/dlg-resize-images.c:412 +#: ../extensions/resize_images/dlg-resize-images.c:423 msgid "Keep the original format" msgstr "Zachovat původní formát" @@ -4372,23 +4348,23 @@ msgid "File search tool." msgstr "Nástroj na vyhledávání souborů." -#: ../extensions/selections/callbacks.c:62 +#: ../extensions/selections/callbacks.c:77 msgid "Add to _Selection" msgstr "Přidat do vý_běru" -#: ../extensions/selections/callbacks.c:65 +#: ../extensions/selections/callbacks.c:86 msgid "Selection 1" msgstr "Výběr 1" -#: ../extensions/selections/callbacks.c:70 +#: ../extensions/selections/callbacks.c:91 msgid "Selection 2" msgstr "Výběr 2" -#: ../extensions/selections/callbacks.c:75 +#: ../extensions/selections/callbacks.c:96 msgid "Selection 3" msgstr "Výběr 3" -#: ../extensions/selections/callbacks.c:180 +#: ../extensions/selections/callbacks.c:285 #, c-format msgid "" "Use Alt-%d to add files to this selection, Ctrl-%d to view this selection." @@ -4396,12 +4372,12 @@ "Použijte Alt-%d pro přidání souborů do tohoto výběru, Ctrl-%d pro zobrazení " "tohoto výběru." -#: ../extensions/selections/gth-selections-manager.c:250 +#: ../extensions/selections/gth-selections-manager.c:239 #, c-format msgid "Selection %d" msgstr "Výběr %d" -#: ../extensions/selections/gth-selections-manager.c:253 +#: ../extensions/selections/gth-selections-manager.c:242 #: ../extensions/selections/selections.extension.in.in.h:1 msgid "Selections" msgstr "Výběry" @@ -4458,7 +4434,7 @@ msgid "Remove the selected files" msgstr "Odstranit vybrané soubory" -#: ../extensions/slideshow/gth-slideshow.c:229 +#: ../extensions/slideshow/gth-slideshow.c:231 msgid "Playing slideshow" msgstr "Promítání snímků" @@ -4587,10 +4563,6 @@ msgid "_Copy originals to destination" msgstr "_Kopírovat originály do cíle" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 -msgid "_Resize if larger than:" -msgstr "Z_menšit, je-li větší než:" - #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 msgid "_Adapt to the window width " msgstr "_Přizpůsobit šířce okna" @@ -4631,36 +4603,36 @@ msgid "Image Attributes" msgstr "Atributy obrázku" -#: ../extensions/webalbums/gth-web-exporter.c:1802 +#: ../extensions/webalbums/gth-web-exporter.c:1800 msgid "Could not show the destination" msgstr "Nelze zobrazit cíl" -#: ../extensions/webalbums/gth-web-exporter.c:1838 +#: ../extensions/webalbums/gth-web-exporter.c:1836 msgid "The album has been created successfully." msgstr "Album bylo úspěšně vytvořeno." -#: ../extensions/webalbums/gth-web-exporter.c:2106 -#: ../extensions/webalbums/gth-web-exporter.c:2133 +#: ../extensions/webalbums/gth-web-exporter.c:2104 +#: ../extensions/webalbums/gth-web-exporter.c:2132 msgid "Saving thumbnails" msgstr "Ukládají se náhledy" -#: ../extensions/webalbums/gth-web-exporter.c:2161 +#: ../extensions/webalbums/gth-web-exporter.c:2160 msgid "Saving HTML pages: Images" msgstr "Ukládám stránky HTML: Obrázky" -#: ../extensions/webalbums/gth-web-exporter.c:2219 +#: ../extensions/webalbums/gth-web-exporter.c:2218 msgid "Saving HTML pages: Indexes" msgstr "Ukládám stránky HTML: Indexy" -#: ../extensions/webalbums/gth-web-exporter.c:2502 +#: ../extensions/webalbums/gth-web-exporter.c:2503 msgid "Copying original images" msgstr "Kopírování originálních obrázků" -#: ../extensions/webalbums/gth-web-exporter.c:2929 +#: ../extensions/webalbums/gth-web-exporter.c:2963 msgid "Could not find the style folder" msgstr "Nelze najít složku se styly" -#: ../extensions/webalbums/gth-web-exporter.c:2967 +#: ../extensions/webalbums/gth-web-exporter.c:3001 msgid "Could not create a temporary folder" msgstr "Nelze vytvořit dočasný adresář" @@ -4672,9 +4644,9 @@ msgid "Create static web albums." msgstr "Vytváření statických webových alb." -#: ../gthumb/dlg-location.c:200 ../gthumb/gth-browser.c:1250 -#: ../gthumb/gth-browser.c:1809 ../gthumb/gth-browser.c:5899 -#: ../gthumb/gth-browser.c:5918 ../gthumb/gth-browser.c:5942 +#: ../gthumb/dlg-location.c:200 ../gthumb/gth-browser.c:1396 +#: ../gthumb/gth-browser.c:1969 ../gthumb/gth-browser.c:6214 +#: ../gthumb/gth-browser.c:6233 ../gthumb/gth-browser.c:6257 #, c-format msgid "Could not load the position \"%s\"" msgstr "Nelze načíst polohu „%s“" @@ -4695,7 +4667,7 @@ msgid "Edit Filter" msgstr "Upravit filtr" -#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:270 +#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:277 msgid "All" msgstr "Vše" @@ -4760,46 +4732,6 @@ msgid "_Restart" msgstr "_Restartovat" -#: ../gthumb/eggfileformatchooser.c:236 -#, c-format -msgid "File _Format: %s" -msgstr "_Formát souboru: %s" - -#: ../gthumb/eggfileformatchooser.c:397 ../gthumb/gth-main-default-tests.c:233 -msgid "All Files" -msgstr "Všechny soubory" - -#: ../gthumb/eggfileformatchooser.c:398 -msgid "All Supported Files" -msgstr "Všechny podporované soubory" - -#: ../gthumb/eggfileformatchooser.c:407 -msgid "By Extension" -msgstr "Podle přípony" - -#: ../gthumb/eggfileformatchooser.c:422 -msgid "File Format" -msgstr "Formát souboru" - -#: ../gthumb/eggfileformatchooser.c:440 -msgid "Extension(s)" -msgstr "Přípona(y)" - -#: ../gthumb/eggfileformatchooser.c:681 -#, c-format -msgid "" -"The program was not able to find out the file format you want to use for `" -"%s'. Please make sure to use a known extension for that file or manually " -"choose a file format from the list below." -msgstr "" -"Program nedokázal najít formát souboru, který chcete použít pro „%s“. " -"Ujistěte se prosím, že jste použili známou příponu souboru nebo ručně zvolte " -"formát v seznamu dole." - -#: ../gthumb/eggfileformatchooser.c:688 -msgid "File format not recognized" -msgstr "Formát souboru nebyl rozpoznán" - #. For translators: This is a progress size indicator, for example: 230.4 MB of 512.8 MB #: ../gthumb/gio-utils.c:1351 #, c-format @@ -4834,7 +4766,7 @@ #. * the separator that your locale uses or use "%Id" instead #. * of "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2848 +#: ../gthumb/glib-utils.c:3068 #, c-format msgctxt "long time format" msgid "%d:%02d:%02d" @@ -4846,13 +4778,13 @@ #. * separator that your locale uses or use "%Id" instead of #. * "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2857 +#: ../gthumb/glib-utils.c:3077 #, c-format msgctxt "short time format" msgid "%d:%02d" msgstr "%d:%02d" -#: ../gthumb/gth-browser-actions-callbacks.c:400 +#: ../gthumb/gth-browser-actions-callbacks.c:414 msgid "" "gthumb is free software; you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -4864,7 +4796,7 @@ "Software Foundation, a to buď ve verzi 2 této licence nebo (dle vaší volby) " "v libovolné novější verzi." -#: ../gthumb/gth-browser-actions-callbacks.c:404 +#: ../gthumb/gth-browser-actions-callbacks.c:418 msgid "" "gthumb is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -4875,7 +4807,7 @@ "bez předpokládané záruky na PRODEJNOST nebo VHODNOST PRO KONKRÉTNÍ ÚČEL. " "Více podrobností najdete přímo v licenci GNU General Public License." -#: ../gthumb/gth-browser-actions-callbacks.c:408 +#: ../gthumb/gth-browser-actions-callbacks.c:422 msgid "" "You should have received a copy of the GNU General Public License along with " "gthumb. If not, see http://www.gnu.org/licenses/." @@ -4884,11 +4816,11 @@ "License. Pokud se tak nestalo, podívejte se na ." -#: ../gthumb/gth-browser-actions-callbacks.c:427 +#: ../gthumb/gth-browser-actions-callbacks.c:441 msgid "An image viewer and browser for GNOME." msgstr "Prohlížeč obrázků pro prostředí GNOME." -#: ../gthumb/gth-browser-actions-callbacks.c:430 +#: ../gthumb/gth-browser-actions-callbacks.c:444 msgid "translator_credits" msgstr "" "Michal Bukovjan \n" @@ -4976,15 +4908,15 @@ msgid "Leave Fullscreen" msgstr "Opustit celou obrazovku" -#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3586 +#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3841 msgid "Go to the previous visited location" msgstr "Přejít na předchozí navštívené místo" -#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3604 +#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3859 msgid "Go to the next visited location" msgstr "Přejít na následující navštívené místo" -#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3622 +#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3877 msgid "Go up one level" msgstr "Přejít o úroveň výše" @@ -4996,7 +4928,7 @@ msgid "Specify a location to open" msgstr "Určit umístění, které se má otevřít" -#: ../gthumb/gth-browser-actions-entries.h:173 ../gthumb/gth-browser.c:672 +#: ../gthumb/gth-browser-actions-entries.h:173 ../gthumb/gth-browser.c:721 msgid "_Delete History" msgstr "O_dstranit historii" @@ -5024,93 +4956,95 @@ msgid "_Keyboard Shortcuts" msgstr "_Klávesové zkratky" -#: ../gthumb/gth-browser-actions-entries.h:206 +#: ../gthumb/gth-browser-actions-entries.h:203 +#: ../gthumb/gth-browser-actions-entries.h:257 +msgid "Edit" +msgstr "Upravit" + +#: ../gthumb/gth-browser-actions-entries.h:204 +#: ../gthumb/gth-browser-actions-entries.h:258 +msgid "Edit file" +msgstr "Upravit soubor" + +#: ../gthumb/gth-browser-actions-entries.h:212 msgid "_Toolbar" msgstr "Lišta _nástrojů" -#: ../gthumb/gth-browser-actions-entries.h:207 +#: ../gthumb/gth-browser-actions-entries.h:213 msgid "View or hide the toolbar of this window" msgstr "Zobrazit nebo skrýt lištu nástrojů tohoto okna" -#: ../gthumb/gth-browser-actions-entries.h:211 +#: ../gthumb/gth-browser-actions-entries.h:217 msgid "_Statusbar" msgstr "_Stavová lišta" -#: ../gthumb/gth-browser-actions-entries.h:212 +#: ../gthumb/gth-browser-actions-entries.h:218 msgid "View or hide the statusbar of this window" msgstr "Zobrazit nebo skrýt stavovou lištu tohoto okna" -#: ../gthumb/gth-browser-actions-entries.h:216 +#: ../gthumb/gth-browser-actions-entries.h:222 msgid "_Filterbar" msgstr "Lišta _filtru" -#: ../gthumb/gth-browser-actions-entries.h:217 +#: ../gthumb/gth-browser-actions-entries.h:223 msgid "View or hide the filterbar of this window" msgstr "Zobrazit nebo skrýt lištu s filtrem tohoto okna" -#: ../gthumb/gth-browser-actions-entries.h:221 +#: ../gthumb/gth-browser-actions-entries.h:227 msgid "_Sidebar" msgstr "Po_stranní panel" -#: ../gthumb/gth-browser-actions-entries.h:222 +#: ../gthumb/gth-browser-actions-entries.h:228 msgid "View or hide the sidebar of this window" msgstr "Zobrazit nebo skrýt postranní panel tohoto okna" -#: ../gthumb/gth-browser-actions-entries.h:226 +#: ../gthumb/gth-browser-actions-entries.h:232 msgid "_Thumbnail Pane" msgstr "Panel s ná_hledy" -#: ../gthumb/gth-browser-actions-entries.h:227 +#: ../gthumb/gth-browser-actions-entries.h:233 msgid "View or hide the thumbnail pane in viewer mode" msgstr "Zobrazit nebo skrýt panel s náhledy v režimu zobrazení" -#: ../gthumb/gth-browser-actions-entries.h:231 +#: ../gthumb/gth-browser-actions-entries.h:237 msgid "_Thumbnails" msgstr "Ná_hledy" -#: ../gthumb/gth-browser-actions-entries.h:232 +#: ../gthumb/gth-browser-actions-entries.h:238 msgid "View thumbnails" msgstr "Zobrazit náhledy" -#: ../gthumb/gth-browser-actions-entries.h:236 +#: ../gthumb/gth-browser-actions-entries.h:242 msgid "_Hidden Files" msgstr "S_kryté soubory" -#: ../gthumb/gth-browser-actions-entries.h:237 +#: ../gthumb/gth-browser-actions-entries.h:243 msgid "Show hidden files and folders" msgstr "Zobrazit skryté soubory a složky" -#: ../gthumb/gth-browser-actions-entries.h:242 -#: ../gthumb/gth-browser-actions-entries.h:247 +#: ../gthumb/gth-browser-actions-entries.h:248 +#: ../gthumb/gth-browser-actions-entries.h:253 msgid "View file properties" msgstr "Zobrazit vlastnosti souboru" -#: ../gthumb/gth-browser-actions-entries.h:251 -msgid "Edit" -msgstr "Upravit" - -#: ../gthumb/gth-browser-actions-entries.h:252 -msgid "Edit file" -msgstr "Upravit soubor" - -#: ../gthumb/gth-browser-actions-entries.h:256 +#: ../gthumb/gth-browser-actions-entries.h:262 msgid "_Fit Window to Image" msgstr "_Přizpůsobit okno obrázku" -#: ../gthumb/gth-browser-actions-entries.h:257 +#: ../gthumb/gth-browser-actions-entries.h:263 msgid "Resize the window to the size of the image" msgstr "Změnit velikost okna, aby odpovídalo velikosti obrázku" -#: ../gthumb/gth-browser.c:369 +#: ../gthumb/gth-browser.c:418 #, c-format msgid "Open %s" msgstr "Otevřít %s" -#: ../gthumb/gth-browser.c:509 +#: ../gthumb/gth-browser.c:558 msgid "[modified]" msgstr "[změněno]" -#: ../gthumb/gth-browser.c:1006 +#: ../gthumb/gth-browser.c:1117 #, c-format msgid "%d file selected (%s)" msgid_plural "%d files selected (%s)" @@ -5118,51 +5052,51 @@ msgstr[1] "Vybrány %d soubory (%s)" msgstr[2] "Vybráno %d souborů (%s)" -#: ../gthumb/gth-browser.c:1041 +#: ../gthumb/gth-browser.c:1152 #, c-format msgid "%s of free space" msgstr "%s volného místa" -#: ../gthumb/gth-browser.c:1905 ../gthumb/gth-browser.c:1932 +#: ../gthumb/gth-browser.c:2073 ../gthumb/gth-browser.c:2100 #, c-format msgid "No suitable module found for %s" msgstr "Nenalezen žádný použitelný modul pro %s" -#: ../gthumb/gth-browser.c:2052 +#: ../gthumb/gth-browser.c:2219 #, c-format msgid "Save changes to file '%s'?" msgstr "Uložit změny do souboru „%s“?" -#: ../gthumb/gth-browser.c:2057 +#: ../gthumb/gth-browser.c:2224 msgid "If you don't save, changes to the file will be permanently lost." msgstr "Pokud změny do souboru neuložíte, budou nenávratně ztraceny." -#: ../gthumb/gth-browser.c:2058 +#: ../gthumb/gth-browser.c:2225 msgid "Do _Not Save" msgstr "_Neukládat" -#: ../gthumb/gth-browser.c:2828 ../gthumb/gth-source-tree.c:182 +#: ../gthumb/gth-browser.c:3020 ../gthumb/gth-source-tree.c:182 msgid "Could not change name" msgstr "Nelze změnit název" -#: ../gthumb/gth-browser.c:3257 ../gthumb/gth-main-default-metadata.c:41 +#: ../gthumb/gth-browser.c:3451 ../gthumb/gth-main-default-metadata.c:41 msgid "Modified" msgstr "Změněno" -#: ../gthumb/gth-browser.c:3587 ../gthumb/gth-browser.c:3605 +#: ../gthumb/gth-browser.c:3842 ../gthumb/gth-browser.c:3860 msgid "View the list of visited locations" msgstr "Zobrazit seznam navštívených míst" -#: ../gthumb/gth-browser.c:3623 +#: ../gthumb/gth-browser.c:3878 msgid "View the list of upper locations" msgstr "Zobrazit seznam nadřízených míst" -#: ../gthumb/gth-browser.c:5900 +#: ../gthumb/gth-browser.c:6215 #, c-format msgid "File type not supported" msgstr "Typ souboru není podporován" -#: ../gthumb/gth-browser.c:5943 +#: ../gthumb/gth-browser.c:6258 #, c-format msgid "No suitable module found" msgstr "Nenalezen žádný použitelný modul" @@ -5172,11 +5106,15 @@ msgid "Could not open the module `%s`: %s" msgstr "Nelze otevřít modul „%s“: %s" -#: ../gthumb/gth-extensions.c:744 +#: ../gthumb/gth-extensions.c:754 #, c-format msgid "The extension '%1$s' is required by the extension '%2$s'" msgstr "Rozšíření „%1$s“ je vyžadováno rozšířením „%2$s“" +#: ../gthumb/gth-file-chooser-dialog.c:144 +msgid "All Supported Files" +msgstr "Všechny podporované soubory" + #: ../gthumb/gth-file-source-vfs.c:121 msgid "Home Folder" msgstr "Domovská složka" @@ -5217,7 +5155,7 @@ msgstr[1] "Opravdu chcete trvale smazat %'d vybrané soubory?" msgstr[2] "Opravdu chcete trvale smazat %'d vybraných souborů?" -#: ../gthumb/gth-filterbar.c:406 +#: ../gthumb/gth-filterbar.c:413 msgid "Hide the filterbar" msgstr "Skrýt panel filtru" @@ -5237,7 +5175,7 @@ msgstr "GB" #. "files" label -#: ../gthumb/gth-filter.c:291 ../gthumb/gth-filter-editor-dialog.c:177 +#: ../gthumb/gth-filter.c:286 ../gthumb/gth-filter-editor-dialog.c:177 msgid "files" msgstr "souborů" @@ -5254,50 +5192,59 @@ msgid "No limit specified" msgstr "Nezadána žádná omezení" -#: ../gthumb/gth-folder-tree.c:857 -msgid "Loading..." -msgstr "Načítá se…" - -#: ../gthumb/gth-folder-tree.c:1100 +#: ../gthumb/gth-folder-tree.c:1369 msgid "(Open Parent)" msgstr "(Otevřít rodiče)" -#: ../gthumb/gth-histogram-view.c:826 +#: ../gthumb/gth-histogram-view.c:825 msgid "Linear scale" msgstr "Lineární měřítko" -#: ../gthumb/gth-histogram-view.c:838 +#: ../gthumb/gth-histogram-view.c:837 msgid "Logarithmic scale" msgstr "Logaritmické měřítko" -#: ../gthumb/gth-histogram-view.c:858 +#: ../gthumb/gth-histogram-view.c:857 msgid "Channel:" msgstr "Kanál:" -#: ../gthumb/gth-histogram-view.c:890 +#: ../gthumb/gth-histogram-view.c:878 msgid "Value" msgstr "Hodnota" -#: ../gthumb/gth-histogram-view.c:896 +#: ../gthumb/gth-histogram-view.c:883 msgid "Red" msgstr "Červená" -#: ../gthumb/gth-histogram-view.c:902 +#: ../gthumb/gth-histogram-view.c:888 msgid "Green" msgstr "Zelená" -#: ../gthumb/gth-histogram-view.c:908 +#: ../gthumb/gth-histogram-view.c:893 msgid "Blue" msgstr "Modrá" -#: ../gthumb/gth-histogram-view.c:914 +#: ../gthumb/gth-histogram-view.c:898 msgid "Alpha" msgstr "Průhlednost" -#: ../gthumb/gth-histogram-view.c:921 +#: ../gthumb/gth-histogram-view.c:904 msgid "RGB" msgstr "RGB" +#: ../gthumb/gth-image-list-task.c:141 +msgid "Could not rename the file" +msgstr "Nelze přejmenovat soubor" + +#: ../gthumb/gth-image-saver.c:39 +msgid "No options available for this file type" +msgstr "Pro tento typ souboru nejsou dostupné žádné volby" + +#: ../gthumb/gth-image-saver.c:185 +#, c-format +msgid "Could not find a suitable module to save the image as \"%s\"" +msgstr "Nelze najít vhodný modul k uložení obrázku jako „%s“" + #: ../gthumb/gth-load-file-data-task.c:108 msgid "Reading file information" msgstr "Čtou se informace o souboru" @@ -5351,6 +5298,10 @@ msgid "dimensions" msgstr "rozměrů" +#: ../gthumb/gth-main-default-tests.c:233 +msgid "All Files" +msgstr "Všechny soubory" + #: ../gthumb/gth-main-default-tests.c:261 msgid "Media" msgstr "Média" @@ -5371,15 +5322,7 @@ msgid "Description (embedded)" msgstr "Popis (vložený)" -#: ../gthumb/gth-pixbuf-list-task.c:139 -msgid "Could not rename the file" -msgstr "Nelze přejmenovat soubor" - -#: ../gthumb/gth-pixbuf-saver.c:34 -msgid "No options available for this file type" -msgstr "Pro tento typ souboru nejsou dostupné žádné volby" - -#: ../gthumb/gth-progress-dialog.c:144 +#: ../gthumb/gth-progress-dialog.c:146 msgid "Cancel operation" msgstr "Zrušit operaci" @@ -5387,60 +5330,66 @@ msgid "Saving file information" msgstr "Ukládají se informace o souboru" -#: ../gthumb/gth-tags-entry.c:388 +#. Translators: %s is a filename +#: ../gthumb/gth-save-image-task.c:162 +#, c-format +msgid "Saving '%s'" +msgstr "Ukládá se „%s“" + +#: ../gthumb/gth-tags-entry.c:390 #, c-format msgid "Create tag «%s»" msgstr "Vytvořit štítek „%s“" -#: ../gthumb/gth-tags-entry.c:735 +#: ../gthumb/gth-tags-entry.c:814 msgid "Show all the tags" msgstr "Zobrazit všechny štítky" -#: ../gthumb/gth-tags-file.c:236 +#: ../gthumb/gth-tags-file.c:235 msgid "Holidays" msgstr "Dovolená" -#: ../gthumb/gth-tags-file.c:237 +#: ../gthumb/gth-tags-file.c:236 msgid "Temporary" msgstr "Dočasné" -#: ../gthumb/gth-tags-file.c:238 +#: ../gthumb/gth-tags-file.c:237 msgid "Screenshots" msgstr "Snímky obrazovky" -#: ../gthumb/gth-tags-file.c:239 +#: ../gthumb/gth-tags-file.c:238 msgid "Science" msgstr "Věda" -#: ../gthumb/gth-tags-file.c:240 +#: ../gthumb/gth-tags-file.c:239 msgid "Favorite" msgstr "Oblíbené" -#: ../gthumb/gth-tags-file.c:241 +#: ../gthumb/gth-tags-file.c:240 msgid "Important" msgstr "Důležité" -#: ../gthumb/gth-tags-file.c:242 +#: ../gthumb/gth-tags-file.c:241 msgid "GNOME" msgstr "GNOME" -#: ../gthumb/gth-tags-file.c:243 +#: ../gthumb/gth-tags-file.c:242 msgid "Games" msgstr "Hry" -#: ../gthumb/gth-tags-file.c:244 +#: ../gthumb/gth-tags-file.c:243 msgid "Party" msgstr "Večírek" -#: ../gthumb/gth-tags-file.c:245 +#: ../gthumb/gth-tags-file.c:244 msgid "Birthday" msgstr "Narozeniny" -#: ../gthumb/gth-tags-file.c:246 +#: ../gthumb/gth-tags-file.c:245 msgid "Astronomy" msgstr "Astronomie" -#: ../gthumb/gth-tags-file.c:247 +#: ../gthumb/gth-tags-file.c:246 msgid "Family" msgstr "Rodina" @@ -5458,7 +5407,7 @@ msgid "is not" msgstr "není" -#: ../gthumb/gth-test-category.c:394 ../gthumb/gth-test-simple.c:812 +#: ../gthumb/gth-test-category.c:407 ../gthumb/gth-test-simple.c:812 #: ../gthumb/gth-test-simple.c:838 ../gthumb/gth-test-simple.c:859 #: ../gthumb/gth-test-simple.c:885 #, c-format @@ -5513,11 +5462,11 @@ msgid "is after" msgstr "je za" -#: ../gthumb/gth-time-selector.c:477 +#: ../gthumb/gth-time-selector.c:478 msgid "Today" msgstr "Dnes" -#: ../gthumb/gth-time-selector.c:485 +#: ../gthumb/gth-time-selector.c:486 msgid "Now" msgstr "Nyní" @@ -5529,55 +5478,50 @@ msgid "Close _All Windows" msgstr "Zavřít všechn_a okna" -#: ../gthumb/gtk-utils.c:551 +#: ../gthumb/gtk-utils.c:499 msgid "Could not display help" msgstr "Nelze zobrazit nápovědu" -#: ../gthumb/gtk-utils.c:868 ../gthumb/gtk-utils.c:875 +#: ../gthumb/gtk-utils.c:800 ../gthumb/gtk-utils.c:807 msgid "Could not launch the application" msgstr "Nelze spustit aplikaci" -#: ../gthumb/gtk-utils.c:978 +#: ../gthumb/gtk-utils.c:910 msgid "_Copy Here" msgstr "_Kopírovat sem" -#: ../gthumb/gtk-utils.c:983 +#: ../gthumb/gtk-utils.c:915 msgid "_Move Here" msgstr "Přesunout se_m" -#: ../gthumb/gtk-utils.c:988 +#: ../gthumb/gtk-utils.c:920 msgid "_Link Here" msgstr "Vytvořit zde _odkaz" -#: ../gthumb/gtk-utils.c:997 +#: ../gthumb/gtk-utils.c:929 msgid "Cancel" msgstr "Zrušit" -#: ../gthumb/main.c:59 +#: ../gthumb/main.c:61 msgid "Open a new window" msgstr "Otevřít nové okno" -#: ../gthumb/main.c:63 +#: ../gthumb/main.c:65 msgid "Start in fullscreen mode" msgstr "Začít v režimu celé obrazovky" -#: ../gthumb/main.c:67 +#: ../gthumb/main.c:69 msgid "Automatically start a slideshow" msgstr "Automaticky začít promítání snímků" -#: ../gthumb/main.c:71 +#: ../gthumb/main.c:73 msgid "Automatically import digital camera photos" msgstr "Automaticky importovat fotografie z digitálního fotoaparátu" -#: ../gthumb/main.c:75 +#: ../gthumb/main.c:77 msgid "Show version" msgstr "Zobrazit verzi" -#: ../gthumb/main.c:344 +#: ../gthumb/main.c:483 msgid "- Image browser and viewer" msgstr "- prohlížeč obrázků" - -#: ../gthumb/pixbuf-io.c:174 -#, c-format -msgid "Could not find a suitable module to save the image as \"%s\"" -msgstr "Nelze najít vhodný modul k uložení obrázku jako „%s“" diff -Nru gthumb-3.0.2/po/de.po gthumb-3.2.3/po/de.po --- gthumb-3.0.2/po/de.po 2012-08-14 16:25:43.000000000 +0000 +++ gthumb-3.2.3/po/de.po 2013-04-30 16:56:13.000000000 +0000 @@ -4,27 +4,28 @@ # Hendrik Richter , 2005, 2006. # Maren Reinecke , 2008. # Jochen Skulj , 2008. -# Mario Blättermann , 2010-2012. -# Christian Kirbach , 2008, 2010, 2012. +# Mario Blättermann , 2010-2013. # Paul Seyfert , 2010. # Wolfgang Stöggl , 2011, 2012. +# Christian Kirbach , 2008, 2010, 2012, 2013. # msgid "" msgstr "" "Project-Id-Version: gthumb master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gthumb&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-05-03 09:47+0000\n" -"PO-Revision-Date: 2012-05-05 12:20+0200\n" -"Last-Translator: Christian Kirbach \n" -"Language-Team: German \n" +"POT-Creation-Date: 2013-03-04 21:11+0000\n" +"PO-Revision-Date: 2013-03-05 23:46+0100\n" +"Last-Translator: Christian Kirbach \n" +"Language-Team: Deutsch \n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-Language: German\n" "X-Poedit-Country: GERMANY\n" +"X-Generator: Gtranslator 2.91.6\n" #: ../copy-n-paste/eggdesktopfile.c:165 #, c-format @@ -97,8 +98,8 @@ msgstr "Optionen der Sitzungsverwaltung anzeigen" #. manually set name and icon -#: ../data/gthumb.desktop.in.in.h:1 ../gthumb/gth-browser.c:530 -#: ../gthumb/gth-progress-dialog.c:388 ../gthumb/main.c:313 +#: ../data/gthumb.desktop.in.in.h:1 ../gthumb/gth-browser.c:578 +#: ../gthumb/gth-progress-dialog.c:390 ../gthumb/main.c:315 msgid "gThumb" msgstr "gThumb" @@ -202,8 +203,8 @@ msgstr "_Vergleichen" #. limit label -#: ../data/ui/filter-editor.ui.h:3 ../gthumb/gth-filter.c:270 -#: ../gthumb/gth-filter.c:342 +#: ../data/ui/filter-editor.ui.h:3 ../gthumb/gth-filter.c:269 +#: ../gthumb/gth-filter.c:337 msgid "_Limit to" msgstr "_Begrenzen bis" @@ -242,7 +243,6 @@ msgstr "Ausgewählt:" #: ../data/ui/location.ui.h:1 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 msgid "_Location:" msgstr "_Ort:" @@ -259,7 +259,6 @@ msgstr "Dateiname:" #: ../data/ui/overwrite-dialog.ui.h:4 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 #: ../extensions/image_print/data/ui/print-layout.ui.h:23 msgid "Size:" msgstr "Größe:" @@ -524,7 +523,6 @@ #: ../extensions/image_viewer/image_viewer.extension.in.in.h:3 #: ../extensions/list_tools/list_tools.extension.in.in.h:3 #: ../extensions/photo_importer/photo_importer.extension.in.in.h:3 -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:3 #: ../extensions/raw_files/raw_files.extension.in.in.h:3 #: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:3 #: ../extensions/rename_series/rename_series.extension.in.in.h:3 @@ -618,16 +616,129 @@ msgid "Write to Disc" msgstr "Auf Medium schreiben" -#: ../extensions/cairo_io/cairo-io-jpeg.c:62 +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:62 #, c-format msgid "Error interpreting JPEG image file: %s" msgstr "Fehler beim Interpretieren der JPEG-Bilddatei: %s" -#: ../extensions/cairo_io/cairo-io-jpeg.c:482 +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:483 #, c-format msgid "Unknown JPEG color space (%d)" msgstr "Unbekannter JPEG-Farbraum (%d)" +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:1 +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:1 +msgid "_Default extension:" +msgstr "Stan_dard-Erweiterung:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:2 +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:1 +msgid "_Quality:" +msgstr "_Qualität:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:3 +msgid "_Smoothing:" +msgstr "_Glätten:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:4 +msgid "Opti_mize" +msgstr "_Optimieren" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:5 +msgid "_Progressive" +msgstr "_Progressiv" + +#: ../extensions/cairo_io/data/ui/png-options.ui.h:1 +msgid "Compression _level:" +msgstr "Kompressions_grad:" + +#: ../extensions/cairo_io/data/ui/save-options-preferences.ui.h:1 +msgid "Default options:" +msgstr "Standardoptionen" + +#: ../extensions/cairo_io/data/ui/tga-options.ui.h:1 +msgid "_RLE compression" +msgstr "_RLE-Kompression" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:2 +msgid "Compression" +msgstr "Kompression" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:3 +msgid "_No compression" +msgstr "_Keine Kompression" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:4 +msgid "No_rmal (Deflate)" +msgstr "_Normal (Entpacken)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:5 +msgid "_Loss compression (JPEG)" +msgstr "_Verlustbehaftete Kompression (JPEG)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:6 +msgid "Resolution" +msgstr "Auflösung" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:7 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 +msgid "_Horizontal:" +msgstr "_Horizontal:" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:8 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 +msgid "_Vertical:" +msgstr "_Vertikal:" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:9 +msgid "dpi" +msgstr "DPI" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:2 +msgid "_Method:" +msgstr "_Methode:" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:3 +msgid "_Lossless" +msgstr "Ver_lustlos" + +#: ../extensions/cairo_io/gth-image-saver-jpeg.c:516 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:140 +msgid "JPEG" +msgstr "JPEG" + +#: ../extensions/cairo_io/gth-image-saver-png.c:353 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:110 +msgid "PNG" +msgstr "PNG" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:257 +#: ../extensions/cairo_io/gth-image-saver-tiff.c:435 +#: ../gthumb/gth-buffer-data.c:84 +msgid "Insufficient memory" +msgstr "Nicht ausreichender Speicher" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:344 +msgid "TGA" +msgstr "TGA" + +#: ../extensions/cairo_io/gth-image-saver-tiff.c:559 +msgid "TIFF" +msgstr "TIFF" + +#: ../extensions/cairo_io/gth-image-saver-webp.c:382 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:165 +msgid "WebP" +msgstr "WebP" + +# Es geht hier um Einstellungen wie Speicherort, Dateiname oder Erweiterung in den Dialogen. +#: ../extensions/cairo_io/preferences.c:134 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 +msgid "Saving" +msgstr "Speichern" + #: ../extensions/catalogs/actions.c:92 ../extensions/catalogs/actions.c:213 #: ../extensions/catalogs/dlg-add-to-catalog.c:274 #: ../extensions/catalogs/dlg-add-to-catalog.c:394 @@ -705,7 +816,6 @@ msgstr "Zum Ordner gehen, der die gewählte Datei enthält" #: ../extensions/catalogs/callbacks.c:110 -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:85 msgid "Other..." msgstr "Andere …" @@ -750,7 +860,7 @@ #: ../extensions/catalogs/callbacks.c:501 #: ../extensions/photo_importer/dlg-photo-importer.c:364 #: ../extensions/photo_importer/dlg-photo-importer.c:404 -#: ../gthumb/gth-file-list.c:43 ../gthumb/gth-folder-tree.c:883 +#: ../gthumb/gth-file-list.c:43 ../gthumb/gth-folder-tree.c:1093 msgid "(Empty)" msgstr "(Leer)" @@ -769,8 +879,8 @@ #: ../extensions/catalogs/catalogs.extension.in.in.h:1 #: ../extensions/catalogs/gth-catalog.c:611 #: ../extensions/catalogs/gth-catalog.c:662 -#: ../extensions/catalogs/gth-catalog.c:1024 -#: ../extensions/catalogs/gth-catalog.c:1025 +#: ../extensions/catalogs/gth-catalog.c:1016 +#: ../extensions/catalogs/gth-catalog.c:1017 msgid "Catalogs" msgstr "Kataloge" @@ -796,7 +906,7 @@ #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:5 #: ../extensions/file_manager/actions.c:945 -#: ../extensions/webalbums/gth-web-exporter.c:1842 +#: ../extensions/webalbums/gth-web-exporter.c:1840 msgid "_View the destination" msgstr "Ziel _betrachten" @@ -861,7 +971,7 @@ msgstr "Änderungsdatum der Datei" #: ../extensions/catalogs/data/ui/organize-files.ui.h:3 -#: ../extensions/comments/main.c:159 +#: ../extensions/comments/main.c:182 msgid "Tag" msgstr "Schlagwort" @@ -920,7 +1030,7 @@ "Die Dateien werden in Kataloge eingeordnet. Auf dem Datenträger wird keine " "Datei verschoben." -#: ../extensions/catalogs/gth-catalog.c:1122 ../extensions/comments/main.c:44 +#: ../extensions/catalogs/gth-catalog.c:1114 ../extensions/comments/main.c:45 #: ../extensions/edit_metadata/callbacks.c:106 #: ../gthumb/gth-main-default-metadata.c:53 msgid "Tags" @@ -962,10 +1072,10 @@ msgstr "Die gewählten Bilder konnten nicht aus dem Katalog entfernt werden" #: ../extensions/catalogs/gth-file-source-catalogs.c:1380 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:731 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:740 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:769 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:1281 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:746 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:755 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:785 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:1320 #: ../extensions/search/gth-search.c:265 msgid "Invalid file format" msgstr "Ungültiges Dateiformat" @@ -992,70 +1102,66 @@ msgstr "Das Datum der gewählten Dateien ändern" #: ../extensions/change_date/data/ui/change-date.ui.h:1 +msgid "+" +msgstr "+" + +#: ../extensions/change_date/data/ui/change-date.ui.h:2 +msgid "-" +msgstr "-" + +#: ../extensions/change_date/data/ui/change-date.ui.h:3 msgid "Change Date" msgstr "Datum ändern" -#: ../extensions/change_date/data/ui/change-date.ui.h:2 +#: ../extensions/change_date/data/ui/change-date.ui.h:4 msgid "Change the following values:" msgstr "Folgende Werte ändern:" -#: ../extensions/change_date/data/ui/change-date.ui.h:3 +#: ../extensions/change_date/data/ui/change-date.ui.h:5 msgid "_Last modified date" msgstr "_Letztes Änderungsdatum" -#: ../extensions/change_date/data/ui/change-date.ui.h:4 +#: ../extensions/change_date/data/ui/change-date.ui.h:6 msgid "Co_mment date" msgstr "Datum des Ko_mmentars" -#: ../extensions/change_date/data/ui/change-date.ui.h:5 -msgid "Exif DateTimeOriginal tag" -msgstr "Exif-Originalzeitpunkteintrag" - -#: ../extensions/change_date/data/ui/change-date.ui.h:6 +#: ../extensions/change_date/data/ui/change-date.ui.h:7 msgid "Change to:" msgstr "Ändern in:" -#: ../extensions/change_date/data/ui/change-date.ui.h:7 +#: ../extensions/change_date/data/ui/change-date.ui.h:8 msgid "The _following date:" msgstr "_Folgendes Datum:" -#: ../extensions/change_date/data/ui/change-date.ui.h:8 +#: ../extensions/change_date/data/ui/change-date.ui.h:9 msgid "File _modified date" msgstr "_Änderungsdatum" -#: ../extensions/change_date/data/ui/change-date.ui.h:9 +#: ../extensions/change_date/data/ui/change-date.ui.h:10 msgid "File c_reation date" msgstr "_Erstellungsdatum der Datei" -#: ../extensions/change_date/data/ui/change-date.ui.h:10 +#: ../extensions/change_date/data/ui/change-date.ui.h:11 msgid "Date p_hoto was taken" msgstr "Zeitpunkt der Aufna_hme" -#: ../extensions/change_date/data/ui/change-date.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:12 msgid "A_djust by" msgstr "A_bgleichen nach" -#: ../extensions/change_date/data/ui/change-date.ui.h:12 +#: ../extensions/change_date/data/ui/change-date.ui.h:13 msgid "hours" msgstr "Stunden" -#: ../extensions/change_date/data/ui/change-date.ui.h:13 +#: ../extensions/change_date/data/ui/change-date.ui.h:14 msgid "minutes" msgstr "Minuten" -#: ../extensions/change_date/data/ui/change-date.ui.h:14 +#: ../extensions/change_date/data/ui/change-date.ui.h:15 #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:6 msgid "seconds" msgstr "Sekunden" -#: ../extensions/change_date/data/ui/change-date.ui.h:15 -msgid "+" -msgstr "+" - -#: ../extensions/change_date/data/ui/change-date.ui.h:16 -msgid "-" -msgstr "-" - #: ../extensions/comments/callbacks.c:46 msgid "Import Embedded Metadata" msgstr "Eingebettete Metadaten importieren" @@ -1083,16 +1189,16 @@ msgid "_Synchronize with the embedded metadata" msgstr "Mit den eingebetteten Metadaten _abgleichen" -#: ../extensions/comments/main.c:34 +#: ../extensions/comments/main.c:35 #: ../extensions/edit_metadata/callbacks.c:100 msgid "Comment" msgstr "Kommentar" -#: ../extensions/comments/main.c:40 ../gthumb/gth-main-default-metadata.c:46 +#: ../extensions/comments/main.c:41 ../gthumb/gth-main-default-metadata.c:46 msgid "Title" msgstr "Titel" -#: ../extensions/comments/main.c:41 ../extensions/comments/main.c:143 +#: ../extensions/comments/main.c:42 ../extensions/comments/main.c:166 #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 #: ../extensions/image_print/data/ui/print-layout.ui.h:8 @@ -1104,16 +1210,16 @@ msgid "Description" msgstr "Beschreibung" -#: ../extensions/comments/main.c:42 ../extensions/comments/main.c:151 +#: ../extensions/comments/main.c:43 ../extensions/comments/main.c:174 #: ../gthumb/gth-main-default-metadata.c:50 msgid "Place" msgstr "Ort" -#: ../extensions/comments/main.c:43 ../gthumb/gth-main-default-metadata.c:51 +#: ../extensions/comments/main.c:44 ../gthumb/gth-main-default-metadata.c:51 msgid "Date" msgstr "Datum" -#: ../extensions/comments/main.c:45 ../gthumb/gth-main-default-metadata.c:54 +#: ../extensions/comments/main.c:46 ../gthumb/gth-main-default-metadata.c:54 msgid "Rating" msgstr "Bewertung" @@ -1149,10 +1255,10 @@ "Dateien zeigt." #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:1 -#: ../extensions/file_tools/gth-file-tool-crop.c:424 -#: ../extensions/file_tools/gth-file-tool-crop.c:454 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 -#: ../extensions/file_tools/gth-file-tool-rotate.c:415 +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:446 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 +#: ../extensions/file_tools/gth-file-tool-rotate.c:397 #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:14 #: ../extensions/slideshow/main.c:277 msgid "None" @@ -1194,16 +1300,6 @@ msgid "_Gradient" msgstr "Farb_verlauf" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 -msgid "_Horizontal:" -msgstr "_Horizontal:" - -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 -msgid "_Vertical:" -msgstr "_Vertikal:" - #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:14 msgid "Select a color" msgstr "Farbe auswählen" @@ -1291,6 +1387,7 @@ #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:6 #: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 #: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 @@ -1322,14 +1419,6 @@ msgid "Create _HTML image map" msgstr "_HTML-Bildübersicht erstellen" -# Es geht hier um Einstellungen wie Speicherort, Dateiname oder Erweiterung in den Dialogen. -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 -#: ../extensions/pixbuf_savers/preferences.c:134 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 -msgid "Saving" -msgstr "Speichern" - #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 msgid "Create a new theme" msgstr "Neues Thema erstellen" @@ -1406,21 +1495,21 @@ msgid "Image Wall" msgstr "Bildwand" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:486 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:498 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:512 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:481 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:492 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:506 msgid "Could not save the theme" msgstr "Das Thema konnte nicht gespeichert werden" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:657 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:651 msgid "Could not delete the theme" msgstr "Das Thema konnte nicht gelöscht werden" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:248 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:247 msgid "Creating images" msgstr "Bilder werden erstellt" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:897 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:896 msgid "Generating thumbnails" msgstr "Miniatur-Vorschaubilder werden erstellt" @@ -1478,33 +1567,33 @@ msgid "_Use the original image folder" msgstr "Den _ursprünglichen Bildordner verwenden" -#: ../extensions/convert_format/dlg-convert-format.c:93 +#: ../extensions/convert_format/dlg-convert-format.c:95 msgid "Converting images" msgstr "Bilder werden konvertiert" -#: ../extensions/desktop_background/actions.c:162 +#: ../extensions/desktop_background/actions.c:158 msgid "Could not show the desktop background properties" msgstr "" -"Die Eigenschaften des Arbeitsflächenhintergrundes konnten nicht angezeigt " +"Die Eigenschaften des Schreibtischhintergrundes konnten nicht angezeigt " "werden" -#: ../extensions/desktop_background/actions.c:228 -#: ../extensions/desktop_background/actions.c:246 +#: ../extensions/desktop_background/actions.c:224 +#: ../extensions/desktop_background/actions.c:242 msgid "Could not set the desktop background" -msgstr "Arbeitsflächenhintergrund konnte nicht gesetzt werden" +msgstr "Schreibtischhintergrund konnte nicht gesetzt werden" #: ../extensions/desktop_background/callbacks.c:49 msgid "Set as Desktop Background" -msgstr "Als Arbeitsflächenhintergrund verwenden" +msgstr "Als Schreibtischhintergrund verwenden" #: ../extensions/desktop_background/callbacks.c:50 #: ../extensions/desktop_background/desktop_background.extension.in.in.h:2 msgid "Set the image as desktop background" -msgstr "Das Bild als Arbeitsflächenhintergrund verwenden" +msgstr "Das Bild als Schreibtischhintergrund verwenden" #: ../extensions/desktop_background/desktop_background.extension.in.in.h:1 msgid "Desktop background" -msgstr "Arbeitsflächenhintergrund" +msgstr "Schreibtischhintergrund" #: ../extensions/edit_metadata/actions.c:66 msgid "" @@ -1588,7 +1677,8 @@ #: ../extensions/edit_metadata/gth-edit-comment-dialog.c:66 #: ../extensions/edit_metadata/gth-edit-tags-dialog.c:83 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:335 +#: ../extensions/facebook/dlg-import-from-facebook.c:319 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:324 #, c-format msgid "%d file" msgid_plural "%d files" @@ -1762,7 +1852,7 @@ msgid "XMP Attached" msgstr "Angehängtes XMP" -#: ../extensions/exiv2_tools/main.c:256 +#: ../extensions/exiv2_tools/main.c:272 msgid "date photo was taken" msgstr "Zeitpunkt der Aufnahme" @@ -1770,47 +1860,52 @@ msgid "Share" msgstr "Freigeben" -#: ../extensions/facebook/callbacks.c:54 +#: ../extensions/facebook/callbacks.c:59 ../extensions/facebook/callbacks.c:64 msgid "Face_book..." msgstr "Face_book …" -#: ../extensions/facebook/callbacks.c:55 +#: ../extensions/facebook/callbacks.c:60 +msgid "Download photos from Facebook" +msgstr "Fotos von Facebook herunterladen" + +#: ../extensions/facebook/callbacks.c:65 msgid "Upload photos to Facebook" msgstr "Fotos zu Facebook übertragen" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:1 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 msgid "Export to Flickr" msgstr "Zu Flickr exportieren" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:2 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 #: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 msgid "_Upload" msgstr "_Hochladen" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:3 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 msgid "_Account:" msgstr "K_onto:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:4 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:3 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 #: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 #: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 msgid "Edit accounts" msgstr "Konten bearbeiten" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 msgid "A_lbum:" msgstr "A_lbum:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 msgid "Add a new album" msgstr "Neues Album hinzufügen" @@ -1819,9 +1914,12 @@ msgstr "Bilder verkleinern, wenn sie diese Größe übersteigen" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:8 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 -msgid "_Resize to:" -msgstr "_Größe ändern auf:" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 +msgid "_Resize if larger than:" +msgstr "Ve_rkleinern, wenn größer als:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:9 msgid "720 x 720" @@ -1843,30 +1941,13 @@ msgid "2048 x 2048" msgstr "2048 x 2048" -#: ../extensions/facebook/data/ui/facebook-account-chooser.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-account-chooser.ui.h:1 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 -#: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 -#: ../extensions/picasaweb/data/ui/picasa-web-account-chooser.ui.h:1 -msgid "A_ccount:" -msgstr "K_onto:" - -#: ../extensions/facebook/data/ui/facebook-account-manager.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-account-manager.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-account-manager.ui.h:1 -#: ../extensions/picasaweb/data/ui/picasa-web-account-manager.ui.h:1 -msgid "A_ccounts:" -msgstr "_Konten:" - #: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 msgid "Public photos" msgstr "Öffentliche Fotos" #: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 msgid "Private photos, visible to friends" msgstr "Private Fotos, für Freunde sichtbar" @@ -1880,25 +1961,6 @@ msgid "_Visibility:" msgstr "_Sichtbarkeit:" -#: ../extensions/facebook/data/ui/facebook-ask-authorization.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-ask-authorization.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-ask-authorization.ui.h:1 -msgid "_Authorize..." -msgstr "_Legitimieren …" - -#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:1 -#: ../extensions/facebook/facebook-authentication.c:472 -#: ../extensions/flicker_utils/flickr-authentication.c:408 -#: ../extensions/oauth/oauth-authentication.c:423 -msgid "Once you're done, click the 'Continue' button below." -msgstr "Sobald dies erledigt ist, klicken Sie auf »Fortsetzen«." - -#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 -#: ../extensions/flicker_utils/data/ui/flicker-complete-authorization.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-complete-authorization.ui.h:1 -msgid "C_ontinue" -msgstr "F_ortfahren" - #: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:1 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:1 @@ -1910,172 +1972,127 @@ #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:2 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:2 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:2 -#: ../extensions/webalbums/gth-web-exporter.c:1841 +#: ../extensions/webalbums/gth-web-exporter.c:1839 msgid "_Open in the Browser" msgstr "Im Br_owser öffnen" -#: ../extensions/facebook/dlg-export-to-facebook.c:130 -#: ../extensions/facebook/dlg-export-to-facebook.c:335 -#: ../extensions/facebook/facebook-authentication.c:192 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 +msgid "Import from Picasa Web Album" +msgstr "Aus dem Picasa-Webalbum importieren" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:2 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 +msgid "_Import" +msgstr "_Importieren" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:4 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 +#: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 +msgid "A_ccount:" +msgstr "K_onto:" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:5 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 +msgid "_Album:" +msgstr "_Album:" + +#: ../extensions/facebook/dlg-export-to-facebook.c:123 +#: ../extensions/facebook/dlg-export-to-facebook.c:326 +#: ../extensions/facebook/dlg-import-from-facebook.c:226 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:138 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:399 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:237 -#: ../extensions/flicker_utils/flickr-authentication.c:191 -#: ../extensions/oauth/oauth-authentication.c:187 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:414 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:231 +#: ../extensions/oauth/web-service.c:380 #: ../extensions/photobucket/dlg-export-to-photobucket.c:131 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:376 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:139 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:424 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:380 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:375 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:124 msgid "Could not connect to the server" msgstr "Verbindung zum Server konnte nicht hergestellt werden" -#: ../extensions/facebook/dlg-export-to-facebook.c:182 +#: ../extensions/facebook/dlg-export-to-facebook.c:175 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:246 #: ../extensions/photobucket/dlg-export-to-photobucket.c:182 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:192 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:176 msgid "Could not upload the files" msgstr "Die Dateien konnten nicht übertragen werden" -#: ../extensions/facebook/dlg-export-to-facebook.c:412 +#: ../extensions/facebook/dlg-export-to-facebook.c:397 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:188 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:223 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:462 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:717 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:457 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:309 msgid "Could not create the album" msgstr "Das Album konnte nicht angelegt werden" -#: ../extensions/facebook/dlg-export-to-facebook.c:481 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:534 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:783 +#: ../extensions/facebook/dlg-export-to-facebook.c:465 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:528 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:375 msgid "New Album" msgstr "Neues Album" -#: ../extensions/facebook/dlg-export-to-facebook.c:561 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:557 -#: ../extensions/image_print/gth-image-print-job.c:1789 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:614 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1002 +#: ../extensions/facebook/dlg-export-to-facebook.c:557 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:583 +#: ../extensions/image_print/gth-image-print-job.c:1739 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:607 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:597 msgid "No valid file selected." msgstr "Keine gültige Datei ausgewählt" -#: ../extensions/facebook/dlg-export-to-facebook.c:562 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:558 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:615 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1003 +#: ../extensions/facebook/dlg-export-to-facebook.c:558 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:584 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:608 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:598 msgid "Could not export the files" msgstr "Die Dateien konnten nicht exportiert werden" -#: ../extensions/facebook/dlg-export-to-facebook.c:570 -#: ../extensions/find_duplicates/gth-find-duplicates.c:255 -#: ../extensions/find_duplicates/gth-find-duplicates.c:347 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:566 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:623 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1010 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:803 -#: ../gthumb/gth-browser.c:1006 +#: ../extensions/facebook/dlg-export-to-facebook.c:566 +#: ../extensions/find_duplicates/gth-find-duplicates.c:277 +#: ../extensions/find_duplicates/gth-find-duplicates.c:470 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:592 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:616 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:605 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:254 +#: ../gthumb/gth-browser.c:1116 #, c-format msgid "%d file (%s)" msgid_plural "%d files (%s)" msgstr[0] "%d Datei (%s)" msgstr[1] "%d Dateien (%s)" -#: ../extensions/facebook/dlg-export-to-facebook.c:591 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:589 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:642 +#: ../extensions/facebook/dlg-export-to-facebook.c:587 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:615 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:635 #, c-format msgid "Export to %s" msgstr "Exportieren nach %s" -#: ../extensions/facebook/facebook-account-chooser-dialog.c:200 -#: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:200 -#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 -msgid "New authentication..." -msgstr "Neue Legitimierung …" - -#: ../extensions/facebook/facebook-authentication.c:194 -#: ../extensions/flicker_utils/flickr-authentication.c:193 -#: ../extensions/oauth/oauth-authentication.c:189 -msgid "Choose _Account..." -msgstr "K_onto wählen …" - -#: ../extensions/facebook/facebook-authentication.c:471 -#: ../extensions/flicker_utils/flickr-authentication.c:407 -#: ../extensions/oauth/oauth-authentication.c:422 -#, c-format -msgid "" -"Return to this window when you have finished the authorization process on %s" -msgstr "" -"Kehren Sie zu diesem Fenster zurück, sobald der Legitimierungsvorgang auf %s " -"abgeschlossen ist." +#: ../extensions/facebook/dlg-import-from-facebook.c:344 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:349 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:279 +msgid "Could not get the photo list" +msgstr "Fotoliste konnten nicht geholt werden" -#: ../extensions/facebook/facebook-authentication.c:556 -#: ../extensions/flicker_utils/flickr-authentication.c:487 -#: ../extensions/oauth/oauth-authentication.c:502 -#, c-format -msgid "gthumb requires your authorization to upload the photos to %s" -msgstr "" -"gThumb benötigt Ihre Legitimierung, um Bilder zu %s übertragen zu können." +#: ../extensions/facebook/dlg-import-from-facebook.c:378 +#: ../extensions/facebook/dlg-import-from-facebook.c:533 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:386 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:551 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:313 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:586 +msgid "No album selected" +msgstr "Keine Album ausgewählt" -#: ../extensions/facebook/facebook-authentication.c:557 -#: ../extensions/flicker_utils/flickr-authentication.c:488 -#: ../extensions/oauth/oauth-authentication.c:503 +#: ../extensions/facebook/dlg-import-from-facebook.c:551 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:569 #, c-format -msgid "" -"Click 'Authorize' to open your web browser and authorize gthumb to upload " -"photos to %s. When you're finished, return to this window to complete the " -"authorization." -msgstr "" -"Klicken Sie auf »Legitimieren«, um Ihren Webbrowser zu öffnen und gThumb zu " -"legitimieren, Fotos zu %s zu übertragen. Sobald dies erledigt ist, kehren " -"Sie zu diesem Fenster zurück, um die Legitimierung abzuschließen." - -#: ../extensions/facebook/facebook-authentication.c:652 -#: ../extensions/flicker_utils/flickr-authentication.c:588 -#: ../extensions/oauth/oauth-authentication.c:605 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:820 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:684 -msgid "Choose Account" -msgstr "Konto wählen" - -#: ../extensions/facebook/facebook-authentication.c:761 -#: ../extensions/flicker_utils/flickr-authentication.c:697 -#: ../extensions/oauth/oauth-authentication.c:714 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:881 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:745 -msgid "Edit Accounts" -msgstr "Konten bearbeiten" - -#: ../extensions/facebook/facebook-connection.c:275 -#: ../extensions/facebook/facebook-connection.c:435 -#: ../extensions/facebook/facebook-service.c:162 -#: ../extensions/facebook/facebook-service.c:265 -#: ../extensions/facebook/facebook-service.c:468 -#: ../extensions/flicker_utils/flickr-connection.c:266 -#: ../extensions/flicker_utils/flickr-connection.c:413 -#: ../extensions/flicker_utils/flickr-service.c:195 -#: ../extensions/flicker_utils/flickr-service.c:398 -#: ../extensions/photobucket/photobucket-consumer.c:74 -#: ../extensions/photobucket/photobucket-consumer.c:79 -#: ../extensions/photobucket/photobucket-consumer.c:115 -#: ../extensions/photobucket/photobucket-consumer.c:170 -msgid "Unknown error" -msgstr "Unbekannter Fehler" - -#: ../extensions/facebook/facebook-connection.c:310 -#: ../extensions/facebook/facebook-connection.c:461 -#: ../extensions/facebook/facebook-service.c:188 -#: ../extensions/facebook/facebook-service.c:290 -#: ../extensions/flicker_utils/flickr-connection.c:292 -#: ../extensions/flicker_utils/flickr-connection.c:439 -#: ../extensions/flicker_utils/flickr-service.c:219 -#: ../extensions/oauth/oauth-connection.c:356 -#: ../extensions/oauth/oauth-connection.c:431 -#: ../extensions/oauth/oauth-connection.c:535 -#: ../extensions/picasaweb/google-connection.c:344 -msgid "Connecting to the server" -msgstr "Verbindung mit Server wird aufgebaut" +msgid "Import from %s" +msgstr "Importieren von %s" +#: ../extensions/facebook/dlg-import-from-facebook.c:551 #: ../extensions/facebook/facebook.extension.in.in.h:1 msgid "Facebook" msgstr "Facebook" @@ -2084,58 +2101,49 @@ msgid "Upload images to Facebook" msgstr "Bilder zu Facebook übertragen" -#: ../extensions/facebook/facebook-service.c:188 -#: ../extensions/facebook/facebook-service.c:290 -#: ../extensions/flicker_utils/flickr-service.c:219 -#: ../extensions/oauth/oauth-connection.c:356 -#: ../extensions/oauth/oauth-connection.c:431 -#: ../extensions/oauth/oauth-connection.c:535 -msgid "Getting account information" -msgstr "Kontoinformationen wird ermittelt" - -#: ../extensions/facebook/facebook-service.c:396 -#: ../extensions/flicker_utils/flickr-service.c:323 -#: ../extensions/photobucket/photobucket-service.c:207 -#: ../extensions/picasaweb/picasa-web-service.c:209 +#: ../extensions/facebook/facebook-service.c:462 +#: ../extensions/flicker_utils/flickr-service.c:863 +#: ../extensions/photobucket/photobucket-service.c:310 +#: ../extensions/picasaweb/picasa-web-service.c:711 msgid "Getting the album list" msgstr "Albenliste wird geholt" -#: ../extensions/facebook/facebook-service.c:525 -#: ../extensions/flicker_utils/flickr-service.c:426 -#: ../extensions/flicker_utils/flickr-service.c:546 -#: ../extensions/flicker_utils/flickr-service.c:584 -#: ../extensions/photobucket/photobucket-service.c:316 -#: ../extensions/picasaweb/picasa-web-service.c:300 +#: ../extensions/facebook/facebook-service.c:584 +#: ../extensions/flicker_utils/flickr-service.c:965 +#: ../extensions/flicker_utils/flickr-service.c:1087 +#: ../extensions/flicker_utils/flickr-service.c:1126 +#: ../extensions/photobucket/photobucket-service.c:423 +#: ../extensions/picasaweb/picasa-web-service.c:805 msgid "Creating the new album" msgstr "Neues Album wird angelegt" -#: ../extensions/facebook/facebook-service.c:584 -#: ../extensions/flicker_utils/flickr-service.c:634 -#: ../extensions/photobucket/photobucket-service.c:373 -#: ../extensions/picasaweb/picasa-web-service.c:357 +#: ../extensions/facebook/facebook-service.c:645 +#: ../extensions/flicker_utils/flickr-service.c:1176 +#: ../extensions/photobucket/photobucket-service.c:485 +#: ../extensions/picasaweb/picasa-web-service.c:860 #, c-format msgid "Could not upload '%s': %s" msgstr "»%s« konnte nicht übertragen werden: %s" #. Translators: %s is a filename -#: ../extensions/facebook/facebook-service.c:670 -#: ../extensions/flicker_utils/flickr-service.c:745 -#: ../extensions/photobucket/photobucket-service.c:430 -#: ../extensions/picasaweb/picasa-web-service.c:412 +#: ../extensions/facebook/facebook-service.c:710 +#: ../extensions/flicker_utils/flickr-service.c:1287 +#: ../extensions/photobucket/photobucket-service.c:542 +#: ../extensions/picasaweb/picasa-web-service.c:917 #, c-format msgid "Uploading '%s'" msgstr "»%s« wird übertragen …" -#: ../extensions/facebook/facebook-service.c:886 -#: ../extensions/flicker_utils/flickr-service.c:914 -#: ../extensions/photobucket/photobucket-service.c:599 -#: ../extensions/picasaweb/picasa-web-service.c:605 +#: ../extensions/facebook/facebook-service.c:923 +#: ../extensions/flicker_utils/flickr-service.c:1482 +#: ../extensions/photobucket/photobucket-service.c:714 +#: ../extensions/picasaweb/picasa-web-service.c:1138 msgid "Uploading the files to the server" msgstr "Dateien werden zum Server übertragen" -#: ../extensions/facebook/facebook-service.c:1003 -#: ../extensions/flicker_utils/flickr-service.c:1077 -#: ../extensions/picasaweb/picasa-web-service.c:718 +#: ../extensions/facebook/facebook-service.c:1022 +#: ../extensions/flicker_utils/flickr-service.c:1651 +#: ../extensions/picasaweb/picasa-web-service.c:1257 msgid "Getting the photo list" msgstr "Bilderliste wird geholt" @@ -2149,13 +2157,13 @@ #: ../extensions/file_manager/actions.c:400 #: ../extensions/file_manager/callbacks.c:380 -#: ../extensions/file_manager/callbacks.c:842 +#: ../extensions/file_manager/callbacks.c:838 msgid "Could not move the files" msgstr "Die Dateien konnten nicht verschoben werden" #: ../extensions/file_manager/actions.c:401 #: ../extensions/file_manager/callbacks.c:381 -#: ../extensions/file_manager/callbacks.c:843 +#: ../extensions/file_manager/callbacks.c:839 msgid "" "Files cannot be moved to the current location, as alternative you can choose " "to copy them." @@ -2184,12 +2192,12 @@ "The folder cannot be moved to the Trash. Do you want to delete it " "permanently?" msgstr "" -"Der Ordner konnte nicht in den Müll verschoben werden. Soll er Dateien " +"Der Ordner konnte nicht in den Papierkorb verschoben werden. Soll er " "dauerhaft gelöscht werden?" #: ../extensions/file_manager/actions.c:780 msgid "Could not move the folder to the Trash" -msgstr "Der Ordner konnte nicht in den Müll verschoben werden" +msgstr "Der Ordner konnte nicht in den Papierkorb verschoben werden" #: ../extensions/file_manager/actions.c:816 #: ../gthumb/gth-file-source-vfs.c:841 @@ -2240,15 +2248,16 @@ #: ../extensions/file_manager/callbacks.c:219 #: ../gthumb/gth-file-source-vfs.c:813 msgid "Mo_ve to Trash" -msgstr "In den _Müll verschieben" +msgstr "In den _Papierkorb verschieben" #: ../extensions/file_manager/callbacks.c:184 msgid "Move the selected files to the Trash" -msgstr "Die gewählten Dateien in den Müll verschieben" +msgstr "Die gewählten Dateien in den Papierkorb verschieben" #: ../extensions/file_manager/callbacks.c:187 #: ../extensions/file_manager/callbacks.c:223 #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:5 +#: ../gthumb/gth-tags-entry.c:871 msgid "_Delete" msgstr "_Löschen" @@ -2300,9 +2309,10 @@ msgid "Move the selected files to another folder" msgstr "Die gewählten Dateien in einen anderen Ordner verschieben" -#: ../extensions/file_manager/callbacks.c:1003 -#: ../extensions/find_duplicates/gth-find-duplicates.c:581 -#: ../gthumb/gth-browser.c:5009 ../gthumb/gth-browser.c:5043 +#: ../extensions/file_manager/callbacks.c:999 +#: ../extensions/find_duplicates/gth-find-duplicates.c:766 +#: ../gthumb/gth-browser.c:5234 ../gthumb/gth-browser.c:5268 +#: ../gthumb/gth-progress-dialog.c:406 msgid "Could not perform the operation" msgstr "Die Aktion konnte nicht ausgeführt werden" @@ -2319,6 +2329,7 @@ msgstr "Dateien werden gelöscht" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:1 +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:5 msgid "_Preview" msgstr "_Vorschau" @@ -2360,81 +2371,96 @@ msgstr "_Zurücksetzen" #: ../extensions/file_tools/data/ui/crop-options.ui.h:1 -msgid "_Position:" -msgstr "_Position:" - -#. this is used to separate the dimensions, for example: 120 × 250 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:4 -msgid "×" -msgstr "×" +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +msgid "Selection" +msgstr "Auswahl" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:5 -msgid "_Grid:" -msgstr "_Gitterlinien:" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 +msgid "_Width:" +msgstr "_Breite:" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:6 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:3 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 +msgid "Heigh_t:" +msgstr "_Höhe:" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:4 +msgid "_Position:" +msgstr "_Position:" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:5 msgid "Maximize" msgstr "Maximieren" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:6 msgid "Center" msgstr "Zentrieren" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 -msgid "Selection" -msgstr "Auswahl" - -#: ../extensions/file_tools/data/ui/crop-options.ui.h:9 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 #: ../extensions/file_tools/data/ui/resize-options.ui.h:5 +msgid "Aspect ratio" +msgstr "Seitenverhältnis" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 msgid "I_nvert aspect ratio" msgstr "Seitenverhältnis _umkehren" #. after the colon there is a control to select the size in pixels -#: ../extensions/file_tools/data/ui/crop-options.ui.h:11 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:10 msgid "M_ultiple of:" msgstr "_Vielfaches von:" #. abbreviation of pixel -#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:12 msgid "px" msgstr "px" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 +#: ../gthumb/gth-file-chooser-dialog.c:252 +msgid "Options" +msgstr "Optionen" + #: ../extensions/file_tools/data/ui/crop-options.ui.h:14 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 -msgid "Aspect ratio" -msgstr "Seitenverhältnis" +msgid "_Grid:" +msgstr "_Gitterlinien:" #: ../extensions/file_tools/data/ui/crop-options.ui.h:15 msgid "C_rop" msgstr "_Zuschneiden" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 -msgid "_Width:" -msgstr "_Breite:" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 -msgid "Heigh_t:" -msgstr "_Höhe:" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 -msgid "Set the image size to this value" -msgstr "Die Bildgröße auf diesen Wert setzen" +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:1 +msgid "Method" +msgstr "Methode" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:2 +msgid "_Brightness" +msgstr "_Helligkeit" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:3 +msgid "_Saturation" +msgstr "_Sättigung" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:4 +msgid "_Average" +msgstr "_Durchschnitt" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 #: ../gthumb/gth-main-default-metadata.c:47 msgid "Dimensions" msgstr "Bildgröße" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 -msgid "High _quality" -msgstr "Hohe _Qualität" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +msgid "Set the image size to this value" +msgstr "Die Bildgröße auf diesen Wert setzen" #: ../extensions/file_tools/data/ui/resize-options.ui.h:8 -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 -msgid "Options" -msgstr "Optionen" +msgid "High _quality" +msgstr "Hohe _Qualität" #: ../extensions/file_tools/data/ui/resize-options.ui.h:9 msgid "Original dimensions:" @@ -2460,45 +2486,45 @@ msgstr "%" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:1 -msgid "Align" -msgstr "Ausrichten" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 msgid "Angle" msgstr "Winkel" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 +msgid "Align" +msgstr "Ausrichten" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 +msgid "Image size" +msgstr "Bildgröße" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 msgid "Point 1:" msgstr "Punkt 1:" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 msgid "Point 2:" msgstr "Punkt 2:" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 msgid "Keep aspect ratio" msgstr "Seitenverhältnis beibehalten" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 -msgid "Image size" -msgstr "Bildgröße" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 msgid "Grid:" msgstr "Gitterlinien:" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 +msgid "_Background:" +msgstr "_Hintergrund:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 msgid "Pick a background color" msgstr "Eine Hintergrundfarbe wählen" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 msgid "_Transparent" msgstr "_Transparent" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 -msgid "_Background:" -msgstr "_Hintergrund:" - #: ../extensions/file_tools/data/ui/rotate-options.ui.h:12 msgid "Reset" msgstr "Zurücksetzen" @@ -2560,142 +2586,136 @@ msgid "Basic tools to modify images." msgstr "Grundlegende Werkzeuge zum Bearbeiten von Bildern." -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:372 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:272 +#: ../extensions/file_tools/gth-file-tool-grayscale.c:248 +#: ../extensions/file_tools/gth-file-tool-negative.c:68 +msgid "Applying changes" +msgstr "Änderungen anwenden" + +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 msgid "Adjust Colors..." msgstr "Farbabgleich …" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 msgid "Adjust Colors" msgstr "Farbabgleich" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:531 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:619 msgid "Change brightness, contrast, saturation and gamma level of the image" msgstr "Helligkeit, Kontrast, Sättigung und Gammawert eines Bildes ändern" -#: ../extensions/file_tools/gth-file-tool-crop.c:424 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:304 +msgid "Adjust Contrast" +msgstr "Kontrastabgleich" + +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:305 +msgid "Automatic contrast adjustment" +msgstr "Automatischer Kontrastabgleich" + +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 msgid "Square" msgstr "Quadrat" -#: ../extensions/file_tools/gth-file-tool-crop.c:425 -#: ../extensions/file_tools/gth-file-tool-resize.c:499 +#: ../extensions/file_tools/gth-file-tool-crop.c:417 +#: ../extensions/file_tools/gth-file-tool-resize.c:590 #, c-format msgid "%d x %d (Image)" msgstr "%d x %d (Bild)" # CHECK -#: ../extensions/file_tools/gth-file-tool-crop.c:428 -#: ../extensions/file_tools/gth-file-tool-resize.c:503 +#: ../extensions/file_tools/gth-file-tool-crop.c:420 +#: ../extensions/file_tools/gth-file-tool-resize.c:594 #, c-format msgid "%d x %d (Screen)" msgstr "%d x %d (Bildschirm)" -#: ../extensions/file_tools/gth-file-tool-crop.c:432 -#: ../extensions/file_tools/gth-file-tool-resize.c:508 +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-resize.c:599 msgid "5:4" msgstr "5:4" -#: ../extensions/file_tools/gth-file-tool-crop.c:433 -#: ../extensions/file_tools/gth-file-tool-resize.c:509 +#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-resize.c:600 msgid "4:3 (DVD, Book)" msgstr "4:3 (DVD, Buch)" -#: ../extensions/file_tools/gth-file-tool-crop.c:434 -#: ../extensions/file_tools/gth-file-tool-resize.c:510 +#: ../extensions/file_tools/gth-file-tool-crop.c:426 +#: ../extensions/file_tools/gth-file-tool-resize.c:601 msgid "7:5" msgstr "7:5" -#: ../extensions/file_tools/gth-file-tool-crop.c:435 -#: ../extensions/file_tools/gth-file-tool-resize.c:511 +#: ../extensions/file_tools/gth-file-tool-crop.c:427 +#: ../extensions/file_tools/gth-file-tool-resize.c:602 msgid "3:2 (Postcard)" msgstr "3:2 (Postkarte)" -#: ../extensions/file_tools/gth-file-tool-crop.c:436 -#: ../extensions/file_tools/gth-file-tool-resize.c:512 +#: ../extensions/file_tools/gth-file-tool-crop.c:428 +#: ../extensions/file_tools/gth-file-tool-resize.c:603 msgid "16:10" msgstr "16:10" -#: ../extensions/file_tools/gth-file-tool-crop.c:437 -#: ../extensions/file_tools/gth-file-tool-resize.c:513 +#: ../extensions/file_tools/gth-file-tool-crop.c:429 +#: ../extensions/file_tools/gth-file-tool-resize.c:604 msgid "16:9 (DVD)" msgstr "16:9 (DVD)" -#: ../extensions/file_tools/gth-file-tool-crop.c:438 -#: ../extensions/file_tools/gth-file-tool-resize.c:514 +#: ../extensions/file_tools/gth-file-tool-crop.c:430 +#: ../extensions/file_tools/gth-file-tool-resize.c:605 msgid "1.85:1" msgstr "1.85:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:439 -#: ../extensions/file_tools/gth-file-tool-resize.c:515 +#: ../extensions/file_tools/gth-file-tool-crop.c:431 +#: ../extensions/file_tools/gth-file-tool-resize.c:606 msgid "2.39:1" msgstr "2.39:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:440 -#: ../extensions/file_tools/gth-file-tool-resize.c:516 +#: ../extensions/file_tools/gth-file-tool-crop.c:432 +#: ../extensions/file_tools/gth-file-tool-resize.c:607 #: ../extensions/image_print/data/ui/print-layout.ui.h:2 #: ../extensions/rename_series/gth-template-selector.c:234 msgid "Custom" msgstr "Benutzerdefiniert:" -#: ../extensions/file_tools/gth-file-tool-crop.c:455 -#: ../extensions/file_tools/gth-file-tool-rotate.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:447 +#: ../extensions/file_tools/gth-file-tool-rotate.c:398 msgid "Rule of Thirds" msgstr "Drittel-Regel" -#: ../extensions/file_tools/gth-file-tool-crop.c:456 -#: ../extensions/file_tools/gth-file-tool-rotate.c:417 +#: ../extensions/file_tools/gth-file-tool-crop.c:448 +#: ../extensions/file_tools/gth-file-tool-rotate.c:399 msgid "Golden Sections" msgstr "Goldener Schnitt" -#: ../extensions/file_tools/gth-file-tool-crop.c:457 -#: ../extensions/file_tools/gth-file-tool-rotate.c:418 +#: ../extensions/file_tools/gth-file-tool-crop.c:449 +#: ../extensions/file_tools/gth-file-tool-rotate.c:400 msgid "Center Lines" msgstr "Zentrale Linien" -#: ../extensions/file_tools/gth-file-tool-crop.c:458 -#: ../extensions/file_tools/gth-file-tool-rotate.c:419 +#: ../extensions/file_tools/gth-file-tool-crop.c:450 +#: ../extensions/file_tools/gth-file-tool-rotate.c:401 msgid "Uniform" msgstr "Gleichmäßig" -#: ../extensions/file_tools/gth-file-tool-crop.c:614 +#: ../extensions/file_tools/gth-file-tool-crop.c:608 msgid "Crop..." msgstr "Zuschneiden …" -#: ../extensions/file_tools/gth-file-tool-crop.c:614 +#: ../extensions/file_tools/gth-file-tool-crop.c:608 msgid "Crop" msgstr "Zuschneiden" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:68 -#: ../extensions/file_tools/gth-file-tool-negative.c:68 -msgid "Applying changes" -msgstr "Änderungen anwenden" - -#: ../extensions/file_tools/gth-file-tool-desaturate.c:203 -msgid "Desaturate" -msgstr "Entsättigen" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:119 -msgid "White balance correction" -msgstr "Weißabgleichlorrektur" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:342 -msgid "Enhance Colors" -msgstr "Farben verbessern" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:343 -msgid "Automatic white balance correction" -msgstr "Automatische Weißabgleichkorrektur" - -#: ../extensions/file_tools/gth-file-tool-equalize.c:86 +#: ../extensions/file_tools/gth-file-tool-equalize.c:45 msgid "Equalizing image histogram" msgstr "Bild durch Angleichen des Histogramms verbessern" # CHECK -#: ../extensions/file_tools/gth-file-tool-equalize.c:275 +#: ../extensions/file_tools/gth-file-tool-equalize.c:230 msgid "Equalize" msgstr "Angleichen" -#: ../extensions/file_tools/gth-file-tool-equalize.c:276 +#: ../extensions/file_tools/gth-file-tool-equalize.c:231 msgid "Equalize image histogram" msgstr "Das Bildhistogramm angleichen" @@ -2707,6 +2727,14 @@ msgid "Flip the image vertically" msgstr "Das Bild vertikal spiegeln" +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale..." +msgstr "Graustufen …" + +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale" +msgstr "Graustufen" + #: ../extensions/file_tools/gth-file-tool-mirror.c:87 msgid "Mirror" msgstr "Horizontal spiegeln" @@ -2723,23 +2751,28 @@ msgid "Redo" msgstr "Wiederholen" -#: ../extensions/file_tools/gth-file-tool-resize.c:680 +#: ../extensions/file_tools/gth-file-tool-resize.c:214 +#: ../extensions/resize_images/dlg-resize-images.c:180 +msgid "Resizing images" +msgstr "Bildgröße wird geändert" + +#: ../extensions/file_tools/gth-file-tool-resize.c:808 msgid "Resize..." msgstr "Bildgröße ändern …" -#: ../extensions/file_tools/gth-file-tool-resize.c:680 +#: ../extensions/file_tools/gth-file-tool-resize.c:808 msgid "Resize" msgstr "Größe ändern" -#: ../extensions/file_tools/gth-file-tool-rotate.c:636 +#: ../extensions/file_tools/gth-file-tool-rotate.c:628 msgid "Rotate..." msgstr "Drehen …" -#: ../extensions/file_tools/gth-file-tool-rotate.c:636 +#: ../extensions/file_tools/gth-file-tool-rotate.c:628 msgid "Rotate" msgstr "Drehen" -#: ../extensions/file_tools/gth-file-tool-rotate.c:637 +#: ../extensions/file_tools/gth-file-tool-rotate.c:629 msgid "Freely rotate the image" msgstr "Das Bild frei drehen" @@ -2769,15 +2802,15 @@ msgid "Save" msgstr "Speichern" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:100 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:101 msgid "Sharpening image" msgstr "Bild wird geschärft" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 msgid "Enhance Focus..." msgstr "Schärfe verbessern …" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 msgid "Enhance Focus" msgstr "Schärfe verbessern" @@ -2837,43 +2870,43 @@ msgid "Find duplicated files." msgstr "Nach mehrfach vorhandenen Dateien suchen" -#: ../extensions/find_duplicates/gth-find-duplicates.c:53 +#: ../extensions/find_duplicates/gth-find-duplicates.c:65 msgid "leave the newest duplicates" msgstr "die neuesten Duplikate behalten" -#: ../extensions/find_duplicates/gth-find-duplicates.c:54 +#: ../extensions/find_duplicates/gth-find-duplicates.c:66 msgid "leave the oldest duplicates" msgstr "die ältesten Duplikate behalten" -#: ../extensions/find_duplicates/gth-find-duplicates.c:55 +#: ../extensions/find_duplicates/gth-find-duplicates.c:67 msgid "by folder..." msgstr "nach Ordner …" -#: ../extensions/find_duplicates/gth-find-duplicates.c:56 +#: ../extensions/find_duplicates/gth-find-duplicates.c:68 msgid "all files" msgstr "Alle Dateien" -#: ../extensions/find_duplicates/gth-find-duplicates.c:57 +#: ../extensions/find_duplicates/gth-find-duplicates.c:69 msgid "no file" msgstr "Keine Datei" -#: ../extensions/find_duplicates/gth-find-duplicates.c:397 -#: ../extensions/find_duplicates/gth-find-duplicates.c:492 +#: ../extensions/find_duplicates/gth-find-duplicates.c:560 +#: ../extensions/find_duplicates/gth-find-duplicates.c:668 #, c-format msgid "%d duplicate" msgid_plural "%d duplicates" msgstr[0] "%d Duplikat" msgstr[1] "%d Duplikate" -#: ../extensions/find_duplicates/gth-find-duplicates.c:536 +#: ../extensions/find_duplicates/gth-find-duplicates.c:712 msgid "Search completed" msgstr "Suche abgeschlossen" -#: ../extensions/find_duplicates/gth-find-duplicates.c:548 +#: ../extensions/find_duplicates/gth-find-duplicates.c:725 msgid "Searching for duplicates" msgstr "Nach Duplikaten wird gesucht" -#: ../extensions/find_duplicates/gth-find-duplicates.c:551 +#: ../extensions/find_duplicates/gth-find-duplicates.c:728 #: ../gthumb/gth-load-file-data-task.c:106 #: ../gthumb/gth-save-file-data-task.c:100 #, c-format @@ -2882,15 +2915,15 @@ msgstr[0] "%d Datei verbleibend" msgstr[1] "%d Dateien verbleibend" -#: ../extensions/find_duplicates/gth-find-duplicates.c:634 +#: ../extensions/find_duplicates/gth-find-duplicates.c:830 msgid "Getting the file list" msgstr "Dateiliste wird geholt" -#: ../extensions/find_duplicates/gth-find-duplicates.c:740 +#: ../extensions/find_duplicates/gth-find-duplicates.c:1016 msgid "Duplicates" msgstr "Duplikate" -#: ../extensions/find_duplicates/gth-find-duplicates.c:997 +#: ../extensions/find_duplicates/gth-find-duplicates.c:1306 msgid "Select" msgstr "Auswählen" @@ -2915,7 +2948,7 @@ msgstr "Bilder zu Flickr übertragen" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 #: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 msgid "Free space:" msgstr "Freier Platz:" @@ -2938,70 +2971,97 @@ msgid "_Safety:" msgstr "_Sicherheit:" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 msgid "Private photos, visible to family and friends" msgstr "Private Fotos, für die Familie und Freunde sichtbar" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 msgid "Private photos, visible to family" msgstr "Private Fotos, für die Familie sichtbar" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 msgid "Private photos" msgstr "Private Fotos" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 msgid "Safe content" msgstr "Sicherer Inhalt" # CHECK: Moderater Inhalt? Inhalt moderieren? -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 msgid "Moderate content" msgstr "Moderierter Inhalt" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:17 msgid "Restricted content" msgstr "Eingeschränkter Inhalt" -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 -msgid "_Import" -msgstr "_Importieren" +#: ../extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui.h:1 +msgid "C_ontinue" +msgstr "F_ortfahren" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:360 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:830 -msgid "Could not get the photo list" -msgstr "Fotoliste konnten nicht geholt werden" +#: ../extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui.h:2 +msgid "_Authorize..." +msgstr "_Legitimieren …" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:397 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:561 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:864 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1026 -msgid "No album selected" -msgstr "Keine Album ausgewählt" +#: ../extensions/flicker_utils/flickr-consumer.c:124 +#: ../extensions/flicker_utils/flickr-service.c:237 +#: ../extensions/flicker_utils/flickr-service.c:348 +#: ../extensions/flicker_utils/flickr-service.c:672 +#: ../extensions/flicker_utils/flickr-service.c:937 +#: ../extensions/oauth/oauth-service.c:154 +#: ../extensions/photobucket/photobucket-consumer.c:74 +#: ../extensions/photobucket/photobucket-consumer.c:82 +#: ../extensions/photobucket/photobucket-consumer.c:149 +#: ../extensions/photobucket/photobucket-service.c:132 +msgid "Unknown error" +msgstr "Unbekannter Fehler" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:579 +#: ../extensions/flicker_utils/flickr-service.c:502 #, c-format -msgid "Import from %s" -msgstr "Importieren von %s" +msgid "" +"Return to this window when you have finished the authorization process on %s" +msgstr "" +"Kehren Sie zu diesem Fenster zurück, sobald der Legitimierungsvorgang auf %s " +"abgeschlossen ist." + +#: ../extensions/flicker_utils/flickr-service.c:503 +msgid "Once you're done, click the 'Continue' button below." +msgstr "Sobald dies erledigt ist, klicken Sie auf »Fortsetzen«." + +#: ../extensions/flicker_utils/flickr-service.c:571 +#, c-format +msgid "gThumb requires your authorization to upload the photos to %s" +msgstr "" +"gThumb benötigt Ihre Legitimierung, um Bilder zu %s übertragen zu können" + +#: ../extensions/flicker_utils/flickr-service.c:572 +#, c-format +msgid "" +"Click 'Authorize' to open your web browser and authorize gthumb to upload " +"photos to %s. When you're finished, return to this window to complete the " +"authorization." +msgstr "" +"Klicken Sie auf »Legitimieren«, um Ihren Webbrowser zu öffnen und gThumb zu " +"legitimieren, Fotos zu %s zu übertragen. Sobald dies erledigt ist, kehren " +"Sie zu diesem Fenster zurück, um die Legitimierung abzuschließen." #: ../extensions/gstreamer_tools/actions.c:66 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1080 -#: ../gthumb/gth-browser.c:2013 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1072 +#: ../gthumb/gth-browser.c:2175 msgid "Could not save the file" msgstr "Die Datei konnte nicht gespeichert werden" -#: ../extensions/gstreamer_tools/actions.c:126 +#: ../extensions/gstreamer_tools/actions.c:130 msgid "Could not take a screenshot" msgstr "Bildschirmfoto konnte nicht aufgenommen werden" -#: ../extensions/gstreamer_tools/actions.c:132 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1248 +#: ../extensions/gstreamer_tools/actions.c:136 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1245 msgid "Save Image" msgstr "Bild speichern" -#: ../extensions/gstreamer_tools/actions.c:152 +#: ../extensions/gstreamer_tools/actions.c:156 msgctxt "Filename" msgid "Screenshot" msgstr "Bildschirmfoto" @@ -3011,7 +3071,7 @@ msgstr "Langsamer" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:686 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:699 msgid "Play" msgstr "Wiedergabe" @@ -3057,11 +3117,11 @@ msgid "Take a screenshot" msgstr "Ein Bildschirmfoto aufnehmen" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:663 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 msgid "Playing video" msgstr "Video wird abgespielt" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:689 msgid "Pause" msgstr "Pause" @@ -3120,20 +3180,19 @@ msgid "Sample rate" msgstr "Abtastrate" -#: ../extensions/gstreamer_utils/gstreamer-utils.c:363 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:362 msgid "Stereo" msgstr "Stereo" -#: ../extensions/gstreamer_utils/gstreamer-utils.c:363 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:362 msgid "Mono" msgstr "Mono" #. Translators: this is an image size, such as 1024 × 768 -#: ../extensions/gstreamer_utils/gstreamer-utils.c:396 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1303 -#: ../extensions/image_viewer/gth-metadata-provider-image.c:190 -#: ../extensions/webalbums/dlg-web-exporter.c:442 -#: ../extensions/webalbums/gth-web-exporter.c:2446 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:395 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1300 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:209 +#: ../extensions/webalbums/gth-web-exporter.c:2446 ../gthumb/gtk-utils.c:1037 #, c-format msgid "%d × %d" msgstr "%d × %d" @@ -3142,7 +3201,7 @@ msgid "Could not print the selected files" msgstr "Die ausgewählten Dateien konnten nicht gedruckt werden" -#: ../extensions/image_print/callbacks.c:54 +#: ../extensions/image_print/callbacks.c:65 msgid "Print the selected images" msgstr "Gewählte Bilder drucken" @@ -3215,25 +3274,26 @@ msgid "Fonts" msgstr "Schriften" -#: ../extensions/image_print/gth-image-print-job.c:971 +#: ../extensions/image_print/gth-image-print-job.c:914 #: ../extensions/webalbums/data/albumthemes/text.h:31 #, c-format msgid "Page %d of %d" msgstr "Seite %d von %d" -#: ../extensions/image_print/gth-image-print-job.c:1734 -#: ../extensions/image_print/gth-image-print-job.c:1861 -#: ../extensions/image_print/gth-image-print-job.c:1898 +#: ../extensions/image_print/gth-image-print-job.c:1680 +#: ../extensions/image_print/gth-image-print-job.c:1845 +#: ../extensions/image_print/gth-image-print-job.c:1888 msgid "Could not print" msgstr "Drucken nicht möglich" -#: ../extensions/image_print/gth-image-print-job.c:1796 +#: ../extensions/image_print/gth-image-print-job.c:1746 #: ../gthumb/gth-main-default-tests.c:240 msgid "Images" msgstr "Bilder" -#: ../extensions/image_print/gth-image-print-job.c:1863 -#: ../gthumb/gth-image-loader.c:204 ../gthumb/gth-image-loader.c:278 +#: ../extensions/image_print/gth-image-print-job.c:1847 +#: ../gthumb/gth-image-loader.c:197 ../gthumb/gth-image-loader.c:304 +#: ../gthumb/gth-image-utils.c:131 ../gthumb/gth-image-utils.c:137 msgid "No suitable loader available for this file type" msgstr "Für diesen Dateityp ist kein brauchbarer Lader verfügbar" @@ -3244,7 +3304,7 @@ msgstr "»%s« wird geladen" #: ../extensions/image_print/gth-load-image-info-task.c:166 -#: ../extensions/webalbums/gth-web-exporter.c:2685 +#: ../extensions/webalbums/gth-web-exporter.c:2719 msgid "Loading images" msgstr "Bilder werden geladen" @@ -3289,7 +3349,7 @@ #: ../extensions/image_rotation/gth-reset-orientation-task.c:111 #: ../extensions/image_rotation/gth-transform-task.c:141 -#: ../extensions/webalbums/gth-web-exporter.c:2339 +#: ../extensions/webalbums/gth-web-exporter.c:2338 #: ../extensions/webalbums/gth-web-exporter.c:2423 msgid "Saving images" msgstr "Bilder werden gespeichert" @@ -3536,39 +3596,39 @@ msgid "custom format" msgstr "Benutzerdefiniertes Format" -#: ../extensions/importer/gth-import-task.c:445 -#: ../extensions/importer/gth-import-task.c:480 -#: ../extensions/importer/gth-import-task.c:651 +#: ../extensions/importer/gth-import-task.c:426 +#: ../extensions/importer/gth-import-task.c:461 +#: ../extensions/importer/gth-import-task.c:671 msgid "Importing files" msgstr "Dateien werden importiert" -#: ../extensions/importer/gth-import-task.c:601 +#: ../extensions/importer/gth-import-task.c:620 msgid "No file imported" msgstr "Keine Datei importiert" -#: ../extensions/importer/gth-import-task.c:602 +#: ../extensions/importer/gth-import-task.c:621 msgid "The selected files are already present in the destination." msgstr "Die gewählten Dateien sind im Ziel bereits vorhanden." -#: ../extensions/importer/gth-import-task.c:625 +#: ../extensions/importer/gth-import-task.c:644 #: ../gthumb/gth-file-source-vfs.c:694 msgid "Could not delete the files" msgstr "Die Dateien konnte nicht gelöscht werden" -#: ../extensions/importer/gth-import-task.c:626 +#: ../extensions/importer/gth-import-task.c:645 msgid "Delete operation not supported." msgstr "Löschvorgang wird nicht unterstützt." -#: ../extensions/importer/gth-import-task.c:712 +#: ../extensions/importer/gth-import-task.c:732 msgid "Last imported" msgstr "Zuletzt importiert" -#: ../extensions/importer/gth-import-task.c:818 +#: ../extensions/importer/gth-import-task.c:838 msgid "No file specified." msgstr "Keine Datei angegeben." #. Translators: For example: Not enough free space in '/home/user/Images'.\n1.3 GB of space is required but only 300 MB is available. -#: ../extensions/importer/gth-import-task.c:855 +#: ../extensions/importer/gth-import-task.c:875 #, c-format msgid "" "Not enough free space in '%s'.\n" @@ -3577,7 +3637,7 @@ "Nicht genug freier Platz in »%s«.\n" "%s werden benötigt, aber es sind nur %s verfügbar." -#: ../extensions/list_tools/callbacks.c:76 ../gthumb/gth-filterbar.c:304 +#: ../extensions/list_tools/callbacks.c:76 ../gthumb/gth-filterbar.c:311 msgid "Personalize..." msgstr "_Personalisieren …" @@ -3721,9 +3781,9 @@ msgstr "Geben Sie einen Wert ein:" #: ../extensions/list_tools/gth-script.c:745 -#: ../extensions/webalbums/gth-web-exporter.c:560 -#: ../extensions/webalbums/gth-web-exporter.c:572 -#: ../extensions/webalbums/gth-web-exporter.c:580 +#: ../extensions/webalbums/gth-web-exporter.c:558 +#: ../extensions/webalbums/gth-web-exporter.c:570 +#: ../extensions/webalbums/gth-web-exporter.c:578 msgid "Malformed command" msgstr "Ungültiger Befehl" @@ -3790,6 +3850,47 @@ msgid "View the photo position on the map" msgstr "Die Position des Fotos auf der Karte anzeigen" +#: ../extensions/oauth/data/ui/oauth-account-manager.ui.h:1 +msgid "A_ccounts:" +msgstr "_Konten:" + +#: ../extensions/oauth/data/ui/oauth-ask-authorization.ui.h:1 +#: ../gthumb/gth-folder-tree.c:1067 +msgid "Loading..." +msgstr "Ladevorgang …" + +#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 +msgid "New authentication..." +msgstr "Neue Legitimierung …" + +#: ../extensions/oauth/oauth-ask-authorization-dialog.c:191 +msgid "Authorization Required" +msgstr "Legitimierung erforderlich" + +#: ../extensions/oauth/web-service.c:382 +msgid "Choose _Account..." +msgstr "K_onto wählen …" + +#: ../extensions/oauth/web-service.c:660 +msgid "Choose Account" +msgstr "Konto wählen" + +#: ../extensions/oauth/web-service.c:777 +msgid "Edit Accounts" +msgstr "Konten bearbeiten" + +#: ../extensions/oauth/web-service.c:795 ../extensions/oauth/web-service.c:812 +msgid "Connecting to the server" +msgstr "Verbindung mit Server wird aufgebaut" + +#: ../extensions/oauth/web-service.c:796 +msgid "Asking authorization" +msgstr "Nach Legitimierung fragen" + +#: ../extensions/oauth/web-service.c:813 +msgid "Getting account information" +msgstr "Kontoinformationen wird ermittelt" + #: ../extensions/photobucket/callbacks.c:54 msgid "Photobucket..." msgstr "Photobucket …" @@ -3798,68 +3899,68 @@ msgid "Upload photos to Photobucket" msgstr "Fotos zu Photobucket übertragen" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +msgid "_Scramble filenames" +msgstr "Dateinamen ver_würfeln" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 msgid "Tiny ( 100 x 75 )" msgstr "Winzig ( 100 x 75 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 msgid "Small ( 160 x 120 )" msgstr "Klein ( 160 x 120 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 msgid "Medium ( 320 x 240 )" msgstr "Mittel ( 320 x 240 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 msgid "Large ( 640 x 480 )" msgstr "Groß ( 640 x 480 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 msgid "15ʺ screen ( 800 x 600 )" msgstr "15ʺ Bildschirm ( 800 x 600 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 msgid "17ʺ screen ( 1024 x 768 )" msgstr "17ʺ Bildschirm ( 1024 x 768 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 msgid "1 megabyte file size" msgstr "Dateigröße 1 Megabyte" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 -msgid "_Scramble filenames" -msgstr "Dateinamen ver_würfeln" - #: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 msgid "_Container:" msgstr "_Container:" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:290 msgid "Tiny ( 100 × 75 )" msgstr "Winzig ( 100 x 75 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 msgid "Small ( 160 × 120 )" msgstr "Klein ( 160 x 120 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 msgid "Medium ( 320 × 240 )" msgstr "Mittel ( 320 x 240 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 msgid "Large ( 640 × 480 )" msgstr "Groß ( 640 x 480 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 msgid "15ʺ screen ( 800 × 600 )" msgstr "15ʺ Bildschirm ( 800 x 600 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 msgid "17ʺ screen ( 1024 × 768 )" msgstr "17ʺ Bildschirm ( 1024 x 768 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:304 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:303 msgid "2 megabyte file size" msgstr "Dateigröße 2 Megabyte" @@ -3902,7 +4003,7 @@ #. view label #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 -#: ../gthumb/gth-filterbar.c:414 +#: ../gthumb/gth-filterbar.c:421 msgid "S_how:" msgstr "An_zeigen:" @@ -3919,7 +4020,7 @@ msgstr "Originale der importierten Bilder _löschen" #: ../extensions/photo_importer/dlg-photo-importer.c:227 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:174 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:149 msgid "Could not import the files" msgstr "Die Dateien konnten nicht importiert werden" @@ -3934,7 +4035,7 @@ msgstr "Ordner konnte nicht geladen werden" #: ../extensions/photo_importer/dlg-photo-importer.c:369 -#: ../gthumb/gth-browser.c:1927 +#: ../gthumb/gth-browser.c:2089 msgid "Getting folder listing..." msgstr "Ordnerinhalt wird ermittelt …" @@ -3979,53 +4080,15 @@ msgid "_Albums:" msgstr "_Alben:" -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 -msgid "Import from Picasa Web Album" -msgstr "Aus dem Picasa-Webalbum importieren" - -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 -msgid "_Album:" -msgstr "_Album:" - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:1 -msgid "_E-Mail:" -msgstr "E-_Mail:" - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 -msgid "" -"Type the characters you see in the picture below. Letters are not case-" -"sensitive." -msgstr "" -"Geben Sie die Zeichen ein, die im Bild unten angezeigt werden. Groß-/" -"Kleinschreibung wird nicht berücksichtigt." - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:3 -msgid "_Password:" -msgstr "_Passwort:" - #: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 msgid "Public" msgstr "Öffentlich" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:354 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:310 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:458 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:469 msgid "Could not get the album list" msgstr "Die Albenliste konnte nicht geholt werden" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:438 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:394 -msgid "Picasa Web Album" -msgstr "Picasa-Webalbum" - -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:525 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:481 -msgid "Account" -msgstr "Konto" - -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:104 -msgid "Could not load the file" -msgstr "Datei konnte nicht geladen werden" - #: ../extensions/picasaweb/picasaweb.extension.in.in.h:1 msgid "Picasa Web Albums" msgstr "Picasa-Webalben" @@ -4034,93 +4097,6 @@ msgid "Upload images to Picasa Web Albums" msgstr "Bilder zu Picasa-Webalben übertragen" -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:1 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:1 -msgid "_Default extension:" -msgstr "Stan_dard-Erweiterung:" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:2 -msgid "_Quality:" -msgstr "_Qualität:" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 -msgid "_Smoothing:" -msgstr "_Glätten:" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 -msgid "Opti_mize" -msgstr "_Optimieren" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:5 -msgid "_Progressive" -msgstr "_Progressiv" - -#: ../extensions/pixbuf_savers/data/ui/png-options.ui.h:1 -msgid "Compression _level:" -msgstr "Kompressions_grad:" - -#: ../extensions/pixbuf_savers/data/ui/save-options-preferences.ui.h:1 -msgid "Default options:" -msgstr "Standardoptionen" - -#: ../extensions/pixbuf_savers/data/ui/tga-options.ui.h:1 -msgid "_RLE compression" -msgstr "_RLE-Kompression" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:2 -msgid "_No compression" -msgstr "_Keine Kompression" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:3 -msgid "No_rmal (Deflate)" -msgstr "_Normal (Entpacken)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 -msgid "_Loss compression (JPEG)" -msgstr "_Verlustbehaftete Kompression (JPEG)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 -msgid "Compression" -msgstr "Kompression" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 -msgid "dpi" -msgstr "DPI" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:9 -msgid "Resolution" -msgstr "Auflösung" - -#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:519 -msgid "JPEG" -msgstr "JPEG" - -#: ../extensions/pixbuf_savers/gth-png-saver.c:140 -msgid "PNG" -msgstr "PNG" - -#: ../extensions/pixbuf_savers/gth-tga-saver.c:286 -#: ../gthumb/gth-buffer-data.c:84 -msgid "Insufficient memory" -msgstr "Nicht ausreichender Speicher" - -#: ../extensions/pixbuf_savers/gth-tga-saver.c:373 -msgid "TGA" -msgstr "TGA" - -#: ../extensions/pixbuf_savers/gth-tiff-saver.c:537 -msgid "TIFF" -msgstr "TIFF" - -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:1 -msgid "Save images" -msgstr "Bilder speichern" - -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:2 -msgid "Save images in common file formats such as JPEG, PNG and TIFF" -msgstr "" -"Speichern von Bildern in häufig genutzten Formaten wie JPEG, PNG und TIFF" - #: ../extensions/raw_files/raw_files.extension.in.in.h:1 msgid "Raw format support" msgstr "Unterstützung für Raw-Format" @@ -4129,11 +4105,11 @@ msgid "Allow to load raw format images." msgstr "Das Laden von Bildern im Raw-Format ermöglichen." -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 msgid "_X:" msgstr "_X:" -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 msgid "_Y:" msgstr "_Y:" @@ -4255,36 +4231,36 @@ msgid "File attribute" msgstr "Dateiattribut" -#: ../extensions/rename_series/dlg-rename-series.c:552 -#: ../extensions/rename_series/dlg-rename-series.c:683 +#: ../extensions/rename_series/dlg-rename-series.c:558 +#: ../extensions/rename_series/dlg-rename-series.c:689 msgid "Could not rename the files" msgstr "Dateien konnten nicht umbenannt werden" -#: ../extensions/rename_series/dlg-rename-series.c:780 +#: ../extensions/rename_series/dlg-rename-series.c:786 msgid "Could not save the template" msgstr "Die Vorlage konnte nicht gespeichert werden" -#: ../extensions/rename_series/dlg-rename-series.c:798 +#: ../extensions/rename_series/dlg-rename-series.c:804 msgid "Edit Template" msgstr "Vorlage bearbeiten" -#: ../extensions/rename_series/dlg-rename-series.c:856 +#: ../extensions/rename_series/dlg-rename-series.c:862 msgid "Old Name" msgstr "Alter Name" -#: ../extensions/rename_series/dlg-rename-series.c:867 +#: ../extensions/rename_series/dlg-rename-series.c:873 msgid "New Name" msgstr "Neuer Name" -#: ../extensions/rename_series/dlg-rename-series.c:944 +#: ../extensions/rename_series/dlg-rename-series.c:950 msgid "Keep original case" msgstr "Groß-/Kleinschreibung beibehalten" -#: ../extensions/rename_series/dlg-rename-series.c:945 +#: ../extensions/rename_series/dlg-rename-series.c:951 msgid "Convert to lower-case" msgstr "In Kleinschreibung umwandeln" -#: ../extensions/rename_series/dlg-rename-series.c:946 +#: ../extensions/rename_series/dlg-rename-series.c:952 msgid "Convert to upper-case" msgstr "In Großschreibung umwandeln" @@ -4333,11 +4309,7 @@ msgid "pixel" msgstr "Pixel" -#: ../extensions/resize_images/dlg-resize-images.c:168 -msgid "Resizing images" -msgstr "Bildgröße wird geändert" - -#: ../extensions/resize_images/dlg-resize-images.c:412 +#: ../extensions/resize_images/dlg-resize-images.c:423 msgid "Keep the original format" msgstr "Originalformat beibehalten" @@ -4489,7 +4461,7 @@ msgid "Remove the selected files" msgstr "Die gewählten Dateien entfernen" -#: ../extensions/slideshow/gth-slideshow.c:229 +#: ../extensions/slideshow/gth-slideshow.c:231 msgid "Playing slideshow" msgstr "Diaschau wird abgespielt" @@ -4618,10 +4590,6 @@ msgid "_Copy originals to destination" msgstr "_Originale an den Zielort kopieren" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 -msgid "_Resize if larger than:" -msgstr "Ve_rkleinern, wenn größer als:" - #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 msgid "_Adapt to the window width " msgstr "An die Fensterbreite _anpassen" @@ -4662,36 +4630,36 @@ msgid "Image Attributes" msgstr "Bild-Attribute" -#: ../extensions/webalbums/gth-web-exporter.c:1802 +#: ../extensions/webalbums/gth-web-exporter.c:1800 msgid "Could not show the destination" msgstr "Das Ziel konnte nicht angezeigt werden" -#: ../extensions/webalbums/gth-web-exporter.c:1838 +#: ../extensions/webalbums/gth-web-exporter.c:1836 msgid "The album has been created successfully." msgstr "Das Album wurde erfolgreich angelegt." -#: ../extensions/webalbums/gth-web-exporter.c:2106 -#: ../extensions/webalbums/gth-web-exporter.c:2133 +#: ../extensions/webalbums/gth-web-exporter.c:2104 +#: ../extensions/webalbums/gth-web-exporter.c:2132 msgid "Saving thumbnails" msgstr "Miniatur-Vorschaubilder werden gespeichert" -#: ../extensions/webalbums/gth-web-exporter.c:2161 +#: ../extensions/webalbums/gth-web-exporter.c:2160 msgid "Saving HTML pages: Images" msgstr "HTML-Seiten werden gespeichert: Bilder" -#: ../extensions/webalbums/gth-web-exporter.c:2219 +#: ../extensions/webalbums/gth-web-exporter.c:2218 msgid "Saving HTML pages: Indexes" msgstr "HTML-Seiten werden gespeichert: Indizes" -#: ../extensions/webalbums/gth-web-exporter.c:2502 +#: ../extensions/webalbums/gth-web-exporter.c:2503 msgid "Copying original images" msgstr "Originalbilder werden kopiert" -#: ../extensions/webalbums/gth-web-exporter.c:2929 +#: ../extensions/webalbums/gth-web-exporter.c:2963 msgid "Could not find the style folder" msgstr "Der Stilvorlagen-Ordner konnte nicht gefunden werden" -#: ../extensions/webalbums/gth-web-exporter.c:2967 +#: ../extensions/webalbums/gth-web-exporter.c:3001 msgid "Could not create a temporary folder" msgstr "Es konnte kein temporärer Ordner angelegt werden" @@ -4703,9 +4671,9 @@ msgid "Create static web albums." msgstr "Statische Web-Alben anlegen." -#: ../gthumb/dlg-location.c:200 ../gthumb/gth-browser.c:1249 -#: ../gthumb/gth-browser.c:1818 ../gthumb/gth-browser.c:5972 -#: ../gthumb/gth-browser.c:5991 ../gthumb/gth-browser.c:6015 +#: ../gthumb/dlg-location.c:200 ../gthumb/gth-browser.c:1396 +#: ../gthumb/gth-browser.c:1969 ../gthumb/gth-browser.c:6214 +#: ../gthumb/gth-browser.c:6233 ../gthumb/gth-browser.c:6257 #, c-format msgid "Could not load the position \"%s\"" msgstr "Die Position »%s« konnte nicht geladen werden" @@ -4726,7 +4694,7 @@ msgid "Edit Filter" msgstr "Filter bearbeiten" -#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:270 +#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:277 msgid "All" msgstr "Alle" @@ -4792,47 +4760,6 @@ msgid "_Restart" msgstr "_Neu starten" -#: ../gthumb/eggfileformatchooser.c:236 -#, c-format -msgid "File _Format: %s" -msgstr "Datei_format: %s" - -#: ../gthumb/eggfileformatchooser.c:397 ../gthumb/gth-main-default-tests.c:233 -msgid "All Files" -msgstr "Alle Dateien" - -#: ../gthumb/eggfileformatchooser.c:398 -msgid "All Supported Files" -msgstr "Alle unterstützten Dateien" - -#: ../gthumb/eggfileformatchooser.c:407 -msgid "By Extension" -msgstr "Nach Erweiterung" - -#: ../gthumb/eggfileformatchooser.c:422 -msgid "File Format" -msgstr "Dateiformat" - -#: ../gthumb/eggfileformatchooser.c:440 -msgid "Extension(s)" -msgstr "Erweiterung(en)" - -#: ../gthumb/eggfileformatchooser.c:681 -#, c-format -msgid "" -"The program was not able to find out the file format you want to use for `%" -"s'. Please make sure to use a known extension for that file or manually " -"choose a file format from the list below." -msgstr "" -"Das Programm war nicht in der Lage, das von Ihnen für »%s« zu verwendende " -"Dateiformat zu ermitteln. Bitte stellen Sie sicher, dass Sie eine bekannte " -"Erweiterung verwenden, oder wählen Sie manuell ein Dateiformat aus der " -"nachstehenden Liste aus." - -#: ../gthumb/eggfileformatchooser.c:688 -msgid "File format not recognized" -msgstr "Dateiformat wurde nicht erkannt" - #. For translators: This is a progress size indicator, for example: 230.4 MB of 512.8 MB #: ../gthumb/gio-utils.c:1351 #, c-format @@ -4867,7 +4794,7 @@ #. * the separator that your locale uses or use "%Id" instead #. * of "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2945 +#: ../gthumb/glib-utils.c:3068 #, c-format msgctxt "long time format" msgid "%d:%02d:%02d" @@ -4879,13 +4806,13 @@ #. * separator that your locale uses or use "%Id" instead of #. * "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2954 +#: ../gthumb/glib-utils.c:3077 #, c-format msgctxt "short time format" msgid "%d:%02d" msgstr "%d:%02d" -#: ../gthumb/gth-browser-actions-callbacks.c:400 +#: ../gthumb/gth-browser-actions-callbacks.c:414 msgid "" "gthumb is free software; you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -4897,7 +4824,7 @@ "sie von der Free Software Foundation festgelegt wurden; entweder in Version " "2 der Lizenz oder (nach Ihrem Ermessen) in jeder folgenden Version." -#: ../gthumb/gth-browser-actions-callbacks.c:404 +#: ../gthumb/gth-browser-actions-callbacks.c:418 msgid "" "gthumb is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -4910,7 +4837,7 @@ "für weitere Informationen bitte in der GNU General Public License (GNU GPL) " "nach." -#: ../gthumb/gth-browser-actions-callbacks.c:408 +#: ../gthumb/gth-browser-actions-callbacks.c:422 msgid "" "You should have received a copy of the GNU General Public License along with " "gthumb. If not, see http://www.gnu.org/licenses/." @@ -4919,11 +4846,11 @@ "gThumb erhalten haben. Falls nicht, schauen Sie unter ." -#: ../gthumb/gth-browser-actions-callbacks.c:427 +#: ../gthumb/gth-browser-actions-callbacks.c:441 msgid "An image viewer and browser for GNOME." msgstr "Ein Bildbetrachter und Browser für GNOME." -#: ../gthumb/gth-browser-actions-callbacks.c:430 +#: ../gthumb/gth-browser-actions-callbacks.c:444 msgid "translator_credits" msgstr "" "Christian Neumair \n" @@ -5015,15 +4942,15 @@ msgid "Leave Fullscreen" msgstr "Vollbild verlassen" -#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3652 +#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3841 msgid "Go to the previous visited location" msgstr "Zum zuvor besuchten Ort wechseln" -#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3670 +#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3859 msgid "Go to the next visited location" msgstr "Zum nächsten besuchten Ort wechseln" -#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3688 +#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3877 msgid "Go up one level" msgstr "Eine Ebene höher gehen" @@ -5035,7 +4962,7 @@ msgid "Specify a location to open" msgstr "Geben Sie einen Ort zum Öffnen an" -#: ../gthumb/gth-browser-actions-entries.h:173 ../gthumb/gth-browser.c:673 +#: ../gthumb/gth-browser-actions-entries.h:173 ../gthumb/gth-browser.c:721 msgid "_Delete History" msgstr "Chronik _vergessen" @@ -5063,146 +4990,148 @@ msgid "_Keyboard Shortcuts" msgstr "_Tastenkürzel" -#: ../gthumb/gth-browser-actions-entries.h:206 +#: ../gthumb/gth-browser-actions-entries.h:203 +#: ../gthumb/gth-browser-actions-entries.h:257 +msgid "Edit" +msgstr "Bearbeiten" + +#: ../gthumb/gth-browser-actions-entries.h:204 +#: ../gthumb/gth-browser-actions-entries.h:258 +msgid "Edit file" +msgstr "Datei bearbeiten" + +#: ../gthumb/gth-browser-actions-entries.h:212 msgid "_Toolbar" msgstr "_Werkzeugleiste" -#: ../gthumb/gth-browser-actions-entries.h:207 +#: ../gthumb/gth-browser-actions-entries.h:213 msgid "View or hide the toolbar of this window" msgstr "Die Werkzeugleiste dieses Fensters anzeigen/verbergen" -#: ../gthumb/gth-browser-actions-entries.h:211 +#: ../gthumb/gth-browser-actions-entries.h:217 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../gthumb/gth-browser-actions-entries.h:212 +#: ../gthumb/gth-browser-actions-entries.h:218 msgid "View or hide the statusbar of this window" msgstr "Die Statusleiste dieses Fensters anzeigen/verbergen" -#: ../gthumb/gth-browser-actions-entries.h:216 +#: ../gthumb/gth-browser-actions-entries.h:222 msgid "_Filterbar" msgstr "_Filterleiste" -#: ../gthumb/gth-browser-actions-entries.h:217 +#: ../gthumb/gth-browser-actions-entries.h:223 msgid "View or hide the filterbar of this window" msgstr "Die Filterleiste dieses Fensters anzeigen/verbergen" -#: ../gthumb/gth-browser-actions-entries.h:221 +#: ../gthumb/gth-browser-actions-entries.h:227 msgid "_Sidebar" msgstr "_Seitenleiste" -#: ../gthumb/gth-browser-actions-entries.h:222 +#: ../gthumb/gth-browser-actions-entries.h:228 msgid "View or hide the sidebar of this window" msgstr "Die Seitenleiste dieses Fensters anzeigen/verbergen" -#: ../gthumb/gth-browser-actions-entries.h:226 +#: ../gthumb/gth-browser-actions-entries.h:232 msgid "_Thumbnail Pane" msgstr "_Vorschauleiste" -#: ../gthumb/gth-browser-actions-entries.h:227 +#: ../gthumb/gth-browser-actions-entries.h:233 msgid "View or hide the thumbnail pane in viewer mode" msgstr "Die Vorschauleiste im Ansichtsmodus anzeigen/verbergen" -#: ../gthumb/gth-browser-actions-entries.h:231 +#: ../gthumb/gth-browser-actions-entries.h:237 msgid "_Thumbnails" msgstr "_Miniatur-Vorschaubilder" -#: ../gthumb/gth-browser-actions-entries.h:232 +#: ../gthumb/gth-browser-actions-entries.h:238 msgid "View thumbnails" msgstr "Miniatur-Vorschaubilder anzeigen" -#: ../gthumb/gth-browser-actions-entries.h:236 +#: ../gthumb/gth-browser-actions-entries.h:242 msgid "_Hidden Files" msgstr "_Verborgene Dateien" -#: ../gthumb/gth-browser-actions-entries.h:237 +#: ../gthumb/gth-browser-actions-entries.h:243 msgid "Show hidden files and folders" msgstr "Verborgene Dateien und Ordner anzeigen" -#: ../gthumb/gth-browser-actions-entries.h:242 -#: ../gthumb/gth-browser-actions-entries.h:247 +#: ../gthumb/gth-browser-actions-entries.h:248 +#: ../gthumb/gth-browser-actions-entries.h:253 msgid "View file properties" msgstr "Die Eigenschaften der Datei anzeigen" -#: ../gthumb/gth-browser-actions-entries.h:251 -msgid "Edit" -msgstr "Bearbeiten" - -#: ../gthumb/gth-browser-actions-entries.h:252 -msgid "Edit file" -msgstr "Datei bearbeiten" - -#: ../gthumb/gth-browser-actions-entries.h:256 +#: ../gthumb/gth-browser-actions-entries.h:262 msgid "_Fit Window to Image" msgstr "Bild auf die Fenstergr_öße anpassen" -#: ../gthumb/gth-browser-actions-entries.h:257 +#: ../gthumb/gth-browser-actions-entries.h:263 msgid "Resize the window to the size of the image" msgstr "Die Größe des Fensters an die Bildgröße anpassen" -#: ../gthumb/gth-browser.c:370 +#: ../gthumb/gth-browser.c:418 #, c-format msgid "Open %s" msgstr "%s öffnen" -#: ../gthumb/gth-browser.c:510 +#: ../gthumb/gth-browser.c:558 msgid "[modified]" msgstr "[geändert]" -#: ../gthumb/gth-browser.c:1007 +#: ../gthumb/gth-browser.c:1117 #, c-format msgid "%d file selected (%s)" msgid_plural "%d files selected (%s)" msgstr[0] "%d Datei ausgewählt (%s)" msgstr[1] "%d Dateien ausgewählt (%s)" -#: ../gthumb/gth-browser.c:1042 +#: ../gthumb/gth-browser.c:1152 #, c-format msgid "%s of free space" msgstr "%s des freien Platzes" -#: ../gthumb/gth-browser.c:1911 ../gthumb/gth-browser.c:1938 +#: ../gthumb/gth-browser.c:2073 ../gthumb/gth-browser.c:2100 #, c-format msgid "No suitable module found for %s" msgstr "Kein passendes Modul für %s gefunden" -#: ../gthumb/gth-browser.c:2057 +#: ../gthumb/gth-browser.c:2219 #, c-format msgid "Save changes to file '%s'?" msgstr "Die Änderungen an Datei »%s« speichern?" -#: ../gthumb/gth-browser.c:2062 +#: ../gthumb/gth-browser.c:2224 msgid "If you don't save, changes to the file will be permanently lost." msgstr "" "Wenn Sie nicht speichern, gehen die Änderungen an dieser Datei permanent " "verloren" -#: ../gthumb/gth-browser.c:2063 +#: ../gthumb/gth-browser.c:2225 msgid "Do _Not Save" msgstr "_Nicht speichern" -#: ../gthumb/gth-browser.c:2836 ../gthumb/gth-source-tree.c:182 +#: ../gthumb/gth-browser.c:3020 ../gthumb/gth-source-tree.c:182 msgid "Could not change name" msgstr "Name konnte nicht geändert werden" -#: ../gthumb/gth-browser.c:3265 ../gthumb/gth-main-default-metadata.c:41 +#: ../gthumb/gth-browser.c:3451 ../gthumb/gth-main-default-metadata.c:41 msgid "Modified" msgstr "Geändert" -#: ../gthumb/gth-browser.c:3653 ../gthumb/gth-browser.c:3671 +#: ../gthumb/gth-browser.c:3842 ../gthumb/gth-browser.c:3860 msgid "View the list of visited locations" msgstr "Die Liste besuchter Orte anzeigen" -#: ../gthumb/gth-browser.c:3689 +#: ../gthumb/gth-browser.c:3878 msgid "View the list of upper locations" msgstr "Die Liste der oberen Orte anzeigen" -#: ../gthumb/gth-browser.c:5973 +#: ../gthumb/gth-browser.c:6215 #, c-format msgid "File type not supported" msgstr "Der Dateityp wird nicht unterstützt" -#: ../gthumb/gth-browser.c:6016 +#: ../gthumb/gth-browser.c:6258 #, c-format msgid "No suitable module found" msgstr "Kein passendes Modul gefunden" @@ -5217,6 +5146,10 @@ msgid "The extension '%1$s' is required by the extension '%2$s'" msgstr "Die Erweiterung »%1$s« wird von der Erweiterung »%2$s« benötigt" +#: ../gthumb/gth-file-chooser-dialog.c:144 +msgid "All Supported Files" +msgstr "Alle unterstützten Dateien" + #: ../gthumb/gth-file-source-vfs.c:121 msgid "Home Folder" msgstr "Persönlicher Ordner" @@ -5230,24 +5163,24 @@ "The files cannot be moved to the Trash. Do you want to delete them " "permanently?" msgstr "" -"Die Dateien können nicht in den Müll verschoben werden. Sollen die Dateien " -"dauerhaft gelöscht werden?" +"Die Dateien können nicht in den Papierkorb verschoben werden. Sollen die " +"Dateien dauerhaft gelöscht werden?" #: ../gthumb/gth-file-source-vfs.c:750 msgid "Could not move the files to the Trash" -msgstr "Die Dateien konnten nicht in den Müll verschoben werden" +msgstr "Die Dateien konnten nicht in den Papierkorb verschoben werden" #: ../gthumb/gth-file-source-vfs.c:797 #, c-format msgid "Are you sure you want to move \"%s\" to trash?" -msgstr "Soll »%s« wirklich in den Müll verschoben werden?" +msgstr "Soll »%s« wirklich in den Papierkorb verschoben werden?" #: ../gthumb/gth-file-source-vfs.c:801 #, c-format msgid "Are you sure you want to move to trash the %'d selected file?" msgid_plural "Are you sure you want to move to trash the %'d selected files?" -msgstr[0] "Soll %'d ausgewählte Datei in den Müll verschoben werden?" -msgstr[1] "Sollen %'d ausgewählte Dateien in den Müll verschoben werden?" +msgstr[0] "Soll %'d ausgewählte Datei in den Papierkorb verschoben werden?" +msgstr[1] "Sollen %'d ausgewählte Dateien in den Papierkorb verschoben werden?" #: ../gthumb/gth-file-source-vfs.c:844 #, c-format @@ -5257,7 +5190,7 @@ msgstr[0] "Soll %'d ausgewählte Datei unwiderruflich gelöscht werden?" msgstr[1] "Sollen %'d ausgewählte Dateien unwiderruflich gelöscht werden?" -#: ../gthumb/gth-filterbar.c:406 +#: ../gthumb/gth-filterbar.c:413 msgid "Hide the filterbar" msgstr "Die Filterleiste verbergen" @@ -5277,7 +5210,7 @@ msgstr "GB" #. "files" label -#: ../gthumb/gth-filter.c:291 ../gthumb/gth-filter-editor-dialog.c:177 +#: ../gthumb/gth-filter.c:286 ../gthumb/gth-filter-editor-dialog.c:177 msgid "files" msgstr "Dateien" @@ -5294,50 +5227,61 @@ msgid "No limit specified" msgstr "Keine Begrenzung angegeben" -#: ../gthumb/gth-folder-tree.c:857 -msgid "Loading..." -msgstr "Ladevorgang …" - -#: ../gthumb/gth-folder-tree.c:1100 +#: ../gthumb/gth-folder-tree.c:1369 msgid "(Open Parent)" msgstr "Vorgänger öffnen" -#: ../gthumb/gth-histogram-view.c:826 +#: ../gthumb/gth-histogram-view.c:825 msgid "Linear scale" msgstr "Lineare Darstellung" -#: ../gthumb/gth-histogram-view.c:838 +#: ../gthumb/gth-histogram-view.c:837 msgid "Logarithmic scale" msgstr "Logarithmische Darstellung" -#: ../gthumb/gth-histogram-view.c:858 +#: ../gthumb/gth-histogram-view.c:857 msgid "Channel:" msgstr "Kanal:" -#: ../gthumb/gth-histogram-view.c:890 +#: ../gthumb/gth-histogram-view.c:878 msgid "Value" msgstr "Wert" -#: ../gthumb/gth-histogram-view.c:896 +#: ../gthumb/gth-histogram-view.c:883 msgid "Red" msgstr "Rot" -#: ../gthumb/gth-histogram-view.c:902 +#: ../gthumb/gth-histogram-view.c:888 msgid "Green" msgstr "Grün" -#: ../gthumb/gth-histogram-view.c:908 +#: ../gthumb/gth-histogram-view.c:893 msgid "Blue" msgstr "Blau" -#: ../gthumb/gth-histogram-view.c:914 +#: ../gthumb/gth-histogram-view.c:898 msgid "Alpha" msgstr "Alpha" -#: ../gthumb/gth-histogram-view.c:921 +#: ../gthumb/gth-histogram-view.c:904 msgid "RGB" msgstr "RGB" +#: ../gthumb/gth-image-list-task.c:141 +msgid "Could not rename the file" +msgstr "Die Datei konnte nicht umbenannt werden" + +#: ../gthumb/gth-image-saver.c:39 +msgid "No options available for this file type" +msgstr "Für diesen Dateityp sind keine Optionen verfügbar" + +#: ../gthumb/gth-image-saver.c:185 +#, c-format +msgid "Could not find a suitable module to save the image as \"%s\"" +msgstr "" +"Es konnte kein passendes Modul zum Speichern des Bildes als »%s« gefunden " +"werden" + #: ../gthumb/gth-load-file-data-task.c:108 msgid "Reading file information" msgstr "Dateiinformationen werden ermittelt" @@ -5391,6 +5335,10 @@ msgid "dimensions" msgstr "Abmessungen" +#: ../gthumb/gth-main-default-tests.c:233 +msgid "All Files" +msgstr "Alle Dateien" + #: ../gthumb/gth-main-default-tests.c:261 msgid "Media" msgstr "Medien" @@ -5411,15 +5359,7 @@ msgid "Description (embedded)" msgstr "Beschreibung (eingebettet)" -#: ../gthumb/gth-pixbuf-list-task.c:139 -msgid "Could not rename the file" -msgstr "Die Datei konnte nicht umbenannt werden" - -#: ../gthumb/gth-pixbuf-saver.c:34 -msgid "No options available for this file type" -msgstr "Für diesen Dateityp sind keine Optionen verfügbar" - -#: ../gthumb/gth-progress-dialog.c:144 +#: ../gthumb/gth-progress-dialog.c:146 msgid "Cancel operation" msgstr "Vorgang abbrechen" @@ -5427,60 +5367,66 @@ msgid "Saving file information" msgstr "Dateiinformationen werden gespeichert" -#: ../gthumb/gth-tags-entry.c:388 +#. Translators: %s is a filename +#: ../gthumb/gth-save-image-task.c:160 +#, c-format +msgid "Saving '%s'" +msgstr "»%s« wird gespeichert" + +#: ../gthumb/gth-tags-entry.c:390 #, c-format msgid "Create tag «%s»" msgstr "Schlagwort »%s« anlegen" -#: ../gthumb/gth-tags-entry.c:735 +#: ../gthumb/gth-tags-entry.c:814 msgid "Show all the tags" msgstr "Alle Schlagwörter zeigen" -#: ../gthumb/gth-tags-file.c:236 +#: ../gthumb/gth-tags-file.c:235 msgid "Holidays" msgstr "Urlaub" -#: ../gthumb/gth-tags-file.c:237 +#: ../gthumb/gth-tags-file.c:236 msgid "Temporary" msgstr "Temporär" -#: ../gthumb/gth-tags-file.c:238 +#: ../gthumb/gth-tags-file.c:237 msgid "Screenshots" msgstr "Bildschirmfotos" -#: ../gthumb/gth-tags-file.c:239 +#: ../gthumb/gth-tags-file.c:238 msgid "Science" msgstr "Wissenschaftlich" -#: ../gthumb/gth-tags-file.c:240 +#: ../gthumb/gth-tags-file.c:239 msgid "Favorite" msgstr "Favorit" -#: ../gthumb/gth-tags-file.c:241 +#: ../gthumb/gth-tags-file.c:240 msgid "Important" msgstr "Wichtig" -#: ../gthumb/gth-tags-file.c:242 +#: ../gthumb/gth-tags-file.c:241 msgid "GNOME" msgstr "GNOME" -#: ../gthumb/gth-tags-file.c:243 +#: ../gthumb/gth-tags-file.c:242 msgid "Games" msgstr "Spiele" -#: ../gthumb/gth-tags-file.c:244 +#: ../gthumb/gth-tags-file.c:243 msgid "Party" msgstr "Party" -#: ../gthumb/gth-tags-file.c:245 +#: ../gthumb/gth-tags-file.c:244 msgid "Birthday" msgstr "Geburtstag" -#: ../gthumb/gth-tags-file.c:246 +#: ../gthumb/gth-tags-file.c:245 msgid "Astronomy" msgstr "Astronomie" -#: ../gthumb/gth-tags-file.c:247 +#: ../gthumb/gth-tags-file.c:246 msgid "Family" msgstr "Familie" @@ -5498,7 +5444,7 @@ msgid "is not" msgstr "ist nicht" -#: ../gthumb/gth-test-category.c:397 ../gthumb/gth-test-simple.c:812 +#: ../gthumb/gth-test-category.c:407 ../gthumb/gth-test-simple.c:812 #: ../gthumb/gth-test-simple.c:838 ../gthumb/gth-test-simple.c:859 #: ../gthumb/gth-test-simple.c:885 #, c-format @@ -5553,11 +5499,11 @@ msgid "is after" msgstr "ist nach" -#: ../gthumb/gth-time-selector.c:477 +#: ../gthumb/gth-time-selector.c:478 msgid "Today" msgstr "Heute" -#: ../gthumb/gth-time-selector.c:485 +#: ../gthumb/gth-time-selector.c:486 msgid "Now" msgstr "Jetzt" @@ -5569,60 +5515,128 @@ msgid "Close _All Windows" msgstr "_Alle Fenster schließen" -#: ../gthumb/gtk-utils.c:551 +#: ../gthumb/gtk-utils.c:490 msgid "Could not display help" msgstr "Hilfe konnte nicht angezeigt werden" -#: ../gthumb/gtk-utils.c:868 ../gthumb/gtk-utils.c:875 +#: ../gthumb/gtk-utils.c:810 ../gthumb/gtk-utils.c:817 msgid "Could not launch the application" msgstr "Anwendung konnte nicht gestartet werden" -#: ../gthumb/gtk-utils.c:978 +#: ../gthumb/gtk-utils.c:920 msgid "_Copy Here" msgstr "Hierher _kopieren" -#: ../gthumb/gtk-utils.c:983 +#: ../gthumb/gtk-utils.c:925 msgid "_Move Here" msgstr "Hierher _verschieben" -#: ../gthumb/gtk-utils.c:988 +#: ../gthumb/gtk-utils.c:930 msgid "_Link Here" msgstr "_Verknüpfung hierher erstellen" -#: ../gthumb/gtk-utils.c:997 +#: ../gthumb/gtk-utils.c:939 msgid "Cancel" msgstr "Abbrechen" -#: ../gthumb/main.c:59 +#: ../gthumb/main.c:61 msgid "Open a new window" msgstr "In neuem Fenster öffnen" -#: ../gthumb/main.c:63 +#: ../gthumb/main.c:65 msgid "Start in fullscreen mode" msgstr "Im Vollbildmodus starten" -#: ../gthumb/main.c:67 +#: ../gthumb/main.c:69 msgid "Automatically start a slideshow" msgstr "Automatisch eine Diaschau beginnen" -#: ../gthumb/main.c:71 +#: ../gthumb/main.c:73 msgid "Automatically import digital camera photos" msgstr "Fotos von Digitalkameras automatisch importieren" -#: ../gthumb/main.c:75 +#: ../gthumb/main.c:77 msgid "Show version" msgstr "Version anzeigen" -#: ../gthumb/main.c:344 +#: ../gthumb/main.c:483 msgid "- Image browser and viewer" msgstr "- Bildbrowser und Betrachter" -#: ../gthumb/pixbuf-io.c:174 -#, c-format -msgid "Could not find a suitable module to save the image as \"%s\"" -msgstr "" -"Es konnte kein passendes Modul zum Speichern des Bildes als »%s« gefunden " -"werden" +#~ msgid "Exif DateTimeOriginal tag" +#~ msgstr "Exif-Originalzeitpunkteintrag" + +#~ msgid "_Resize to:" +#~ msgstr "_Größe ändern auf:" + +#~ msgid "×" +#~ msgstr "×" + +#~ msgid "Desaturate" +#~ msgstr "Entsättigen" + +#~ msgid "White balance correction" +#~ msgstr "Weißabgleichlorrektur" + +#~ msgid "Enhance Colors" +#~ msgstr "Farben verbessern" + +#~ msgid "Automatic white balance correction" +#~ msgstr "Automatische Weißabgleichkorrektur" + +#~ msgid "_E-Mail:" +#~ msgstr "E-_Mail:" + +#~ msgid "" +#~ "Type the characters you see in the picture below. Letters are not case-" +#~ "sensitive." +#~ msgstr "" +#~ "Geben Sie die Zeichen ein, die im Bild unten angezeigt werden. Groß-/" +#~ "Kleinschreibung wird nicht berücksichtigt." + +#~ msgid "_Password:" +#~ msgstr "_Passwort:" + +#~ msgid "Picasa Web Album" +#~ msgstr "Picasa-Webalbum" + +#~ msgid "Account" +#~ msgstr "Konto" + +#~ msgid "Could not load the file" +#~ msgstr "Datei konnte nicht geladen werden" + +#~ msgid "Save images" +#~ msgstr "Bilder speichern" + +#~ msgid "Save images in common file formats such as JPEG, PNG and TIFF" +#~ msgstr "" +#~ "Speichern von Bildern in häufig genutzten Formaten wie JPEG, PNG und TIFF" + +#~ msgid "File _Format: %s" +#~ msgstr "Datei_format: %s" + +#~ msgid "By Extension" +#~ msgstr "Nach Erweiterung" + +#~ msgid "File Format" +#~ msgstr "Dateiformat" + +#~ msgid "Extension(s)" +#~ msgstr "Erweiterung(en)" + +#~ msgid "" +#~ "The program was not able to find out the file format you want to use for `" +#~ "%s'. Please make sure to use a known extension for that file or manually " +#~ "choose a file format from the list below." +#~ msgstr "" +#~ "Das Programm war nicht in der Lage, das von Ihnen für »%s« zu verwendende " +#~ "Dateiformat zu ermitteln. Bitte stellen Sie sicher, dass Sie eine " +#~ "bekannte Erweiterung verwenden, oder wählen Sie manuell ein Dateiformat " +#~ "aus der nachstehenden Liste aus." + +#~ msgid "File format not recognized" +#~ msgstr "Dateiformat wurde nicht erkannt" #~ msgid "Choose another tag" #~ msgstr "Wählen Sie ein anderes Schlagwort" diff -Nru gthumb-3.0.2/po/es.po gthumb-3.2.3/po/es.po --- gthumb-3.0.2/po/es.po 2012-08-14 16:25:43.000000000 +0000 +++ gthumb-3.2.3/po/es.po 2013-04-30 17:06:23.000000000 +0000 @@ -7,22 +7,23 @@ # Pablo Gonzalo del Campo , 2002-2003. # Francisco Javier F. Serrador , 2003, 2004, 2005, 2006. # Jorge González , 2007, 2008, 2009, 2010, 2011. -# Daniel Mustieles , 2008, 2009, 2010, 2011, 2012. +# Daniel Mustieles , 2008, 2009, 2010, 2011, 2012, 2013. # msgid "" msgstr "" "Project-Id-Version: gthumb.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gthumb&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-03-28 16:29+0000\n" -"PO-Revision-Date: 2012-03-28 18:26+0200\n" +"POT-Creation-Date: 2013-01-19 18:36+0000\n" +"PO-Revision-Date: 2013-01-24 16:39+0100\n" "Last-Translator: Daniel Mustieles \n" "Language-Team: Español \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Gtranslator 2.91.5\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" #: ../copy-n-paste/eggdesktopfile.c:165 #, c-format @@ -94,8 +95,8 @@ msgstr "Mostrar las opciones de gestión de la sesión" #. manually set name and icon -#: ../data/gthumb.desktop.in.in.h:1 ../gthumb/gth-browser.c:529 -#: ../gthumb/gth-progress-dialog.c:388 ../gthumb/main.c:313 +#: ../data/gthumb.desktop.in.in.h:1 ../gthumb/gth-browser.c:578 +#: ../gthumb/gth-progress-dialog.c:390 ../gthumb/main.c:315 msgid "gThumb" msgstr "gThumb" @@ -195,8 +196,8 @@ msgstr "C_oincide" #. limit label -#: ../data/ui/filter-editor.ui.h:3 ../gthumb/gth-filter.c:270 -#: ../gthumb/gth-filter.c:342 +#: ../data/ui/filter-editor.ui.h:3 ../gthumb/gth-filter.c:269 +#: ../gthumb/gth-filter.c:337 msgid "_Limit to" msgstr "_Limitar a" @@ -235,7 +236,6 @@ msgstr "Seleccionados:" #: ../data/ui/location.ui.h:1 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 msgid "_Location:" msgstr "_Lugar:" @@ -252,7 +252,6 @@ msgstr "Nombre del archivo:" #: ../data/ui/overwrite-dialog.ui.h:4 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 #: ../extensions/image_print/data/ui/print-layout.ui.h:23 msgid "Size:" msgstr "Tamaño:" @@ -399,7 +398,7 @@ #: ../data/ui/preferences.ui.h:25 #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 -#: ../extensions/edit_metadata/gth-edit-general-page.c:473 +#: ../extensions/edit_metadata/gth-edit-general-page.c:481 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 #: ../gthumb/gth-main-default-metadata.c:33 msgid "General" @@ -517,7 +516,6 @@ #: ../extensions/image_viewer/image_viewer.extension.in.in.h:3 #: ../extensions/list_tools/list_tools.extension.in.in.h:3 #: ../extensions/photo_importer/photo_importer.extension.in.in.h:3 -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:3 #: ../extensions/raw_files/raw_files.extension.in.in.h:3 #: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:3 #: ../extensions/rename_series/rename_series.extension.in.in.h:3 @@ -611,16 +609,128 @@ msgid "Write to Disc" msgstr "Grabar al disco" -#: ../extensions/cairo_io/cairo-io-jpeg.c:62 +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:62 #, c-format msgid "Error interpreting JPEG image file: %s" msgstr "Error al interpretar el archivo de imagen JPEG: %s" -#: ../extensions/cairo_io/cairo-io-jpeg.c:482 +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:483 #, c-format msgid "Unknown JPEG color space (%d)" msgstr "Espacio de color JPEG desconocido (%d)" +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:1 +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:1 +msgid "_Default extension:" +msgstr "Extensión pre_determinada:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:2 +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:1 +msgid "_Quality:" +msgstr "_Calidad:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:3 +msgid "_Smoothing:" +msgstr "_Suavizado:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:4 +msgid "Opti_mize" +msgstr "Opti_mizar" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:5 +msgid "_Progressive" +msgstr "_Progresivo" + +#: ../extensions/cairo_io/data/ui/png-options.ui.h:1 +msgid "Compression _level:" +msgstr "Nive_l de compresión:" + +#: ../extensions/cairo_io/data/ui/save-options-preferences.ui.h:1 +msgid "Default options:" +msgstr "Opciones predeterminadas:" + +#: ../extensions/cairo_io/data/ui/tga-options.ui.h:1 +msgid "_RLE compression" +msgstr "Compresión _RLE" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:2 +msgid "Compression" +msgstr "Compresión" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:3 +msgid "_No compression" +msgstr "_Sin compresión" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:4 +msgid "No_rmal (Deflate)" +msgstr "No_rmal (sin compresión)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:5 +msgid "_Loss compression (JPEG)" +msgstr "C_ompresión con pérdida (JPEG)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:6 +msgid "Resolution" +msgstr "Resolución" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:7 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 +msgid "_Horizontal:" +msgstr "_Horizontal:" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:8 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 +msgid "_Vertical:" +msgstr "_Vertical:" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:9 +msgid "dpi" +msgstr "dpi" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:2 +msgid "_Method:" +msgstr "_Método:" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:3 +msgid "_Lossless" +msgstr "_Sin pérdidas" + +#: ../extensions/cairo_io/gth-image-saver-jpeg.c:516 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:140 +msgid "JPEG" +msgstr "JPEG" + +#: ../extensions/cairo_io/gth-image-saver-png.c:353 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:110 +msgid "PNG" +msgstr "PNG" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:257 +#: ../extensions/cairo_io/gth-image-saver-tiff.c:435 +#: ../gthumb/gth-buffer-data.c:84 +msgid "Insufficient memory" +msgstr "Memoria insuficiente" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:344 +msgid "TGA" +msgstr "TGA" + +#: ../extensions/cairo_io/gth-image-saver-tiff.c:559 +msgid "TIFF" +msgstr "TIFF" + +#: ../extensions/cairo_io/gth-image-saver-webp.c:382 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:165 +msgid "WebP" +msgstr "WebP" + +#: ../extensions/cairo_io/preferences.c:134 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 +msgid "Saving" +msgstr "Guardando" + #: ../extensions/catalogs/actions.c:92 ../extensions/catalogs/actions.c:213 #: ../extensions/catalogs/dlg-add-to-catalog.c:274 #: ../extensions/catalogs/dlg-add-to-catalog.c:394 @@ -688,15 +798,16 @@ msgstr "_Añadir al catálogo" #: ../extensions/catalogs/callbacks.c:105 +#: ../extensions/selections/callbacks.c:80 msgid "Open _Folder" msgstr "Abrir _carpeta" #: ../extensions/catalogs/callbacks.c:106 +#: ../extensions/selections/callbacks.c:81 msgid "Go to the folder that contains the selected file" msgstr "Ir a la carpeta que contiene el archivo seleccionado" #: ../extensions/catalogs/callbacks.c:110 -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:85 msgid "Other..." msgstr "Otro…" @@ -732,36 +843,36 @@ msgid "Rena_me" msgstr "Re_nombrar" -#: ../extensions/catalogs/callbacks.c:279 -#: ../extensions/catalogs/callbacks.c:282 +#: ../extensions/catalogs/callbacks.c:281 +#: ../extensions/catalogs/callbacks.c:284 msgid "Command Line" msgstr "Línea de comandos" -#: ../extensions/catalogs/callbacks.c:497 -#: ../extensions/catalogs/callbacks.c:502 +#: ../extensions/catalogs/callbacks.c:496 +#: ../extensions/catalogs/callbacks.c:501 #: ../extensions/photo_importer/dlg-photo-importer.c:364 #: ../extensions/photo_importer/dlg-photo-importer.c:404 -#: ../gthumb/gth-file-list.c:43 ../gthumb/gth-folder-tree.c:883 +#: ../gthumb/gth-file-list.c:43 ../gthumb/gth-folder-tree.c:1093 msgid "(Empty)" msgstr "(Vacío)" -#: ../extensions/catalogs/callbacks.c:697 +#: ../extensions/catalogs/callbacks.c:700 msgid "Catalog Properties" msgstr "Propiedades del catálogo" -#: ../extensions/catalogs/callbacks.c:711 +#: ../extensions/catalogs/callbacks.c:714 msgid "Organize" msgstr "Organizar" -#: ../extensions/catalogs/callbacks.c:712 +#: ../extensions/catalogs/callbacks.c:715 msgid "Automatically organize files by date" msgstr "Organizar los archivos automáticamente por fecha" #: ../extensions/catalogs/catalogs.extension.in.in.h:1 #: ../extensions/catalogs/gth-catalog.c:611 #: ../extensions/catalogs/gth-catalog.c:662 -#: ../extensions/catalogs/gth-catalog.c:1024 -#: ../extensions/catalogs/gth-catalog.c:1025 +#: ../extensions/catalogs/gth-catalog.c:1016 +#: ../extensions/catalogs/gth-catalog.c:1017 msgid "Catalogs" msgstr "Catálogos" @@ -787,7 +898,7 @@ #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:5 #: ../extensions/file_manager/actions.c:945 -#: ../extensions/webalbums/gth-web-exporter.c:1842 +#: ../extensions/webalbums/gth-web-exporter.c:1840 msgid "_View the destination" msgstr "_Ver el destino" @@ -841,7 +952,7 @@ msgstr "_Vista previa del catálogo:" #: ../extensions/catalogs/data/ui/organize-files.ui.h:1 -#: ../extensions/edit_metadata/gth-edit-general-page.c:550 +#: ../extensions/edit_metadata/gth-edit-general-page.c:558 #: ../gthumb/gth-main-default-tests.c:300 msgid "Date photo was taken" msgstr "Fecha en que se tomó la foto" @@ -852,7 +963,7 @@ msgstr "Fecha de modificación del archivo" #: ../extensions/catalogs/data/ui/organize-files.ui.h:3 -#: ../extensions/comments/main.c:159 +#: ../extensions/comments/main.c:182 msgid "Tag" msgstr "Etiqueta" @@ -911,7 +1022,7 @@ "Los archivos se organizarán en catálogos. No se moverá ningún archivo del " "disco." -#: ../extensions/catalogs/gth-catalog.c:1122 ../extensions/comments/main.c:44 +#: ../extensions/catalogs/gth-catalog.c:1114 ../extensions/comments/main.c:45 #: ../extensions/edit_metadata/callbacks.c:106 #: ../gthumb/gth-main-default-metadata.c:53 msgid "Tags" @@ -953,10 +1064,10 @@ msgstr "No se pudieron quitar los archivos del catálogo" #: ../extensions/catalogs/gth-file-source-catalogs.c:1380 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:685 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:694 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:723 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:1228 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:746 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:755 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:785 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:1320 #: ../extensions/search/gth-search.c:265 msgid "Invalid file format" msgstr "Formato de archivo no válido" @@ -983,70 +1094,66 @@ msgstr "Cambiar la fecha de los archivos" #: ../extensions/change_date/data/ui/change-date.ui.h:1 +msgid "+" +msgstr "+" + +#: ../extensions/change_date/data/ui/change-date.ui.h:2 +msgid "-" +msgstr "-" + +#: ../extensions/change_date/data/ui/change-date.ui.h:3 msgid "Change Date" msgstr "Cambiar fecha" -#: ../extensions/change_date/data/ui/change-date.ui.h:2 +#: ../extensions/change_date/data/ui/change-date.ui.h:4 msgid "Change the following values:" msgstr "Cambiar los siguientes siguientes:" -#: ../extensions/change_date/data/ui/change-date.ui.h:3 +#: ../extensions/change_date/data/ui/change-date.ui.h:5 msgid "_Last modified date" msgstr "_Última fecha de modificación" -#: ../extensions/change_date/data/ui/change-date.ui.h:4 +#: ../extensions/change_date/data/ui/change-date.ui.h:6 msgid "Co_mment date" msgstr "Fecha del co_mentario" -#: ../extensions/change_date/data/ui/change-date.ui.h:5 -msgid "Exif DateTimeOriginal tag" -msgstr "Etiqueta EXIF de fecha y hora originales" - -#: ../extensions/change_date/data/ui/change-date.ui.h:6 +#: ../extensions/change_date/data/ui/change-date.ui.h:7 msgid "Change to:" msgstr "Cambiar a:" -#: ../extensions/change_date/data/ui/change-date.ui.h:7 +#: ../extensions/change_date/data/ui/change-date.ui.h:8 msgid "The _following date:" msgstr "La s_iguiente fecha:" -#: ../extensions/change_date/data/ui/change-date.ui.h:8 +#: ../extensions/change_date/data/ui/change-date.ui.h:9 msgid "File _modified date" msgstr "Fecha de _modificación del archivo" -#: ../extensions/change_date/data/ui/change-date.ui.h:9 +#: ../extensions/change_date/data/ui/change-date.ui.h:10 msgid "File c_reation date" msgstr "Fecha de c_reación del archivo" -#: ../extensions/change_date/data/ui/change-date.ui.h:10 +#: ../extensions/change_date/data/ui/change-date.ui.h:11 msgid "Date p_hoto was taken" msgstr "Fecha en que se _tomó la foto" -#: ../extensions/change_date/data/ui/change-date.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:12 msgid "A_djust by" msgstr "Aju_star por" -#: ../extensions/change_date/data/ui/change-date.ui.h:12 +#: ../extensions/change_date/data/ui/change-date.ui.h:13 msgid "hours" msgstr "horas" -#: ../extensions/change_date/data/ui/change-date.ui.h:13 +#: ../extensions/change_date/data/ui/change-date.ui.h:14 msgid "minutes" msgstr "minutos" -#: ../extensions/change_date/data/ui/change-date.ui.h:14 +#: ../extensions/change_date/data/ui/change-date.ui.h:15 #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:6 msgid "seconds" msgstr "segundos" -#: ../extensions/change_date/data/ui/change-date.ui.h:15 -msgid "+" -msgstr "+" - -#: ../extensions/change_date/data/ui/change-date.ui.h:16 -msgid "-" -msgstr "-" - #: ../extensions/comments/callbacks.c:46 msgid "Import Embedded Metadata" msgstr "Importar metadatos empotrados" @@ -1074,16 +1181,16 @@ msgid "_Synchronize with the embedded metadata" msgstr "_Sincronizar con los metadatos empotrados" -#: ../extensions/comments/main.c:34 +#: ../extensions/comments/main.c:35 #: ../extensions/edit_metadata/callbacks.c:100 msgid "Comment" msgstr "Comentario" -#: ../extensions/comments/main.c:40 ../gthumb/gth-main-default-metadata.c:46 +#: ../extensions/comments/main.c:41 ../gthumb/gth-main-default-metadata.c:46 msgid "Title" msgstr "Título" -#: ../extensions/comments/main.c:41 ../extensions/comments/main.c:143 +#: ../extensions/comments/main.c:42 ../extensions/comments/main.c:166 #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 #: ../extensions/image_print/data/ui/print-layout.ui.h:8 @@ -1095,16 +1202,16 @@ msgid "Description" msgstr "Descripción" -#: ../extensions/comments/main.c:42 ../extensions/comments/main.c:151 +#: ../extensions/comments/main.c:43 ../extensions/comments/main.c:174 #: ../gthumb/gth-main-default-metadata.c:50 msgid "Place" msgstr "Lugar" -#: ../extensions/comments/main.c:43 ../gthumb/gth-main-default-metadata.c:51 +#: ../extensions/comments/main.c:44 ../gthumb/gth-main-default-metadata.c:51 msgid "Date" msgstr "Fecha" -#: ../extensions/comments/main.c:45 ../gthumb/gth-main-default-metadata.c:54 +#: ../extensions/comments/main.c:46 ../gthumb/gth-main-default-metadata.c:54 msgid "Rating" msgstr "Puntuación" @@ -1140,10 +1247,10 @@ "seleccionados." #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:1 -#: ../extensions/file_tools/gth-file-tool-crop.c:424 -#: ../extensions/file_tools/gth-file-tool-crop.c:454 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 -#: ../extensions/file_tools/gth-file-tool-rotate.c:415 +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:446 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 +#: ../extensions/file_tools/gth-file-tool-rotate.c:397 #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:14 #: ../extensions/slideshow/main.c:277 msgid "None" @@ -1185,16 +1292,6 @@ msgid "_Gradient" msgstr "_Gradiente" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 -msgid "_Horizontal:" -msgstr "_Horizontal:" - -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 -msgid "_Vertical:" -msgstr "_Vertical:" - #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:14 msgid "Select a color" msgstr "Seleccionar un color" @@ -1282,6 +1379,7 @@ #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:6 #: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 #: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 @@ -1313,13 +1411,6 @@ msgid "Create _HTML image map" msgstr "Crear un mapa de imagen para un _HTML" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 -#: ../extensions/pixbuf_savers/preferences.c:134 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 -msgid "Saving" -msgstr "Guardando" - #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 msgid "Create a new theme" msgstr "Crear un tema nuevo" @@ -1396,21 +1487,21 @@ msgid "Image Wall" msgstr "Mural de fotos" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:486 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:498 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:512 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:481 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:492 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:506 msgid "Could not save the theme" msgstr "No se pudo guardar el tema" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:657 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:651 msgid "Could not delete the theme" msgstr "No se pudo eliminar el tema" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:248 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:247 msgid "Creating images" msgstr "Crear imágenes" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:897 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:896 msgid "Generating thumbnails" msgstr "Generando miniaturas" @@ -1468,16 +1559,16 @@ msgid "_Use the original image folder" msgstr "_Usar la carpeta de imágenes original" -#: ../extensions/convert_format/dlg-convert-format.c:93 +#: ../extensions/convert_format/dlg-convert-format.c:95 msgid "Converting images" msgstr "Convirtiendo imágenes" -#: ../extensions/desktop_background/actions.c:162 +#: ../extensions/desktop_background/actions.c:158 msgid "Could not show the desktop background properties" msgstr "No se pudieron mostrar las propiedades del fondo del escritorio" -#: ../extensions/desktop_background/actions.c:228 -#: ../extensions/desktop_background/actions.c:246 +#: ../extensions/desktop_background/actions.c:224 +#: ../extensions/desktop_background/actions.c:242 msgid "Could not set the desktop background" msgstr "No se pudo establecer el fondo del escritorio" @@ -1576,7 +1667,8 @@ #: ../extensions/edit_metadata/gth-edit-comment-dialog.c:66 #: ../extensions/edit_metadata/gth-edit-tags-dialog.c:83 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:335 +#: ../extensions/facebook/dlg-import-from-facebook.c:319 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:324 #, c-format msgid "%d file" msgid_plural "%d files" @@ -1584,7 +1676,7 @@ msgstr[1] "%d archivos" #: ../extensions/edit_metadata/gth-edit-comment-dialog.c:144 -#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:192 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:197 msgid "Sa_ve and Close" msgstr "_Guardar y cerrar" @@ -1592,28 +1684,28 @@ msgid "Save only cha_nged fields" msgstr "Guardar sólo ca_mpos alterados" -#: ../extensions/edit_metadata/gth-edit-general-page.c:547 +#: ../extensions/edit_metadata/gth-edit-general-page.c:555 msgid "No date" msgstr "Sin fecha" -#: ../extensions/edit_metadata/gth-edit-general-page.c:548 +#: ../extensions/edit_metadata/gth-edit-general-page.c:556 msgid "The following date" msgstr "La siguiente fecha" -#: ../extensions/edit_metadata/gth-edit-general-page.c:549 +#: ../extensions/edit_metadata/gth-edit-general-page.c:557 #: ../extensions/importer/gth-import-preferences-dialog.c:331 msgid "Current date" msgstr "Fecha actual" -#: ../extensions/edit_metadata/gth-edit-general-page.c:551 +#: ../extensions/edit_metadata/gth-edit-general-page.c:559 msgid "Last modified date" msgstr "Última fecha de modificación" -#: ../extensions/edit_metadata/gth-edit-general-page.c:552 +#: ../extensions/edit_metadata/gth-edit-general-page.c:560 msgid "File creation date" msgstr "Fecha de creación del archivo" -#: ../extensions/edit_metadata/gth-edit-general-page.c:553 +#: ../extensions/edit_metadata/gth-edit-general-page.c:561 msgid "Do not modify" msgstr "No modificar" @@ -1623,20 +1715,20 @@ msgid "%s Tags" msgstr "%s etiquetas" -#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:184 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:189 msgid "Assign Tags" msgstr "Asignar etiquetas" -#: ../extensions/edit_metadata/gth-tag-task.c:115 -#: ../extensions/edit_metadata/gth-tag-task.c:132 +#: ../extensions/edit_metadata/gth-tag-task.c:119 +#: ../extensions/edit_metadata/gth-tag-task.c:136 msgid "Assigning tags to the selected files" msgstr "Asignando etiquetas a los archivos seleccionados" -#: ../extensions/edit_metadata/gth-tag-task.c:115 +#: ../extensions/edit_metadata/gth-tag-task.c:119 msgid "Writing files" msgstr "Escribiendo archivos" -#: ../extensions/edit_metadata/gth-tag-task.c:132 +#: ../extensions/edit_metadata/gth-tag-task.c:136 msgid "Reading files" msgstr "Leyendo archivos" @@ -1749,7 +1841,7 @@ msgid "XMP Attached" msgstr "XMP adjunto" -#: ../extensions/exiv2_tools/main.c:256 +#: ../extensions/exiv2_tools/main.c:272 msgid "date photo was taken" msgstr "fecha en la que se tomó la foto" @@ -1757,47 +1849,52 @@ msgid "Share" msgstr "Compartir" -#: ../extensions/facebook/callbacks.c:54 +#: ../extensions/facebook/callbacks.c:59 ../extensions/facebook/callbacks.c:64 msgid "Face_book..." msgstr "Face_book…" -#: ../extensions/facebook/callbacks.c:55 +#: ../extensions/facebook/callbacks.c:60 +msgid "Download photos from Facebook" +msgstr "Descargar fotos de Facebook" + +#: ../extensions/facebook/callbacks.c:65 msgid "Upload photos to Facebook" msgstr "Subir fotos a Facebook" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:1 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 msgid "Export to Flickr" msgstr "Exportar a Flickr" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:2 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 #: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 msgid "_Upload" msgstr "Su_bir" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:3 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 msgid "_Account:" msgstr "C_uenta:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:4 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:3 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 #: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 #: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 msgid "Edit accounts" msgstr "Editar cuentas" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 msgid "A_lbum:" msgstr "Á_lbum:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 msgid "Add a new album" msgstr "Añadir un álbum nuevo" @@ -1806,9 +1903,12 @@ msgstr "Redimensionar las imágenes si son más grandes que este tamaño" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:8 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 -msgid "_Resize to:" -msgstr "_Redimensionar a:" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 +msgid "_Resize if larger than:" +msgstr "Red_imensionar si son más grandes que:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:9 msgid "720 x 720" @@ -1830,30 +1930,13 @@ msgid "2048 x 2048" msgstr "2048 x 2048" -#: ../extensions/facebook/data/ui/facebook-account-chooser.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-account-chooser.ui.h:1 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 -#: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 -#: ../extensions/picasaweb/data/ui/picasa-web-account-chooser.ui.h:1 -msgid "A_ccount:" -msgstr "C_uenta:" - -#: ../extensions/facebook/data/ui/facebook-account-manager.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-account-manager.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-account-manager.ui.h:1 -#: ../extensions/picasaweb/data/ui/picasa-web-account-manager.ui.h:1 -msgid "A_ccounts:" -msgstr "Cue_ntas:" - #: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 msgid "Public photos" msgstr "Fotos públicas" #: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 msgid "Private photos, visible to friends" msgstr "Fotos privadas, visibles para los amigos" @@ -1867,25 +1950,6 @@ msgid "_Visibility:" msgstr "_Visibilidad:" -#: ../extensions/facebook/data/ui/facebook-ask-authorization.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-ask-authorization.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-ask-authorization.ui.h:1 -msgid "_Authorize..." -msgstr "Autorizar…" - -#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:1 -#: ../extensions/facebook/facebook-authentication.c:472 -#: ../extensions/flicker_utils/flickr-authentication.c:408 -#: ../extensions/oauth/oauth-authentication.c:423 -msgid "Once you're done, click the 'Continue' button below." -msgstr "Cuando haya terminado, pulse el botón «Continuar»." - -#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 -#: ../extensions/flicker_utils/data/ui/flicker-complete-authorization.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-complete-authorization.ui.h:1 -msgid "C_ontinue" -msgstr "Continuar" - #: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:1 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:1 @@ -1897,170 +1961,127 @@ #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:2 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:2 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:2 -#: ../extensions/webalbums/gth-web-exporter.c:1841 +#: ../extensions/webalbums/gth-web-exporter.c:1839 msgid "_Open in the Browser" msgstr "Abrir en el na_vegador" -#: ../extensions/facebook/dlg-export-to-facebook.c:130 -#: ../extensions/facebook/dlg-export-to-facebook.c:335 -#: ../extensions/facebook/facebook-authentication.c:192 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 +msgid "Import from Picasa Web Album" +msgstr "Importar de álbumes web de Picasa" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:2 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 +msgid "_Import" +msgstr "_Importar" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:4 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 +#: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 +msgid "A_ccount:" +msgstr "C_uenta:" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:5 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 +msgid "_Album:" +msgstr "Á_lbum:" + +#: ../extensions/facebook/dlg-export-to-facebook.c:123 +#: ../extensions/facebook/dlg-export-to-facebook.c:326 +#: ../extensions/facebook/dlg-import-from-facebook.c:226 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:138 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:399 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:237 -#: ../extensions/flicker_utils/flickr-authentication.c:191 -#: ../extensions/oauth/oauth-authentication.c:187 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:414 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:231 +#: ../extensions/oauth/web-service.c:380 #: ../extensions/photobucket/dlg-export-to-photobucket.c:131 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:376 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:139 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:424 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:380 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:375 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:124 msgid "Could not connect to the server" msgstr "No se pudo conectar con el servidor" -#: ../extensions/facebook/dlg-export-to-facebook.c:182 +#: ../extensions/facebook/dlg-export-to-facebook.c:175 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:246 #: ../extensions/photobucket/dlg-export-to-photobucket.c:182 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:192 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:176 msgid "Could not upload the files" msgstr "No se pudieron subir los archivos" -#: ../extensions/facebook/dlg-export-to-facebook.c:412 +#: ../extensions/facebook/dlg-export-to-facebook.c:397 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:188 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:223 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:462 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:717 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:457 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:309 msgid "Could not create the album" msgstr "No se pudo crear el álbum" -#: ../extensions/facebook/dlg-export-to-facebook.c:481 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:534 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:783 +#: ../extensions/facebook/dlg-export-to-facebook.c:465 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:528 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:375 msgid "New Album" msgstr "Álbum nuevo" -#: ../extensions/facebook/dlg-export-to-facebook.c:561 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:557 -#: ../extensions/image_print/gth-image-print-job.c:1789 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:614 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1002 +#: ../extensions/facebook/dlg-export-to-facebook.c:557 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:583 +#: ../extensions/image_print/gth-image-print-job.c:1739 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:607 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:597 msgid "No valid file selected." msgstr "No se seleccionó ningún un archivo válido." -#: ../extensions/facebook/dlg-export-to-facebook.c:562 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:558 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:615 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1003 +#: ../extensions/facebook/dlg-export-to-facebook.c:558 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:584 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:608 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:598 msgid "Could not export the files" msgstr "No se pudieron exportar los archivos" -#: ../extensions/facebook/dlg-export-to-facebook.c:570 -#: ../extensions/find_duplicates/gth-find-duplicates.c:255 -#: ../extensions/find_duplicates/gth-find-duplicates.c:347 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:566 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:623 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1010 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:803 -#: ../gthumb/gth-browser.c:1005 +#: ../extensions/facebook/dlg-export-to-facebook.c:566 +#: ../extensions/find_duplicates/gth-find-duplicates.c:277 +#: ../extensions/find_duplicates/gth-find-duplicates.c:470 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:592 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:616 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:605 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:254 +#: ../gthumb/gth-browser.c:1116 #, c-format msgid "%d file (%s)" msgid_plural "%d files (%s)" msgstr[0] "%d archivo (%s)" msgstr[1] "%d archivos (%s)" -#: ../extensions/facebook/dlg-export-to-facebook.c:591 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:589 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:642 +#: ../extensions/facebook/dlg-export-to-facebook.c:587 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:615 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:635 #, c-format msgid "Export to %s" msgstr "Exportar a %s" -#: ../extensions/facebook/facebook-account-chooser-dialog.c:200 -#: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:200 -#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 -msgid "New authentication..." -msgstr "Nueva autenticación…" - -#: ../extensions/facebook/facebook-authentication.c:194 -#: ../extensions/flicker_utils/flickr-authentication.c:193 -#: ../extensions/oauth/oauth-authentication.c:189 -msgid "Choose _Account..." -msgstr "Seleccionar c_uenta…" - -#: ../extensions/facebook/facebook-authentication.c:471 -#: ../extensions/flicker_utils/flickr-authentication.c:407 -#: ../extensions/oauth/oauth-authentication.c:422 -#, c-format -msgid "" -"Return to this window when you have finished the authorization process on %s" -msgstr "" -"Volver a esta ventana cuando haya finalizado el proceso de autorización en %s" +#: ../extensions/facebook/dlg-import-from-facebook.c:344 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:349 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:279 +msgid "Could not get the photo list" +msgstr "No se pudo obtener la lista de fotos" -#: ../extensions/facebook/facebook-authentication.c:556 -#: ../extensions/flicker_utils/flickr-authentication.c:487 -#: ../extensions/oauth/oauth-authentication.c:502 -#, c-format -msgid "gthumb requires your authorization to upload the photos to %s" -msgstr "gThumb requiere su autorización para subir las fotos a %s" +#: ../extensions/facebook/dlg-import-from-facebook.c:378 +#: ../extensions/facebook/dlg-import-from-facebook.c:533 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:386 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:551 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:313 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:586 +msgid "No album selected" +msgstr "No se seleccionó ningún álbum" -#: ../extensions/facebook/facebook-authentication.c:557 -#: ../extensions/flicker_utils/flickr-authentication.c:488 -#: ../extensions/oauth/oauth-authentication.c:503 +#: ../extensions/facebook/dlg-import-from-facebook.c:551 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:569 #, c-format -msgid "" -"Click 'Authorize' to open your web browser and authorize gthumb to upload " -"photos to %s. When you're finished, return to this window to complete the " -"authorization." -msgstr "" -"Pulse «Autorizar» para abrir su navegador web y autorizar a gThumb a subir " -"fotos a %s. Cuando haya terminado, vuelva a esta ventana para completar la " -"autorización." - -#: ../extensions/facebook/facebook-authentication.c:652 -#: ../extensions/flicker_utils/flickr-authentication.c:588 -#: ../extensions/oauth/oauth-authentication.c:605 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:820 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:684 -msgid "Choose Account" -msgstr "Seleccionar cuenta" - -#: ../extensions/facebook/facebook-authentication.c:761 -#: ../extensions/flicker_utils/flickr-authentication.c:697 -#: ../extensions/oauth/oauth-authentication.c:714 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:881 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:745 -msgid "Edit Accounts" -msgstr "Editar cuentas" - -#: ../extensions/facebook/facebook-connection.c:275 -#: ../extensions/facebook/facebook-connection.c:435 -#: ../extensions/facebook/facebook-service.c:162 -#: ../extensions/facebook/facebook-service.c:265 -#: ../extensions/facebook/facebook-service.c:468 -#: ../extensions/flicker_utils/flickr-connection.c:266 -#: ../extensions/flicker_utils/flickr-connection.c:413 -#: ../extensions/flicker_utils/flickr-service.c:195 -#: ../extensions/flicker_utils/flickr-service.c:398 -#: ../extensions/photobucket/photobucket-consumer.c:74 -#: ../extensions/photobucket/photobucket-consumer.c:79 -#: ../extensions/photobucket/photobucket-consumer.c:115 -#: ../extensions/photobucket/photobucket-consumer.c:170 -msgid "Unknown error" -msgstr "Error desconocido" - -#: ../extensions/facebook/facebook-connection.c:310 -#: ../extensions/facebook/facebook-connection.c:461 -#: ../extensions/facebook/facebook-service.c:188 -#: ../extensions/facebook/facebook-service.c:290 -#: ../extensions/flicker_utils/flickr-connection.c:292 -#: ../extensions/flicker_utils/flickr-connection.c:439 -#: ../extensions/flicker_utils/flickr-service.c:219 -#: ../extensions/oauth/oauth-connection.c:356 -#: ../extensions/oauth/oauth-connection.c:431 -#: ../extensions/oauth/oauth-connection.c:535 -#: ../extensions/picasaweb/google-connection.c:344 -msgid "Connecting to the server" -msgstr "Conectando con el servidor" +msgid "Import from %s" +msgstr "Importar desde %s" +#: ../extensions/facebook/dlg-import-from-facebook.c:551 #: ../extensions/facebook/facebook.extension.in.in.h:1 msgid "Facebook" msgstr "Facebook" @@ -2069,58 +2090,49 @@ msgid "Upload images to Facebook" msgstr "Subir imágenes a Facebook" -#: ../extensions/facebook/facebook-service.c:188 -#: ../extensions/facebook/facebook-service.c:290 -#: ../extensions/flicker_utils/flickr-service.c:219 -#: ../extensions/oauth/oauth-connection.c:356 -#: ../extensions/oauth/oauth-connection.c:431 -#: ../extensions/oauth/oauth-connection.c:535 -msgid "Getting account information" -msgstr "Obteniendo información de la cuenta" - -#: ../extensions/facebook/facebook-service.c:396 -#: ../extensions/flicker_utils/flickr-service.c:323 -#: ../extensions/photobucket/photobucket-service.c:207 -#: ../extensions/picasaweb/picasa-web-service.c:209 +#: ../extensions/facebook/facebook-service.c:462 +#: ../extensions/flicker_utils/flickr-service.c:863 +#: ../extensions/photobucket/photobucket-service.c:310 +#: ../extensions/picasaweb/picasa-web-service.c:711 msgid "Getting the album list" msgstr "Obteniendo la lista de álbumes" -#: ../extensions/facebook/facebook-service.c:525 -#: ../extensions/flicker_utils/flickr-service.c:426 -#: ../extensions/flicker_utils/flickr-service.c:546 -#: ../extensions/flicker_utils/flickr-service.c:584 -#: ../extensions/photobucket/photobucket-service.c:316 -#: ../extensions/picasaweb/picasa-web-service.c:300 +#: ../extensions/facebook/facebook-service.c:584 +#: ../extensions/flicker_utils/flickr-service.c:965 +#: ../extensions/flicker_utils/flickr-service.c:1087 +#: ../extensions/flicker_utils/flickr-service.c:1126 +#: ../extensions/photobucket/photobucket-service.c:423 +#: ../extensions/picasaweb/picasa-web-service.c:805 msgid "Creating the new album" msgstr "Creando un álbum nuevo" -#: ../extensions/facebook/facebook-service.c:584 -#: ../extensions/flicker_utils/flickr-service.c:634 -#: ../extensions/photobucket/photobucket-service.c:373 -#: ../extensions/picasaweb/picasa-web-service.c:357 +#: ../extensions/facebook/facebook-service.c:645 +#: ../extensions/flicker_utils/flickr-service.c:1176 +#: ../extensions/photobucket/photobucket-service.c:485 +#: ../extensions/picasaweb/picasa-web-service.c:860 #, c-format msgid "Could not upload '%s': %s" msgstr "No se pudo subir «%s»: %s" #. Translators: %s is a filename -#: ../extensions/facebook/facebook-service.c:670 -#: ../extensions/flicker_utils/flickr-service.c:745 -#: ../extensions/photobucket/photobucket-service.c:430 -#: ../extensions/picasaweb/picasa-web-service.c:412 +#: ../extensions/facebook/facebook-service.c:710 +#: ../extensions/flicker_utils/flickr-service.c:1287 +#: ../extensions/photobucket/photobucket-service.c:542 +#: ../extensions/picasaweb/picasa-web-service.c:917 #, c-format msgid "Uploading '%s'" msgstr "Subiendo «%s»" -#: ../extensions/facebook/facebook-service.c:886 -#: ../extensions/flicker_utils/flickr-service.c:914 -#: ../extensions/photobucket/photobucket-service.c:599 -#: ../extensions/picasaweb/picasa-web-service.c:605 +#: ../extensions/facebook/facebook-service.c:923 +#: ../extensions/flicker_utils/flickr-service.c:1482 +#: ../extensions/photobucket/photobucket-service.c:714 +#: ../extensions/picasaweb/picasa-web-service.c:1138 msgid "Uploading the files to the server" msgstr "Subiendo los archivos al servidor" -#: ../extensions/facebook/facebook-service.c:1003 -#: ../extensions/flicker_utils/flickr-service.c:1077 -#: ../extensions/picasaweb/picasa-web-service.c:718 +#: ../extensions/facebook/facebook-service.c:1022 +#: ../extensions/flicker_utils/flickr-service.c:1651 +#: ../extensions/picasaweb/picasa-web-service.c:1257 msgid "Getting the photo list" msgstr "Obteniendo la lista de fotos" @@ -2134,13 +2146,13 @@ #: ../extensions/file_manager/actions.c:400 #: ../extensions/file_manager/callbacks.c:380 -#: ../extensions/file_manager/callbacks.c:842 +#: ../extensions/file_manager/callbacks.c:838 msgid "Could not move the files" msgstr "No se pudieron mover los archivos" #: ../extensions/file_manager/actions.c:401 #: ../extensions/file_manager/callbacks.c:381 -#: ../extensions/file_manager/callbacks.c:843 +#: ../extensions/file_manager/callbacks.c:839 msgid "" "Files cannot be moved to the current location, as alternative you can choose " "to copy them." @@ -2233,6 +2245,7 @@ #: ../extensions/file_manager/callbacks.c:187 #: ../extensions/file_manager/callbacks.c:223 #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:5 +#: ../gthumb/gth-tags-entry.c:871 msgid "_Delete" msgstr "_Eliminar" @@ -2284,9 +2297,10 @@ msgid "Move the selected files to another folder" msgstr "Mover los archivos seleccionados a otra carpeta" -#: ../extensions/file_manager/callbacks.c:1003 -#: ../extensions/find_duplicates/gth-find-duplicates.c:581 -#: ../gthumb/gth-browser.c:4940 ../gthumb/gth-browser.c:4974 +#: ../extensions/file_manager/callbacks.c:999 +#: ../extensions/find_duplicates/gth-find-duplicates.c:766 +#: ../gthumb/gth-browser.c:5234 ../gthumb/gth-browser.c:5268 +#: ../gthumb/gth-progress-dialog.c:406 msgid "Could not perform the operation" msgstr "No se pudo efectuar la operación" @@ -2303,6 +2317,7 @@ msgstr "Eliminando archivos" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:1 +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:5 msgid "_Preview" msgstr "_Vista previa" @@ -2344,81 +2359,96 @@ msgstr "_Reiniciar" #: ../extensions/file_tools/data/ui/crop-options.ui.h:1 -msgid "_Position:" -msgstr "_Posición:" +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +msgid "Selection" +msgstr "Selección" -#. this is used to separate the dimensions, for example: 120 × 250 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:4 -msgid "×" -msgstr "×" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 +msgid "_Width:" +msgstr "A_ncho:" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:5 -msgid "_Grid:" -msgstr "_Rejilla:" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:3 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 +msgid "Heigh_t:" +msgstr "Al_tura:" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:6 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:4 +msgid "_Position:" +msgstr "_Posición:" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:5 msgid "Maximize" msgstr "Maximizar" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:6 msgid "Center" msgstr "Centrar" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 -msgid "Selection" -msgstr "Selección" - -#: ../extensions/file_tools/data/ui/crop-options.ui.h:9 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 #: ../extensions/file_tools/data/ui/resize-options.ui.h:5 +msgid "Aspect ratio" +msgstr "Proporción de aspecto" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 msgid "I_nvert aspect ratio" msgstr "I_nvertir la proporción de la imagen" #. after the colon there is a control to select the size in pixels -#: ../extensions/file_tools/data/ui/crop-options.ui.h:11 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:10 msgid "M_ultiple of:" msgstr "_Múltiple de:" #. abbreviation of pixel -#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:12 msgid "px" msgstr "px" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 +#: ../gthumb/gth-file-chooser-dialog.c:252 +msgid "Options" +msgstr "Opciones" + #: ../extensions/file_tools/data/ui/crop-options.ui.h:14 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 -msgid "Aspect ratio" -msgstr "Proporción de aspecto" +msgid "_Grid:" +msgstr "_Rejilla:" #: ../extensions/file_tools/data/ui/crop-options.ui.h:15 msgid "C_rop" msgstr "Recor_tar" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 -msgid "_Width:" -msgstr "A_ncho:" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 -msgid "Heigh_t:" -msgstr "Al_tura:" +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:1 +msgid "Method" +msgstr "Método" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:2 +msgid "_Brightness" +msgstr "_Brillo" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:3 +msgid "_Saturation" +msgstr "_Saturación" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:4 +msgid "_Average" +msgstr "_Media" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 -msgid "Set the image size to this value" -msgstr "Establecer el tamaño de la imagen a este valor" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 #: ../gthumb/gth-main-default-metadata.c:47 msgid "Dimensions" msgstr "Dimensiones" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 -msgid "High _quality" -msgstr "Alta _calidad" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +msgid "Set the image size to this value" +msgstr "Establecer el tamaño de la imagen a este valor" #: ../extensions/file_tools/data/ui/resize-options.ui.h:8 -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 -msgid "Options" -msgstr "Opciones" +msgid "High _quality" +msgstr "Alta _calidad" #: ../extensions/file_tools/data/ui/resize-options.ui.h:9 msgid "Original dimensions:" @@ -2444,45 +2474,45 @@ msgstr "%" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:1 -msgid "Align" -msgstr "Alinear" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 msgid "Angle" msgstr "Angulo" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 +msgid "Align" +msgstr "Alinear" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 +msgid "Image size" +msgstr "Tamaño de la imagen" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 msgid "Point 1:" msgstr "Punto 1:" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 msgid "Point 2:" msgstr "Punto 2:" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 msgid "Keep aspect ratio" msgstr "Mantener proporción de aspecto" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 -msgid "Image size" -msgstr "Tamaño de la imagen" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 msgid "Grid:" msgstr "Cuadrícula:" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 +msgid "_Background:" +msgstr "_Fondo:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 msgid "Pick a background color" msgstr "Escoger un color de fondo" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 msgid "_Transparent" msgstr "_Transparente" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 -msgid "_Background:" -msgstr "_Fondo:" - #: ../extensions/file_tools/data/ui/rotate-options.ui.h:12 msgid "Reset" msgstr "Restablecer" @@ -2544,140 +2574,134 @@ msgid "Basic tools to modify images." msgstr "Herramientas básicas para modificar imágenes." -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:372 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:272 +#: ../extensions/file_tools/gth-file-tool-grayscale.c:248 +#: ../extensions/file_tools/gth-file-tool-negative.c:68 +msgid "Applying changes" +msgstr "Aplicando cambios" + +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 msgid "Adjust Colors..." msgstr "Ajustar colores…" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 msgid "Adjust Colors" msgstr "Ajustar colores" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:531 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:619 msgid "Change brightness, contrast, saturation and gamma level of the image" msgstr "Cambiar el brillo, contraste, saturación y nivel gamma de la imagen" -#: ../extensions/file_tools/gth-file-tool-crop.c:424 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:304 +msgid "Adjust Contrast" +msgstr "Ajustar contraste" + +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:305 +msgid "Automatic contrast adjustment" +msgstr "Ajuste automático del contraste" + +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 msgid "Square" msgstr "Cuadrado" -#: ../extensions/file_tools/gth-file-tool-crop.c:425 -#: ../extensions/file_tools/gth-file-tool-resize.c:499 +#: ../extensions/file_tools/gth-file-tool-crop.c:417 +#: ../extensions/file_tools/gth-file-tool-resize.c:590 #, c-format msgid "%d x %d (Image)" msgstr "%d x %d (Imagen)" -#: ../extensions/file_tools/gth-file-tool-crop.c:428 -#: ../extensions/file_tools/gth-file-tool-resize.c:503 +#: ../extensions/file_tools/gth-file-tool-crop.c:420 +#: ../extensions/file_tools/gth-file-tool-resize.c:594 #, c-format msgid "%d x %d (Screen)" msgstr "%d x %d (Pantalla)" -#: ../extensions/file_tools/gth-file-tool-crop.c:432 -#: ../extensions/file_tools/gth-file-tool-resize.c:508 +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-resize.c:599 msgid "5:4" msgstr "5:4" -#: ../extensions/file_tools/gth-file-tool-crop.c:433 -#: ../extensions/file_tools/gth-file-tool-resize.c:509 +#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-resize.c:600 msgid "4:3 (DVD, Book)" msgstr "4:3 (DVD, libro)" -#: ../extensions/file_tools/gth-file-tool-crop.c:434 -#: ../extensions/file_tools/gth-file-tool-resize.c:510 +#: ../extensions/file_tools/gth-file-tool-crop.c:426 +#: ../extensions/file_tools/gth-file-tool-resize.c:601 msgid "7:5" msgstr "7:5" -#: ../extensions/file_tools/gth-file-tool-crop.c:435 -#: ../extensions/file_tools/gth-file-tool-resize.c:511 +#: ../extensions/file_tools/gth-file-tool-crop.c:427 +#: ../extensions/file_tools/gth-file-tool-resize.c:602 msgid "3:2 (Postcard)" msgstr "3:2 (Postal)" -#: ../extensions/file_tools/gth-file-tool-crop.c:436 -#: ../extensions/file_tools/gth-file-tool-resize.c:512 +#: ../extensions/file_tools/gth-file-tool-crop.c:428 +#: ../extensions/file_tools/gth-file-tool-resize.c:603 msgid "16:10" msgstr "16:10" -#: ../extensions/file_tools/gth-file-tool-crop.c:437 -#: ../extensions/file_tools/gth-file-tool-resize.c:513 +#: ../extensions/file_tools/gth-file-tool-crop.c:429 +#: ../extensions/file_tools/gth-file-tool-resize.c:604 msgid "16:9 (DVD)" msgstr "16:9 (DVD)" -#: ../extensions/file_tools/gth-file-tool-crop.c:438 -#: ../extensions/file_tools/gth-file-tool-resize.c:514 +#: ../extensions/file_tools/gth-file-tool-crop.c:430 +#: ../extensions/file_tools/gth-file-tool-resize.c:605 msgid "1.85:1" msgstr "1.85:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:439 -#: ../extensions/file_tools/gth-file-tool-resize.c:515 +#: ../extensions/file_tools/gth-file-tool-crop.c:431 +#: ../extensions/file_tools/gth-file-tool-resize.c:606 msgid "2.39:1" msgstr "2.39:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:440 -#: ../extensions/file_tools/gth-file-tool-resize.c:516 +#: ../extensions/file_tools/gth-file-tool-crop.c:432 +#: ../extensions/file_tools/gth-file-tool-resize.c:607 #: ../extensions/image_print/data/ui/print-layout.ui.h:2 #: ../extensions/rename_series/gth-template-selector.c:234 msgid "Custom" msgstr "Personalizado" -#: ../extensions/file_tools/gth-file-tool-crop.c:455 -#: ../extensions/file_tools/gth-file-tool-rotate.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:447 +#: ../extensions/file_tools/gth-file-tool-rotate.c:398 msgid "Rule of Thirds" msgstr "Regla de los tercios" -#: ../extensions/file_tools/gth-file-tool-crop.c:456 -#: ../extensions/file_tools/gth-file-tool-rotate.c:417 +#: ../extensions/file_tools/gth-file-tool-crop.c:448 +#: ../extensions/file_tools/gth-file-tool-rotate.c:399 msgid "Golden Sections" msgstr "Secciones doradas" -#: ../extensions/file_tools/gth-file-tool-crop.c:457 -#: ../extensions/file_tools/gth-file-tool-rotate.c:418 +#: ../extensions/file_tools/gth-file-tool-crop.c:449 +#: ../extensions/file_tools/gth-file-tool-rotate.c:400 msgid "Center Lines" msgstr "Centrar líneas" -#: ../extensions/file_tools/gth-file-tool-crop.c:458 -#: ../extensions/file_tools/gth-file-tool-rotate.c:419 +#: ../extensions/file_tools/gth-file-tool-crop.c:450 +#: ../extensions/file_tools/gth-file-tool-rotate.c:401 msgid "Uniform" msgstr "Uniformar" -#: ../extensions/file_tools/gth-file-tool-crop.c:614 +#: ../extensions/file_tools/gth-file-tool-crop.c:608 msgid "Crop..." msgstr "Recortar…" -#: ../extensions/file_tools/gth-file-tool-crop.c:614 +#: ../extensions/file_tools/gth-file-tool-crop.c:608 msgid "Crop" msgstr "Recortar" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:68 -#: ../extensions/file_tools/gth-file-tool-negative.c:68 -msgid "Applying changes" -msgstr "Aplicando cambios" - -#: ../extensions/file_tools/gth-file-tool-desaturate.c:203 -msgid "Desaturate" -msgstr "Desaturar" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:119 -msgid "White balance correction" -msgstr "Corrección del balance de blancos" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:342 -msgid "Enhance Colors" -msgstr "Realzar colores" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:343 -msgid "Automatic white balance correction" -msgstr "Corrección automática del balance de blancos" - -#: ../extensions/file_tools/gth-file-tool-equalize.c:86 +#: ../extensions/file_tools/gth-file-tool-equalize.c:45 msgid "Equalizing image histogram" msgstr "Ecualizando el histograma de la imagen" -#: ../extensions/file_tools/gth-file-tool-equalize.c:275 +#: ../extensions/file_tools/gth-file-tool-equalize.c:230 msgid "Equalize" msgstr "Ecualizar" -#: ../extensions/file_tools/gth-file-tool-equalize.c:276 +#: ../extensions/file_tools/gth-file-tool-equalize.c:231 msgid "Equalize image histogram" msgstr "Ecualizar el histograma de la imagen" @@ -2689,6 +2713,14 @@ msgid "Flip the image vertically" msgstr "Voltea la imagen verticalmente" +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale..." +msgstr "Escala de grises…" + +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale" +msgstr "Escala de grises" + #: ../extensions/file_tools/gth-file-tool-mirror.c:87 msgid "Mirror" msgstr "Reflejar" @@ -2705,23 +2737,28 @@ msgid "Redo" msgstr "Rehacer" -#: ../extensions/file_tools/gth-file-tool-resize.c:680 +#: ../extensions/file_tools/gth-file-tool-resize.c:214 +#: ../extensions/resize_images/dlg-resize-images.c:180 +msgid "Resizing images" +msgstr "Redimensionando imágenes" + +#: ../extensions/file_tools/gth-file-tool-resize.c:808 msgid "Resize..." msgstr "Redimensionar…" -#: ../extensions/file_tools/gth-file-tool-resize.c:680 +#: ../extensions/file_tools/gth-file-tool-resize.c:808 msgid "Resize" msgstr "Redimensionar" -#: ../extensions/file_tools/gth-file-tool-rotate.c:636 +#: ../extensions/file_tools/gth-file-tool-rotate.c:628 msgid "Rotate..." msgstr "Rotar…" -#: ../extensions/file_tools/gth-file-tool-rotate.c:636 +#: ../extensions/file_tools/gth-file-tool-rotate.c:628 msgid "Rotate" msgstr "Rotar" -#: ../extensions/file_tools/gth-file-tool-rotate.c:637 +#: ../extensions/file_tools/gth-file-tool-rotate.c:629 msgid "Freely rotate the image" msgstr "Rotar libremente la imagen" @@ -2751,15 +2788,15 @@ msgid "Save" msgstr "Guardar" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:100 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:101 msgid "Sharpening image" msgstr "Enfocando la imagen" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 msgid "Enhance Focus..." msgstr "Realzar foco…" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 msgid "Enhance Focus" msgstr "Realzar foco" @@ -2819,43 +2856,43 @@ msgid "Find duplicated files." msgstr "Buscar archivos duplicados." -#: ../extensions/find_duplicates/gth-find-duplicates.c:53 +#: ../extensions/find_duplicates/gth-find-duplicates.c:65 msgid "leave the newest duplicates" msgstr "dejar los duplicados más nuevos" -#: ../extensions/find_duplicates/gth-find-duplicates.c:54 +#: ../extensions/find_duplicates/gth-find-duplicates.c:66 msgid "leave the oldest duplicates" msgstr "dejar los duplicados más antiguos" -#: ../extensions/find_duplicates/gth-find-duplicates.c:55 +#: ../extensions/find_duplicates/gth-find-duplicates.c:67 msgid "by folder..." msgstr "por _carpeta…" -#: ../extensions/find_duplicates/gth-find-duplicates.c:56 +#: ../extensions/find_duplicates/gth-find-duplicates.c:68 msgid "all files" msgstr "todos los archivos" -#: ../extensions/find_duplicates/gth-find-duplicates.c:57 +#: ../extensions/find_duplicates/gth-find-duplicates.c:69 msgid "no file" msgstr "ningún archivo" -#: ../extensions/find_duplicates/gth-find-duplicates.c:397 -#: ../extensions/find_duplicates/gth-find-duplicates.c:492 +#: ../extensions/find_duplicates/gth-find-duplicates.c:560 +#: ../extensions/find_duplicates/gth-find-duplicates.c:668 #, c-format msgid "%d duplicate" msgid_plural "%d duplicates" msgstr[0] "%d duplicado" msgstr[1] "%d duplicados" -#: ../extensions/find_duplicates/gth-find-duplicates.c:536 +#: ../extensions/find_duplicates/gth-find-duplicates.c:712 msgid "Search completed" msgstr "Búsqueda completada" -#: ../extensions/find_duplicates/gth-find-duplicates.c:548 +#: ../extensions/find_duplicates/gth-find-duplicates.c:725 msgid "Searching for duplicates" msgstr "Buscando duplicados" -#: ../extensions/find_duplicates/gth-find-duplicates.c:551 +#: ../extensions/find_duplicates/gth-find-duplicates.c:728 #: ../gthumb/gth-load-file-data-task.c:106 #: ../gthumb/gth-save-file-data-task.c:100 #, c-format @@ -2864,15 +2901,15 @@ msgstr[0] "%d archivo restante" msgstr[1] "%d archivos restantes" -#: ../extensions/find_duplicates/gth-find-duplicates.c:634 +#: ../extensions/find_duplicates/gth-find-duplicates.c:830 msgid "Getting the file list" msgstr "Obteniendo la lista de archivos" -#: ../extensions/find_duplicates/gth-find-duplicates.c:740 +#: ../extensions/find_duplicates/gth-find-duplicates.c:1016 msgid "Duplicates" msgstr "Duplicados" -#: ../extensions/find_duplicates/gth-find-duplicates.c:997 +#: ../extensions/find_duplicates/gth-find-duplicates.c:1306 msgid "Select" msgstr "Seleccionar" @@ -2897,7 +2934,7 @@ msgstr "Subir imágenes a Flickr" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 #: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 msgid "Free space:" msgstr "Espacio libre:" @@ -2919,69 +2956,94 @@ msgid "_Safety:" msgstr "_Seguridad:" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 msgid "Private photos, visible to family and friends" msgstr "Fotos privadas, visibles para la familia y los amigos" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 msgid "Private photos, visible to family" msgstr "Fotos privadas, visibles para la familia" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 msgid "Private photos" msgstr "Fotos privadas" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 msgid "Safe content" msgstr "Contenido seguro" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 msgid "Moderate content" msgstr "Moderar contenido" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:17 msgid "Restricted content" msgstr "Contenido restringido" -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 -msgid "_Import" -msgstr "_Importar" +#: ../extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui.h:1 +msgid "C_ontinue" +msgstr "Continuar" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:360 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:830 -msgid "Could not get the photo list" -msgstr "No se pudo obtener la lista de fotos" +#: ../extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui.h:2 +msgid "_Authorize..." +msgstr "Autorizar…" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:397 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:561 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:864 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1026 -msgid "No album selected" -msgstr "No se seleccionó ningún álbum" +#: ../extensions/flicker_utils/flickr-consumer.c:124 +#: ../extensions/flicker_utils/flickr-service.c:237 +#: ../extensions/flicker_utils/flickr-service.c:348 +#: ../extensions/flicker_utils/flickr-service.c:672 +#: ../extensions/flicker_utils/flickr-service.c:937 +#: ../extensions/oauth/oauth-service.c:154 +#: ../extensions/photobucket/photobucket-consumer.c:74 +#: ../extensions/photobucket/photobucket-consumer.c:82 +#: ../extensions/photobucket/photobucket-consumer.c:149 +#: ../extensions/photobucket/photobucket-service.c:132 +msgid "Unknown error" +msgstr "Error desconocido" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:579 +#: ../extensions/flicker_utils/flickr-service.c:502 #, c-format -msgid "Import from %s" -msgstr "Importar desde %s" +msgid "" +"Return to this window when you have finished the authorization process on %s" +msgstr "" +"Volver a esta ventana cuando haya finalizado el proceso de autorización en %s" + +#: ../extensions/flicker_utils/flickr-service.c:503 +msgid "Once you're done, click the 'Continue' button below." +msgstr "Cuando haya terminado, pulse el botón «Continuar»." + +#: ../extensions/flicker_utils/flickr-service.c:571 +#, c-format +msgid "gThumb requires your authorization to upload the photos to %s" +msgstr "gThumb requiere su autorización para subir las fotos a %s" + +#: ../extensions/flicker_utils/flickr-service.c:572 +#, c-format +msgid "" +"Click 'Authorize' to open your web browser and authorize gthumb to upload " +"photos to %s. When you're finished, return to this window to complete the " +"authorization." +msgstr "" +"Pulse «Autorizar» para abrir su navegador web y autorizar a gThumb a subir " +"fotos a %s. Cuando haya terminado, vuelva a esta ventana para completar la " +"autorización." #: ../extensions/gstreamer_tools/actions.c:66 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1080 -#: ../gthumb/gth-browser.c:2008 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1072 +#: ../gthumb/gth-browser.c:2175 msgid "Could not save the file" msgstr "No se pudo guardar el archivo" -#: ../extensions/gstreamer_tools/actions.c:126 +#: ../extensions/gstreamer_tools/actions.c:130 msgid "Could not take a screenshot" msgstr "No se pudo hacer la captura de pantalla" -#: ../extensions/gstreamer_tools/actions.c:132 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1248 +#: ../extensions/gstreamer_tools/actions.c:136 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1245 msgid "Save Image" msgstr "Guardar imagen" -#: ../extensions/gstreamer_tools/actions.c:152 +#: ../extensions/gstreamer_tools/actions.c:156 msgctxt "Filename" msgid "Screenshot" msgstr "Captura de pantalla" @@ -2991,7 +3053,7 @@ msgstr "Más lento" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:686 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:699 msgid "Play" msgstr "Reproducir" @@ -3037,11 +3099,11 @@ msgid "Take a screenshot" msgstr "Capturar la pantalla" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:663 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 msgid "Playing video" msgstr "Reproduciendo vídeo" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:689 msgid "Pause" msgstr "Pausar" @@ -3100,20 +3162,19 @@ msgid "Sample rate" msgstr "Frecuencia de muestreo" -#: ../extensions/gstreamer_utils/gstreamer-utils.c:363 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:362 msgid "Stereo" msgstr "Estéreo" -#: ../extensions/gstreamer_utils/gstreamer-utils.c:363 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:362 msgid "Mono" msgstr "Mono" #. Translators: this is an image size, such as 1024 × 768 -#: ../extensions/gstreamer_utils/gstreamer-utils.c:396 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1303 -#: ../extensions/image_viewer/gth-metadata-provider-image.c:190 -#: ../extensions/webalbums/dlg-web-exporter.c:442 -#: ../extensions/webalbums/gth-web-exporter.c:2446 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:395 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1300 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:209 +#: ../extensions/webalbums/gth-web-exporter.c:2446 ../gthumb/gtk-utils.c:1027 #, c-format msgid "%d × %d" msgstr "%d × %d" @@ -3122,7 +3183,7 @@ msgid "Could not print the selected files" msgstr "No se pudieron imprimir los archivos seleccionados" -#: ../extensions/image_print/callbacks.c:54 +#: ../extensions/image_print/callbacks.c:65 msgid "Print the selected images" msgstr "Imprimir las imágenes seleccionadas" @@ -3195,25 +3256,26 @@ msgid "Fonts" msgstr "Tipografías" -#: ../extensions/image_print/gth-image-print-job.c:971 +#: ../extensions/image_print/gth-image-print-job.c:914 #: ../extensions/webalbums/data/albumthemes/text.h:31 #, c-format msgid "Page %d of %d" msgstr "Página %d de %d" -#: ../extensions/image_print/gth-image-print-job.c:1734 -#: ../extensions/image_print/gth-image-print-job.c:1861 -#: ../extensions/image_print/gth-image-print-job.c:1898 +#: ../extensions/image_print/gth-image-print-job.c:1680 +#: ../extensions/image_print/gth-image-print-job.c:1845 +#: ../extensions/image_print/gth-image-print-job.c:1888 msgid "Could not print" msgstr "No se pudo imprimir" -#: ../extensions/image_print/gth-image-print-job.c:1796 +#: ../extensions/image_print/gth-image-print-job.c:1746 #: ../gthumb/gth-main-default-tests.c:240 msgid "Images" msgstr "Imágenes" -#: ../extensions/image_print/gth-image-print-job.c:1863 -#: ../gthumb/gth-image-loader.c:204 ../gthumb/gth-image-loader.c:278 +#: ../extensions/image_print/gth-image-print-job.c:1847 +#: ../gthumb/gth-image-loader.c:197 ../gthumb/gth-image-loader.c:304 +#: ../gthumb/gth-image-utils.c:131 ../gthumb/gth-image-utils.c:137 msgid "No suitable loader available for this file type" msgstr "No hay disponible ningún cargador para este tipo de archivo" @@ -3224,7 +3286,7 @@ msgstr "Cargando «%s»" #: ../extensions/image_print/gth-load-image-info-task.c:166 -#: ../extensions/webalbums/gth-web-exporter.c:2685 +#: ../extensions/webalbums/gth-web-exporter.c:2719 msgid "Loading images" msgstr "Cargando las imágenes" @@ -3266,7 +3328,7 @@ #: ../extensions/image_rotation/gth-reset-orientation-task.c:111 #: ../extensions/image_rotation/gth-transform-task.c:141 -#: ../extensions/webalbums/gth-web-exporter.c:2339 +#: ../extensions/webalbums/gth-web-exporter.c:2338 #: ../extensions/webalbums/gth-web-exporter.c:2423 msgid "Saving images" msgstr "Guardando las imágenes" @@ -3513,39 +3575,39 @@ msgid "custom format" msgstr "formato personalizado" -#: ../extensions/importer/gth-import-task.c:442 -#: ../extensions/importer/gth-import-task.c:477 -#: ../extensions/importer/gth-import-task.c:648 +#: ../extensions/importer/gth-import-task.c:426 +#: ../extensions/importer/gth-import-task.c:461 +#: ../extensions/importer/gth-import-task.c:671 msgid "Importing files" msgstr "Importando archivos" -#: ../extensions/importer/gth-import-task.c:598 +#: ../extensions/importer/gth-import-task.c:620 msgid "No file imported" msgstr "No se importó ningún archivo" -#: ../extensions/importer/gth-import-task.c:599 +#: ../extensions/importer/gth-import-task.c:621 msgid "The selected files are already present in the destination." msgstr "Los archivos seleccionados ya existen en el destino." -#: ../extensions/importer/gth-import-task.c:622 +#: ../extensions/importer/gth-import-task.c:644 #: ../gthumb/gth-file-source-vfs.c:694 msgid "Could not delete the files" msgstr "No se pudieron eliminar los archivos" -#: ../extensions/importer/gth-import-task.c:623 +#: ../extensions/importer/gth-import-task.c:645 msgid "Delete operation not supported." msgstr "La operación de borrado no está soportada." -#: ../extensions/importer/gth-import-task.c:709 +#: ../extensions/importer/gth-import-task.c:732 msgid "Last imported" msgstr "Último importado" -#: ../extensions/importer/gth-import-task.c:815 +#: ../extensions/importer/gth-import-task.c:838 msgid "No file specified." msgstr "No se especificó ningún archivo." #. Translators: For example: Not enough free space in '/home/user/Images'.\n1.3 GB of space is required but only 300 MB is available. -#: ../extensions/importer/gth-import-task.c:852 +#: ../extensions/importer/gth-import-task.c:875 #, c-format msgid "" "Not enough free space in '%s'.\n" @@ -3554,7 +3616,7 @@ "No hay espacio libre suficiente en «%s».\n" "se requieren %s , pero sólo hay %s disponibles." -#: ../extensions/list_tools/callbacks.c:76 ../gthumb/gth-filterbar.c:304 +#: ../extensions/list_tools/callbacks.c:76 ../gthumb/gth-filterbar.c:311 msgid "Personalize..." msgstr "Personalizar…" @@ -3698,9 +3760,9 @@ msgstr "Introducir un valor:" #: ../extensions/list_tools/gth-script.c:745 -#: ../extensions/webalbums/gth-web-exporter.c:560 -#: ../extensions/webalbums/gth-web-exporter.c:572 -#: ../extensions/webalbums/gth-web-exporter.c:580 +#: ../extensions/webalbums/gth-web-exporter.c:558 +#: ../extensions/webalbums/gth-web-exporter.c:570 +#: ../extensions/webalbums/gth-web-exporter.c:578 msgid "Malformed command" msgstr "Comando mal formado" @@ -3766,6 +3828,47 @@ msgid "View the photo position on the map" msgstr "Ver la posición de la foto en el mapa" +#: ../extensions/oauth/data/ui/oauth-account-manager.ui.h:1 +msgid "A_ccounts:" +msgstr "Cue_ntas:" + +#: ../extensions/oauth/data/ui/oauth-ask-authorization.ui.h:1 +#: ../gthumb/gth-folder-tree.c:1067 +msgid "Loading..." +msgstr "Cargando…" + +#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 +msgid "New authentication..." +msgstr "Nueva autenticación…" + +#: ../extensions/oauth/oauth-ask-authorization-dialog.c:191 +msgid "Authorization Required" +msgstr "Se requiere autoriación" + +#: ../extensions/oauth/web-service.c:382 +msgid "Choose _Account..." +msgstr "Seleccionar c_uenta…" + +#: ../extensions/oauth/web-service.c:660 +msgid "Choose Account" +msgstr "Seleccionar cuenta" + +#: ../extensions/oauth/web-service.c:777 +msgid "Edit Accounts" +msgstr "Editar cuentas" + +#: ../extensions/oauth/web-service.c:795 ../extensions/oauth/web-service.c:812 +msgid "Connecting to the server" +msgstr "Conectando con el servidor" + +#: ../extensions/oauth/web-service.c:796 +msgid "Asking authorization" +msgstr "Solicitando autorización" + +#: ../extensions/oauth/web-service.c:813 +msgid "Getting account information" +msgstr "Obteniendo información de la cuenta" + #: ../extensions/photobucket/callbacks.c:54 msgid "Photobucket..." msgstr "Photobucket…" @@ -3774,68 +3877,68 @@ msgid "Upload photos to Photobucket" msgstr "Subir fotos a Photobucket" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +msgid "_Scramble filenames" +msgstr "Me_zclar nombres de archivos" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 msgid "Tiny ( 100 x 75 )" msgstr "Diminuta (100 x 75)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 msgid "Small ( 160 x 120 )" msgstr "Pequeña (160 x 120)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 msgid "Medium ( 320 x 240 )" msgstr "Mediana (320 x 240)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 msgid "Large ( 640 x 480 )" msgstr "Grande (640 x 480)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 msgid "15ʺ screen ( 800 x 600 )" msgstr "Pantalla de 15\" (800 x 600)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 msgid "17ʺ screen ( 1024 x 768 )" msgstr "Pantalla de 17\" (1024 x 768)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 msgid "1 megabyte file size" msgstr "tamaño de archivo de 1 megabyte" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 -msgid "_Scramble filenames" -msgstr "Me_zclar nombres de archivos" - #: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 msgid "_Container:" msgstr "Contened_or:" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:290 msgid "Tiny ( 100 × 75 )" msgstr "Diminuto (100 × 75)" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 msgid "Small ( 160 × 120 )" msgstr "Pequeño ( 160 × 120 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 msgid "Medium ( 320 × 240 )" msgstr "Mediano (320 × 240)" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 msgid "Large ( 640 × 480 )" msgstr "Grande (640 × 480)" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 msgid "15ʺ screen ( 800 × 600 )" msgstr "Pantalla de 15\" (800 × 600)" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 msgid "17ʺ screen ( 1024 × 768 )" msgstr "Pantalla de 17\" (1024 × 768)" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:304 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:303 msgid "2 megabyte file size" msgstr "tamaño de archivo de 2 megabytes" @@ -3877,7 +3980,7 @@ #. view label #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 -#: ../gthumb/gth-filterbar.c:414 +#: ../gthumb/gth-filterbar.c:421 msgid "S_how:" msgstr "M_ostrar:" @@ -3894,7 +3997,7 @@ msgstr "_Borrar los archivos importados del origen" #: ../extensions/photo_importer/dlg-photo-importer.c:227 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:174 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:149 msgid "Could not import the files" msgstr "No se pudieron importar los archivos" @@ -3909,7 +4012,7 @@ msgstr "No se pudo abrir la carpeta" #: ../extensions/photo_importer/dlg-photo-importer.c:369 -#: ../gthumb/gth-browser.c:1921 +#: ../gthumb/gth-browser.c:2089 msgid "Getting folder listing..." msgstr "Obteniendo la lista de carpetas…" @@ -3954,53 +4057,15 @@ msgid "_Albums:" msgstr "Álbu_mes" -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 -msgid "Import from Picasa Web Album" -msgstr "Importar de álbumes web de Picasa" - -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 -msgid "_Album:" -msgstr "Á_lbum:" - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:1 -msgid "_E-Mail:" -msgstr "Correo-_e:" - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 -msgid "" -"Type the characters you see in the picture below. Letters are not case-" -"sensitive." -msgstr "" -"Escriba los caracteres que ve en la siguiente imagen. No es sensible a la " -"capitalización." - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:3 -msgid "_Password:" -msgstr "Contrase_ña:" - #: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 msgid "Public" msgstr "Público" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:354 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:310 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:458 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:469 msgid "Could not get the album list" msgstr "No se pudo obtener la lista de álbumes" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:438 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:394 -msgid "Picasa Web Album" -msgstr "Álbum web de Picasa" - -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:525 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:481 -msgid "Account" -msgstr "Cuenta" - -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:104 -msgid "Could not load the file" -msgstr "No se pudo cargar el archivo" - #: ../extensions/picasaweb/picasaweb.extension.in.in.h:1 msgid "Picasa Web Albums" msgstr "Álbumes web de Picasa" @@ -4009,92 +4074,6 @@ msgid "Upload images to Picasa Web Albums" msgstr "Subir imágenes a álbumes web Picasa" -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:1 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:1 -msgid "_Default extension:" -msgstr "Extensión pre_determinada:" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:2 -msgid "_Quality:" -msgstr "_Calidad:" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 -msgid "_Smoothing:" -msgstr "_Suavizado:" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 -msgid "Opti_mize" -msgstr "Opti_mizar" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:5 -msgid "_Progressive" -msgstr "_Progresivo" - -#: ../extensions/pixbuf_savers/data/ui/png-options.ui.h:1 -msgid "Compression _level:" -msgstr "Nive_l de compresión:" - -#: ../extensions/pixbuf_savers/data/ui/save-options-preferences.ui.h:1 -msgid "Default options:" -msgstr "Opciones predeterminadas:" - -#: ../extensions/pixbuf_savers/data/ui/tga-options.ui.h:1 -msgid "_RLE compression" -msgstr "Compresión _RLE" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:2 -msgid "_No compression" -msgstr "_Sin compresión" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:3 -msgid "No_rmal (Deflate)" -msgstr "No_rmal (sin compresión)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 -msgid "_Loss compression (JPEG)" -msgstr "C_ompresión con pérdida (JPEG)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 -msgid "Compression" -msgstr "Compresión" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 -msgid "dpi" -msgstr "dpi" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:9 -msgid "Resolution" -msgstr "Resolución" - -#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:519 -msgid "JPEG" -msgstr "JPEG" - -#: ../extensions/pixbuf_savers/gth-png-saver.c:140 -msgid "PNG" -msgstr "PNG" - -#: ../extensions/pixbuf_savers/gth-tga-saver.c:286 -#: ../gthumb/gth-buffer-data.c:84 -msgid "Insufficient memory" -msgstr "Memoria insuficiente" - -#: ../extensions/pixbuf_savers/gth-tga-saver.c:373 -msgid "TGA" -msgstr "TGA" - -#: ../extensions/pixbuf_savers/gth-tiff-saver.c:537 -msgid "TIFF" -msgstr "TIFF" - -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:1 -msgid "Save images" -msgstr "Guardar imágenes" - -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:2 -msgid "Save images in common file formats such as JPEG, PNG and TIFF" -msgstr "Guardar imágenes en formatos comunes tales como JPEG, PNG y TIFF" - #: ../extensions/raw_files/raw_files.extension.in.in.h:1 msgid "Raw format support" msgstr "Soporte para formato raw" @@ -4103,11 +4082,11 @@ msgid "Allow to load raw format images." msgstr "Permitir cargar imágenes en formato raw." -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 msgid "_X:" msgstr "_X:" -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 msgid "_Y:" msgstr "_Y:" @@ -4229,36 +4208,36 @@ msgid "File attribute" msgstr "Atributo del archivo" -#: ../extensions/rename_series/dlg-rename-series.c:552 -#: ../extensions/rename_series/dlg-rename-series.c:683 +#: ../extensions/rename_series/dlg-rename-series.c:558 +#: ../extensions/rename_series/dlg-rename-series.c:689 msgid "Could not rename the files" msgstr "No se pudieron renombrar los archivos" -#: ../extensions/rename_series/dlg-rename-series.c:780 +#: ../extensions/rename_series/dlg-rename-series.c:786 msgid "Could not save the template" msgstr "No se pudo guardar la plantilla" -#: ../extensions/rename_series/dlg-rename-series.c:798 +#: ../extensions/rename_series/dlg-rename-series.c:804 msgid "Edit Template" msgstr "Editar plantilla" -#: ../extensions/rename_series/dlg-rename-series.c:856 +#: ../extensions/rename_series/dlg-rename-series.c:862 msgid "Old Name" msgstr "Nombre antiguo" -#: ../extensions/rename_series/dlg-rename-series.c:867 +#: ../extensions/rename_series/dlg-rename-series.c:873 msgid "New Name" msgstr "Nombre nuevo" -#: ../extensions/rename_series/dlg-rename-series.c:944 +#: ../extensions/rename_series/dlg-rename-series.c:950 msgid "Keep original case" msgstr "Mantener la capitalización original" -#: ../extensions/rename_series/dlg-rename-series.c:945 +#: ../extensions/rename_series/dlg-rename-series.c:951 msgid "Convert to lower-case" msgstr "Convertir a minúsculas" -#: ../extensions/rename_series/dlg-rename-series.c:946 +#: ../extensions/rename_series/dlg-rename-series.c:952 msgid "Convert to upper-case" msgstr "Convertir a mayúsculas" @@ -4307,11 +4286,7 @@ msgid "pixel" msgstr "píxel" -#: ../extensions/resize_images/dlg-resize-images.c:168 -msgid "Resizing images" -msgstr "Redimensionando imágenes" - -#: ../extensions/resize_images/dlg-resize-images.c:412 +#: ../extensions/resize_images/dlg-resize-images.c:423 msgid "Keep the original format" msgstr "Mantener el formato original" @@ -4377,23 +4352,23 @@ msgid "File search tool." msgstr "Herramienta de búsqueda de archivos." -#: ../extensions/selections/callbacks.c:62 +#: ../extensions/selections/callbacks.c:77 msgid "Add to _Selection" msgstr "Añadir a _selección" -#: ../extensions/selections/callbacks.c:65 +#: ../extensions/selections/callbacks.c:86 msgid "Selection 1" msgstr "Selección 1" -#: ../extensions/selections/callbacks.c:70 +#: ../extensions/selections/callbacks.c:91 msgid "Selection 2" msgstr "Selección 2" -#: ../extensions/selections/callbacks.c:75 +#: ../extensions/selections/callbacks.c:96 msgid "Selection 3" msgstr "Selección 3" -#: ../extensions/selections/callbacks.c:180 +#: ../extensions/selections/callbacks.c:285 #, c-format msgid "" "Use Alt-%d to add files to this selection, Ctrl-%d to view this selection." @@ -4463,7 +4438,7 @@ msgid "Remove the selected files" msgstr "Quitar los archivos seleccionados" -#: ../extensions/slideshow/gth-slideshow.c:229 +#: ../extensions/slideshow/gth-slideshow.c:231 msgid "Playing slideshow" msgstr "Reproduciendo las diapositivas" @@ -4592,10 +4567,6 @@ msgid "_Copy originals to destination" msgstr "_Copiar originales al destino" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 -msgid "_Resize if larger than:" -msgstr "Red_imensionar si son más grandes que:" - #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 msgid "_Adapt to the window width " msgstr "A_daptarse a la anchura de la ventana" @@ -4636,36 +4607,36 @@ msgid "Image Attributes" msgstr "Atributos de la imagen" -#: ../extensions/webalbums/gth-web-exporter.c:1802 +#: ../extensions/webalbums/gth-web-exporter.c:1800 msgid "Could not show the destination" msgstr "No se pudo mostrar el destino" -#: ../extensions/webalbums/gth-web-exporter.c:1838 +#: ../extensions/webalbums/gth-web-exporter.c:1836 msgid "The album has been created successfully." msgstr "El álbum se creó correctamente." -#: ../extensions/webalbums/gth-web-exporter.c:2106 -#: ../extensions/webalbums/gth-web-exporter.c:2133 +#: ../extensions/webalbums/gth-web-exporter.c:2104 +#: ../extensions/webalbums/gth-web-exporter.c:2132 msgid "Saving thumbnails" msgstr "Guardando las miniaturas" -#: ../extensions/webalbums/gth-web-exporter.c:2161 +#: ../extensions/webalbums/gth-web-exporter.c:2160 msgid "Saving HTML pages: Images" msgstr "Guardando las páginas HTML: Imágenes" -#: ../extensions/webalbums/gth-web-exporter.c:2219 +#: ../extensions/webalbums/gth-web-exporter.c:2218 msgid "Saving HTML pages: Indexes" msgstr "Guardando las páginas HTML: Índices" -#: ../extensions/webalbums/gth-web-exporter.c:2502 +#: ../extensions/webalbums/gth-web-exporter.c:2503 msgid "Copying original images" msgstr "Copiando imágenes originales" -#: ../extensions/webalbums/gth-web-exporter.c:2929 +#: ../extensions/webalbums/gth-web-exporter.c:2963 msgid "Could not find the style folder" msgstr "No se pudo encontrar la carpeta de estilos" -#: ../extensions/webalbums/gth-web-exporter.c:2967 +#: ../extensions/webalbums/gth-web-exporter.c:3001 msgid "Could not create a temporary folder" msgstr "No se pudo crear una carpeta temporal" @@ -4677,9 +4648,9 @@ msgid "Create static web albums." msgstr "Creando álbumes web estáticos." -#: ../gthumb/dlg-location.c:200 ../gthumb/gth-browser.c:1250 -#: ../gthumb/gth-browser.c:1809 ../gthumb/gth-browser.c:5900 -#: ../gthumb/gth-browser.c:5919 ../gthumb/gth-browser.c:5943 +#: ../gthumb/dlg-location.c:200 ../gthumb/gth-browser.c:1396 +#: ../gthumb/gth-browser.c:1969 ../gthumb/gth-browser.c:6214 +#: ../gthumb/gth-browser.c:6233 ../gthumb/gth-browser.c:6257 #, c-format msgid "Could not load the position \"%s\"" msgstr "No se pudo cargar la posición «%s»" @@ -4700,7 +4671,7 @@ msgid "Edit Filter" msgstr "Editar filtro" -#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:270 +#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:277 msgid "All" msgstr "Todas" @@ -4765,46 +4736,6 @@ msgid "_Restart" msgstr "_Reiniciar" -#: ../gthumb/eggfileformatchooser.c:236 -#, c-format -msgid "File _Format: %s" -msgstr "_Formato del archivo: %s" - -#: ../gthumb/eggfileformatchooser.c:397 ../gthumb/gth-main-default-tests.c:233 -msgid "All Files" -msgstr "Todos los archivos" - -#: ../gthumb/eggfileformatchooser.c:398 -msgid "All Supported Files" -msgstr "Todos los archivos soportados" - -#: ../gthumb/eggfileformatchooser.c:407 -msgid "By Extension" -msgstr "Por extensión" - -#: ../gthumb/eggfileformatchooser.c:422 -msgid "File Format" -msgstr "Formato de archivo" - -#: ../gthumb/eggfileformatchooser.c:440 -msgid "Extension(s)" -msgstr "Extensión(es)" - -#: ../gthumb/eggfileformatchooser.c:681 -#, c-format -msgid "" -"The program was not able to find out the file format you want to use for `%" -"s'. Please make sure to use a known extension for that file or manually " -"choose a file format from the list below." -msgstr "" -"El programa no pudo encontrar el formato de archivo que quiere usar para «%" -"s». Asegúrese de usar una extensión de archivo conocida para el archivo o " -"elija manualmente un formato de archivo de la lista de abajo." - -#: ../gthumb/eggfileformatchooser.c:688 -msgid "File format not recognized" -msgstr "No se reconoció el formato de archivo" - #. For translators: This is a progress size indicator, for example: 230.4 MB of 512.8 MB #: ../gthumb/gio-utils.c:1351 #, c-format @@ -4839,7 +4770,7 @@ #. * the separator that your locale uses or use "%Id" instead #. * of "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2945 +#: ../gthumb/glib-utils.c:3068 #, c-format msgctxt "long time format" msgid "%d:%02d:%02d" @@ -4851,13 +4782,13 @@ #. * separator that your locale uses or use "%Id" instead of #. * "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2954 +#: ../gthumb/glib-utils.c:3077 #, c-format msgctxt "short time format" msgid "%d:%02d" msgstr "%d:%02d" -#: ../gthumb/gth-browser-actions-callbacks.c:400 +#: ../gthumb/gth-browser-actions-callbacks.c:414 msgid "" "gthumb is free software; you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -4869,7 +4800,7 @@ "Software Foundation; ya sea en la versión 2 de la Licencia, como (a su " "elección) cualquier otra versión posterior." -#: ../gthumb/gth-browser-actions-callbacks.c:404 +#: ../gthumb/gth-browser-actions-callbacks.c:418 msgid "" "gthumb is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -4881,7 +4812,7 @@ "PARA UN PROPÓSITO DETERMINADO. Vea la Licencia Pública General de GNU para " "más detalles." -#: ../gthumb/gth-browser-actions-callbacks.c:408 +#: ../gthumb/gth-browser-actions-callbacks.c:422 msgid "" "You should have received a copy of the GNU General Public License along with " "gthumb. If not, see http://www.gnu.org/licenses/." @@ -4889,11 +4820,11 @@ "Debería haber recibido una copia de la Licencia Pública General GNU junto " "con gthumb. Si no la recibió, consulte http://www.gnu.org/licenses/." -#: ../gthumb/gth-browser-actions-callbacks.c:427 +#: ../gthumb/gth-browser-actions-callbacks.c:441 msgid "An image viewer and browser for GNOME." msgstr "Un visor y navegador de imágenes para GNOME." -#: ../gthumb/gth-browser-actions-callbacks.c:430 +#: ../gthumb/gth-browser-actions-callbacks.c:444 msgid "translator_credits" msgstr "" "Daniel Mustieles , 2008, 2009, 2010\n" @@ -4983,15 +4914,15 @@ msgid "Leave Fullscreen" msgstr "Salir de «Pantalla completa»" -#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3587 +#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3841 msgid "Go to the previous visited location" msgstr "Ir a la ubicación visitada previamente" -#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3605 +#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3859 msgid "Go to the next visited location" msgstr "Ir a la siguiente ubicación visitada" -#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3623 +#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3877 msgid "Go up one level" msgstr "Subir un nivel" @@ -5003,7 +4934,7 @@ msgid "Specify a location to open" msgstr "Especificar una ubicación que abrir" -#: ../gthumb/gth-browser-actions-entries.h:173 ../gthumb/gth-browser.c:672 +#: ../gthumb/gth-browser-actions-entries.h:173 ../gthumb/gth-browser.c:721 msgid "_Delete History" msgstr "_Borrar histórico" @@ -5031,144 +4962,146 @@ msgid "_Keyboard Shortcuts" msgstr "Combinaciones de _teclas" -#: ../gthumb/gth-browser-actions-entries.h:206 +#: ../gthumb/gth-browser-actions-entries.h:203 +#: ../gthumb/gth-browser-actions-entries.h:257 +msgid "Edit" +msgstr "Editar" + +#: ../gthumb/gth-browser-actions-entries.h:204 +#: ../gthumb/gth-browser-actions-entries.h:258 +msgid "Edit file" +msgstr "Editar archivo" + +#: ../gthumb/gth-browser-actions-entries.h:212 msgid "_Toolbar" msgstr "Barra de herramien_tas" -#: ../gthumb/gth-browser-actions-entries.h:207 +#: ../gthumb/gth-browser-actions-entries.h:213 msgid "View or hide the toolbar of this window" msgstr "Mostrar u ocultar la barra de herramientas de esta ventana" -#: ../gthumb/gth-browser-actions-entries.h:211 +#: ../gthumb/gth-browser-actions-entries.h:217 msgid "_Statusbar" msgstr "Barra de e_stado" -#: ../gthumb/gth-browser-actions-entries.h:212 +#: ../gthumb/gth-browser-actions-entries.h:218 msgid "View or hide the statusbar of this window" msgstr "Mostrar u ocultar la barra de estado de esta ventana" -#: ../gthumb/gth-browser-actions-entries.h:216 +#: ../gthumb/gth-browser-actions-entries.h:222 msgid "_Filterbar" msgstr "Barra de _filtros" -#: ../gthumb/gth-browser-actions-entries.h:217 +#: ../gthumb/gth-browser-actions-entries.h:223 msgid "View or hide the filterbar of this window" msgstr "Mostrar u ocultar la barra de filtros de esta ventana" -#: ../gthumb/gth-browser-actions-entries.h:221 +#: ../gthumb/gth-browser-actions-entries.h:227 msgid "_Sidebar" msgstr "Barra _lateral" -#: ../gthumb/gth-browser-actions-entries.h:222 +#: ../gthumb/gth-browser-actions-entries.h:228 msgid "View or hide the sidebar of this window" msgstr "Mostrar u ocultar la barra lateral de esta ventana" -#: ../gthumb/gth-browser-actions-entries.h:226 +#: ../gthumb/gth-browser-actions-entries.h:232 msgid "_Thumbnail Pane" msgstr "Panel de minia_turas" -#: ../gthumb/gth-browser-actions-entries.h:227 +#: ../gthumb/gth-browser-actions-entries.h:233 msgid "View or hide the thumbnail pane in viewer mode" msgstr "Mostrar u ocultar el panel de miniaturas en el modo visor" -#: ../gthumb/gth-browser-actions-entries.h:231 +#: ../gthumb/gth-browser-actions-entries.h:237 msgid "_Thumbnails" msgstr "Minia_turas" -#: ../gthumb/gth-browser-actions-entries.h:232 +#: ../gthumb/gth-browser-actions-entries.h:238 msgid "View thumbnails" msgstr "Ver las miniaturas" -#: ../gthumb/gth-browser-actions-entries.h:236 +#: ../gthumb/gth-browser-actions-entries.h:242 msgid "_Hidden Files" msgstr "Archivos _ocultos" -#: ../gthumb/gth-browser-actions-entries.h:237 +#: ../gthumb/gth-browser-actions-entries.h:243 msgid "Show hidden files and folders" msgstr "Mostrar archivos y carpetas ocultos" -#: ../gthumb/gth-browser-actions-entries.h:242 -#: ../gthumb/gth-browser-actions-entries.h:247 +#: ../gthumb/gth-browser-actions-entries.h:248 +#: ../gthumb/gth-browser-actions-entries.h:253 msgid "View file properties" msgstr "Ver las propiedades del archivo" -#: ../gthumb/gth-browser-actions-entries.h:251 -msgid "Edit" -msgstr "Editar" - -#: ../gthumb/gth-browser-actions-entries.h:252 -msgid "Edit file" -msgstr "Editar archivo" - -#: ../gthumb/gth-browser-actions-entries.h:256 +#: ../gthumb/gth-browser-actions-entries.h:262 msgid "_Fit Window to Image" msgstr "_Ajustar ventana a la imagen" -#: ../gthumb/gth-browser-actions-entries.h:257 +#: ../gthumb/gth-browser-actions-entries.h:263 msgid "Resize the window to the size of the image" msgstr "Redimensionar la ventana al tamaño de la imagen" -#: ../gthumb/gth-browser.c:369 +#: ../gthumb/gth-browser.c:418 #, c-format msgid "Open %s" msgstr "Abrir %s" -#: ../gthumb/gth-browser.c:509 +#: ../gthumb/gth-browser.c:558 msgid "[modified]" msgstr "[modificada]" -#: ../gthumb/gth-browser.c:1006 +#: ../gthumb/gth-browser.c:1117 #, c-format msgid "%d file selected (%s)" msgid_plural "%d files selected (%s)" msgstr[0] "%d archivo seleccionado (%s)" msgstr[1] "%d archivos seleccionados (%s)" -#: ../gthumb/gth-browser.c:1041 +#: ../gthumb/gth-browser.c:1152 #, c-format msgid "%s of free space" msgstr "%s de espacio libre" -#: ../gthumb/gth-browser.c:1905 ../gthumb/gth-browser.c:1932 +#: ../gthumb/gth-browser.c:2073 ../gthumb/gth-browser.c:2100 #, c-format msgid "No suitable module found for %s" msgstr "No se pudo encontrar un módulo apropiado para %s" -#: ../gthumb/gth-browser.c:2052 +#: ../gthumb/gth-browser.c:2219 #, c-format msgid "Save changes to file '%s'?" msgstr "¿Guardar los cambios al archivo «%s»?" -#: ../gthumb/gth-browser.c:2057 +#: ../gthumb/gth-browser.c:2224 msgid "If you don't save, changes to the file will be permanently lost." msgstr "Si no guarda, se perderán para siempre los cambios en el archivo." -#: ../gthumb/gth-browser.c:2058 +#: ../gthumb/gth-browser.c:2225 msgid "Do _Not Save" msgstr "_No guardar" -#: ../gthumb/gth-browser.c:2829 ../gthumb/gth-source-tree.c:182 +#: ../gthumb/gth-browser.c:3020 ../gthumb/gth-source-tree.c:182 msgid "Could not change name" msgstr "No se pudo cambiar el nombre" -#: ../gthumb/gth-browser.c:3258 ../gthumb/gth-main-default-metadata.c:41 +#: ../gthumb/gth-browser.c:3451 ../gthumb/gth-main-default-metadata.c:41 msgid "Modified" msgstr "Modificado" -#: ../gthumb/gth-browser.c:3588 ../gthumb/gth-browser.c:3606 +#: ../gthumb/gth-browser.c:3842 ../gthumb/gth-browser.c:3860 msgid "View the list of visited locations" msgstr "Ver la lista de lugares visitados" -#: ../gthumb/gth-browser.c:3624 +#: ../gthumb/gth-browser.c:3878 msgid "View the list of upper locations" msgstr "Ver la lista de lugares anteriores" -#: ../gthumb/gth-browser.c:5901 +#: ../gthumb/gth-browser.c:6215 #, c-format msgid "File type not supported" msgstr "Tipo de archivo no soportado" -#: ../gthumb/gth-browser.c:5944 +#: ../gthumb/gth-browser.c:6258 #, c-format msgid "No suitable module found" msgstr "No se encontró un modulo adecuado" @@ -5178,11 +5111,15 @@ msgid "Could not open the module `%s`: %s" msgstr "No se pudo abrir el módulo «%s»: %s" -#: ../gthumb/gth-extensions.c:744 +#: ../gthumb/gth-extensions.c:754 #, c-format msgid "The extension '%1$s' is required by the extension '%2$s'" msgstr "La extensión «%2$s» requiere la extensión «%1$s»" +#: ../gthumb/gth-file-chooser-dialog.c:144 +msgid "All Supported Files" +msgstr "Todos los archivos soportados" + #: ../gthumb/gth-file-source-vfs.c:121 msgid "Home Folder" msgstr "Carpeta personal" @@ -5228,7 +5165,7 @@ "¿Está seguro de que quiere eliminar permanentemente los %'d archivos " "seleccionados?" -#: ../gthumb/gth-filterbar.c:406 +#: ../gthumb/gth-filterbar.c:413 msgid "Hide the filterbar" msgstr "Ocultar la barra de filtros" @@ -5248,7 +5185,7 @@ msgstr "GB" #. "files" label -#: ../gthumb/gth-filter.c:291 ../gthumb/gth-filter-editor-dialog.c:177 +#: ../gthumb/gth-filter.c:286 ../gthumb/gth-filter-editor-dialog.c:177 msgid "files" msgstr "archivos" @@ -5265,50 +5202,60 @@ msgid "No limit specified" msgstr "No se especificó ningún límite" -#: ../gthumb/gth-folder-tree.c:857 -msgid "Loading..." -msgstr "Cargando…" - -#: ../gthumb/gth-folder-tree.c:1100 +#: ../gthumb/gth-folder-tree.c:1369 msgid "(Open Parent)" msgstr "(Abrir padre)" -#: ../gthumb/gth-histogram-view.c:826 +#: ../gthumb/gth-histogram-view.c:825 msgid "Linear scale" msgstr "Escala lineal" -#: ../gthumb/gth-histogram-view.c:838 +#: ../gthumb/gth-histogram-view.c:837 msgid "Logarithmic scale" msgstr "Escala logarítmica" -#: ../gthumb/gth-histogram-view.c:858 +#: ../gthumb/gth-histogram-view.c:857 msgid "Channel:" msgstr "Canal:" -#: ../gthumb/gth-histogram-view.c:890 +#: ../gthumb/gth-histogram-view.c:878 msgid "Value" msgstr "Valor" -#: ../gthumb/gth-histogram-view.c:896 +#: ../gthumb/gth-histogram-view.c:883 msgid "Red" msgstr "Rojo" -#: ../gthumb/gth-histogram-view.c:902 +#: ../gthumb/gth-histogram-view.c:888 msgid "Green" msgstr "Verde" -#: ../gthumb/gth-histogram-view.c:908 +#: ../gthumb/gth-histogram-view.c:893 msgid "Blue" msgstr "Azul" -#: ../gthumb/gth-histogram-view.c:914 +#: ../gthumb/gth-histogram-view.c:898 msgid "Alpha" msgstr "Alfa" -#: ../gthumb/gth-histogram-view.c:921 +#: ../gthumb/gth-histogram-view.c:904 msgid "RGB" msgstr "RGB" +#: ../gthumb/gth-image-list-task.c:141 +msgid "Could not rename the file" +msgstr "No se pudo renombrar el archivo" + +#: ../gthumb/gth-image-saver.c:39 +msgid "No options available for this file type" +msgstr "No hay opciones disponibles para este tipo de archivo" + +#: ../gthumb/gth-image-saver.c:185 +#, c-format +msgid "Could not find a suitable module to save the image as \"%s\"" +msgstr "" +"No se pudo encontrar un módulo adecuado para guardar la imagen como «%s»" + #: ../gthumb/gth-load-file-data-task.c:108 msgid "Reading file information" msgstr "Leyendo la información del archivo" @@ -5362,6 +5309,10 @@ msgid "dimensions" msgstr "dimensiones" +#: ../gthumb/gth-main-default-tests.c:233 +msgid "All Files" +msgstr "Todos los archivos" + #: ../gthumb/gth-main-default-tests.c:261 msgid "Media" msgstr "Soporte" @@ -5382,15 +5333,7 @@ msgid "Description (embedded)" msgstr "Descripción (empotrada)" -#: ../gthumb/gth-pixbuf-list-task.c:139 -msgid "Could not rename the file" -msgstr "No se pudo renombrar el archivo" - -#: ../gthumb/gth-pixbuf-saver.c:34 -msgid "No options available for this file type" -msgstr "No hay opciones disponibles para este tipo de archivo" - -#: ../gthumb/gth-progress-dialog.c:144 +#: ../gthumb/gth-progress-dialog.c:146 msgid "Cancel operation" msgstr "Cancelar operación" @@ -5398,60 +5341,67 @@ msgid "Saving file information" msgstr "Guardando la información del archivo" -#: ../gthumb/gth-tags-entry.c:388 +#. Translators: %s is a filename +#: ../gthumb/gth-save-image-task.c:162 +#, c-format +#| msgid "Starting %s" +msgid "Saving '%s'" +msgstr "Guardando «%s»" + +#: ../gthumb/gth-tags-entry.c:390 #, c-format msgid "Create tag «%s»" msgstr "Crear etiqueta «%s»" -#: ../gthumb/gth-tags-entry.c:735 +#: ../gthumb/gth-tags-entry.c:814 msgid "Show all the tags" msgstr "Mostrar todas las etiquetas" -#: ../gthumb/gth-tags-file.c:236 +#: ../gthumb/gth-tags-file.c:235 msgid "Holidays" msgstr "Vacaciones" -#: ../gthumb/gth-tags-file.c:237 +#: ../gthumb/gth-tags-file.c:236 msgid "Temporary" msgstr "Temporal" -#: ../gthumb/gth-tags-file.c:238 +#: ../gthumb/gth-tags-file.c:237 msgid "Screenshots" msgstr "Capturas de pantallas" -#: ../gthumb/gth-tags-file.c:239 +#: ../gthumb/gth-tags-file.c:238 msgid "Science" msgstr "Ciencia" -#: ../gthumb/gth-tags-file.c:240 +#: ../gthumb/gth-tags-file.c:239 msgid "Favorite" msgstr "Favorita" -#: ../gthumb/gth-tags-file.c:241 +#: ../gthumb/gth-tags-file.c:240 msgid "Important" msgstr "Importante" -#: ../gthumb/gth-tags-file.c:242 +#: ../gthumb/gth-tags-file.c:241 msgid "GNOME" msgstr "GNOME" -#: ../gthumb/gth-tags-file.c:243 +#: ../gthumb/gth-tags-file.c:242 msgid "Games" msgstr "Juegos" -#: ../gthumb/gth-tags-file.c:244 +#: ../gthumb/gth-tags-file.c:243 msgid "Party" msgstr "Fiesta" -#: ../gthumb/gth-tags-file.c:245 +#: ../gthumb/gth-tags-file.c:244 msgid "Birthday" msgstr "Cumpleaños" -#: ../gthumb/gth-tags-file.c:246 +#: ../gthumb/gth-tags-file.c:245 msgid "Astronomy" msgstr "Astronomía" -#: ../gthumb/gth-tags-file.c:247 +#: ../gthumb/gth-tags-file.c:246 msgid "Family" msgstr "Familia" @@ -5469,7 +5419,7 @@ msgid "is not" msgstr "no es" -#: ../gthumb/gth-test-category.c:394 ../gthumb/gth-test-simple.c:812 +#: ../gthumb/gth-test-category.c:407 ../gthumb/gth-test-simple.c:812 #: ../gthumb/gth-test-simple.c:838 ../gthumb/gth-test-simple.c:859 #: ../gthumb/gth-test-simple.c:885 #, c-format @@ -5524,11 +5474,11 @@ msgid "is after" msgstr "está después" -#: ../gthumb/gth-time-selector.c:477 +#: ../gthumb/gth-time-selector.c:478 msgid "Today" msgstr "Hoy" -#: ../gthumb/gth-time-selector.c:485 +#: ../gthumb/gth-time-selector.c:486 msgid "Now" msgstr "Ahora" @@ -5540,59 +5490,126 @@ msgid "Close _All Windows" msgstr "Cerrar _todas las ventanas" -#: ../gthumb/gtk-utils.c:551 +#: ../gthumb/gtk-utils.c:499 msgid "Could not display help" msgstr "No se pudo mostrar la ayuda" -#: ../gthumb/gtk-utils.c:868 ../gthumb/gtk-utils.c:875 +#: ../gthumb/gtk-utils.c:800 ../gthumb/gtk-utils.c:807 msgid "Could not launch the application" msgstr "No se pudo lanzar la aplicación" -#: ../gthumb/gtk-utils.c:978 +#: ../gthumb/gtk-utils.c:910 msgid "_Copy Here" msgstr "_Copiar aquí" -#: ../gthumb/gtk-utils.c:983 +#: ../gthumb/gtk-utils.c:915 msgid "_Move Here" msgstr "_Mover aquí" -#: ../gthumb/gtk-utils.c:988 +#: ../gthumb/gtk-utils.c:920 msgid "_Link Here" msgstr "En_lazar aquí" -#: ../gthumb/gtk-utils.c:997 +#: ../gthumb/gtk-utils.c:929 msgid "Cancel" msgstr "Cancelar" -#: ../gthumb/main.c:59 +#: ../gthumb/main.c:61 msgid "Open a new window" msgstr "Abrir una ventana nueva" -#: ../gthumb/main.c:63 +#: ../gthumb/main.c:65 msgid "Start in fullscreen mode" msgstr "Iniciar en modo de pantalla completa" -#: ../gthumb/main.c:67 +#: ../gthumb/main.c:69 msgid "Automatically start a slideshow" msgstr "Iniciar una secuencia automáticamente" -#: ../gthumb/main.c:71 +#: ../gthumb/main.c:73 msgid "Automatically import digital camera photos" msgstr "Importar automáticamente fotos de la cámara digital" -#: ../gthumb/main.c:75 +#: ../gthumb/main.c:77 msgid "Show version" msgstr "Mostrar versión" -#: ../gthumb/main.c:344 +#: ../gthumb/main.c:483 msgid "- Image browser and viewer" msgstr "- Explorador de imágenes y visor" -#: ../gthumb/pixbuf-io.c:174 -#, c-format -msgid "Could not find a suitable module to save the image as \"%s\"" -msgstr "" -"No se pudo encontrar un módulo adecuado para guardar la imagen como «%s»" +#~ msgid "_Resize to:" +#~ msgstr "_Redimensionar a:" + +#~ msgid "_E-Mail:" +#~ msgstr "Correo-_e:" + +#~ msgid "" +#~ "Type the characters you see in the picture below. Letters are not case-" +#~ "sensitive." +#~ msgstr "" +#~ "Escriba los caracteres que ve en la siguiente imagen. No es sensible a la " +#~ "capitalización." + +#~ msgid "_Password:" +#~ msgstr "Contrase_ña:" + +#~ msgid "Picasa Web Album" +#~ msgstr "Álbum web de Picasa" + +#~ msgid "Account" +#~ msgstr "Cuenta" + +#~ msgid "Could not load the file" +#~ msgstr "No se pudo cargar el archivo" + +#~ msgid "Exif DateTimeOriginal tag" +#~ msgstr "Etiqueta EXIF de fecha y hora originales" + +#~ msgid "×" +#~ msgstr "×" + +#~ msgid "Desaturate" +#~ msgstr "Desaturar" + +#~ msgid "White balance correction" +#~ msgstr "Corrección del balance de blancos" + +#~ msgid "Enhance Colors" +#~ msgstr "Realzar colores" + +#~ msgid "Automatic white balance correction" +#~ msgstr "Corrección automática del balance de blancos" + +#~ msgid "Save images" +#~ msgstr "Guardar imágenes" + +#~ msgid "Save images in common file formats such as JPEG, PNG and TIFF" +#~ msgstr "Guardar imágenes en formatos comunes tales como JPEG, PNG y TIFF" + +#~ msgid "File _Format: %s" +#~ msgstr "_Formato del archivo: %s" + +#~ msgid "By Extension" +#~ msgstr "Por extensión" + +#~ msgid "File Format" +#~ msgstr "Formato de archivo" + +#~ msgid "Extension(s)" +#~ msgstr "Extensión(es)" + +#~ msgid "" +#~ "The program was not able to find out the file format you want to use for `" +#~ "%s'. Please make sure to use a known extension for that file or manually " +#~ "choose a file format from the list below." +#~ msgstr "" +#~ "El programa no pudo encontrar el formato de archivo que quiere usar para «%" +#~ "s». Asegúrese de usar una extensión de archivo conocida para el archivo o " +#~ "elija manualmente un formato de archivo de la lista de abajo." + +#~ msgid "File format not recognized" +#~ msgstr "No se reconoció el formato de archivo" #~ msgid "Choose another tag" #~ msgstr "Seleccionar otra etiqueta" diff -Nru gthumb-3.0.2/po/fr.po gthumb-3.2.3/po/fr.po --- gthumb-3.0.2/po/fr.po 2012-08-14 16:25:43.000000000 +0000 +++ gthumb-3.2.3/po/fr.po 2013-04-30 16:56:13.000000000 +0000 @@ -19,10 +19,11 @@ "Project-Id-Version: gthumb 2.14\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gthumb&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-04-25 20:46+0000\n" -"PO-Revision-Date: 2011-10-20 09:01+0200\n" +"POT-Creation-Date: 2013-01-19 18:36+0000\n" +"PO-Revision-Date: 2013-03-10 19:32+0100\n" "Last-Translator: Claude Paroz \n" "Language-Team: GNOME French Team \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -99,8 +100,8 @@ msgstr "Affiche les options de gestion de session" #. manually set name and icon -#: ../data/gthumb.desktop.in.in.h:1 ../gthumb/gth-browser.c:530 -#: ../gthumb/gth-progress-dialog.c:388 ../gthumb/main.c:313 +#: ../data/gthumb.desktop.in.in.h:1 ../gthumb/gth-browser.c:578 +#: ../gthumb/gth-progress-dialog.c:390 ../gthumb/main.c:315 msgid "gThumb" msgstr "gThumb" @@ -204,8 +205,8 @@ msgstr "_Correspondance" #. limit label -#: ../data/ui/filter-editor.ui.h:3 ../gthumb/gth-filter.c:270 -#: ../gthumb/gth-filter.c:342 +#: ../data/ui/filter-editor.ui.h:3 ../gthumb/gth-filter.c:269 +#: ../gthumb/gth-filter.c:337 msgid "_Limit to" msgstr "_Limiter à" @@ -244,7 +245,6 @@ msgstr "Sélection :" #: ../data/ui/location.ui.h:1 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 msgid "_Location:" msgstr "Emp_lacement :" @@ -261,7 +261,6 @@ msgstr "Nom de fichier :" #: ../data/ui/overwrite-dialog.ui.h:4 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 #: ../extensions/image_print/data/ui/print-layout.ui.h:23 msgid "Size:" msgstr "Taille :" @@ -410,7 +409,7 @@ #: ../data/ui/preferences.ui.h:25 #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 -#: ../extensions/edit_metadata/gth-edit-general-page.c:473 +#: ../extensions/edit_metadata/gth-edit-general-page.c:481 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 #: ../gthumb/gth-main-default-metadata.c:33 msgid "General" @@ -528,7 +527,6 @@ #: ../extensions/image_viewer/image_viewer.extension.in.in.h:3 #: ../extensions/list_tools/list_tools.extension.in.in.h:3 #: ../extensions/photo_importer/photo_importer.extension.in.in.h:3 -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:3 #: ../extensions/raw_files/raw_files.extension.in.in.h:3 #: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:3 #: ../extensions/rename_series/rename_series.extension.in.in.h:3 @@ -622,16 +620,128 @@ msgid "Write to Disc" msgstr "Graver sur le disque" -#: ../extensions/cairo_io/cairo-io-jpeg.c:62 +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:62 #, c-format msgid "Error interpreting JPEG image file: %s" msgstr "Erreur lors de l'interprétation du fichier image JPEG : %s" -#: ../extensions/cairo_io/cairo-io-jpeg.c:482 +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:483 #, c-format msgid "Unknown JPEG color space (%d)" msgstr "Espace de couleur JPEG inconnu (%d)" +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:1 +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:1 +msgid "_Default extension:" +msgstr "Extension par _défaut :" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:2 +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:1 +msgid "_Quality:" +msgstr "_Qualité :" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:3 +msgid "_Smoothing:" +msgstr "_Lissage :" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:4 +msgid "Opti_mize" +msgstr "Opti_misé" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:5 +msgid "_Progressive" +msgstr "_Progressif" + +#: ../extensions/cairo_io/data/ui/png-options.ui.h:1 +msgid "Compression _level:" +msgstr "_Niveau de compression :" + +#: ../extensions/cairo_io/data/ui/save-options-preferences.ui.h:1 +msgid "Default options:" +msgstr "Options par défaut :" + +#: ../extensions/cairo_io/data/ui/tga-options.ui.h:1 +msgid "_RLE compression" +msgstr "Compression _RLE" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:2 +msgid "Compression" +msgstr "Compression" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:3 +msgid "_No compression" +msgstr "_Aucune compression" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:4 +msgid "No_rmal (Deflate)" +msgstr "No_rmal (réduit)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:5 +msgid "_Loss compression (JPEG)" +msgstr "Compression avec _perte (JPEG)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:6 +msgid "Resolution" +msgstr "Résolution" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:7 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 +msgid "_Horizontal:" +msgstr "_Horizontal :" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:8 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 +msgid "_Vertical:" +msgstr "_Vertical :" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:9 +msgid "dpi" +msgstr "ppp" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:2 +msgid "_Method:" +msgstr "_Méthode :" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:3 +msgid "_Lossless" +msgstr "_Sans perte" + +#: ../extensions/cairo_io/gth-image-saver-jpeg.c:516 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:140 +msgid "JPEG" +msgstr "JPEG" + +#: ../extensions/cairo_io/gth-image-saver-png.c:353 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:110 +msgid "PNG" +msgstr "PNG" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:257 +#: ../extensions/cairo_io/gth-image-saver-tiff.c:435 +#: ../gthumb/gth-buffer-data.c:84 +msgid "Insufficient memory" +msgstr "Mémoire insuffisante" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:344 +msgid "TGA" +msgstr "TGA" + +#: ../extensions/cairo_io/gth-image-saver-tiff.c:559 +msgid "TIFF" +msgstr "TIFF" + +#: ../extensions/cairo_io/gth-image-saver-webp.c:382 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:165 +msgid "WebP" +msgstr "WebP" + +#: ../extensions/cairo_io/preferences.c:134 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 +msgid "Saving" +msgstr "Enregistrement" + #: ../extensions/catalogs/actions.c:92 ../extensions/catalogs/actions.c:213 #: ../extensions/catalogs/dlg-add-to-catalog.c:274 #: ../extensions/catalogs/dlg-add-to-catalog.c:394 @@ -709,7 +819,6 @@ msgstr "Va au dossier qui contient le fichier sélectionné" #: ../extensions/catalogs/callbacks.c:110 -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:85 msgid "Other..." msgstr "Autre..." @@ -754,7 +863,7 @@ #: ../extensions/catalogs/callbacks.c:501 #: ../extensions/photo_importer/dlg-photo-importer.c:364 #: ../extensions/photo_importer/dlg-photo-importer.c:404 -#: ../gthumb/gth-file-list.c:43 ../gthumb/gth-folder-tree.c:883 +#: ../gthumb/gth-file-list.c:43 ../gthumb/gth-folder-tree.c:1093 msgid "(Empty)" msgstr "(vide)" @@ -773,8 +882,8 @@ #: ../extensions/catalogs/catalogs.extension.in.in.h:1 #: ../extensions/catalogs/gth-catalog.c:611 #: ../extensions/catalogs/gth-catalog.c:662 -#: ../extensions/catalogs/gth-catalog.c:1024 -#: ../extensions/catalogs/gth-catalog.c:1025 +#: ../extensions/catalogs/gth-catalog.c:1016 +#: ../extensions/catalogs/gth-catalog.c:1017 msgid "Catalogs" msgstr "Catalogues" @@ -800,7 +909,7 @@ #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:5 #: ../extensions/file_manager/actions.c:945 -#: ../extensions/webalbums/gth-web-exporter.c:1842 +#: ../extensions/webalbums/gth-web-exporter.c:1840 msgid "_View the destination" msgstr "_Afficher la destination" @@ -854,7 +963,7 @@ msgstr "A_perçu du catalogue :" #: ../extensions/catalogs/data/ui/organize-files.ui.h:1 -#: ../extensions/edit_metadata/gth-edit-general-page.c:550 +#: ../extensions/edit_metadata/gth-edit-general-page.c:558 #: ../gthumb/gth-main-default-tests.c:300 msgid "Date photo was taken" msgstr "Date de prise de photo" @@ -865,7 +974,7 @@ msgstr "Date de modification du fichier" #: ../extensions/catalogs/data/ui/organize-files.ui.h:3 -#: ../extensions/comments/main.c:159 +#: ../extensions/comments/main.c:182 msgid "Tag" msgstr "Étiquette" @@ -924,7 +1033,7 @@ "Les fichiers sont organisés en catalogues. Aucun fichier n'est déplacé sur " "le disque." -#: ../extensions/catalogs/gth-catalog.c:1122 ../extensions/comments/main.c:44 +#: ../extensions/catalogs/gth-catalog.c:1114 ../extensions/comments/main.c:45 #: ../extensions/edit_metadata/callbacks.c:106 #: ../gthumb/gth-main-default-metadata.c:53 msgid "Tags" @@ -966,10 +1075,10 @@ msgstr "Impossible de supprimer les fichiers du catalogue" #: ../extensions/catalogs/gth-file-source-catalogs.c:1380 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:685 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:694 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:723 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:1228 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:746 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:755 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:785 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:1320 #: ../extensions/search/gth-search.c:265 msgid "Invalid file format" msgstr "Format de fichier non valide" @@ -996,70 +1105,66 @@ msgstr "Modifie la date des fichiers" #: ../extensions/change_date/data/ui/change-date.ui.h:1 +msgid "+" +msgstr "+" + +#: ../extensions/change_date/data/ui/change-date.ui.h:2 +msgid "-" +msgstr "-" + +#: ../extensions/change_date/data/ui/change-date.ui.h:3 msgid "Change Date" msgstr "Modification de la date" -#: ../extensions/change_date/data/ui/change-date.ui.h:2 +#: ../extensions/change_date/data/ui/change-date.ui.h:4 msgid "Change the following values:" msgstr "Modifier les valeurs suivantes :" -#: ../extensions/change_date/data/ui/change-date.ui.h:3 +#: ../extensions/change_date/data/ui/change-date.ui.h:5 msgid "_Last modified date" msgstr "_Date de dernière modification" -#: ../extensions/change_date/data/ui/change-date.ui.h:4 +#: ../extensions/change_date/data/ui/change-date.ui.h:6 msgid "Co_mment date" msgstr "Date du co_mmentaire" -#: ../extensions/change_date/data/ui/change-date.ui.h:5 -msgid "Exif DateTimeOriginal tag" -msgstr "Étiquette DateTimeOriginal d'Exif" - -#: ../extensions/change_date/data/ui/change-date.ui.h:6 +#: ../extensions/change_date/data/ui/change-date.ui.h:7 msgid "Change to:" msgstr "Modifier en :" -#: ../extensions/change_date/data/ui/change-date.ui.h:7 +#: ../extensions/change_date/data/ui/change-date.ui.h:8 msgid "The _following date:" msgstr "La date _suivante :" -#: ../extensions/change_date/data/ui/change-date.ui.h:8 +#: ../extensions/change_date/data/ui/change-date.ui.h:9 msgid "File _modified date" msgstr "Date de _modification du fichier" -#: ../extensions/change_date/data/ui/change-date.ui.h:9 +#: ../extensions/change_date/data/ui/change-date.ui.h:10 msgid "File c_reation date" msgstr "Date de c_réation du fichier" -#: ../extensions/change_date/data/ui/change-date.ui.h:10 +#: ../extensions/change_date/data/ui/change-date.ui.h:11 msgid "Date p_hoto was taken" msgstr "Date de prise de la p_hoto" -#: ../extensions/change_date/data/ui/change-date.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:12 msgid "A_djust by" msgstr "A_juster par" -#: ../extensions/change_date/data/ui/change-date.ui.h:12 +#: ../extensions/change_date/data/ui/change-date.ui.h:13 msgid "hours" msgstr "heures" -#: ../extensions/change_date/data/ui/change-date.ui.h:13 +#: ../extensions/change_date/data/ui/change-date.ui.h:14 msgid "minutes" msgstr "minutes" -#: ../extensions/change_date/data/ui/change-date.ui.h:14 +#: ../extensions/change_date/data/ui/change-date.ui.h:15 #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:6 msgid "seconds" msgstr "secondes" -#: ../extensions/change_date/data/ui/change-date.ui.h:15 -msgid "+" -msgstr "+" - -#: ../extensions/change_date/data/ui/change-date.ui.h:16 -msgid "-" -msgstr "-" - #: ../extensions/comments/callbacks.c:46 msgid "Import Embedded Metadata" msgstr "Importer les métadonnées incorporées" @@ -1087,16 +1192,16 @@ msgid "_Synchronize with the embedded metadata" msgstr "_Synchroniser avec les méta-données incorporées" -#: ../extensions/comments/main.c:34 +#: ../extensions/comments/main.c:35 #: ../extensions/edit_metadata/callbacks.c:100 msgid "Comment" msgstr "Commentaire" -#: ../extensions/comments/main.c:40 ../gthumb/gth-main-default-metadata.c:46 +#: ../extensions/comments/main.c:41 ../gthumb/gth-main-default-metadata.c:46 msgid "Title" msgstr "Titre" -#: ../extensions/comments/main.c:41 ../extensions/comments/main.c:143 +#: ../extensions/comments/main.c:42 ../extensions/comments/main.c:166 #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 #: ../extensions/image_print/data/ui/print-layout.ui.h:8 @@ -1108,16 +1213,16 @@ msgid "Description" msgstr "Description" -#: ../extensions/comments/main.c:42 ../extensions/comments/main.c:151 +#: ../extensions/comments/main.c:43 ../extensions/comments/main.c:174 #: ../gthumb/gth-main-default-metadata.c:50 msgid "Place" msgstr "Lieu" -#: ../extensions/comments/main.c:43 ../gthumb/gth-main-default-metadata.c:51 +#: ../extensions/comments/main.c:44 ../gthumb/gth-main-default-metadata.c:51 msgid "Date" msgstr "Date" -#: ../extensions/comments/main.c:45 ../gthumb/gth-main-default-metadata.c:54 +#: ../extensions/comments/main.c:46 ../gthumb/gth-main-default-metadata.c:54 msgid "Rating" msgstr "Classement" @@ -1152,10 +1257,10 @@ "Créer une image index contenant des vignettes des fichiers sélectionnés." #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:1 -#: ../extensions/file_tools/gth-file-tool-crop.c:424 -#: ../extensions/file_tools/gth-file-tool-crop.c:454 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 -#: ../extensions/file_tools/gth-file-tool-rotate.c:415 +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:446 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 +#: ../extensions/file_tools/gth-file-tool-rotate.c:397 #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:14 #: ../extensions/slideshow/main.c:277 msgid "None" @@ -1197,16 +1302,6 @@ msgid "_Gradient" msgstr "_Dégradé" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 -msgid "_Horizontal:" -msgstr "_Horizontal :" - -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 -msgid "_Vertical:" -msgstr "_Vertical :" - #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:14 msgid "Select a color" msgstr "Choisir une couleur" @@ -1294,6 +1389,7 @@ #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:6 #: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 #: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 @@ -1325,13 +1421,6 @@ msgid "Create _HTML image map" msgstr "Créer une carte _HTML cliquable" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 -#: ../extensions/pixbuf_savers/preferences.c:134 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 -msgid "Saving" -msgstr "Enregistrement" - #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 msgid "Create a new theme" msgstr "Créer un nouveau thème" @@ -1408,21 +1497,21 @@ msgid "Image Wall" msgstr "Mur d'images" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:486 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:498 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:512 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:481 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:492 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:506 msgid "Could not save the theme" msgstr "Impossible d'enregistrer le thème" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:657 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:651 msgid "Could not delete the theme" msgstr "Impossible de supprimer le thème" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:248 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:247 msgid "Creating images" msgstr "Création des images" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:897 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:896 msgid "Generating thumbnails" msgstr "Génération des vignettes" @@ -1480,16 +1569,16 @@ msgid "_Use the original image folder" msgstr "_Utiliser le dossier d'images original" -#: ../extensions/convert_format/dlg-convert-format.c:93 +#: ../extensions/convert_format/dlg-convert-format.c:95 msgid "Converting images" msgstr "Conversion des images" -#: ../extensions/desktop_background/actions.c:162 +#: ../extensions/desktop_background/actions.c:158 msgid "Could not show the desktop background properties" msgstr "Impossible d'afficher les propriétés de l'arrière-plan du bureau" -#: ../extensions/desktop_background/actions.c:228 -#: ../extensions/desktop_background/actions.c:246 +#: ../extensions/desktop_background/actions.c:224 +#: ../extensions/desktop_background/actions.c:242 msgid "Could not set the desktop background" msgstr "Impossible de définir l'arrière-plan du bureau" @@ -1590,7 +1679,8 @@ #: ../extensions/edit_metadata/gth-edit-comment-dialog.c:66 #: ../extensions/edit_metadata/gth-edit-tags-dialog.c:83 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:335 +#: ../extensions/facebook/dlg-import-from-facebook.c:319 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:324 #, c-format msgid "%d file" msgid_plural "%d files" @@ -1598,7 +1688,7 @@ msgstr[1] "%d fichiers" #: ../extensions/edit_metadata/gth-edit-comment-dialog.c:144 -#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:192 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:197 msgid "Sa_ve and Close" msgstr "Enregistrer et fer_mer" @@ -1606,28 +1696,28 @@ msgid "Save only cha_nged fields" msgstr "E_nregistrer que les champs modifiés" -#: ../extensions/edit_metadata/gth-edit-general-page.c:547 +#: ../extensions/edit_metadata/gth-edit-general-page.c:555 msgid "No date" msgstr "Aucune date" -#: ../extensions/edit_metadata/gth-edit-general-page.c:548 +#: ../extensions/edit_metadata/gth-edit-general-page.c:556 msgid "The following date" msgstr "La date suivante" -#: ../extensions/edit_metadata/gth-edit-general-page.c:549 +#: ../extensions/edit_metadata/gth-edit-general-page.c:557 #: ../extensions/importer/gth-import-preferences-dialog.c:331 msgid "Current date" msgstr "Date actuelle" -#: ../extensions/edit_metadata/gth-edit-general-page.c:551 +#: ../extensions/edit_metadata/gth-edit-general-page.c:559 msgid "Last modified date" msgstr "Date de dernière modification" -#: ../extensions/edit_metadata/gth-edit-general-page.c:552 +#: ../extensions/edit_metadata/gth-edit-general-page.c:560 msgid "File creation date" msgstr "Date de création du fichier" -#: ../extensions/edit_metadata/gth-edit-general-page.c:553 +#: ../extensions/edit_metadata/gth-edit-general-page.c:561 msgid "Do not modify" msgstr "Ne pas modifier" @@ -1637,20 +1727,20 @@ msgid "%s Tags" msgstr "Étiquettes de %s" -#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:184 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:189 msgid "Assign Tags" msgstr "Attribuer des étiquettes" -#: ../extensions/edit_metadata/gth-tag-task.c:115 -#: ../extensions/edit_metadata/gth-tag-task.c:132 +#: ../extensions/edit_metadata/gth-tag-task.c:119 +#: ../extensions/edit_metadata/gth-tag-task.c:136 msgid "Assigning tags to the selected files" msgstr "Attribution d'étiquettes aux fichiers sélectionnés" -#: ../extensions/edit_metadata/gth-tag-task.c:115 +#: ../extensions/edit_metadata/gth-tag-task.c:119 msgid "Writing files" msgstr "Écriture de fichiers" -#: ../extensions/edit_metadata/gth-tag-task.c:132 +#: ../extensions/edit_metadata/gth-tag-task.c:136 msgid "Reading files" msgstr "Lecture de fichiers" @@ -1764,7 +1854,7 @@ msgid "XMP Attached" msgstr "XMP attaché" -#: ../extensions/exiv2_tools/main.c:256 +#: ../extensions/exiv2_tools/main.c:272 msgid "date photo was taken" msgstr "date de prise de photo" @@ -1772,47 +1862,52 @@ msgid "Share" msgstr "Partager" -#: ../extensions/facebook/callbacks.c:54 +#: ../extensions/facebook/callbacks.c:59 ../extensions/facebook/callbacks.c:64 msgid "Face_book..." msgstr "Face_book..." -#: ../extensions/facebook/callbacks.c:55 +#: ../extensions/facebook/callbacks.c:60 +msgid "Download photos from Facebook" +msgstr "Télécharger des photos depuis Facebook" + +#: ../extensions/facebook/callbacks.c:65 msgid "Upload photos to Facebook" msgstr "Envoie des photos sur Facebook" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:1 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 msgid "Export to Flickr" msgstr "Exporter vers Flickr" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:2 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 #: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 msgid "_Upload" msgstr "_Envoyer" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:3 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 msgid "_Account:" msgstr "_Compte :" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:4 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:3 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 #: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 #: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 msgid "Edit accounts" msgstr "Modifier les comptes" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 msgid "A_lbum:" msgstr "A_lbum :" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 msgid "Add a new album" msgstr "Ajouter un nouvel album" @@ -1822,9 +1917,12 @@ "Redimensionne les images quand elles sont plus grandes que cette taille" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:8 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 -msgid "_Resize to:" -msgstr "_Redimensionner à :" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 +msgid "_Resize if larger than:" +msgstr "_Redimensionner si l'image est plus grande que :" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:9 msgid "720 x 720" @@ -1846,30 +1944,13 @@ msgid "2048 x 2048" msgstr "2048 x 2048" -#: ../extensions/facebook/data/ui/facebook-account-chooser.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-account-chooser.ui.h:1 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 -#: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 -#: ../extensions/picasaweb/data/ui/picasa-web-account-chooser.ui.h:1 -msgid "A_ccount:" -msgstr "_Compte :" - -#: ../extensions/facebook/data/ui/facebook-account-manager.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-account-manager.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-account-manager.ui.h:1 -#: ../extensions/picasaweb/data/ui/picasa-web-account-manager.ui.h:1 -msgid "A_ccounts:" -msgstr "Co_mptes :" - #: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 msgid "Public photos" msgstr "Photos publiques" #: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 msgid "Private photos, visible to friends" msgstr "Photos privées, visible pour les amis" @@ -1883,26 +1964,6 @@ msgid "_Visibility:" msgstr "_Visibilité :" -#: ../extensions/facebook/data/ui/facebook-ask-authorization.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-ask-authorization.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-ask-authorization.ui.h:1 -msgid "_Authorize..." -msgstr "_Autoriser..." - -#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:1 -#: ../extensions/facebook/facebook-authentication.c:472 -#: ../extensions/flicker_utils/flickr-authentication.c:408 -#: ../extensions/oauth/oauth-authentication.c:423 -msgid "Once you're done, click the 'Continue' button below." -msgstr "" -"Quand vous avez terminé, cliquez sur le bouton « Continuer » ci-dessous." - -#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 -#: ../extensions/flicker_utils/data/ui/flicker-complete-authorization.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-complete-authorization.ui.h:1 -msgid "C_ontinue" -msgstr "Co_ntinuer" - #: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:1 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:1 @@ -1914,171 +1975,127 @@ #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:2 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:2 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:2 -#: ../extensions/webalbums/gth-web-exporter.c:1841 +#: ../extensions/webalbums/gth-web-exporter.c:1839 msgid "_Open in the Browser" msgstr "_Ouvrir dans le navigateur" -#: ../extensions/facebook/dlg-export-to-facebook.c:130 -#: ../extensions/facebook/dlg-export-to-facebook.c:335 -#: ../extensions/facebook/facebook-authentication.c:192 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 +msgid "Import from Picasa Web Album" +msgstr "Importer depuis un album Web Picasa" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:2 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 +msgid "_Import" +msgstr "_Importer" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:4 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 +#: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 +msgid "A_ccount:" +msgstr "_Compte :" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:5 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 +msgid "_Album:" +msgstr "_Album :" + +#: ../extensions/facebook/dlg-export-to-facebook.c:123 +#: ../extensions/facebook/dlg-export-to-facebook.c:326 +#: ../extensions/facebook/dlg-import-from-facebook.c:226 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:138 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:399 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:237 -#: ../extensions/flicker_utils/flickr-authentication.c:191 -#: ../extensions/oauth/oauth-authentication.c:187 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:414 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:231 +#: ../extensions/oauth/web-service.c:380 #: ../extensions/photobucket/dlg-export-to-photobucket.c:131 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:376 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:139 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:424 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:380 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:375 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:124 msgid "Could not connect to the server" msgstr "Impossible de se connecter au serveur" -#: ../extensions/facebook/dlg-export-to-facebook.c:182 +#: ../extensions/facebook/dlg-export-to-facebook.c:175 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:246 #: ../extensions/photobucket/dlg-export-to-photobucket.c:182 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:192 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:176 msgid "Could not upload the files" msgstr "Impossible d'envoyer les fichiers" -#: ../extensions/facebook/dlg-export-to-facebook.c:412 +#: ../extensions/facebook/dlg-export-to-facebook.c:397 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:188 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:223 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:462 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:717 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:457 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:309 msgid "Could not create the album" msgstr "Impossible de créer l'album" -#: ../extensions/facebook/dlg-export-to-facebook.c:481 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:534 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:783 +#: ../extensions/facebook/dlg-export-to-facebook.c:465 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:528 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:375 msgid "New Album" msgstr "Nouvel album" -#: ../extensions/facebook/dlg-export-to-facebook.c:561 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:557 -#: ../extensions/image_print/gth-image-print-job.c:1789 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:614 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1002 +#: ../extensions/facebook/dlg-export-to-facebook.c:557 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:583 +#: ../extensions/image_print/gth-image-print-job.c:1739 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:607 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:597 msgid "No valid file selected." msgstr "Aucun fichier valide n'est sélectionné." -#: ../extensions/facebook/dlg-export-to-facebook.c:562 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:558 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:615 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1003 +#: ../extensions/facebook/dlg-export-to-facebook.c:558 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:584 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:608 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:598 msgid "Could not export the files" msgstr "Impossible d'exporter les fichiers" -#: ../extensions/facebook/dlg-export-to-facebook.c:570 -#: ../extensions/find_duplicates/gth-find-duplicates.c:255 -#: ../extensions/find_duplicates/gth-find-duplicates.c:347 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:566 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:623 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1010 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:803 -#: ../gthumb/gth-browser.c:1006 +#: ../extensions/facebook/dlg-export-to-facebook.c:566 +#: ../extensions/find_duplicates/gth-find-duplicates.c:277 +#: ../extensions/find_duplicates/gth-find-duplicates.c:470 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:592 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:616 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:605 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:254 +#: ../gthumb/gth-browser.c:1116 #, c-format msgid "%d file (%s)" msgid_plural "%d files (%s)" msgstr[0] "%d fichier (%s)" msgstr[1] "%d fichiers (%s)" -#: ../extensions/facebook/dlg-export-to-facebook.c:591 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:589 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:642 +#: ../extensions/facebook/dlg-export-to-facebook.c:587 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:615 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:635 #, c-format msgid "Export to %s" msgstr "Exporter vers %s" -#: ../extensions/facebook/facebook-account-chooser-dialog.c:200 -#: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:200 -#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 -msgid "New authentication..." -msgstr "Nouvelle authentification..." - -#: ../extensions/facebook/facebook-authentication.c:194 -#: ../extensions/flicker_utils/flickr-authentication.c:193 -#: ../extensions/oauth/oauth-authentication.c:189 -msgid "Choose _Account..." -msgstr "Sélectionner le _compte..." +#: ../extensions/facebook/dlg-import-from-facebook.c:344 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:349 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:279 +msgid "Could not get the photo list" +msgstr "Impossible d'obtenir la liste des photos" -#: ../extensions/facebook/facebook-authentication.c:471 -#: ../extensions/flicker_utils/flickr-authentication.c:407 -#: ../extensions/oauth/oauth-authentication.c:422 -#, c-format -msgid "" -"Return to this window when you have finished the authorization process on %s" -msgstr "" -"Revenez dans cette fenêtre lorsque vous avez terminé le processus " -"d'autorisation sur %s" +#: ../extensions/facebook/dlg-import-from-facebook.c:378 +#: ../extensions/facebook/dlg-import-from-facebook.c:533 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:386 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:551 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:313 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:586 +msgid "No album selected" +msgstr "Aucun album sélectionné" -#: ../extensions/facebook/facebook-authentication.c:556 -#: ../extensions/flicker_utils/flickr-authentication.c:487 -#: ../extensions/oauth/oauth-authentication.c:502 -#, c-format -msgid "gthumb requires your authorization to upload the photos to %s" -msgstr "gthumb a besoin de votre autorisation pour envoyer les photos sur %s" - -#: ../extensions/facebook/facebook-authentication.c:557 -#: ../extensions/flicker_utils/flickr-authentication.c:488 -#: ../extensions/oauth/oauth-authentication.c:503 +#: ../extensions/facebook/dlg-import-from-facebook.c:551 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:569 #, c-format -msgid "" -"Click 'Authorize' to open your web browser and authorize gthumb to upload " -"photos to %s. When you're finished, return to this window to complete the " -"authorization." -msgstr "" -"Cliquez sur « Autoriser » pour ouvrir votre navigateur Web et autoriser " -"gthumb à envoyer des photos sur %s. Quand vous avez fini, revenez à cette " -"fenêtre pour terminer l'autorisation." - -#: ../extensions/facebook/facebook-authentication.c:652 -#: ../extensions/flicker_utils/flickr-authentication.c:588 -#: ../extensions/oauth/oauth-authentication.c:605 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:820 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:684 -msgid "Choose Account" -msgstr "Choisir le compte" - -#: ../extensions/facebook/facebook-authentication.c:761 -#: ../extensions/flicker_utils/flickr-authentication.c:697 -#: ../extensions/oauth/oauth-authentication.c:714 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:881 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:745 -msgid "Edit Accounts" -msgstr "Modifier les comptes" - -#: ../extensions/facebook/facebook-connection.c:275 -#: ../extensions/facebook/facebook-connection.c:435 -#: ../extensions/facebook/facebook-service.c:162 -#: ../extensions/facebook/facebook-service.c:265 -#: ../extensions/facebook/facebook-service.c:468 -#: ../extensions/flicker_utils/flickr-connection.c:266 -#: ../extensions/flicker_utils/flickr-connection.c:413 -#: ../extensions/flicker_utils/flickr-service.c:195 -#: ../extensions/flicker_utils/flickr-service.c:398 -#: ../extensions/photobucket/photobucket-consumer.c:74 -#: ../extensions/photobucket/photobucket-consumer.c:79 -#: ../extensions/photobucket/photobucket-consumer.c:115 -#: ../extensions/photobucket/photobucket-consumer.c:170 -msgid "Unknown error" -msgstr "Erreur inconnue" - -#: ../extensions/facebook/facebook-connection.c:310 -#: ../extensions/facebook/facebook-connection.c:461 -#: ../extensions/facebook/facebook-service.c:188 -#: ../extensions/facebook/facebook-service.c:290 -#: ../extensions/flicker_utils/flickr-connection.c:292 -#: ../extensions/flicker_utils/flickr-connection.c:439 -#: ../extensions/flicker_utils/flickr-service.c:219 -#: ../extensions/oauth/oauth-connection.c:356 -#: ../extensions/oauth/oauth-connection.c:431 -#: ../extensions/oauth/oauth-connection.c:535 -#: ../extensions/picasaweb/google-connection.c:344 -msgid "Connecting to the server" -msgstr "Connexion au serveur" +msgid "Import from %s" +msgstr "Importation depuis %s" +#: ../extensions/facebook/dlg-import-from-facebook.c:551 #: ../extensions/facebook/facebook.extension.in.in.h:1 msgid "Facebook" msgstr "Facebook" @@ -2087,58 +2104,49 @@ msgid "Upload images to Facebook" msgstr "Envoyer des images sur Facebook" -#: ../extensions/facebook/facebook-service.c:188 -#: ../extensions/facebook/facebook-service.c:290 -#: ../extensions/flicker_utils/flickr-service.c:219 -#: ../extensions/oauth/oauth-connection.c:356 -#: ../extensions/oauth/oauth-connection.c:431 -#: ../extensions/oauth/oauth-connection.c:535 -msgid "Getting account information" -msgstr "Obtention des informations du compte" - -#: ../extensions/facebook/facebook-service.c:396 -#: ../extensions/flicker_utils/flickr-service.c:323 -#: ../extensions/photobucket/photobucket-service.c:207 -#: ../extensions/picasaweb/picasa-web-service.c:209 +#: ../extensions/facebook/facebook-service.c:462 +#: ../extensions/flicker_utils/flickr-service.c:863 +#: ../extensions/photobucket/photobucket-service.c:310 +#: ../extensions/picasaweb/picasa-web-service.c:711 msgid "Getting the album list" msgstr "Obtention de la liste des albums" -#: ../extensions/facebook/facebook-service.c:525 -#: ../extensions/flicker_utils/flickr-service.c:426 -#: ../extensions/flicker_utils/flickr-service.c:546 -#: ../extensions/flicker_utils/flickr-service.c:584 -#: ../extensions/photobucket/photobucket-service.c:316 -#: ../extensions/picasaweb/picasa-web-service.c:300 +#: ../extensions/facebook/facebook-service.c:584 +#: ../extensions/flicker_utils/flickr-service.c:965 +#: ../extensions/flicker_utils/flickr-service.c:1087 +#: ../extensions/flicker_utils/flickr-service.c:1126 +#: ../extensions/photobucket/photobucket-service.c:423 +#: ../extensions/picasaweb/picasa-web-service.c:805 msgid "Creating the new album" msgstr "Création du nouvel album" -#: ../extensions/facebook/facebook-service.c:584 -#: ../extensions/flicker_utils/flickr-service.c:634 -#: ../extensions/photobucket/photobucket-service.c:373 -#: ../extensions/picasaweb/picasa-web-service.c:357 +#: ../extensions/facebook/facebook-service.c:645 +#: ../extensions/flicker_utils/flickr-service.c:1176 +#: ../extensions/photobucket/photobucket-service.c:485 +#: ../extensions/picasaweb/picasa-web-service.c:860 #, c-format msgid "Could not upload '%s': %s" msgstr "Impossible d'envoyer « %s » : %s" #. Translators: %s is a filename -#: ../extensions/facebook/facebook-service.c:670 -#: ../extensions/flicker_utils/flickr-service.c:745 -#: ../extensions/photobucket/photobucket-service.c:430 -#: ../extensions/picasaweb/picasa-web-service.c:412 +#: ../extensions/facebook/facebook-service.c:710 +#: ../extensions/flicker_utils/flickr-service.c:1287 +#: ../extensions/photobucket/photobucket-service.c:542 +#: ../extensions/picasaweb/picasa-web-service.c:917 #, c-format msgid "Uploading '%s'" msgstr "Envoi de « %s »" -#: ../extensions/facebook/facebook-service.c:886 -#: ../extensions/flicker_utils/flickr-service.c:914 -#: ../extensions/photobucket/photobucket-service.c:599 -#: ../extensions/picasaweb/picasa-web-service.c:605 +#: ../extensions/facebook/facebook-service.c:923 +#: ../extensions/flicker_utils/flickr-service.c:1482 +#: ../extensions/photobucket/photobucket-service.c:714 +#: ../extensions/picasaweb/picasa-web-service.c:1138 msgid "Uploading the files to the server" msgstr "Envoi des fichiers vers le serveur" -#: ../extensions/facebook/facebook-service.c:1003 -#: ../extensions/flicker_utils/flickr-service.c:1077 -#: ../extensions/picasaweb/picasa-web-service.c:718 +#: ../extensions/facebook/facebook-service.c:1022 +#: ../extensions/flicker_utils/flickr-service.c:1651 +#: ../extensions/picasaweb/picasa-web-service.c:1257 msgid "Getting the photo list" msgstr "Obtention de la liste des photos" @@ -2152,13 +2160,13 @@ #: ../extensions/file_manager/actions.c:400 #: ../extensions/file_manager/callbacks.c:380 -#: ../extensions/file_manager/callbacks.c:842 +#: ../extensions/file_manager/callbacks.c:838 msgid "Could not move the files" msgstr "Impossible de déplacer les fichiers" #: ../extensions/file_manager/actions.c:401 #: ../extensions/file_manager/callbacks.c:381 -#: ../extensions/file_manager/callbacks.c:843 +#: ../extensions/file_manager/callbacks.c:839 msgid "" "Files cannot be moved to the current location, as alternative you can choose " "to copy them." @@ -2252,6 +2260,7 @@ #: ../extensions/file_manager/callbacks.c:187 #: ../extensions/file_manager/callbacks.c:223 #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:5 +#: ../gthumb/gth-tags-entry.c:871 msgid "_Delete" msgstr "_Supprimer" @@ -2303,9 +2312,10 @@ msgid "Move the selected files to another folder" msgstr "Déplace les fichiers sélectionnés vers une autre dossier" -#: ../extensions/file_manager/callbacks.c:1003 -#: ../extensions/find_duplicates/gth-find-duplicates.c:581 -#: ../gthumb/gth-browser.c:5009 ../gthumb/gth-browser.c:5043 +#: ../extensions/file_manager/callbacks.c:999 +#: ../extensions/find_duplicates/gth-find-duplicates.c:766 +#: ../gthumb/gth-browser.c:5234 ../gthumb/gth-browser.c:5268 +#: ../gthumb/gth-progress-dialog.c:406 msgid "Could not perform the operation" msgstr "Impossible d'effectuer cette opération" @@ -2322,6 +2332,7 @@ msgstr "Suppression des fichiers" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:1 +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:5 msgid "_Preview" msgstr "_Aperçu" @@ -2363,81 +2374,96 @@ msgstr "_Réinitialiser" #: ../extensions/file_tools/data/ui/crop-options.ui.h:1 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +msgid "Selection" +msgstr "Sélection" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 +msgid "_Width:" +msgstr "_Largeur :" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:3 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 +msgid "Heigh_t:" +msgstr "Hau_teur :" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:4 msgid "_Position:" msgstr "_Position :" -#. this is used to separate the dimensions, for example: 120 × 250 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:4 -msgid "×" -msgstr "×" - #: ../extensions/file_tools/data/ui/crop-options.ui.h:5 -msgid "_Grid:" -msgstr "_Grille :" - -#: ../extensions/file_tools/data/ui/crop-options.ui.h:6 msgid "Maximize" msgstr "Maximiser" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:6 msgid "Center" msgstr "Centrer" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 -msgid "Selection" -msgstr "Sélection" - -#: ../extensions/file_tools/data/ui/crop-options.ui.h:9 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 #: ../extensions/file_tools/data/ui/resize-options.ui.h:5 +msgid "Aspect ratio" +msgstr "Proportions" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 msgid "I_nvert aspect ratio" msgstr "I_nverser les proportions" #. after the colon there is a control to select the size in pixels -#: ../extensions/file_tools/data/ui/crop-options.ui.h:11 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:10 msgid "M_ultiple of:" msgstr "M_ultiple de :" #. abbreviation of pixel -#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:12 msgid "px" msgstr "px" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 +#: ../gthumb/gth-file-chooser-dialog.c:252 +msgid "Options" +msgstr "Options" + #: ../extensions/file_tools/data/ui/crop-options.ui.h:14 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 -msgid "Aspect ratio" -msgstr "Proportions" +msgid "_Grid:" +msgstr "_Grille :" #: ../extensions/file_tools/data/ui/crop-options.ui.h:15 msgid "C_rop" msgstr "Découpe_r" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 -msgid "_Width:" -msgstr "_Largeur :" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 -msgid "Heigh_t:" -msgstr "Hau_teur :" +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:1 +msgid "Method" +msgstr "Méthode" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:2 +msgid "_Brightness" +msgstr "_Luminosité" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:3 +msgid "_Saturation" +msgstr "_Saturation" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:4 +msgid "_Average" +msgstr "_Moyenne" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 -msgid "Set the image size to this value" -msgstr "Définit la taille d'image à cette valeur" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 #: ../gthumb/gth-main-default-metadata.c:47 msgid "Dimensions" msgstr "Dimensions" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 -msgid "High _quality" -msgstr "Haute _qualité" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +msgid "Set the image size to this value" +msgstr "Définit la taille d'image à cette valeur" #: ../extensions/file_tools/data/ui/resize-options.ui.h:8 -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 -msgid "Options" -msgstr "Options" +msgid "High _quality" +msgstr "Haute _qualité" #: ../extensions/file_tools/data/ui/resize-options.ui.h:9 msgid "Original dimensions:" @@ -2463,45 +2489,45 @@ msgstr "%" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:1 -msgid "Align" -msgstr "Aligner" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 msgid "Angle" msgstr "Angle" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 +msgid "Align" +msgstr "Aligner" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 +msgid "Image size" +msgstr "Taille de l'image" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 msgid "Point 1:" msgstr "Point 1 :" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 msgid "Point 2:" msgstr "Point 2 :" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 msgid "Keep aspect ratio" msgstr "Conserver les proportions" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 -msgid "Image size" -msgstr "Taille de l'image" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 msgid "Grid:" msgstr "Grille :" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 +msgid "_Background:" +msgstr "_Arrière-plan :" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 msgid "Pick a background color" msgstr "Choisir une couleur d'arrière-plan" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 msgid "_Transparent" msgstr "_Transparent" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 -msgid "_Background:" -msgstr "_Arrière-plan :" - #: ../extensions/file_tools/data/ui/rotate-options.ui.h:12 msgid "Reset" msgstr "Réinitialiser" @@ -2563,141 +2589,135 @@ msgid "Basic tools to modify images." msgstr "Outils de base pour modifier des images." -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:372 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:272 +#: ../extensions/file_tools/gth-file-tool-grayscale.c:248 +#: ../extensions/file_tools/gth-file-tool-negative.c:68 +msgid "Applying changes" +msgstr "Application des changements" + +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 msgid "Adjust Colors..." msgstr "Ajustement des couleurs..." -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 msgid "Adjust Colors" msgstr "Ajustement des couleurs" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:531 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:619 msgid "Change brightness, contrast, saturation and gamma level of the image" msgstr "" "Modifie les niveaux de luminosité, contraste, saturation et gamma de l'image" -#: ../extensions/file_tools/gth-file-tool-crop.c:424 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:304 +msgid "Adjust Contrast" +msgstr "Ajustement du contraste" + +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:305 +msgid "Automatic contrast adjustment" +msgstr "Ajustement automatique du contraste" + +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 msgid "Square" msgstr "Carré" -#: ../extensions/file_tools/gth-file-tool-crop.c:425 -#: ../extensions/file_tools/gth-file-tool-resize.c:499 +#: ../extensions/file_tools/gth-file-tool-crop.c:417 +#: ../extensions/file_tools/gth-file-tool-resize.c:590 #, c-format msgid "%d x %d (Image)" msgstr "%d x %d (Image)" -#: ../extensions/file_tools/gth-file-tool-crop.c:428 -#: ../extensions/file_tools/gth-file-tool-resize.c:503 +#: ../extensions/file_tools/gth-file-tool-crop.c:420 +#: ../extensions/file_tools/gth-file-tool-resize.c:594 #, c-format msgid "%d x %d (Screen)" msgstr "%d x %d (écran)" -#: ../extensions/file_tools/gth-file-tool-crop.c:432 -#: ../extensions/file_tools/gth-file-tool-resize.c:508 +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-resize.c:599 msgid "5:4" msgstr "5 x 4" -#: ../extensions/file_tools/gth-file-tool-crop.c:433 -#: ../extensions/file_tools/gth-file-tool-resize.c:509 +#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-resize.c:600 msgid "4:3 (DVD, Book)" msgstr "4 x 3 (DVD, livre)" -#: ../extensions/file_tools/gth-file-tool-crop.c:434 -#: ../extensions/file_tools/gth-file-tool-resize.c:510 +#: ../extensions/file_tools/gth-file-tool-crop.c:426 +#: ../extensions/file_tools/gth-file-tool-resize.c:601 msgid "7:5" msgstr "7 x 5" -#: ../extensions/file_tools/gth-file-tool-crop.c:435 -#: ../extensions/file_tools/gth-file-tool-resize.c:511 +#: ../extensions/file_tools/gth-file-tool-crop.c:427 +#: ../extensions/file_tools/gth-file-tool-resize.c:602 msgid "3:2 (Postcard)" msgstr "3 x 2 (Carte postale)" -#: ../extensions/file_tools/gth-file-tool-crop.c:436 -#: ../extensions/file_tools/gth-file-tool-resize.c:512 +#: ../extensions/file_tools/gth-file-tool-crop.c:428 +#: ../extensions/file_tools/gth-file-tool-resize.c:603 msgid "16:10" msgstr "16 x 10" -#: ../extensions/file_tools/gth-file-tool-crop.c:437 -#: ../extensions/file_tools/gth-file-tool-resize.c:513 +#: ../extensions/file_tools/gth-file-tool-crop.c:429 +#: ../extensions/file_tools/gth-file-tool-resize.c:604 msgid "16:9 (DVD)" msgstr "16 x 9 (DVD)" -#: ../extensions/file_tools/gth-file-tool-crop.c:438 -#: ../extensions/file_tools/gth-file-tool-resize.c:514 +#: ../extensions/file_tools/gth-file-tool-crop.c:430 +#: ../extensions/file_tools/gth-file-tool-resize.c:605 msgid "1.85:1" msgstr "1,85 x 1" -#: ../extensions/file_tools/gth-file-tool-crop.c:439 -#: ../extensions/file_tools/gth-file-tool-resize.c:515 +#: ../extensions/file_tools/gth-file-tool-crop.c:431 +#: ../extensions/file_tools/gth-file-tool-resize.c:606 msgid "2.39:1" msgstr "2,39 x 1" -#: ../extensions/file_tools/gth-file-tool-crop.c:440 -#: ../extensions/file_tools/gth-file-tool-resize.c:516 +#: ../extensions/file_tools/gth-file-tool-crop.c:432 +#: ../extensions/file_tools/gth-file-tool-resize.c:607 #: ../extensions/image_print/data/ui/print-layout.ui.h:2 #: ../extensions/rename_series/gth-template-selector.c:234 msgid "Custom" msgstr "Personnalisé" -#: ../extensions/file_tools/gth-file-tool-crop.c:455 -#: ../extensions/file_tools/gth-file-tool-rotate.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:447 +#: ../extensions/file_tools/gth-file-tool-rotate.c:398 msgid "Rule of Thirds" msgstr "Règle des tiers" -#: ../extensions/file_tools/gth-file-tool-crop.c:456 -#: ../extensions/file_tools/gth-file-tool-rotate.c:417 +#: ../extensions/file_tools/gth-file-tool-crop.c:448 +#: ../extensions/file_tools/gth-file-tool-rotate.c:399 msgid "Golden Sections" msgstr "Nombre d'or" -#: ../extensions/file_tools/gth-file-tool-crop.c:457 -#: ../extensions/file_tools/gth-file-tool-rotate.c:418 +#: ../extensions/file_tools/gth-file-tool-crop.c:449 +#: ../extensions/file_tools/gth-file-tool-rotate.c:400 msgid "Center Lines" msgstr "Lignes centrales" -#: ../extensions/file_tools/gth-file-tool-crop.c:458 -#: ../extensions/file_tools/gth-file-tool-rotate.c:419 +#: ../extensions/file_tools/gth-file-tool-crop.c:450 +#: ../extensions/file_tools/gth-file-tool-rotate.c:401 msgid "Uniform" msgstr "Uniforme" -#: ../extensions/file_tools/gth-file-tool-crop.c:614 +#: ../extensions/file_tools/gth-file-tool-crop.c:608 msgid "Crop..." msgstr "Découper..." -#: ../extensions/file_tools/gth-file-tool-crop.c:614 +#: ../extensions/file_tools/gth-file-tool-crop.c:608 msgid "Crop" msgstr "Découper" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:68 -#: ../extensions/file_tools/gth-file-tool-negative.c:68 -msgid "Applying changes" -msgstr "Application des changements" - -#: ../extensions/file_tools/gth-file-tool-desaturate.c:203 -msgid "Desaturate" -msgstr "Désaturer" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:119 -msgid "White balance correction" -msgstr "Correction de la balance des blancs" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:342 -msgid "Enhance Colors" -msgstr "Améliorer les couleurs" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:343 -msgid "Automatic white balance correction" -msgstr "Correction automatique de la balance des blancs" - -#: ../extensions/file_tools/gth-file-tool-equalize.c:86 +#: ../extensions/file_tools/gth-file-tool-equalize.c:45 msgid "Equalizing image histogram" msgstr "Égalisation de l'histogramme de l'image" -#: ../extensions/file_tools/gth-file-tool-equalize.c:275 +#: ../extensions/file_tools/gth-file-tool-equalize.c:230 msgid "Equalize" msgstr "Égaliser" -#: ../extensions/file_tools/gth-file-tool-equalize.c:276 +#: ../extensions/file_tools/gth-file-tool-equalize.c:231 msgid "Equalize image histogram" msgstr "Égalise l'histogramme de l'image" @@ -2709,6 +2729,14 @@ msgid "Flip the image vertically" msgstr "Retourner l'image verticalement" +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale..." +msgstr "Niveaux de gris..." + +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale" +msgstr "Niveaux de gris" + #: ../extensions/file_tools/gth-file-tool-mirror.c:87 msgid "Mirror" msgstr "Miroir" @@ -2725,23 +2753,28 @@ msgid "Redo" msgstr "Rétablir" -#: ../extensions/file_tools/gth-file-tool-resize.c:680 +#: ../extensions/file_tools/gth-file-tool-resize.c:214 +#: ../extensions/resize_images/dlg-resize-images.c:180 +msgid "Resizing images" +msgstr "Redimensionne les images" + +#: ../extensions/file_tools/gth-file-tool-resize.c:808 msgid "Resize..." msgstr "Redimensionner..." -#: ../extensions/file_tools/gth-file-tool-resize.c:680 +#: ../extensions/file_tools/gth-file-tool-resize.c:808 msgid "Resize" msgstr "Redimensionner" -#: ../extensions/file_tools/gth-file-tool-rotate.c:636 +#: ../extensions/file_tools/gth-file-tool-rotate.c:628 msgid "Rotate..." msgstr "Pivoter…" -#: ../extensions/file_tools/gth-file-tool-rotate.c:636 +#: ../extensions/file_tools/gth-file-tool-rotate.c:628 msgid "Rotate" msgstr "Pivoter" -#: ../extensions/file_tools/gth-file-tool-rotate.c:637 +#: ../extensions/file_tools/gth-file-tool-rotate.c:629 msgid "Freely rotate the image" msgstr "Rotation libre de l'image" @@ -2771,15 +2804,15 @@ msgid "Save" msgstr "Enregistrer" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:100 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:101 msgid "Sharpening image" msgstr "Augmentation de la netteté de l'image" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 msgid "Enhance Focus..." msgstr "Améliorer la netteté…" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 msgid "Enhance Focus" msgstr "Améliorer la netteté" @@ -2840,43 +2873,43 @@ msgid "Find duplicated files." msgstr "Rechercher des fichiers en double." -#: ../extensions/find_duplicates/gth-find-duplicates.c:53 +#: ../extensions/find_duplicates/gth-find-duplicates.c:65 msgid "leave the newest duplicates" msgstr "conserver le doublon le plus récent" -#: ../extensions/find_duplicates/gth-find-duplicates.c:54 +#: ../extensions/find_duplicates/gth-find-duplicates.c:66 msgid "leave the oldest duplicates" msgstr "conserver le doublon le plus ancien" -#: ../extensions/find_duplicates/gth-find-duplicates.c:55 +#: ../extensions/find_duplicates/gth-find-duplicates.c:67 msgid "by folder..." msgstr "par dossier…" -#: ../extensions/find_duplicates/gth-find-duplicates.c:56 +#: ../extensions/find_duplicates/gth-find-duplicates.c:68 msgid "all files" msgstr "tous les fichiers" -#: ../extensions/find_duplicates/gth-find-duplicates.c:57 +#: ../extensions/find_duplicates/gth-find-duplicates.c:69 msgid "no file" msgstr "aucun fichier" -#: ../extensions/find_duplicates/gth-find-duplicates.c:397 -#: ../extensions/find_duplicates/gth-find-duplicates.c:492 +#: ../extensions/find_duplicates/gth-find-duplicates.c:560 +#: ../extensions/find_duplicates/gth-find-duplicates.c:668 #, c-format msgid "%d duplicate" msgid_plural "%d duplicates" msgstr[0] "%d doublon" msgstr[1] "%d doublons" -#: ../extensions/find_duplicates/gth-find-duplicates.c:536 +#: ../extensions/find_duplicates/gth-find-duplicates.c:712 msgid "Search completed" msgstr "Recherche terminée" -#: ../extensions/find_duplicates/gth-find-duplicates.c:548 +#: ../extensions/find_duplicates/gth-find-duplicates.c:725 msgid "Searching for duplicates" msgstr "Recherche de doublons" -#: ../extensions/find_duplicates/gth-find-duplicates.c:551 +#: ../extensions/find_duplicates/gth-find-duplicates.c:728 #: ../gthumb/gth-load-file-data-task.c:106 #: ../gthumb/gth-save-file-data-task.c:100 #, c-format @@ -2885,15 +2918,15 @@ msgstr[0] "encore %d fichier" msgstr[1] "encore %d fichiers" -#: ../extensions/find_duplicates/gth-find-duplicates.c:634 +#: ../extensions/find_duplicates/gth-find-duplicates.c:830 msgid "Getting the file list" msgstr "Obtention de la liste des fichiers" -#: ../extensions/find_duplicates/gth-find-duplicates.c:740 +#: ../extensions/find_duplicates/gth-find-duplicates.c:1016 msgid "Duplicates" msgstr "Doublons" -#: ../extensions/find_duplicates/gth-find-duplicates.c:997 +#: ../extensions/find_duplicates/gth-find-duplicates.c:1306 msgid "Select" msgstr "Choisir" @@ -2918,7 +2951,7 @@ msgstr "Envoie des images sur Flickr" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 #: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 msgid "Free space:" msgstr "Espace libre :" @@ -2940,69 +2973,96 @@ msgid "_Safety:" msgstr "_Sécurité :" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 msgid "Private photos, visible to family and friends" msgstr "Photos privées, visible pour la famille et les amis" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 msgid "Private photos, visible to family" msgstr "Photos privées, visible pour la famille" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 msgid "Private photos" msgstr "Photos privées" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 msgid "Safe content" msgstr "Contenu tout public" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 msgid "Moderate content" msgstr "Modération du contenu" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:17 msgid "Restricted content" msgstr "Contenu confidentiel" -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 -msgid "_Import" -msgstr "_Importer" +#: ../extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui.h:1 +msgid "C_ontinue" +msgstr "Co_ntinuer" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:360 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:830 -msgid "Could not get the photo list" -msgstr "Impossible d'obtenir la liste des photos" +#: ../extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui.h:2 +msgid "_Authorize..." +msgstr "_Autoriser..." -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:397 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:561 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:864 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1026 -msgid "No album selected" -msgstr "Aucun album sélectionné" +#: ../extensions/flicker_utils/flickr-consumer.c:124 +#: ../extensions/flicker_utils/flickr-service.c:237 +#: ../extensions/flicker_utils/flickr-service.c:348 +#: ../extensions/flicker_utils/flickr-service.c:672 +#: ../extensions/flicker_utils/flickr-service.c:937 +#: ../extensions/oauth/oauth-service.c:154 +#: ../extensions/photobucket/photobucket-consumer.c:74 +#: ../extensions/photobucket/photobucket-consumer.c:82 +#: ../extensions/photobucket/photobucket-consumer.c:149 +#: ../extensions/photobucket/photobucket-service.c:132 +msgid "Unknown error" +msgstr "Erreur inconnue" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:579 +#: ../extensions/flicker_utils/flickr-service.c:502 #, c-format -msgid "Import from %s" -msgstr "Importation depuis %s" +msgid "" +"Return to this window when you have finished the authorization process on %s" +msgstr "" +"Revenez dans cette fenêtre lorsque vous avez terminé le processus " +"d'autorisation sur %s" + +#: ../extensions/flicker_utils/flickr-service.c:503 +msgid "Once you're done, click the 'Continue' button below." +msgstr "" +"Quand vous avez terminé, cliquez sur le bouton « Continuer » ci-dessous." + +#: ../extensions/flicker_utils/flickr-service.c:571 +#, c-format +msgid "gThumb requires your authorization to upload the photos to %s" +msgstr "gThumb a besoin de votre autorisation pour envoyer les photos sur %s" + +#: ../extensions/flicker_utils/flickr-service.c:572 +#, c-format +msgid "" +"Click 'Authorize' to open your web browser and authorize gthumb to upload " +"photos to %s. When you're finished, return to this window to complete the " +"authorization." +msgstr "" +"Cliquez sur « Autoriser » pour ouvrir votre navigateur Web et autoriser " +"gthumb à envoyer des photos sur %s. Quand vous avez fini, revenez à cette " +"fenêtre pour terminer l'autorisation." #: ../extensions/gstreamer_tools/actions.c:66 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1080 -#: ../gthumb/gth-browser.c:2013 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1072 +#: ../gthumb/gth-browser.c:2175 msgid "Could not save the file" msgstr "Impossible d'enregistrer le fichier" -#: ../extensions/gstreamer_tools/actions.c:126 +#: ../extensions/gstreamer_tools/actions.c:130 msgid "Could not take a screenshot" msgstr "Impossible de faire une capture d'écran" -#: ../extensions/gstreamer_tools/actions.c:132 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1248 +#: ../extensions/gstreamer_tools/actions.c:136 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1245 msgid "Save Image" msgstr "Enregistrer l'image" -#: ../extensions/gstreamer_tools/actions.c:152 +#: ../extensions/gstreamer_tools/actions.c:156 msgctxt "Filename" msgid "Screenshot" msgstr "Capture d'écran " @@ -3012,7 +3072,7 @@ msgstr "Plus lent" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:686 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:699 msgid "Play" msgstr "Lecture" @@ -3058,11 +3118,11 @@ msgid "Take a screenshot" msgstr "Prend une capture d'écran" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:663 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 msgid "Playing video" msgstr "Lecture de la vidéo" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:689 msgid "Pause" msgstr "Pause" @@ -3121,20 +3181,19 @@ msgid "Sample rate" msgstr "Taux d'échantillonnage" -#: ../extensions/gstreamer_utils/gstreamer-utils.c:363 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:362 msgid "Stereo" msgstr "Stéréo" -#: ../extensions/gstreamer_utils/gstreamer-utils.c:363 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:362 msgid "Mono" msgstr "Mono" #. Translators: this is an image size, such as 1024 × 768 -#: ../extensions/gstreamer_utils/gstreamer-utils.c:396 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1303 -#: ../extensions/image_viewer/gth-metadata-provider-image.c:190 -#: ../extensions/webalbums/dlg-web-exporter.c:442 -#: ../extensions/webalbums/gth-web-exporter.c:2446 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:395 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1300 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:209 +#: ../extensions/webalbums/gth-web-exporter.c:2446 ../gthumb/gtk-utils.c:1027 #, c-format msgid "%d × %d" msgstr "%d × %d" @@ -3143,7 +3202,7 @@ msgid "Could not print the selected files" msgstr "Impossible d'imprimer les fichiers sélectionnés" -#: ../extensions/image_print/callbacks.c:54 +#: ../extensions/image_print/callbacks.c:65 msgid "Print the selected images" msgstr "Imprime les images sélectionnées" @@ -3216,25 +3275,26 @@ msgid "Fonts" msgstr "Polices" -#: ../extensions/image_print/gth-image-print-job.c:971 +#: ../extensions/image_print/gth-image-print-job.c:914 #: ../extensions/webalbums/data/albumthemes/text.h:31 #, c-format msgid "Page %d of %d" msgstr "Page %d sur %d" -#: ../extensions/image_print/gth-image-print-job.c:1734 -#: ../extensions/image_print/gth-image-print-job.c:1861 -#: ../extensions/image_print/gth-image-print-job.c:1898 +#: ../extensions/image_print/gth-image-print-job.c:1680 +#: ../extensions/image_print/gth-image-print-job.c:1845 +#: ../extensions/image_print/gth-image-print-job.c:1888 msgid "Could not print" msgstr "Impossible d'imprimer" -#: ../extensions/image_print/gth-image-print-job.c:1796 +#: ../extensions/image_print/gth-image-print-job.c:1746 #: ../gthumb/gth-main-default-tests.c:240 msgid "Images" msgstr "Images" -#: ../extensions/image_print/gth-image-print-job.c:1863 -#: ../gthumb/gth-image-loader.c:204 ../gthumb/gth-image-loader.c:278 +#: ../extensions/image_print/gth-image-print-job.c:1847 +#: ../gthumb/gth-image-loader.c:197 ../gthumb/gth-image-loader.c:304 +#: ../gthumb/gth-image-utils.c:131 ../gthumb/gth-image-utils.c:137 msgid "No suitable loader available for this file type" msgstr "Aucun chargeur approprié pour ce type de fichier" @@ -3245,7 +3305,7 @@ msgstr "Chargement de « %s »" #: ../extensions/image_print/gth-load-image-info-task.c:166 -#: ../extensions/webalbums/gth-web-exporter.c:2685 +#: ../extensions/webalbums/gth-web-exporter.c:2719 msgid "Loading images" msgstr "Chargement des images" @@ -3287,7 +3347,7 @@ #: ../extensions/image_rotation/gth-reset-orientation-task.c:111 #: ../extensions/image_rotation/gth-transform-task.c:141 -#: ../extensions/webalbums/gth-web-exporter.c:2339 +#: ../extensions/webalbums/gth-web-exporter.c:2338 #: ../extensions/webalbums/gth-web-exporter.c:2423 msgid "Saving images" msgstr "Enregistrement des images" @@ -3534,39 +3594,39 @@ msgid "custom format" msgstr "format personnalisé" -#: ../extensions/importer/gth-import-task.c:442 -#: ../extensions/importer/gth-import-task.c:477 -#: ../extensions/importer/gth-import-task.c:648 +#: ../extensions/importer/gth-import-task.c:426 +#: ../extensions/importer/gth-import-task.c:461 +#: ../extensions/importer/gth-import-task.c:671 msgid "Importing files" msgstr "Importation de fichiers" -#: ../extensions/importer/gth-import-task.c:598 +#: ../extensions/importer/gth-import-task.c:620 msgid "No file imported" msgstr "Aucun fichier importé" -#: ../extensions/importer/gth-import-task.c:599 +#: ../extensions/importer/gth-import-task.c:621 msgid "The selected files are already present in the destination." msgstr "Les fichiers sélectionnés sont déjà présents dans la destination." -#: ../extensions/importer/gth-import-task.c:622 +#: ../extensions/importer/gth-import-task.c:644 #: ../gthumb/gth-file-source-vfs.c:694 msgid "Could not delete the files" msgstr "Impossible de supprimer les fichiers" -#: ../extensions/importer/gth-import-task.c:623 +#: ../extensions/importer/gth-import-task.c:645 msgid "Delete operation not supported." msgstr "Opération de suppression non prise en charge." -#: ../extensions/importer/gth-import-task.c:709 +#: ../extensions/importer/gth-import-task.c:732 msgid "Last imported" msgstr "Dernière importation" -#: ../extensions/importer/gth-import-task.c:815 +#: ../extensions/importer/gth-import-task.c:838 msgid "No file specified." msgstr "Aucun fichier indiqué." #. Translators: For example: Not enough free space in '/home/user/Images'.\n1.3 GB of space is required but only 300 MB is available. -#: ../extensions/importer/gth-import-task.c:852 +#: ../extensions/importer/gth-import-task.c:875 #, c-format msgid "" "Not enough free space in '%s'.\n" @@ -3575,7 +3635,7 @@ "Espace libre insuffisant dans « %s ».\n" "Il faudrait %s de libre, mais il y en a seulement %s." -#: ../extensions/list_tools/callbacks.c:76 ../gthumb/gth-filterbar.c:304 +#: ../extensions/list_tools/callbacks.c:76 ../gthumb/gth-filterbar.c:311 msgid "Personalize..." msgstr "Personnaliser..." @@ -3718,9 +3778,9 @@ msgstr "Saisissez une valeur :" #: ../extensions/list_tools/gth-script.c:745 -#: ../extensions/webalbums/gth-web-exporter.c:560 -#: ../extensions/webalbums/gth-web-exporter.c:572 -#: ../extensions/webalbums/gth-web-exporter.c:580 +#: ../extensions/webalbums/gth-web-exporter.c:558 +#: ../extensions/webalbums/gth-web-exporter.c:570 +#: ../extensions/webalbums/gth-web-exporter.c:578 msgid "Malformed command" msgstr "Commande malformée" @@ -3785,6 +3845,47 @@ msgid "View the photo position on the map" msgstr "Afficher la position de la photo sur la carte" +#: ../extensions/oauth/data/ui/oauth-account-manager.ui.h:1 +msgid "A_ccounts:" +msgstr "Co_mptes :" + +#: ../extensions/oauth/data/ui/oauth-ask-authorization.ui.h:1 +#: ../gthumb/gth-folder-tree.c:1067 +msgid "Loading..." +msgstr "Chargement..." + +#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 +msgid "New authentication..." +msgstr "Nouvelle authentification..." + +#: ../extensions/oauth/oauth-ask-authorization-dialog.c:191 +msgid "Authorization Required" +msgstr "Autorisation requise" + +#: ../extensions/oauth/web-service.c:382 +msgid "Choose _Account..." +msgstr "Sélectionner le _compte..." + +#: ../extensions/oauth/web-service.c:660 +msgid "Choose Account" +msgstr "Choisir le compte" + +#: ../extensions/oauth/web-service.c:777 +msgid "Edit Accounts" +msgstr "Modifier les comptes" + +#: ../extensions/oauth/web-service.c:795 ../extensions/oauth/web-service.c:812 +msgid "Connecting to the server" +msgstr "Connexion au serveur" + +#: ../extensions/oauth/web-service.c:796 +msgid "Asking authorization" +msgstr "Demande d'autorisation" + +#: ../extensions/oauth/web-service.c:813 +msgid "Getting account information" +msgstr "Obtention des informations du compte" + #: ../extensions/photobucket/callbacks.c:54 msgid "Photobucket..." msgstr "Photobucket..." @@ -3793,68 +3894,68 @@ msgid "Upload photos to Photobucket" msgstr "Envoie des photos sur Photobucket" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +msgid "_Scramble filenames" +msgstr "_Masquer les noms de fichier" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 msgid "Tiny ( 100 x 75 )" msgstr "Tout petit (100 x 75)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 msgid "Small ( 160 x 120 )" msgstr "Petit (160 x 120)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 msgid "Medium ( 320 x 240 )" msgstr "Moyen (320 x 240)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 msgid "Large ( 640 x 480 )" msgstr "Grand (640 x 480)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 msgid "15ʺ screen ( 800 x 600 )" msgstr "Écran 15ʺ (800 x 600)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 msgid "17ʺ screen ( 1024 x 768 )" msgstr "Écran 17ʺ (1024 x 768)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 msgid "1 megabyte file size" msgstr "Taille de fichier d'un mégaoctet" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 -msgid "_Scramble filenames" -msgstr "_Masquer les noms de fichier" - #: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 msgid "_Container:" msgstr "_Conteneur :" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:290 msgid "Tiny ( 100 × 75 )" msgstr "Tout petit (100 × 75)" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 msgid "Small ( 160 × 120 )" msgstr "Petit (160 × 120)" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 msgid "Medium ( 320 × 240 )" msgstr "Moyen (320 × 240)" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 msgid "Large ( 640 × 480 )" msgstr "Grand (640 × 480)" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 msgid "15ʺ screen ( 800 × 600 )" msgstr "Écran 15ʺ (800 × 600)" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 msgid "17ʺ screen ( 1024 × 768 )" msgstr "Écran 17ʺ (1024 × 768)" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:304 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:303 msgid "2 megabyte file size" msgstr "Taille de fichier de deux mégaoctets" @@ -3897,7 +3998,7 @@ #. view label #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 -#: ../gthumb/gth-filterbar.c:414 +#: ../gthumb/gth-filterbar.c:421 msgid "S_how:" msgstr "A_fficher :" @@ -3914,7 +4015,7 @@ msgstr "_Supprimer les fichiers importés de la source" #: ../extensions/photo_importer/dlg-photo-importer.c:227 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:174 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:149 msgid "Could not import the files" msgstr "Impossible d'importer les fichiers" @@ -3929,7 +4030,7 @@ msgstr "Impossible de charger le dossier" #: ../extensions/photo_importer/dlg-photo-importer.c:369 -#: ../gthumb/gth-browser.c:1927 +#: ../gthumb/gth-browser.c:2089 msgid "Getting folder listing..." msgstr "Obtention du contenu du dossier..." @@ -3974,53 +4075,15 @@ msgid "_Albums:" msgstr "_Albums :" -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 -msgid "Import from Picasa Web Album" -msgstr "Importer depuis un album Web Picasa" - -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 -msgid "_Album:" -msgstr "_Album :" - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:1 -msgid "_E-Mail:" -msgstr "_Courriel :" - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 -msgid "" -"Type the characters you see in the picture below. Letters are not case-" -"sensitive." -msgstr "" -"Saisissez les caractères qui s'affichent dans l'image ci-dessous. Les " -"lettres ne sont pas sensibles à la casse." - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:3 -msgid "_Password:" -msgstr "Mot de _passe :" - #: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 msgid "Public" msgstr "Publique" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:354 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:310 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:458 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:469 msgid "Could not get the album list" msgstr "Impossible d'obtenir la liste des albums" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:438 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:394 -msgid "Picasa Web Album" -msgstr "Album Web Picasa" - -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:525 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:481 -msgid "Account" -msgstr "Compte" - -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:104 -msgid "Could not load the file" -msgstr "Impossible de charger le fichier" - #: ../extensions/picasaweb/picasaweb.extension.in.in.h:1 msgid "Picasa Web Albums" msgstr "Albums Web Picasa" @@ -4029,94 +4092,6 @@ msgid "Upload images to Picasa Web Albums" msgstr "Envoyer des images vers les albums Web Picasa " -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:1 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:1 -msgid "_Default extension:" -msgstr "Extension par _défaut :" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:2 -msgid "_Quality:" -msgstr "_Qualité :" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 -msgid "_Smoothing:" -msgstr "_Lissage :" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 -msgid "Opti_mize" -msgstr "Opti_misé" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:5 -msgid "_Progressive" -msgstr "_Progressif" - -#: ../extensions/pixbuf_savers/data/ui/png-options.ui.h:1 -msgid "Compression _level:" -msgstr "_Niveau de compression :" - -#: ../extensions/pixbuf_savers/data/ui/save-options-preferences.ui.h:1 -msgid "Default options:" -msgstr "Options par défaut :" - -#: ../extensions/pixbuf_savers/data/ui/tga-options.ui.h:1 -msgid "_RLE compression" -msgstr "Compression _RLE" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:2 -msgid "_No compression" -msgstr "_Aucune compression" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:3 -msgid "No_rmal (Deflate)" -msgstr "No_rmal (réduit)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 -msgid "_Loss compression (JPEG)" -msgstr "Compression avec _perte (JPEG)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 -msgid "Compression" -msgstr "Compression" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 -msgid "dpi" -msgstr "ppp" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:9 -msgid "Resolution" -msgstr "Résolution" - -#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:519 -msgid "JPEG" -msgstr "JPEG" - -#: ../extensions/pixbuf_savers/gth-png-saver.c:140 -msgid "PNG" -msgstr "PNG" - -#: ../extensions/pixbuf_savers/gth-tga-saver.c:286 -#: ../gthumb/gth-buffer-data.c:84 -msgid "Insufficient memory" -msgstr "Mémoire insuffisante" - -#: ../extensions/pixbuf_savers/gth-tga-saver.c:373 -msgid "TGA" -msgstr "TGA" - -#: ../extensions/pixbuf_savers/gth-tiff-saver.c:537 -msgid "TIFF" -msgstr "TIFF" - -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:1 -msgid "Save images" -msgstr "Enregistrer les images" - -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:2 -msgid "Save images in common file formats such as JPEG, PNG and TIFF" -msgstr "" -"Enregistre les images dans des formats de fichier courants tels que JPEG, " -"PNG et TIFF" - #: ../extensions/raw_files/raw_files.extension.in.in.h:1 msgid "Raw format support" msgstr "Prise en charge du format raw" @@ -4125,11 +4100,11 @@ msgid "Allow to load raw format images." msgstr "Permet le chargement d'images au format raw." -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 msgid "_X:" msgstr "_X :" -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 msgid "_Y:" msgstr "_Y :" @@ -4251,36 +4226,36 @@ msgid "File attribute" msgstr "Attribut de fichier" -#: ../extensions/rename_series/dlg-rename-series.c:552 -#: ../extensions/rename_series/dlg-rename-series.c:683 +#: ../extensions/rename_series/dlg-rename-series.c:558 +#: ../extensions/rename_series/dlg-rename-series.c:689 msgid "Could not rename the files" msgstr "Impossible de renommer les fichiers" -#: ../extensions/rename_series/dlg-rename-series.c:780 +#: ../extensions/rename_series/dlg-rename-series.c:786 msgid "Could not save the template" msgstr "Impossible d'enregistrer le modèle" -#: ../extensions/rename_series/dlg-rename-series.c:798 +#: ../extensions/rename_series/dlg-rename-series.c:804 msgid "Edit Template" msgstr "Modifier le modèle" -#: ../extensions/rename_series/dlg-rename-series.c:856 +#: ../extensions/rename_series/dlg-rename-series.c:862 msgid "Old Name" msgstr "Ancien nom" -#: ../extensions/rename_series/dlg-rename-series.c:867 +#: ../extensions/rename_series/dlg-rename-series.c:873 msgid "New Name" msgstr "Nouveau nom" -#: ../extensions/rename_series/dlg-rename-series.c:944 +#: ../extensions/rename_series/dlg-rename-series.c:950 msgid "Keep original case" msgstr "Conserver la casse d'origine" -#: ../extensions/rename_series/dlg-rename-series.c:945 +#: ../extensions/rename_series/dlg-rename-series.c:951 msgid "Convert to lower-case" msgstr "Convertir en minuscules" -#: ../extensions/rename_series/dlg-rename-series.c:946 +#: ../extensions/rename_series/dlg-rename-series.c:952 msgid "Convert to upper-case" msgstr "Convertir en majuscules" @@ -4329,11 +4304,7 @@ msgid "pixel" msgstr "pixel" -#: ../extensions/resize_images/dlg-resize-images.c:168 -msgid "Resizing images" -msgstr "Redimensionne les images" - -#: ../extensions/resize_images/dlg-resize-images.c:412 +#: ../extensions/resize_images/dlg-resize-images.c:423 msgid "Keep the original format" msgstr "Conserver le format d'origine" @@ -4485,7 +4456,7 @@ msgid "Remove the selected files" msgstr "Supprimer les fichiers sélectionnés" -#: ../extensions/slideshow/gth-slideshow.c:229 +#: ../extensions/slideshow/gth-slideshow.c:231 msgid "Playing slideshow" msgstr "Diaporama en cours" @@ -4614,10 +4585,6 @@ msgid "_Copy originals to destination" msgstr "_Copier les images originales vers la destination" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 -msgid "_Resize if larger than:" -msgstr "_Redimensionner si l'image est plus grande que :" - #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 msgid "_Adapt to the window width " msgstr "_Adapter à la largeur de la fenêtre " @@ -4658,36 +4625,36 @@ msgid "Image Attributes" msgstr "Attributs de l'image" -#: ../extensions/webalbums/gth-web-exporter.c:1802 +#: ../extensions/webalbums/gth-web-exporter.c:1800 msgid "Could not show the destination" msgstr "Impossible d'afficher la destination" -#: ../extensions/webalbums/gth-web-exporter.c:1838 +#: ../extensions/webalbums/gth-web-exporter.c:1836 msgid "The album has been created successfully." msgstr "La création de l'album a réussi." -#: ../extensions/webalbums/gth-web-exporter.c:2106 -#: ../extensions/webalbums/gth-web-exporter.c:2133 +#: ../extensions/webalbums/gth-web-exporter.c:2104 +#: ../extensions/webalbums/gth-web-exporter.c:2132 msgid "Saving thumbnails" msgstr "Enregistrement des vignettes" -#: ../extensions/webalbums/gth-web-exporter.c:2161 +#: ../extensions/webalbums/gth-web-exporter.c:2160 msgid "Saving HTML pages: Images" msgstr "Enregistrement des pages HTML : images" -#: ../extensions/webalbums/gth-web-exporter.c:2219 +#: ../extensions/webalbums/gth-web-exporter.c:2218 msgid "Saving HTML pages: Indexes" msgstr "Enregistrement des pages HTML : index" -#: ../extensions/webalbums/gth-web-exporter.c:2502 +#: ../extensions/webalbums/gth-web-exporter.c:2503 msgid "Copying original images" msgstr "Copie des images originales" -#: ../extensions/webalbums/gth-web-exporter.c:2929 +#: ../extensions/webalbums/gth-web-exporter.c:2963 msgid "Could not find the style folder" msgstr "Impossible de trouver le dossier de style" -#: ../extensions/webalbums/gth-web-exporter.c:2967 +#: ../extensions/webalbums/gth-web-exporter.c:3001 msgid "Could not create a temporary folder" msgstr "Impossible de créer un dossier temporaire" @@ -4699,9 +4666,9 @@ msgid "Create static web albums." msgstr "Créer des albums Web statiques." -#: ../gthumb/dlg-location.c:200 ../gthumb/gth-browser.c:1249 -#: ../gthumb/gth-browser.c:1818 ../gthumb/gth-browser.c:5972 -#: ../gthumb/gth-browser.c:5991 ../gthumb/gth-browser.c:6015 +#: ../gthumb/dlg-location.c:200 ../gthumb/gth-browser.c:1396 +#: ../gthumb/gth-browser.c:1969 ../gthumb/gth-browser.c:6214 +#: ../gthumb/gth-browser.c:6233 ../gthumb/gth-browser.c:6257 #, c-format msgid "Could not load the position \"%s\"" msgstr "Impossible de charger l'emplacement « %s »" @@ -4722,7 +4689,7 @@ msgid "Edit Filter" msgstr "Modifier un filtre" -#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:270 +#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:277 msgid "All" msgstr "Tout" @@ -4787,47 +4754,6 @@ msgid "_Restart" msgstr "_Redémarrer" -#: ../gthumb/eggfileformatchooser.c:236 -#, c-format -msgid "File _Format: %s" -msgstr "_Format de fichier : %s" - -#: ../gthumb/eggfileformatchooser.c:397 ../gthumb/gth-main-default-tests.c:233 -msgid "All Files" -msgstr "Tous les fichiers" - -#: ../gthumb/eggfileformatchooser.c:398 -msgid "All Supported Files" -msgstr "Tous les fichiers pris en charge" - -#: ../gthumb/eggfileformatchooser.c:407 -msgid "By Extension" -msgstr "Par extension" - -#: ../gthumb/eggfileformatchooser.c:422 -msgid "File Format" -msgstr "Format de Fichier" - -#: ../gthumb/eggfileformatchooser.c:440 -msgid "Extension(s)" -msgstr "Extension(s)" - -#: ../gthumb/eggfileformatchooser.c:681 -#, c-format -msgid "" -"The program was not able to find out the file format you want to use for `%" -"s'. Please make sure to use a known extension for that file or manually " -"choose a file format from the list below." -msgstr "" -"Le programme n'a pas réussi à trouver le format de fichier que vous " -"souhaitez utiliser pour « %s ». Assurez-vous d'utiliser une extension connue " -"pour ce fichier ou choisissez manuellement un format de fichier dans la " -"liste ci-dessous." - -#: ../gthumb/eggfileformatchooser.c:688 -msgid "File format not recognized" -msgstr "Format de fichier non reconnu" - #. For translators: This is a progress size indicator, for example: 230.4 MB of 512.8 MB #: ../gthumb/gio-utils.c:1351 #, c-format @@ -4862,7 +4788,7 @@ #. * the separator that your locale uses or use "%Id" instead #. * of "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2945 +#: ../gthumb/glib-utils.c:3068 #, c-format msgctxt "long time format" msgid "%d:%02d:%02d" @@ -4874,13 +4800,13 @@ #. * separator that your locale uses or use "%Id" instead of #. * "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2954 +#: ../gthumb/glib-utils.c:3077 #, c-format msgctxt "short time format" msgid "%d:%02d" msgstr "%d:%02d" -#: ../gthumb/gth-browser-actions-callbacks.c:400 +#: ../gthumb/gth-browser-actions-callbacks.c:414 msgid "" "gthumb is free software; you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -4892,7 +4818,7 @@ "par la Free Software Foundation ; soit la version 2 de la Licence, ou (à " "votre discrétion) une version ultérieure quelconque." -#: ../gthumb/gth-browser-actions-callbacks.c:404 +#: ../gthumb/gth-browser-actions-callbacks.c:418 msgid "" "gthumb is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -4904,7 +4830,7 @@ "D'ADÉQUATION À UN BESOIN PARTICULIER. Pour plus de détails, voir la Licence " "Publique Générale GNU." -#: ../gthumb/gth-browser-actions-callbacks.c:408 +#: ../gthumb/gth-browser-actions-callbacks.c:422 msgid "" "You should have received a copy of the GNU General Public License along with " "gthumb. If not, see http://www.gnu.org/licenses/." @@ -4912,11 +4838,11 @@ "Vous devriez avoir reçu un exemplaire de la Licence Publique Générale GNU " "avec gthumb ; si ce n'est pas le cas, consultez http://www.gnu.org/licenses/." -#: ../gthumb/gth-browser-actions-callbacks.c:427 +#: ../gthumb/gth-browser-actions-callbacks.c:441 msgid "An image viewer and browser for GNOME." msgstr "Un visionneur et navigateur d'images pour GNOME." -#: ../gthumb/gth-browser-actions-callbacks.c:430 +#: ../gthumb/gth-browser-actions-callbacks.c:444 msgid "translator_credits" msgstr "" "Christophe Merlet \n" @@ -5011,15 +4937,15 @@ msgid "Leave Fullscreen" msgstr "Quitte le mode plein écran" -#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3652 +#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3841 msgid "Go to the previous visited location" msgstr "Va à l'emplacement visité précédent" -#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3670 +#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3859 msgid "Go to the next visited location" msgstr "Va à l'emplacement visité suivant" -#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3688 +#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3877 msgid "Go up one level" msgstr "Remonte d'un niveau" @@ -5031,7 +4957,7 @@ msgid "Specify a location to open" msgstr "Spécifie un emplacement à ouvrir" -#: ../gthumb/gth-browser-actions-entries.h:173 ../gthumb/gth-browser.c:673 +#: ../gthumb/gth-browser-actions-entries.h:173 ../gthumb/gth-browser.c:721 msgid "_Delete History" msgstr "_Supprimer l'historique" @@ -5059,146 +4985,148 @@ msgid "_Keyboard Shortcuts" msgstr "Raccourcis _clavier" -#: ../gthumb/gth-browser-actions-entries.h:206 +#: ../gthumb/gth-browser-actions-entries.h:203 +#: ../gthumb/gth-browser-actions-entries.h:257 +msgid "Edit" +msgstr "Modifier" + +#: ../gthumb/gth-browser-actions-entries.h:204 +#: ../gthumb/gth-browser-actions-entries.h:258 +msgid "Edit file" +msgstr "Modifie le fichier" + +#: ../gthumb/gth-browser-actions-entries.h:212 msgid "_Toolbar" msgstr "Barre d'_outils" -#: ../gthumb/gth-browser-actions-entries.h:207 +#: ../gthumb/gth-browser-actions-entries.h:213 msgid "View or hide the toolbar of this window" msgstr "Affiche ou masque la barre d'outils de cette fenêtre" -#: ../gthumb/gth-browser-actions-entries.h:211 +#: ../gthumb/gth-browser-actions-entries.h:217 msgid "_Statusbar" msgstr "Barre d'é_tat" -#: ../gthumb/gth-browser-actions-entries.h:212 +#: ../gthumb/gth-browser-actions-entries.h:218 msgid "View or hide the statusbar of this window" msgstr "Affiche ou masque la barre d'état de cette fenêtre" -#: ../gthumb/gth-browser-actions-entries.h:216 +#: ../gthumb/gth-browser-actions-entries.h:222 msgid "_Filterbar" msgstr "Barre de _filtre" -#: ../gthumb/gth-browser-actions-entries.h:217 +#: ../gthumb/gth-browser-actions-entries.h:223 msgid "View or hide the filterbar of this window" msgstr "Affiche ou masque la barre de filtre de cette fenêtre" -#: ../gthumb/gth-browser-actions-entries.h:221 +#: ../gthumb/gth-browser-actions-entries.h:227 msgid "_Sidebar" msgstr "Barre _latérale" -#: ../gthumb/gth-browser-actions-entries.h:222 +#: ../gthumb/gth-browser-actions-entries.h:228 msgid "View or hide the sidebar of this window" msgstr "Affiche ou masque la barre latérale de cette fenêtre" -#: ../gthumb/gth-browser-actions-entries.h:226 +#: ../gthumb/gth-browser-actions-entries.h:232 msgid "_Thumbnail Pane" msgstr "_Panneau des vignettes" -#: ../gthumb/gth-browser-actions-entries.h:227 +#: ../gthumb/gth-browser-actions-entries.h:233 msgid "View or hide the thumbnail pane in viewer mode" msgstr "Affiche ou masque le panneau des vignettes en mode affichage" -#: ../gthumb/gth-browser-actions-entries.h:231 +#: ../gthumb/gth-browser-actions-entries.h:237 msgid "_Thumbnails" msgstr "_Vignettes" -#: ../gthumb/gth-browser-actions-entries.h:232 +#: ../gthumb/gth-browser-actions-entries.h:238 msgid "View thumbnails" msgstr "Affiche les vignettes" -#: ../gthumb/gth-browser-actions-entries.h:236 +#: ../gthumb/gth-browser-actions-entries.h:242 msgid "_Hidden Files" msgstr "Fic_hiers cachés" -#: ../gthumb/gth-browser-actions-entries.h:237 +#: ../gthumb/gth-browser-actions-entries.h:243 msgid "Show hidden files and folders" msgstr "Affiche les fichiers et dossiers cachés" -#: ../gthumb/gth-browser-actions-entries.h:242 -#: ../gthumb/gth-browser-actions-entries.h:247 +#: ../gthumb/gth-browser-actions-entries.h:248 +#: ../gthumb/gth-browser-actions-entries.h:253 msgid "View file properties" msgstr "Affiche les propriétés du fichier" -#: ../gthumb/gth-browser-actions-entries.h:251 -msgid "Edit" -msgstr "Modifier" - -#: ../gthumb/gth-browser-actions-entries.h:252 -msgid "Edit file" -msgstr "Modifie le fichier" - -#: ../gthumb/gth-browser-actions-entries.h:256 +#: ../gthumb/gth-browser-actions-entries.h:262 msgid "_Fit Window to Image" msgstr "Ajuster la _fenêtre à l'image" -#: ../gthumb/gth-browser-actions-entries.h:257 +#: ../gthumb/gth-browser-actions-entries.h:263 msgid "Resize the window to the size of the image" msgstr "Redimensionne la fenêtre à la taille de l'image" -#: ../gthumb/gth-browser.c:370 +#: ../gthumb/gth-browser.c:418 #, c-format msgid "Open %s" msgstr "Ouvrir %s" -#: ../gthumb/gth-browser.c:510 +#: ../gthumb/gth-browser.c:558 msgid "[modified]" msgstr "[modifié]" -#: ../gthumb/gth-browser.c:1007 +#: ../gthumb/gth-browser.c:1117 #, c-format msgid "%d file selected (%s)" msgid_plural "%d files selected (%s)" msgstr[0] "%d fichier sélectionné (%s)" msgstr[1] "%d fichiers sélectionnés (%s)" -#: ../gthumb/gth-browser.c:1042 +#: ../gthumb/gth-browser.c:1152 #, c-format msgid "%s of free space" msgstr "%s d'espace libre" -#: ../gthumb/gth-browser.c:1911 ../gthumb/gth-browser.c:1938 +#: ../gthumb/gth-browser.c:2073 ../gthumb/gth-browser.c:2100 #, c-format msgid "No suitable module found for %s" msgstr "Aucun module approprié trouvé pour « %s »" -#: ../gthumb/gth-browser.c:2057 +#: ../gthumb/gth-browser.c:2219 #, c-format msgid "Save changes to file '%s'?" msgstr "Enregistrer les modifications dans le fichier « %s » ?" -#: ../gthumb/gth-browser.c:2062 +#: ../gthumb/gth-browser.c:2224 msgid "If you don't save, changes to the file will be permanently lost." msgstr "" "Si vous n'enregistrez pas, les modifications de ce fichier seront " "définitivement perdues." -#: ../gthumb/gth-browser.c:2063 +#: ../gthumb/gth-browser.c:2225 msgid "Do _Not Save" msgstr "_Ne pas enregistrer" -#: ../gthumb/gth-browser.c:2836 ../gthumb/gth-source-tree.c:182 +#: ../gthumb/gth-browser.c:3020 ../gthumb/gth-source-tree.c:182 msgid "Could not change name" msgstr "Impossible de modifier le nom" -#: ../gthumb/gth-browser.c:3265 ../gthumb/gth-main-default-metadata.c:41 +#: ../gthumb/gth-browser.c:3451 ../gthumb/gth-main-default-metadata.c:41 msgid "Modified" msgstr "Modifié" -#: ../gthumb/gth-browser.c:3653 ../gthumb/gth-browser.c:3671 +#: ../gthumb/gth-browser.c:3842 ../gthumb/gth-browser.c:3860 msgid "View the list of visited locations" msgstr "Afficher la liste des emplacements visités" -#: ../gthumb/gth-browser.c:3689 +#: ../gthumb/gth-browser.c:3878 msgid "View the list of upper locations" msgstr "Afficher la liste des emplacements visités plus haut" -#: ../gthumb/gth-browser.c:5973 +#: ../gthumb/gth-browser.c:6215 #, c-format msgid "File type not supported" msgstr "Type de fichier non pris en charge" -#: ../gthumb/gth-browser.c:6016 +#: ../gthumb/gth-browser.c:6258 #, c-format msgid "No suitable module found" msgstr "Aucun module approprié trouvé" @@ -5213,6 +5141,10 @@ msgid "The extension '%1$s' is required by the extension '%2$s'" msgstr "L'extension « %s » est requise par l'extension « %s »" +#: ../gthumb/gth-file-chooser-dialog.c:144 +msgid "All Supported Files" +msgstr "Tous les fichiers pris en charge" + #: ../gthumb/gth-file-source-vfs.c:121 msgid "Home Folder" msgstr "Dossier personnel" @@ -5257,7 +5189,7 @@ msgstr[1] "" "Voulez-vous vraiment supprimer définitivement les %'d fichiers sélectionnés ?" -#: ../gthumb/gth-filterbar.c:406 +#: ../gthumb/gth-filterbar.c:413 msgid "Hide the filterbar" msgstr "Masquer la barre de filtre" @@ -5277,7 +5209,7 @@ msgstr "Gio" #. "files" label -#: ../gthumb/gth-filter.c:291 ../gthumb/gth-filter-editor-dialog.c:177 +#: ../gthumb/gth-filter.c:286 ../gthumb/gth-filter-editor-dialog.c:177 msgid "files" msgstr "fichiers" @@ -5294,50 +5226,61 @@ msgid "No limit specified" msgstr "Aucune limite définie" -#: ../gthumb/gth-folder-tree.c:857 -msgid "Loading..." -msgstr "Chargement..." - -#: ../gthumb/gth-folder-tree.c:1100 +#: ../gthumb/gth-folder-tree.c:1369 msgid "(Open Parent)" msgstr "(Ouvrir le parent)" -#: ../gthumb/gth-histogram-view.c:826 +#: ../gthumb/gth-histogram-view.c:825 msgid "Linear scale" msgstr "Échelle linéaire" -#: ../gthumb/gth-histogram-view.c:838 +#: ../gthumb/gth-histogram-view.c:837 msgid "Logarithmic scale" msgstr "Échelle logarithmique" -#: ../gthumb/gth-histogram-view.c:858 +#: ../gthumb/gth-histogram-view.c:857 msgid "Channel:" msgstr "Canal :" -#: ../gthumb/gth-histogram-view.c:890 +#: ../gthumb/gth-histogram-view.c:878 msgid "Value" msgstr "Valeur" -#: ../gthumb/gth-histogram-view.c:896 +#: ../gthumb/gth-histogram-view.c:883 msgid "Red" msgstr "Rouge" -#: ../gthumb/gth-histogram-view.c:902 +#: ../gthumb/gth-histogram-view.c:888 msgid "Green" msgstr "Vert" -#: ../gthumb/gth-histogram-view.c:908 +#: ../gthumb/gth-histogram-view.c:893 msgid "Blue" msgstr "Bleu" -#: ../gthumb/gth-histogram-view.c:914 +#: ../gthumb/gth-histogram-view.c:898 msgid "Alpha" msgstr "Alpha" -#: ../gthumb/gth-histogram-view.c:921 +#: ../gthumb/gth-histogram-view.c:904 msgid "RGB" msgstr "RVB" +#: ../gthumb/gth-image-list-task.c:141 +msgid "Could not rename the file" +msgstr "Impossible de renommer le fichier" + +#: ../gthumb/gth-image-saver.c:39 +msgid "No options available for this file type" +msgstr "Aucune option n'est disponible pour ce type de fichier" + +#: ../gthumb/gth-image-saver.c:185 +#, c-format +msgid "Could not find a suitable module to save the image as \"%s\"" +msgstr "" +"Impossible de trouver un module approprié pour enregistrer l'image comme " +"« %s »" + #: ../gthumb/gth-load-file-data-task.c:108 msgid "Reading file information" msgstr "Lecture des informations du fichier" @@ -5391,6 +5334,10 @@ msgid "dimensions" msgstr "dimensions" +#: ../gthumb/gth-main-default-tests.c:233 +msgid "All Files" +msgstr "Tous les fichiers" + #: ../gthumb/gth-main-default-tests.c:261 msgid "Media" msgstr "Média" @@ -5411,15 +5358,7 @@ msgid "Description (embedded)" msgstr "Description (incorporée)" -#: ../gthumb/gth-pixbuf-list-task.c:139 -msgid "Could not rename the file" -msgstr "Impossible de renommer le fichier" - -#: ../gthumb/gth-pixbuf-saver.c:34 -msgid "No options available for this file type" -msgstr "Aucune option n'est disponible pour ce type de fichier" - -#: ../gthumb/gth-progress-dialog.c:144 +#: ../gthumb/gth-progress-dialog.c:146 msgid "Cancel operation" msgstr "Annule l'opération" @@ -5427,60 +5366,66 @@ msgid "Saving file information" msgstr "Enregistrement des informations du fichier" -#: ../gthumb/gth-tags-entry.c:388 +#. Translators: %s is a filename +#: ../gthumb/gth-save-image-task.c:162 +#, c-format +msgid "Saving '%s'" +msgstr "Enregistrement de %s" + +#: ../gthumb/gth-tags-entry.c:390 #, c-format msgid "Create tag «%s»" msgstr "Créer l'étiquette « %s »" -#: ../gthumb/gth-tags-entry.c:735 +#: ../gthumb/gth-tags-entry.c:814 msgid "Show all the tags" msgstr "Affiche toutes les étiquettes" -#: ../gthumb/gth-tags-file.c:236 +#: ../gthumb/gth-tags-file.c:235 msgid "Holidays" msgstr "Vacances" -#: ../gthumb/gth-tags-file.c:237 +#: ../gthumb/gth-tags-file.c:236 msgid "Temporary" msgstr "Temporaire" -#: ../gthumb/gth-tags-file.c:238 +#: ../gthumb/gth-tags-file.c:237 msgid "Screenshots" msgstr "Captures d'écran" -#: ../gthumb/gth-tags-file.c:239 +#: ../gthumb/gth-tags-file.c:238 msgid "Science" msgstr "Science" -#: ../gthumb/gth-tags-file.c:240 +#: ../gthumb/gth-tags-file.c:239 msgid "Favorite" msgstr "Favori" -#: ../gthumb/gth-tags-file.c:241 +#: ../gthumb/gth-tags-file.c:240 msgid "Important" msgstr "Important" -#: ../gthumb/gth-tags-file.c:242 +#: ../gthumb/gth-tags-file.c:241 msgid "GNOME" msgstr "GNOME" -#: ../gthumb/gth-tags-file.c:243 +#: ../gthumb/gth-tags-file.c:242 msgid "Games" msgstr "Jeux" -#: ../gthumb/gth-tags-file.c:244 +#: ../gthumb/gth-tags-file.c:243 msgid "Party" msgstr "Fête" -#: ../gthumb/gth-tags-file.c:245 +#: ../gthumb/gth-tags-file.c:244 msgid "Birthday" msgstr "Anniversaire" -#: ../gthumb/gth-tags-file.c:246 +#: ../gthumb/gth-tags-file.c:245 msgid "Astronomy" msgstr "Astronomie" -#: ../gthumb/gth-tags-file.c:247 +#: ../gthumb/gth-tags-file.c:246 msgid "Family" msgstr "Famille" @@ -5498,7 +5443,7 @@ msgid "is not" msgstr "n'est pas" -#: ../gthumb/gth-test-category.c:394 ../gthumb/gth-test-simple.c:812 +#: ../gthumb/gth-test-category.c:407 ../gthumb/gth-test-simple.c:812 #: ../gthumb/gth-test-simple.c:838 ../gthumb/gth-test-simple.c:859 #: ../gthumb/gth-test-simple.c:885 #, c-format @@ -5553,11 +5498,11 @@ msgid "is after" msgstr "est après" -#: ../gthumb/gth-time-selector.c:477 +#: ../gthumb/gth-time-selector.c:478 msgid "Today" msgstr "Aujourd'hui" -#: ../gthumb/gth-time-selector.c:485 +#: ../gthumb/gth-time-selector.c:486 msgid "Now" msgstr "Maintenant" @@ -5569,57 +5514,126 @@ msgid "Close _All Windows" msgstr "Fermer _toutes les fenêtres" -#: ../gthumb/gtk-utils.c:551 +#: ../gthumb/gtk-utils.c:499 msgid "Could not display help" msgstr "Impossible d'afficher l'aide" -#: ../gthumb/gtk-utils.c:868 ../gthumb/gtk-utils.c:875 +#: ../gthumb/gtk-utils.c:800 ../gthumb/gtk-utils.c:807 msgid "Could not launch the application" msgstr "Impossible de lancer l'application" -#: ../gthumb/gtk-utils.c:978 +#: ../gthumb/gtk-utils.c:910 msgid "_Copy Here" msgstr "_Copier ici" -#: ../gthumb/gtk-utils.c:983 +#: ../gthumb/gtk-utils.c:915 msgid "_Move Here" msgstr "_Déplacer ici" -#: ../gthumb/gtk-utils.c:988 +#: ../gthumb/gtk-utils.c:920 msgid "_Link Here" msgstr "Faire un _lien ici" -#: ../gthumb/gtk-utils.c:997 +#: ../gthumb/gtk-utils.c:929 msgid "Cancel" msgstr "Annuler" -#: ../gthumb/main.c:59 +#: ../gthumb/main.c:61 msgid "Open a new window" msgstr "Ouvre une nouvelle fenêtre" -#: ../gthumb/main.c:63 +#: ../gthumb/main.c:65 msgid "Start in fullscreen mode" msgstr "Démarre en mode plein écran" -#: ../gthumb/main.c:67 +#: ../gthumb/main.c:69 msgid "Automatically start a slideshow" msgstr "Démarre automatiquement un diaporama" -#: ../gthumb/main.c:71 +#: ../gthumb/main.c:73 msgid "Automatically import digital camera photos" msgstr "Importe automatiquement les photos de l'appareil photo" -#: ../gthumb/main.c:75 +#: ../gthumb/main.c:77 msgid "Show version" msgstr "Affiche la version" -#: ../gthumb/main.c:344 +#: ../gthumb/main.c:483 msgid "- Image browser and viewer" msgstr "- Visionneur et navigateur d'images" -#: ../gthumb/pixbuf-io.c:174 -#, c-format -msgid "Could not find a suitable module to save the image as \"%s\"" -msgstr "" -"Impossible de trouver un module approprié pour enregistrer l'image comme « %" -"s »" +#~ msgid "Exif DateTimeOriginal tag" +#~ msgstr "Étiquette DateTimeOriginal d'Exif" + +#~ msgid "_Resize to:" +#~ msgstr "_Redimensionner à :" + +#~ msgid "×" +#~ msgstr "×" + +#~ msgid "Desaturate" +#~ msgstr "Désaturer" + +#~ msgid "White balance correction" +#~ msgstr "Correction de la balance des blancs" + +#~ msgid "Enhance Colors" +#~ msgstr "Améliorer les couleurs" + +#~ msgid "Automatic white balance correction" +#~ msgstr "Correction automatique de la balance des blancs" + +#~ msgid "_E-Mail:" +#~ msgstr "_Courriel :" + +#~ msgid "" +#~ "Type the characters you see in the picture below. Letters are not case-" +#~ "sensitive." +#~ msgstr "" +#~ "Saisissez les caractères qui s'affichent dans l'image ci-dessous. Les " +#~ "lettres ne sont pas sensibles à la casse." + +#~ msgid "_Password:" +#~ msgstr "Mot de _passe :" + +#~ msgid "Picasa Web Album" +#~ msgstr "Album Web Picasa" + +#~ msgid "Account" +#~ msgstr "Compte" + +#~ msgid "Could not load the file" +#~ msgstr "Impossible de charger le fichier" + +#~ msgid "Save images" +#~ msgstr "Enregistrer les images" + +#~ msgid "Save images in common file formats such as JPEG, PNG and TIFF" +#~ msgstr "" +#~ "Enregistre les images dans des formats de fichier courants tels que JPEG, " +#~ "PNG et TIFF" + +#~ msgid "File _Format: %s" +#~ msgstr "_Format de fichier : %s" + +#~ msgid "By Extension" +#~ msgstr "Par extension" + +#~ msgid "File Format" +#~ msgstr "Format de Fichier" + +#~ msgid "Extension(s)" +#~ msgstr "Extension(s)" + +#~ msgid "" +#~ "The program was not able to find out the file format you want to use for `" +#~ "%s'. Please make sure to use a known extension for that file or manually " +#~ "choose a file format from the list below." +#~ msgstr "" +#~ "Le programme n'a pas réussi à trouver le format de fichier que vous " +#~ "souhaitez utiliser pour « %s ». Assurez-vous d'utiliser une extension " +#~ "connue pour ce fichier ou choisissez manuellement un format de fichier " +#~ "dans la liste ci-dessous." + +#~ msgid "File format not recognized" +#~ msgstr "Format de fichier non reconnu" diff -Nru gthumb-3.0.2/po/hu.po gthumb-3.2.3/po/hu.po --- gthumb-3.0.2/po/hu.po 2012-08-14 16:25:43.000000000 +0000 +++ gthumb-3.2.3/po/hu.po 2013-04-30 16:56:13.000000000 +0000 @@ -5,114 +5,127 @@ # Andras Timar , 2003, 2004. # Laszlo Dvornik , 2004. # Balazs Ur , 2011. -# Gabor Kelemen , 2005, 2007, 2009, 2011. +# Gabor Kelemen , 2005, 2007, 2009, 2011, 2012. +# Balázs Úr , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: gthumb master\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-25 13:51+0200\n" -"PO-Revision-Date: 2011-06-28 13:49+0200\n" -"Last-Translator: Gabor Kelemen \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=gthumb&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-02-16 21:21+0000\n" +"PO-Revision-Date: 2013-03-20 22:25+0100\n" +"Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 1.2\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../copy-n-paste/eggdesktopfile.c:164 +#: ../copy-n-paste/eggdesktopfile.c:165 #, c-format msgid "File is not a valid .desktop file" msgstr "A fájl nem egy érvényes .desktop fájl" -#: ../copy-n-paste/eggdesktopfile.c:187 +#. translators: 'Version' is from a desktop file, and +#. * should not be translated. '%s' would probably be a +#. * version number. +#: ../copy-n-paste/eggdesktopfile.c:191 #, c-format msgid "Unrecognized desktop file Version '%s'" msgstr "Ismeretlen .desktop fájl verzió: „%s”" -#: ../copy-n-paste/eggdesktopfile.c:957 +#: ../copy-n-paste/eggdesktopfile.c:974 #, c-format msgid "Starting %s" msgstr "%s indítása" -#: ../copy-n-paste/eggdesktopfile.c:1099 +#: ../copy-n-paste/eggdesktopfile.c:1116 #, c-format msgid "Application does not accept documents on command line" msgstr "Az alkalmazás nem fogad el dokumentumokat a parancssorban" -#: ../copy-n-paste/eggdesktopfile.c:1167 +#: ../copy-n-paste/eggdesktopfile.c:1184 #, c-format msgid "Unrecognized launch option: %d" msgstr "Ismeretlen indítási kapcsoló: %d" -#: ../copy-n-paste/eggdesktopfile.c:1372 +#. translators: The 'Type=Link' string is found in a +#. * desktop file, and should not be translated. +#: ../copy-n-paste/eggdesktopfile.c:1391 #, c-format msgid "Can't pass document URIs to a 'Type=Link' desktop entry" msgstr "Nem adhatók dokumentum-URI címek egy „Type=Link” asztali bejegyzésnek" -#: ../copy-n-paste/eggdesktopfile.c:1391 +#: ../copy-n-paste/eggdesktopfile.c:1412 #, c-format msgid "Not a launchable item" msgstr "Nem futtatható elem" -#: ../copy-n-paste/eggsmclient.c:225 +#: ../copy-n-paste/eggsmclient.c:226 msgid "Disable connection to session manager" msgstr "A munkamenet-kezelőhöz való csatlakozás tiltása" -#: ../copy-n-paste/eggsmclient.c:228 +#: ../copy-n-paste/eggsmclient.c:229 msgid "Specify file containing saved configuration" msgstr "A mentett beállításokat tartalmazó fájl megadása" -#: ../copy-n-paste/eggsmclient.c:228 +#: ../copy-n-paste/eggsmclient.c:229 msgid "FILE" msgstr "FÁJL" -#: ../copy-n-paste/eggsmclient.c:231 +#: ../copy-n-paste/eggsmclient.c:232 msgid "Specify session management ID" msgstr "A munkamenet-kezelő azonosítójának megadása" -#: ../copy-n-paste/eggsmclient.c:231 +#: ../copy-n-paste/eggsmclient.c:232 msgid "ID" msgstr "Azonosító" -#: ../copy-n-paste/eggsmclient.c:252 +#: ../copy-n-paste/eggsmclient.c:253 msgid "Session management options:" msgstr "Munkamenet-kezelés kapcsolói:" -#: ../copy-n-paste/eggsmclient.c:253 +#: ../copy-n-paste/eggsmclient.c:254 msgid "Show session management options" msgstr "Munkamenet-kezelési kapcsolók megjelenítése" -#: ../data/gthumb.desktop.in.in.h:1 -msgid "Image Viewer" -msgstr "Képmegjelenítő" - -#: ../data/gthumb.desktop.in.in.h:2 -msgid "View and organize your images" -msgstr "Képek megtekintése és rendszerezése" - -#: ../data/gthumb.desktop.in.in.h:3 ../data/gthumb-import.desktop.in.in.h:3 +#. manually set name and icon +#: ../data/gthumb.desktop.in.in.h:1 ../gthumb/gth-browser.c:578 +#: ../gthumb/gth-progress-dialog.c:390 ../gthumb/main.c:315 msgid "gThumb" msgstr "gThumb" -#: ../data/gthumb.desktop.in.in.h:4 +#: ../data/gthumb.desktop.in.in.h:2 +msgid "Image Viewer" +msgstr "Képmegjelenítő" + +#: ../data/gthumb.desktop.in.in.h:3 msgid "gThumb Image Viewer" msgstr "gThumb képmegjelenítő" +#: ../data/gthumb.desktop.in.in.h:4 +msgid "View and organize your images" +msgstr "Képek megtekintése és rendszerezése" + #: ../data/gthumb-import.desktop.in.in.h:1 -msgid "Import the photos on your camera card" -msgstr "Fényképek importálása a fényképezőgép kártyájáról" +msgid "Import with gThumb" +msgstr "Importálás a gThumb programmal" #: ../data/gthumb-import.desktop.in.in.h:2 msgid "Photo Import Tool" msgstr "Fénykép-importáló eszköz" -#: ../data/gthumb-import.desktop.in.in.h:4 +#: ../data/gthumb-import.desktop.in.in.h:3 msgid "gThumb Photo Import Tool" msgstr "gThumb fénykép-importáló eszköz" -#: ../data/gthumb.schemas.in.h:1 +#: ../data/gthumb-import.desktop.in.in.h:4 +msgid "Import the photos on your camera card" +msgstr "Fényképek importálása a fényképezőgép kártyájáról" + +#: ../data/org.gnome.gthumb.gschema.xml.in.h:1 msgid "" "Images over this size (in bytes) will not be thumbnailed. Use 0 if you want " "to generate thumbnails for all images." @@ -120,124 +133,143 @@ "Az ennél nagyobb képekhez (bájtban) nem készül bélyegkép. Használjon 0-t, ha " "azt akarja, hogy minden képhez készüljön bélyegkép." -#: ../data/gthumb.schemas.in.h:2 -msgid "" -"Possible values are: actual_size, fit, keep_prev, fit_if_larger, " -"fit_width_if_larger." -msgstr "" -"Lehetséges értékek: actual_size, fit, keep_prev, fit_if_larger, " -"fit_width_if_larger." +#: ../data/org.gnome.gthumb.gschema.xml.in.h:2 +msgid "Whether to resize the window to fit the size of the image" +msgstr "Méretezze-e át az ablakot úgy, hogy illeszkedjen a kép méretéhez" -#: ../data/gthumb.schemas.in.h:3 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:2 -msgid "Possible values are: high, low." -msgstr "Lehetséges értékek: high, low." - -#: ../data/gthumb.schemas.in.h:4 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:3 -msgid "Possible values are: light, midtone, dark." -msgstr "Lehetséges értékek: light, midtone, dark." - -#: ../data/gthumb.schemas.in.h:5 -msgid "Possible values are: list, thumbnails." -msgstr "Lehetséges értékek: list, thumbnails." - -#: ../data/gthumb.schemas.in.h:6 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:4 -msgid "Possible values are: small, medium, large." -msgstr "Lehetséges értékek: small, medium, large." - -#: ../data/gthumb.schemas.in.h:7 -msgid "Possible values are: system, text_below, text_beside, text_only, icons_only." -msgstr "Lehetséges értékek: system, text_below, text_beside, text_only, icons_only." +#: ../data/org.gnome.gthumb.gschema.xml.in.h:3 +msgid "Open files in the active window" +msgstr "Fájlok megnyitása az aktív ablakban" -#: ../data/gthumb.schemas.in.h:8 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:5 +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:1 msgid "Possible values are: white, black, checked, none." msgstr "Lehetséges értékek: white, black, checked, none." -#: ../data/gthumb.schemas.in.h:9 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:6 +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:2 +msgid "Whether to reset the scrollbars position after changing image" +msgstr "Képváltás után a görgetősáv pozíciói vissza legyenek-e állítva" + +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:3 msgid "Whether to always use a black background." -msgstr "Mindig fekete legyen-e a háttér." +msgstr "Mindig fekete hátteret használjon-e." -#: ../data/gthumb.schemas.in.h:10 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:7 -msgid "Whether to reset the scrollbar positions after changing image" -msgstr "Képváltás után a görgetősáv pozíciói vissza legyenek-e állítva" +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:1 +msgid "Possible values are: jpeg, jpg." +msgstr "Lehetséges értékek: jpeg, jpg." + +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:2 +msgid "Possible values are: tiff, tif." +msgstr "Lehetséges értékek: tiff, tif." + +#: ../data/org.gnome.gthumb.rename-series.gschema.xml.in.h:1 +msgid "" +"Possible values include: general::unsorted, file::name, file::size, file::" +"mtime, exif::photo::datetimeoriginal" +msgstr "" +"Lehetséges értékek: general::unsorted, file::name, file::size, file::mtime, " +"exif::photo::datetimeoriginal" -#: ../data/ui/extensions.ui.h:1 -msgid "Available _extensions:" -msgstr "_Elérhető kiterjesztések:" +#: ../data/ui/extensions-preferences.ui.h:1 +msgid "_Extensions:" +msgstr "_Kiterjesztések:" -#: ../data/ui/extensions.ui.h:2 +#: ../data/ui/extensions-preferences.ui.h:2 msgid "More extensions..." msgstr "Több kiterjesztés…" -#: ../data/ui/extensions.ui.h:3 -msgid "_Categories:" -msgstr "_Kategóriák:" - -#: ../data/ui/extensions.ui.h:4 -msgid "gthumb Extensions" -msgstr "gthumb kiterjesztések" +#: ../data/ui/extensions-preferences.ui.h:3 +msgid "Some extensions are configurable." +msgstr "Néhány kiterjesztés konfigurálható." #: ../data/ui/filter-editor.ui.h:1 msgid "Filter _Name:" msgstr "Szűrő _neve:" -#. limit label -#: ../data/ui/filter-editor.ui.h:2 ../gthumb/gth-filter.c:258 -#: ../gthumb/gth-filter.c:330 -msgid "_Limit to" -msgstr "K_orlát" - -#: ../data/ui/filter-editor.ui.h:3 +#: ../data/ui/filter-editor.ui.h:2 #: ../extensions/search/data/ui/search-editor.ui.h:3 msgid "_Match" msgstr "I_lleszkedés" +#. limit label +#: ../data/ui/filter-editor.ui.h:3 ../gthumb/gth-filter.c:269 +#: ../gthumb/gth-filter.c:337 +msgid "_Limit to" +msgstr "K_orlát" + #: ../data/ui/filter-editor.ui.h:4 msgid "selected by" msgstr "kijelölve" +#: ../data/ui/histogram-info.ui.h:1 +msgid "Mean:" +msgstr "Középérték:" + +#. Short for "Standard deviation". Try to keep it under the 12 characters in the translation or it will be ellipsizied at the end. +#: ../data/ui/histogram-info.ui.h:3 +msgid "Std dev:" +msgstr "Szórás:" + +#: ../data/ui/histogram-info.ui.h:4 +msgid "Median:" +msgstr "Medián:" + +#. After the colon there is the total number of pixels +#: ../data/ui/histogram-info.ui.h:6 +msgid "Pixels:" +msgstr "Képpontok:" + +#. After the colon there is a percentile. +#: ../data/ui/histogram-info.ui.h:8 +msgctxt "Pixels" +msgid "Max:" +msgstr "Max:" + +#. After the colon there is the percentile of selected pixels. +#: ../data/ui/histogram-info.ui.h:10 +msgctxt "Pixels" +msgid "Selected:" +msgstr "Kijelölve:" + +#: ../data/ui/location.ui.h:1 +msgid "_Location:" +msgstr "_Hely:" + #: ../data/ui/overwrite-dialog.ui.h:1 -msgid "Do not overwrite _the old file" -msgstr "Ne írja felül a _régi fájlokat" +msgid "Overwrite the old file with the new one?" +msgstr "Felülírja a régi fájlt az újjal?" #: ../data/ui/overwrite-dialog.ui.h:2 +msgid "Old File:" +msgstr "Régi fájl:" + +#: ../data/ui/overwrite-dialog.ui.h:3 msgid "Filename:" msgstr "Fájlnév:" -#: ../data/ui/overwrite-dialog.ui.h:3 +#: ../data/ui/overwrite-dialog.ui.h:4 +#: ../extensions/image_print/data/ui/print-layout.ui.h:23 +msgid "Size:" +msgstr "Méret:" + +#: ../data/ui/overwrite-dialog.ui.h:5 msgid "Modified:" msgstr "Módosítva:" -#: ../data/ui/overwrite-dialog.ui.h:4 +#: ../data/ui/overwrite-dialog.ui.h:6 msgid "New File:" msgstr "Új fájl:" -#: ../data/ui/overwrite-dialog.ui.h:5 -msgid "Old File:" -msgstr "Régi fájl:" - -#: ../data/ui/overwrite-dialog.ui.h:6 +#: ../data/ui/overwrite-dialog.ui.h:7 msgid "Over_write the old file" msgstr "A régi fájl fe_lülírása" -#: ../data/ui/overwrite-dialog.ui.h:7 -msgid "Overwrite _all files" -msgstr "_Minden fájl felülírása" - #: ../data/ui/overwrite-dialog.ui.h:8 -msgid "Overwrite the old file with the new one?" -msgstr "Felülírja a régi fájlt az újjal?" +msgid "Do not overwrite _the old file" +msgstr "Ne írja felül a _régi fájlokat" #: ../data/ui/overwrite-dialog.ui.h:9 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:9 -#: ../extensions/image_print/data/ui/print-layout.ui.h:12 -msgid "Size:" -msgstr "Méret:" +msgid "Overwrite _all files" +msgstr "_Minden fájl felülírása" #: ../data/ui/overwrite-dialog.ui.h:10 msgid "_Do not overwrite any file" @@ -260,239 +292,257 @@ msgstr "_Egyéb szűrők:" #: ../data/ui/preferences.ui.h:1 -msgid "Activate items with a double click" -msgstr "Elemek aktiválása dupla kattintással" +msgid "below the folder list" +msgstr "a mappalista alatt" #: ../data/ui/preferences.ui.h:2 -msgid "Activate items with a single click" -msgstr "Elemek aktiválása egy kattintással" +msgid "on the right" +msgstr "a jobb oldalon" #: ../data/ui/preferences.ui.h:3 -msgid "Appearance" -msgstr "Megjelenés" +msgid "gThumb Preferences" +msgstr "A gThumb beállításai" #: ../data/ui/preferences.ui.h:4 -msgid "As_k confirmation before deleting files or catalogs" -msgstr "_Megerősítés kérése fájlok vagy katalógusok törlésekor" +msgid "_Toolbar style:" +msgstr "_Eszköztár stílusa:" #: ../data/ui/preferences.ui.h:5 -msgid "Ask whether to save _modified files" -msgstr "_Rákérdezés, hogy mentse-e a módosított fájlokat" +msgid "T_humbnails in viewer:" +msgstr "_Bélyegképek a megjelenítőben:" -#: ../data/ui/preferences.ui.h:6 ../extensions/image_viewer/preferences.c:111 -msgid "Black" -msgstr "Fekete" +#: ../data/ui/preferences.ui.h:6 +msgid "System settings" +msgstr "Rendszerbeállítások" -#: ../data/ui/preferences.ui.h:7 ../gthumb/dlg-extensions.c:69 -#: ../gthumb/gth-browser-actions-entries.h:155 -msgid "Browser" -msgstr "Böngésző" +#: ../data/ui/preferences.ui.h:7 +msgid "Text below icons" +msgstr "Szöveg az ikonok alatt" #: ../data/ui/preferences.ui.h:8 -#: ../extensions/image_print/data/ui/print-layout.ui.h:1 -msgid "Caption" -msgstr "Cím" +msgid "Text beside icons" +msgstr "Szöveg az ikonok mellett" -#: ../data/ui/preferences.ui.h:9 ../extensions/image_viewer/preferences.c:112 -msgid "Checked" -msgstr "Sakktábla" +#: ../data/ui/preferences.ui.h:9 +msgid "Icons only" +msgstr "Csak ikonok" #: ../data/ui/preferences.ui.h:10 -msgid "Choose startup folder" -msgstr "Kezdőmappa kiválasztása" +msgid "Text only" +msgstr "Csak szöveg" #: ../data/ui/preferences.ui.h:11 -msgid "D_etermine image type from content (slower)" -msgstr "Kép_típus meghatározása a tartalom alapján (lassabb)" +msgid "on the bottom" +msgstr "alul" -#: ../data/ui/preferences.ui.h:12 ../extensions/image_viewer/preferences.c:101 -msgid "Fit to width if larger" -msgstr "Kép igazítása a szélességhez, ha nagyobb" +#: ../data/ui/preferences.ui.h:12 +msgid "on the side" +msgstr "oldalt" -#: ../data/ui/preferences.ui.h:13 ../extensions/image_viewer/preferences.c:98 -msgid "Fit to window" -msgstr "Kép igazítása az ablakmérethez" +#: ../data/ui/preferences.ui.h:13 +msgid "File _properties in browser:" +msgstr "Fájlt_ulajdonságok a böngészőben:" -#: ../data/ui/preferences.ui.h:14 ../extensions/image_viewer/preferences.c:99 -msgid "Fit to window if larger" -msgstr "Kép igazítása az ablakmérethez, ha nagyobb" +#: ../data/ui/preferences.ui.h:14 +msgid "Appearance" +msgstr "Megjelenés" #: ../data/ui/preferences.ui.h:15 -msgid "Follow Nautilus behaviour" -msgstr "A Nautilus viselkedésének átvétele" +msgid "Go to last _visited location" +msgstr "_Ugrás az utoljára meglátogatott helyre" #: ../data/ui/preferences.ui.h:16 -#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 -#: ../extensions/edit_metadata/gth-edit-comment-page.c:374 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 -#: ../gthumb/gth-main-default-metadata.c:33 -msgid "General" -msgstr "Általános" +msgid "Go to this _folder:" +msgstr "U_grás a következő mappába:" #: ../data/ui/preferences.ui.h:17 -msgid "Go to last _visited location" -msgstr "_Ugrás az utoljára meglátogatott helyre" +msgid "Choose startup folder" +msgstr "Kezdőmappa kiválasztása" #: ../data/ui/preferences.ui.h:18 -msgid "Go to this _folder:" -msgstr "U_grás a következő mappába:" +msgid "Set to C_urrent" +msgstr "_Beállítás a jelenlegire" -#: ../data/ui/preferences.ui.h:19 ../gthumb/dlg-preferences.c:231 -msgid "Icons only" -msgstr "Csak ikonok" +#: ../data/ui/preferences.ui.h:19 +msgid "_Reuse the active window to open files" +msgstr "Az aktív ablak újra_hasznosítása fájlok megnyitásához" -#: ../data/ui/preferences.ui.h:20 ../extensions/image_viewer/preferences.c:97 -msgid "Keep previous zoom" -msgstr "Előző nagyítás megtartása" +#: ../data/ui/preferences.ui.h:20 +msgid "On startup:" +msgstr "Induláskor:" #: ../data/ui/preferences.ui.h:21 -#: ../extensions/file_tools/gth-file-tool-crop.c:399 -#: ../extensions/file_tools/gth-file-tool-crop.c:425 -#: ../extensions/file_tools/gth-file-tool-resize.c:422 -#: ../extensions/image_viewer/preferences.c:110 -#: ../extensions/slideshow/main.c:278 -msgid "None" -msgstr "Nincs" +msgid "As_k confirmation before deleting files or catalogs" +msgstr "_Megerősítés kérése fájlok vagy katalógusok törlésekor" #: ../data/ui/preferences.ui.h:22 -msgid "On startup:" -msgstr "Induláskor:" +msgid "Ask whether to save _modified files" +msgstr "_Rákérdezés, hogy mentse-e a módosított fájlokat" #: ../data/ui/preferences.ui.h:23 -#: ../extensions/exiv2_tools/gth-edit-exiv2-page.c:190 +msgid "_Store metadata inside files if possible" +msgstr "Metaadatok _tárolása a fájlokon belül, ha lehetséges" + +#: ../data/ui/preferences.ui.h:24 +#: ../extensions/exiv2_tools/gth-edit-iptc-page.c:198 #: ../extensions/gstreamer_tools/main.c:33 -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:17 msgid "Other" msgstr "Egyéb" -#: ../data/ui/preferences.ui.h:24 -msgid "Set image to actual size" -msgstr "Kép megjelenítése a tényleges méretében" - #: ../data/ui/preferences.ui.h:25 -msgid "Set to C_urrent" -msgstr "_Beállítás a jelenlegire" +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 +#: ../extensions/edit_metadata/gth-edit-general-page.c:481 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 +#: ../gthumb/gth-main-default-metadata.c:33 +msgid "General" +msgstr "Általános" -#. Set widgets data. -#: ../data/ui/preferences.ui.h:26 ../gthumb/dlg-preferences.c:231 -msgid "System settings" -msgstr "Rendszerbeállítások" +#: ../data/ui/preferences.ui.h:26 +#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 +#: ../extensions/image_print/data/ui/print-layout.ui.h:18 +msgid "Caption" +msgstr "Felirat" #: ../data/ui/preferences.ui.h:27 -msgid "T_humbnails in viewer:" -msgstr "_Bélyegképek a megjelenítőben:" - -#: ../data/ui/preferences.ui.h:28 ../gthumb/dlg-preferences.c:231 -msgid "Text below icons" -msgstr "Szöveg az ikonok alatt" - -#: ../data/ui/preferences.ui.h:29 ../gthumb/dlg-preferences.c:231 -msgid "Text beside icons" -msgstr "Szöveg az ikonok mellett" +msgid "Thumbnail _size:" +msgstr "Bélyegképek _mérete:" -#: ../data/ui/preferences.ui.h:30 ../gthumb/dlg-preferences.c:231 -msgid "Text only" -msgstr "Csak szöveg" +#: ../data/ui/preferences.ui.h:28 +msgid "48" +msgstr "48" + +#: ../data/ui/preferences.ui.h:29 +msgid "64" +msgstr "64" + +#: ../data/ui/preferences.ui.h:30 +msgid "85" +msgstr "85" #: ../data/ui/preferences.ui.h:31 -msgid "Thumbnail _size:" -msgstr "Bélyegképek _mérete:" +msgid "95" +msgstr "95" -#: ../data/ui/preferences.ui.h:32 ../extensions/image_viewer/preferences.c:109 -msgid "White" -msgstr "Fehér" +#: ../data/ui/preferences.ui.h:32 +msgid "112" +msgstr "112" #: ../data/ui/preferences.ui.h:33 -msgid "_Store metadata inside files if possible" -msgstr "Metaadatok _tárolása a fájlokon belül, ha lehetséges" +msgid "128" +msgstr "128" #: ../data/ui/preferences.ui.h:34 -msgid "_Toolbar style:" -msgstr "_Eszköztár stílusa:" +msgid "164" +msgstr "164" #: ../data/ui/preferences.ui.h:35 -msgid "gthumb Preferences" -msgstr "A gThumb beállításai" +msgid "200" +msgstr "200" #: ../data/ui/preferences.ui.h:36 -msgid "on the bottom" -msgstr "alul" +msgid "256" +msgstr "256" #: ../data/ui/preferences.ui.h:37 -msgid "on the side" -msgstr "oldalt" +msgid "D_etermine image type from content (slower)" +msgstr "Kép_típus meghatározása a tartalom alapján (lassabb)" + +#: ../data/ui/preferences.ui.h:38 ../gthumb/dlg-preferences-extensions.c:71 +#: ../gthumb/gth-browser-actions-entries.h:179 +msgid "Browser" +msgstr "Böngésző" #: ../data/ui/sort-order.ui.h:1 msgid "Sort By" msgstr "Rendezés" #: ../data/ui/sort-order.ui.h:2 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:4 +msgid "_Sort by:" +msgstr "_Rendezés:" + +#: ../data/ui/sort-order.ui.h:3 msgid "_Inverse order" msgstr "_Fordított sorrend" -#: ../data/ui/sort-order.ui.h:3 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 -msgid "_Sort by:" -msgstr "_Rendezés:" +#: ../extensions/23hq/23hq.extension.in.in.h:1 +msgid "23" +msgstr "23" + +#: ../extensions/23hq/23hq.extension.in.in.h:2 +msgid "Upload images to 23hq.com" +msgstr "Képek feltöltése a 23hq.com oldalra" + +#: ../extensions/23hq/callbacks.c:68 +msgid "_23..." +msgstr "_23…" + +#: ../extensions/23hq/callbacks.c:69 +msgid "Upload photos to 23" +msgstr "Fényképek feltöltése a 23-ra" #: ../extensions/bookmarks/bookmarks.extension.in.in.h:1 -msgid "Add bookmarks support." -msgstr "Könyvjelzők támogatása." - -#: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:1 msgid "Bookmarks" msgstr "Könyvjelzők" +#: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 +msgid "Add bookmarks support." +msgstr "Könyvjelzők támogatása." + #: ../extensions/bookmarks/bookmarks.extension.in.in.h:3 #: ../extensions/burn_disc/burn_disc.extension.in.in.h:3 #: ../extensions/catalogs/catalogs.extension.in.in.h:3 #: ../extensions/change_date/change_date.extension.in.in.h:3 #: ../extensions/comments/comments.extension.in.in.h:3 +#: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:3 #: ../extensions/convert_format/convert_format.extension.in.in.h:3 #: ../extensions/desktop_background/desktop_background.extension.in.in.h:3 #: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:3 #: ../extensions/exiv2_tools/exiv2_tools.extension.in.in.h:3 #: ../extensions/file_manager/file_manager.extension.in.in.h:3 #: ../extensions/file_tools/file_tools.extension.in.in.h:3 +#: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:3 #: ../extensions/gstreamer_tools/gstreamer_tools.extension.in.in.h:3 #: ../extensions/image_print/image_print.extension.in.in.h:3 #: ../extensions/image_rotation/image_rotation.extension.in.in.h:3 #: ../extensions/image_viewer/image_viewer.extension.in.in.h:3 #: ../extensions/list_tools/list_tools.extension.in.in.h:3 #: ../extensions/photo_importer/photo_importer.extension.in.in.h:3 -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:3 #: ../extensions/raw_files/raw_files.extension.in.in.h:3 #: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:3 #: ../extensions/rename_series/rename_series.extension.in.in.h:3 #: ../extensions/resize_images/resize_images.extension.in.in.h:3 #: ../extensions/search/search.extension.in.in.h:3 +#: ../extensions/selections/selections.extension.in.in.h:3 #: ../extensions/slideshow/slideshow.extension.in.in.h:3 #: ../extensions/webalbums/webalbums.extension.in.in.h:3 msgid "gthumb development team" msgstr "A gthumb fejlesztőcsapata" -#: ../extensions/bookmarks/callbacks.c:52 +#: ../extensions/bookmarks/callbacks.c:54 msgid "_Bookmarks" msgstr "_Könyvjelzők" -#: ../extensions/bookmarks/callbacks.c:53 +#: ../extensions/bookmarks/callbacks.c:55 msgid "_System Bookmarks" msgstr "_Rendszerkönyvjelzők" -#: ../extensions/bookmarks/callbacks.c:56 +#: ../extensions/bookmarks/callbacks.c:58 msgid "_Add Bookmark" msgstr "Köny_vjelző hozzáadása" -#: ../extensions/bookmarks/callbacks.c:57 +#: ../extensions/bookmarks/callbacks.c:59 msgid "Add current location to bookmarks" msgstr "A jelenlegi hely hozzáadása a könyvjelzőkhöz" -#: ../extensions/bookmarks/callbacks.c:61 +#: ../extensions/bookmarks/callbacks.c:63 msgid "_Edit Bookmarks..." msgstr "Könyvjelzők s_zerkesztése…" -#: ../extensions/bookmarks/callbacks.c:62 +#: ../extensions/bookmarks/callbacks.c:64 msgid "Edit bookmarks" msgstr "Könyvjelzők szerkesztése" @@ -501,13 +551,13 @@ msgstr "_Könyvjelzők:" #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:3 -msgid "_Location" -msgstr "_Hely" - -#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:4 msgid "_Name" msgstr "_Név" +#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:4 +msgid "_Location" +msgstr "_Hely" + #: ../extensions/bookmarks/dlg-bookmarks.c:70 msgid "Could not remove the bookmark" msgstr "Nem lehet eltávolítani a könyvjelzőt" @@ -541,149 +591,283 @@ msgstr "Jelenlegi mappa és _almappái" #: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:3 -msgid "Source" -msgstr "Forrás" - -#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:4 msgid "_Selected files" msgstr "_Kijelölt fájlok" +#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:4 +msgid "Source" +msgstr "Forrás" + #: ../extensions/burn_disc/gth-burn-task.c:238 #: ../extensions/burn_disc/gth-burn-task.c:259 -#: ../extensions/burn_disc/gth-burn-task.c:393 +#: ../extensions/burn_disc/gth-burn-task.c:397 msgid "Write to Disc" msgstr "Lemezre írás" -#: ../extensions/catalogs/actions.c:62 -msgid "Could not remove the files from the catalog" -msgstr "Nem lehet eltávolítani a fájlokat a katalógusból" +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:62 +#, c-format +msgid "Error interpreting JPEG image file: %s" +msgstr "Hiba a JPEG képfájl értelmezésekor: %s" -#: ../extensions/catalogs/actions.c:120 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:637 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:646 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:674 -#: ../extensions/search/gth-search.c:295 -msgid "Invalid file format" -msgstr "Érvénytelen fájlformátum" +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:483 +#, c-format +msgid "Unknown JPEG color space (%d)" +msgstr "Ismeretlen JPEG színtér (%d)" -#: ../extensions/catalogs/actions.c:189 -#: ../extensions/catalogs/dlg-add-to-catalog.c:265 -msgid "Enter the catalog name: " -msgstr "Adja meg a katalógus nevét: " - -#: ../extensions/catalogs/actions.c:193 ../extensions/catalogs/actions.c:259 -#: ../extensions/catalogs/dlg-add-to-catalog.c:269 -#: ../extensions/catalogs/dlg-add-to-catalog.c:335 -#: ../extensions/file_manager/actions.c:45 -msgid "C_reate" -msgstr "_Létrehozás" +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:1 +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:1 +msgid "_Default extension:" +msgstr "_Alapértelmezett kiterjesztés:" -#: ../extensions/catalogs/actions.c:233 -#: ../extensions/catalogs/dlg-add-to-catalog.c:217 -#: ../extensions/catalogs/dlg-add-to-catalog.c:310 -#: ../extensions/search/gth-search-task.c:332 -msgid "Could not create the catalog" -msgstr "Nem lehet létrehozni a katalógust" +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:2 +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:1 +msgid "_Quality:" +msgstr "_Minőség:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:3 +msgid "_Smoothing:" +msgstr "_Simítás:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:4 +msgid "Opti_mize" +msgstr "Opti_malizálás" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:5 +msgid "_Progressive" +msgstr "_Progresszív" + +#: ../extensions/cairo_io/data/ui/png-options.ui.h:1 +msgid "Compression _level:" +msgstr "Tömörítés _szintje:" + +#: ../extensions/cairo_io/data/ui/save-options-preferences.ui.h:1 +msgid "Default options:" +msgstr "Alapértelmezett beállítások:" + +#: ../extensions/cairo_io/data/ui/tga-options.ui.h:1 +msgid "_RLE compression" +msgstr "_RLE tömörítés" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:2 +msgid "Compression" +msgstr "Tömörítés" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:3 +msgid "_No compression" +msgstr "_Nincs tömörítés" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:4 +msgid "No_rmal (Deflate)" +msgstr "No_rmál (Deflate)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:5 +msgid "_Loss compression (JPEG)" +msgstr "V_eszteséges tömörítés (JPEG)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:6 +msgid "Resolution" +msgstr "Felbontás" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:7 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 +msgid "_Horizontal:" +msgstr "_Vízszintes:" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:8 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 +msgid "_Vertical:" +msgstr "_Függőleges:" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:9 +msgid "dpi" +msgstr "dpi" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:2 +msgid "_Method:" +msgstr "_Módszer:" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:3 +msgid "_Lossless" +msgstr "_Veszteségmentes" + +#: ../extensions/cairo_io/gth-image-saver-jpeg.c:516 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:140 +msgid "JPEG" +msgstr "JPEG" + +#: ../extensions/cairo_io/gth-image-saver-png.c:353 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:110 +msgid "PNG" +msgstr "PNG" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:257 +#: ../extensions/cairo_io/gth-image-saver-tiff.c:435 +#: ../gthumb/gth-buffer-data.c:84 +msgid "Insufficient memory" +msgstr "Kevés a memória" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:344 +msgid "TGA" +msgstr "TGA" + +#: ../extensions/cairo_io/gth-image-saver-tiff.c:559 +msgid "TIFF" +msgstr "TIFF" -#: ../extensions/catalogs/actions.c:255 -#: ../extensions/catalogs/dlg-add-to-catalog.c:331 -msgid "Enter the library name: " -msgstr "Adja meg a gyűjtemény nevét: " - -#: ../extensions/catalogs/actions.c:299 -#: ../extensions/catalogs/dlg-add-to-catalog.c:375 -msgid "Could not create the library" -msgstr "Nem lehet létrehozni gyűjteményt" +#: ../extensions/cairo_io/gth-image-saver-webp.c:382 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:165 +msgid "WebP" +msgstr "WebP" + +#: ../extensions/cairo_io/preferences.c:134 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 +msgid "Saving" +msgstr "Mentés" + +#: ../extensions/catalogs/actions.c:92 ../extensions/catalogs/actions.c:213 +#: ../extensions/catalogs/dlg-add-to-catalog.c:274 +#: ../extensions/catalogs/dlg-add-to-catalog.c:394 +#: ../extensions/file_manager/actions.c:68 +#: ../extensions/list_tools/gth-script-editor-dialog.c:290 +#: ../gthumb/gth-filter-editor-dialog.c:461 +#, c-format +msgid "No name specified" +msgstr "Nincs név megadva" + +#: ../extensions/catalogs/actions.c:99 ../extensions/catalogs/actions.c:220 +#: ../extensions/catalogs/dlg-add-to-catalog.c:281 +#: ../extensions/catalogs/dlg-add-to-catalog.c:401 +#: ../extensions/file_manager/actions.c:75 +#, c-format +msgid "Invalid name. The following characters are not allowed: %s" +msgstr "Érvénytelen név. A következő karakterek nem engedélyezettek: %s" + +#: ../extensions/catalogs/actions.c:155 ../extensions/catalogs/actions.c:267 +#: ../extensions/catalogs/dlg-add-to-catalog.c:338 +#: ../extensions/catalogs/dlg-add-to-catalog.c:448 +#: ../extensions/catalogs/gth-file-source-catalogs.c:508 +#: ../extensions/file_manager/actions.c:106 +msgid "Name already used" +msgstr "A név már használatban van" + +#: ../extensions/catalogs/actions.c:178 +#: ../extensions/catalogs/dlg-add-to-catalog.c:359 +msgid "New catalog" +msgstr "Új katalógus" + +#: ../extensions/catalogs/actions.c:179 +#: ../extensions/catalogs/dlg-add-to-catalog.c:360 +msgid "Enter the catalog name:" +msgstr "Adja meg a katalógus nevét:" + +#: ../extensions/catalogs/actions.c:181 ../extensions/catalogs/actions.c:293 +#: ../extensions/catalogs/dlg-add-to-catalog.c:362 +#: ../extensions/catalogs/dlg-add-to-catalog.c:474 +#: ../extensions/file_manager/actions.c:136 +msgid "C_reate" +msgstr "_Létrehozás" -#: ../extensions/catalogs/actions.c:331 +#: ../extensions/catalogs/actions.c:290 +#: ../extensions/catalogs/dlg-add-to-catalog.c:471 +msgid "New library" +msgstr "Új gyűjtemény" + +#: ../extensions/catalogs/actions.c:291 +#: ../extensions/catalogs/dlg-add-to-catalog.c:472 +msgid "Enter the library name:" +msgstr "Adja meg a gyűjtemény nevét:" + +#: ../extensions/catalogs/actions.c:326 msgid "Could not remove the catalog" msgstr "Nem lehet eltávolítani a katalógust" -#: ../extensions/catalogs/actions.c:365 +#: ../extensions/catalogs/actions.c:363 #, c-format msgid "Are you sure you want to remove \"%s\"?" msgstr "Biztosan eltávolítja a következőt: „%s”?" -#: ../extensions/catalogs/callbacks.c:98 +#: ../extensions/catalogs/callbacks.c:102 msgid "_Add to Catalog" msgstr "Hozzá_adás katalógushoz" -#: ../extensions/catalogs/callbacks.c:101 +#: ../extensions/catalogs/callbacks.c:105 +#: ../extensions/selections/callbacks.c:80 msgid "Open _Folder" msgstr "Ma_ppa megnyitása" -#: ../extensions/catalogs/callbacks.c:102 +#: ../extensions/catalogs/callbacks.c:106 +#: ../extensions/selections/callbacks.c:81 msgid "Go to the folder that contains the selected file" msgstr "Ugrás a kijelölt fájlt tartalmazó mappába" -#: ../extensions/catalogs/callbacks.c:106 -#: ../extensions/edit_metadata/callbacks.c:106 -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:87 +#: ../extensions/catalogs/callbacks.c:110 msgid "Other..." msgstr "Egyéb…" -#: ../extensions/catalogs/callbacks.c:107 +#: ../extensions/catalogs/callbacks.c:111 msgid "Choose another catalog" msgstr "Válasszon másik katalógust" -#: ../extensions/catalogs/callbacks.c:111 +#: ../extensions/catalogs/callbacks.c:115 msgid "_Add to Catalog..." msgstr "Hozzá_adás katalógushoz…" -#: ../extensions/catalogs/callbacks.c:112 +#: ../extensions/catalogs/callbacks.c:116 msgid "Add selected images to a catalog" msgstr "A kijelölt képek hozzáadása a katalógushoz" -#: ../extensions/catalogs/callbacks.c:116 +#: ../extensions/catalogs/callbacks.c:120 msgid "Remo_ve from Catalog" msgstr "El_távolítás a katalógusból" -#: ../extensions/catalogs/callbacks.c:117 +#: ../extensions/catalogs/callbacks.c:121 msgid "Remove selected images from the catalog" msgstr "A kijelölt képek eltávolítása a katalógusból" -#: ../extensions/catalogs/callbacks.c:121 +#: ../extensions/catalogs/callbacks.c:125 msgid "Create _Catalog" msgstr "_Katalógus létrehozása" -#: ../extensions/catalogs/callbacks.c:126 +#: ../extensions/catalogs/callbacks.c:130 msgid "Create _Library" msgstr "Gyűjtemény _létrehozása" -#: ../extensions/catalogs/callbacks.c:136 +#: ../extensions/catalogs/callbacks.c:140 msgid "Rena_me" msgstr "Át_nevezés" -#: ../extensions/catalogs/callbacks.c:263 -#: ../extensions/catalogs/callbacks.c:266 +#: ../extensions/catalogs/callbacks.c:281 +#: ../extensions/catalogs/callbacks.c:284 msgid "Command Line" msgstr "Parancssor" -#: ../extensions/catalogs/callbacks.c:481 -#: ../extensions/catalogs/callbacks.c:486 -#: ../extensions/photo_importer/dlg-photo-importer.c:313 -#: ../extensions/photo_importer/dlg-photo-importer.c:353 -#: ../gthumb/gth-file-list.c:45 ../gthumb/gth-folder-tree.c:874 +#: ../extensions/catalogs/callbacks.c:496 +#: ../extensions/catalogs/callbacks.c:501 +#: ../extensions/photo_importer/dlg-photo-importer.c:364 +#: ../extensions/photo_importer/dlg-photo-importer.c:404 +#: ../gthumb/gth-file-list.c:43 ../gthumb/gth-folder-tree.c:1093 msgid "(Empty)" msgstr "(Üres)" -#: ../extensions/catalogs/callbacks.c:679 +#: ../extensions/catalogs/callbacks.c:700 msgid "Catalog Properties" msgstr "Katalógus tulajdonságai" -#: ../extensions/catalogs/callbacks.c:693 +#: ../extensions/catalogs/callbacks.c:714 msgid "Organize" msgstr "Rendszerezés" -#: ../extensions/catalogs/callbacks.c:694 +#: ../extensions/catalogs/callbacks.c:715 msgid "Automatically organize files by date" msgstr "Fájlok automatikus rendezése dátum szerint" #: ../extensions/catalogs/catalogs.extension.in.in.h:1 -#: ../extensions/catalogs/gth-catalog.c:641 -#: ../extensions/catalogs/gth-catalog.c:690 -#: ../extensions/catalogs/gth-catalog.c:1047 -#: ../extensions/catalogs/gth-catalog.c:1048 +#: ../extensions/catalogs/gth-catalog.c:611 +#: ../extensions/catalogs/gth-catalog.c:662 +#: ../extensions/catalogs/gth-catalog.c:1016 +#: ../extensions/catalogs/gth-catalog.c:1017 msgid "Catalogs" msgstr "Katalógusok" @@ -700,139 +884,189 @@ msgstr "_Katalógusok:" #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:3 -msgid "New _Library" -msgstr "Új _gyűjtemény" - -#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:4 msgid "_New Catalog" msgstr "Ú_j katalógus" +#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:4 +msgid "New _Library" +msgstr "Új _gyűjtemény" + #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:5 -#: ../extensions/webalbums/gth-web-exporter.c:1834 +#: ../extensions/file_manager/actions.c:945 +#: ../extensions/webalbums/gth-web-exporter.c:1840 msgid "_View the destination" msgstr "A cél _megjelenítése" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:1 -msgid "Catalog" -msgstr "Katalógus" - -#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 -#: ../gthumb/gth-file-properties.c:199 +#: ../gthumb/gth-file-properties.c:209 msgid "Properties" msgstr "Tulajdonságok" +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:1 +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:1 +msgid "_Name:" +msgstr "_Név:" + #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:4 -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:3 +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:2 msgid "_Date:" msgstr "_Dátum:" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:5 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:36 -#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 -msgid "_Name:" -msgstr "_Név:" +msgid "Catalog" +msgstr "Katalógus" #: ../extensions/catalogs/data/ui/organize-files-task.ui.h:1 -msgid "Catalog _Preview:" -msgstr "Katalógus _előnézete:" - -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:2 -msgid "Organization:" -msgstr "Szervezet:" - -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 -#: ../extensions/catalogs/data/ui/organize-files.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 msgid "Organize Files" msgstr "Fájlok rendszerezése" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:2 msgid "Organizing files" msgstr "Fájlok rendszerezése" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 +msgid "Organization:" +msgstr "Szervezet:" + +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:4 msgid "Select All" msgstr "Összes kijelölése" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 msgid "Select None" msgstr "Kijelölés megszüntetése" +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 +msgid "Catalog _Preview:" +msgstr "Katalógus _előnézete:" + #: ../extensions/catalogs/data/ui/organize-files.ui.h:1 -#: ../extensions/edit_metadata/gth-edit-comment-page.c:451 -#: ../gthumb/gth-main-default-tests.c:264 +#: ../extensions/edit_metadata/gth-edit-general-page.c:558 +#: ../gthumb/gth-main-default-tests.c:300 msgid "Date photo was taken" msgstr "Fényképkészítés dátuma" #: ../extensions/catalogs/data/ui/organize-files.ui.h:2 -#: ../gthumb/gth-main-default-tests.c:256 +#: ../gthumb/gth-main-default-tests.c:292 msgid "File modified date" msgstr "Fájlmódosítás dátuma" #: ../extensions/catalogs/data/ui/organize-files.ui.h:3 -msgid "Ignore catalogs with a single file" -msgstr "Az egy fájlból álló katalógusok figyelmen kívül hagyása" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:5 -msgid "Put single files in the catalog:" -msgstr "Egyetlen fájl elhelyezése a katalógusban:" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 -msgid "Singles" -msgstr "Egyetlen" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:7 -#: ../extensions/comments/main.c:225 +#: ../extensions/comments/main.c:182 msgid "Tag" msgstr "Címke" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:8 -#: ../gthumb/gth-main-default-tests.c:284 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:4 +msgid "tag" +msgstr "címke" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:5 +#: ../gthumb/gth-main-default-tests.c:324 msgid "Tag (embedded)" msgstr "Címke (beágyazott)" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:9 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:7 msgid "_Group files by:" msgstr "Fájlok _csoportosítása:" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:10 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:8 +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 #: ../extensions/search/data/ui/search-editor.ui.h:2 msgid "_Include sub-folders" msgstr "_Almappákban is" +#: ../extensions/catalogs/data/ui/organize-files.ui.h:9 +msgid "Ignore catalogs with a single file" +msgstr "Az egy fájlból álló katalógusok figyelmen kívül hagyása" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:10 +msgid "Put single files in the catalog:" +msgstr "Egyetlen fájl elhelyezése a katalógusban:" + #: ../extensions/catalogs/data/ui/organize-files.ui.h:11 -msgid "tag" -msgstr "címke" +msgid "Singles" +msgstr "Egyetlen" #: ../extensions/catalogs/dlg-add-to-catalog.c:105 #: ../extensions/catalogs/dlg-add-to-catalog.c:136 msgid "Could not add the files to the catalog" msgstr "Nem lehet a fájlokat hozzáadni a katalógushoz" +#: ../extensions/catalogs/dlg-add-to-catalog.c:217 +#: ../extensions/search/gth-search-task.c:356 +msgid "Could not create the catalog" +msgstr "Nem lehet létrehozni a katalógust" + #: ../extensions/catalogs/dlg-catalog-properties.c:80 msgid "Could not save the catalog" msgstr "Nem lehet elmenteni a katalógust" -#: ../extensions/catalogs/dlg-catalog-properties.c:166 +#: ../extensions/catalogs/dlg-catalog-properties.c:159 msgid "Could not load the catalog" msgstr "Nem lehet betölteni a katalógust" #: ../extensions/catalogs/dlg-organize-files.c:120 msgid "Files will be organized in catalogs. No file will be moved on disk." -msgstr "A fájlok katalógusokba lesznek szervezve. A lemezen nem történik fájlmozgatás." +msgstr "" +"A fájlok katalógusokba lesznek szervezve. A lemezen nem történik " +"fájlmozgatás." -#: ../extensions/catalogs/gth-catalog.c:1145 +#: ../extensions/catalogs/gth-catalog.c:1114 ../extensions/comments/main.c:45 +#: ../extensions/edit_metadata/callbacks.c:106 #: ../gthumb/gth-main-default-metadata.c:53 msgid "Tags" msgstr "Címkék" -#: ../extensions/catalogs/gth-file-source-catalogs.c:791 +#: ../extensions/catalogs/gth-file-source-catalogs.c:953 +#, c-format +msgid "The catalog '%s' already exists, do you want to overwrite it?" +msgstr "A(z) „%s” katalógus már létezik, szeretné felülírni?" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:955 +#, c-format +msgid "The library '%s' already exists, do you want to overwrite it?" +msgstr "A(z) „%s” gyűjtemény már létezik, szeretné felülírni?" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:963 +msgid "Over_write" +msgstr "F_elülírás" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1081 +msgid "Cannot move the files" +msgstr "Nem sikerült áthelyezni a fájlokat" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1083 +msgid "Cannot copy the files" +msgstr "Nem sikerült átmásolni a fájlokat" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1088 +msgid "Invalid destination." +msgstr "Érvénytelen cél." + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1135 #, c-format msgid "Copying files to '%s'" msgstr "Fájlok másolása ide: „%s”" +#: ../extensions/catalogs/gth-file-source-catalogs.c:1322 +msgid "Could not remove the files from the catalog" +msgstr "Nem lehet eltávolítani a fájlokat a katalógusból" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1380 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:746 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:755 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:785 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:1320 +#: ../extensions/search/gth-search.c:265 +msgid "Invalid file format" +msgstr "Érvénytelen fájlformátum" + #: ../extensions/catalogs/gth-organize-task.c:202 #, c-format msgid "Operation completed. Catalogs: %d. Images: %d." @@ -855,63 +1089,85 @@ msgstr "A fájlok dátumának megváltoztatása" #: ../extensions/change_date/data/ui/change-date.ui.h:1 -msgid "A_djust by" -msgstr "Mó_dosítás ennyivel" +msgid "+" +msgstr "+" #: ../extensions/change_date/data/ui/change-date.ui.h:2 +msgid "-" +msgstr "-" + +#: ../extensions/change_date/data/ui/change-date.ui.h:3 msgid "Change Date" msgstr "Változás dátuma" -#: ../extensions/change_date/data/ui/change-date.ui.h:3 +#: ../extensions/change_date/data/ui/change-date.ui.h:4 msgid "Change the following values:" msgstr "A következő értékek módosítása:" -#: ../extensions/change_date/data/ui/change-date.ui.h:4 -msgid "Change to:" -msgstr "Módosítás erre:" - #: ../extensions/change_date/data/ui/change-date.ui.h:5 -msgid "Co_mment date" -msgstr "Megjegyzés _dátuma" +msgid "_Last modified date" +msgstr "Utolsó módosítás _dátuma" #: ../extensions/change_date/data/ui/change-date.ui.h:6 -msgid "Date p_hoto was taken" -msgstr "_Fényképkészítés ideje" +msgid "Co_mment date" +msgstr "Megjegyzés _dátuma" #: ../extensions/change_date/data/ui/change-date.ui.h:7 -msgid "Exif DateTimeOriginal tag" -msgstr "Exif DateTimeOriginal címke" +msgid "Change to:" +msgstr "Módosítás erre:" #: ../extensions/change_date/data/ui/change-date.ui.h:8 +msgid "The _following date:" +msgstr "A _következő dátum:" + +#: ../extensions/change_date/data/ui/change-date.ui.h:9 msgid "File _modified date" msgstr "Fájl _módosításának ideje" -#: ../extensions/change_date/data/ui/change-date.ui.h:9 +#: ../extensions/change_date/data/ui/change-date.ui.h:10 msgid "File c_reation date" msgstr "Fájl létre_hozásának ideje" -#: ../extensions/change_date/data/ui/change-date.ui.h:10 -msgid "The _following date:" -msgstr "A _következő dátum:" - #: ../extensions/change_date/data/ui/change-date.ui.h:11 -msgid "_Last modified date" -msgstr "Utolsó módosítás _dátuma" +msgid "Date p_hoto was taken" +msgstr "_Fényképkészítés ideje" #: ../extensions/change_date/data/ui/change-date.ui.h:12 +msgid "A_djust by" +msgstr "Mó_dosítás ennyivel" + +#: ../extensions/change_date/data/ui/change-date.ui.h:13 msgid "hours" -msgstr "órával" +msgstr "óra" -#: ../extensions/comments/comments.extension.in.in.h:1 -msgid "Add comments and tags to any file type." -msgstr "Megjegyzések és címkék hozzáadása bármilyen fájltípushoz." +#: ../extensions/change_date/data/ui/change-date.ui.h:14 +msgid "minutes" +msgstr "perc" -#: ../extensions/comments/comments.extension.in.in.h:2 +#: ../extensions/change_date/data/ui/change-date.ui.h:15 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:6 +msgid "seconds" +msgstr "másodperc" + +#: ../extensions/comments/callbacks.c:46 +msgid "Import Embedded Metadata" +msgstr "Beágyazott metaadat importálása" + +#: ../extensions/comments/callbacks.c:47 +msgid "Import the metadata stored inside files into the gThumb comment system" +msgstr "" +"A fájlokon belül tárolt metaadatok importálása a gThumb megjegyzésrendszerébe" + +#: ../extensions/comments/comments.extension.in.in.h:1 msgid "Comments and tags" msgstr "Megjegyzések és címkék" +#: ../extensions/comments/comments.extension.in.in.h:2 +msgid "Add comments and tags to any file type." +msgstr "Megjegyzések és címkék hozzáadása bármilyen fájltípushoz." + #: ../extensions/comments/data/ui/comments-preferences.ui.h:1 -#: ../extensions/importer/gth-import-preferences-dialog.c:314 +#: ../extensions/importer/gth-import-preferences-dialog.c:318 msgid "Preferences" msgstr "Beállítások" @@ -919,24 +1175,349 @@ msgid "_Synchronize with the embedded metadata" msgstr "_Szinkronizálás a beágyazott metaadatokkal" -#: ../extensions/comments/main.c:33 -#: ../extensions/edit_metadata/callbacks.c:101 +#: ../extensions/comments/main.c:35 +#: ../extensions/edit_metadata/callbacks.c:100 msgid "Comment" msgstr "Megjegyzés" -#: ../extensions/comments/main.c:209 -#: ../extensions/importer/data/ui/import-preferences.ui.h:1 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:24 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:13 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 -#: ../gthumb/gth-main-default-metadata.c:52 -msgid "Description" -msgstr "Leírás" +#: ../extensions/comments/main.c:41 ../gthumb/gth-main-default-metadata.c:46 +msgid "Title" +msgstr "Cím" + +#: ../extensions/comments/main.c:42 ../extensions/comments/main.c:166 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 +#: ../extensions/image_print/data/ui/print-layout.ui.h:8 +#: ../extensions/importer/data/ui/import-preferences.ui.h:6 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 +#: ../gthumb/gth-main-default-metadata.c:52 +msgid "Description" +msgstr "Leírás" -#: ../extensions/comments/main.c:217 ../gthumb/gth-main-default-metadata.c:50 +#: ../extensions/comments/main.c:43 ../extensions/comments/main.c:174 +#: ../gthumb/gth-main-default-metadata.c:50 msgid "Place" msgstr "Hely" +#: ../extensions/comments/main.c:44 ../gthumb/gth-main-default-metadata.c:51 +msgid "Date" +msgstr "Dátum" + +#: ../extensions/comments/main.c:46 ../gthumb/gth-main-default-metadata.c:54 +msgid "Rating" +msgstr "Értékelés" + +#: ../extensions/contact_sheet/callbacks.c:59 +msgid "Contact _Sheet" +msgstr "Partner _munkalap" + +#: ../extensions/contact_sheet/callbacks.c:61 +msgid "Contact _Sheet..." +msgstr "Partner _munkalap…" + +#: ../extensions/contact_sheet/callbacks.c:62 +msgid "Create a contact sheet" +msgstr "Partner munkalap létrehozása" + +#: ../extensions/contact_sheet/callbacks.c:65 +msgid "Image _Wall..." +msgstr "Kép_fal…" + +#: ../extensions/contact_sheet/callbacks.c:66 +msgid "Create an image-wall" +msgstr "Képfal létrehozása" + +#: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:1 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:1 +msgid "Contact Sheet" +msgstr "Partner munkalap" + +#: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:2 +msgid "Create an index image displaying the thumbnails of the selected files." +msgstr "" +"Indexkép létrehozása a kijelölt fájlok bélyegképeinek megjelenítéséhez." + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:1 +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:446 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 +#: ../extensions/file_tools/gth-file-tool-rotate.c:397 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:14 +#: ../extensions/slideshow/main.c:277 +msgid "None" +msgstr "Nincs" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:2 +msgid "Simple" +msgstr "Egyszerű" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:3 +msgid "Simple with shadow" +msgstr "Egyszerű árnyékkal" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:4 +msgid "Shadow only" +msgstr "Csak árnyék" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:5 +msgid "Slide" +msgstr "Dia" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:6 +msgid "Inward Shadow" +msgstr "Belső árnyék" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:7 +msgid "Outward Shadow" +msgstr "Külső árnyék" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:9 +msgid "Background" +msgstr "Háttér" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:10 +msgid "_Solid color" +msgstr "_Homogén szín" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:11 +msgid "_Gradient" +msgstr "_Színátmenet" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:14 +msgid "Select a color" +msgstr "Válasszon színt" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:15 +msgid "Frame" +msgstr "Keret" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:16 +msgid "_Style:" +msgstr "_Stílus:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:17 +msgid "C_olor:" +msgstr "S_zín:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:18 +#: ../extensions/rename_series/dlg-rename-series.c:57 +msgid "Text" +msgstr "Szöveg" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 +#: ../extensions/image_print/data/ui/print-layout.ui.h:3 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 +msgid "_Header:" +msgstr "F_ejléc:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:20 +msgid "Select a font" +msgstr "Válasszon betűkészletet" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:21 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 +#: ../extensions/image_print/data/ui/print-layout.ui.h:4 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 +msgid "_Footer:" +msgstr "_Lábléc:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:22 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 +msgid "Caption:" +msgstr "Felirat:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:2 +#: ../extensions/image_print/data/ui/print-layout.ui.h:5 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:6 +msgid "The current page number" +msgstr "A jelenlegi oldalszám" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:3 +#: ../extensions/image_print/data/ui/print-layout.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 +msgid "The total number of pages" +msgstr "Az oldalak teljes száma" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:4 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 +#: ../extensions/image_print/data/ui/print-layout.ui.h:7 +#: ../extensions/importer/data/ui/import-preferences.ui.h:5 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:8 +msgid "Special code" +msgstr "Speciális kód" + +#. translate only the text in the curly brackets +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:8 +#: ../extensions/image_print/data/ui/print-layout.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 +#, no-c-format +msgid "%D{ format }" +msgstr "%D{ formátum }" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 +msgid "The current date" +msgstr "A mai dátum" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:6 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 +msgid "_Destination:" +msgstr "_Cél:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:13 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:3 +#: ../extensions/convert_format/data/ui/convert-format.ui.h:4 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 +msgid "Choose destination folder" +msgstr "Válasszon célmappát" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:14 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 +msgid "File_name:" +msgstr "Fájl_név:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:8 +msgid "New enumerator digit" +msgstr "Új számláló számjegy" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:16 +msgid "Create _HTML image map" +msgstr "_HTML képtérkép létrehozása" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 +msgid "Create a new theme" +msgstr "Új téma létrehozása" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:19 +msgid "Edit the selected theme" +msgstr "A kijelölt téma szerkesztése" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:20 +msgid "Delete the selected theme" +msgstr "A kijelölt téma törlése" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:21 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 +msgid "Theme" +msgstr "Téma" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:23 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:16 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 +msgid "Columns:" +msgstr "Oszlopok:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:24 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:10 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 +msgid "Images per page:" +msgstr "Képek száma oldalanként:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:25 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 +msgid "All images on a single page" +msgstr "Minden kép egy oldalon" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:26 +msgid "_All pages with the same size" +msgstr "_Minden oldal ugyanezzel a mérettel" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:27 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:15 +msgid "Layout" +msgstr "Elrendezés" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:28 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:13 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 +msgid "S_ort:" +msgstr "_Rendezés:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:29 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:14 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 +msgid "Re_verse order" +msgstr "_Fordított sorrend" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:30 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:15 +msgid "_Size:" +msgstr "_Méret:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 +msgid "Sq_uared" +msgstr "_Négyzet" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:33 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:16 +msgid "Thumbnails" +msgstr "Bélyegképek" + +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 +msgid "Image Wall" +msgstr "Képfal" + +#: ../extensions/contact_sheet/dlg-contact-sheet.c:481 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:492 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:506 +msgid "Could not save the theme" +msgstr "Nem sikerült elmenteni a témát" + +#: ../extensions/contact_sheet/dlg-contact-sheet.c:651 +msgid "Could not delete the theme" +msgstr "Nem sikerült törölni a témát" + +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:247 +msgid "Creating images" +msgstr "Képek létrehozása" + +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:896 +msgid "Generating thumbnails" +msgstr "Bélyegképek előállítása" + +#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:32 +msgid "Header" +msgstr "Fejléc" + +#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:33 +msgid "Footer" +msgstr "Lábléc" + +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:193 +msgid "Theme Properties" +msgstr "Téma tulajdonságai" + +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:208 +msgid "Copy _From" +msgstr "Másolás _innen" + +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:316 +msgid "New theme" +msgstr "Új téma" + #: ../extensions/convert_format/callbacks.c:45 msgid "Convert Format..." msgstr "Átalakítás más formátumba…" @@ -954,34 +1535,33 @@ msgstr "Kép mentése más formátumba" #: ../extensions/convert_format/data/ui/convert-format.ui.h:1 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 -msgid "Choose destination folder" -msgstr "Válasszon célmappát" - -#: ../extensions/convert_format/data/ui/convert-format.ui.h:2 msgid "Convert Format" msgstr "Átalakítás más formátumba" +#: ../extensions/convert_format/data/ui/convert-format.ui.h:2 +msgid "New format" +msgstr "Új formátum" + #: ../extensions/convert_format/data/ui/convert-format.ui.h:3 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:4 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 msgid "Destination" msgstr "Cél" -#: ../extensions/convert_format/data/ui/convert-format.ui.h:4 -msgid "New format" -msgstr "Új formátum" +#: ../extensions/convert_format/data/ui/convert-format.ui.h:5 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 +msgid "_Use the original image folder" +msgstr "Az _eredeti képmappa használata" -#: ../extensions/convert_format/dlg-convert-format.c:91 +#: ../extensions/convert_format/dlg-convert-format.c:95 msgid "Converting images" msgstr "Képek átalakítása" -#: ../extensions/desktop_background/actions.c:139 +#: ../extensions/desktop_background/actions.c:158 msgid "Could not show the desktop background properties" msgstr "Nem jeleníthetők meg az asztal hátterének tulajdonságai" -#: ../extensions/desktop_background/actions.c:203 -#: ../extensions/desktop_background/actions.c:221 +#: ../extensions/desktop_background/actions.c:224 +#: ../extensions/desktop_background/actions.c:242 msgid "Could not set the desktop background" msgstr "Nem állítható be az asztal háttere" @@ -998,33 +1578,52 @@ msgid "Desktop background" msgstr "Asztal háttere" -#: ../extensions/edit_metadata/callbacks.c:98 +#: ../extensions/edit_metadata/actions.c:66 +msgid "" +"Are you sure you want to permanently delete the metadata of the selected " +"files?" +msgstr "Biztosan véglegesen törölni kívánja a kijelölt fájlok metaadatait?" + +#: ../extensions/edit_metadata/actions.c:73 +msgid "If you delete the metadata, it will be permanently lost." +msgstr "Ha törli a metaadatokat, azok véglegesen elvesznek." + +#: ../extensions/edit_metadata/callbacks.c:97 msgid "T_ags" msgstr "_Címkék" -#: ../extensions/edit_metadata/callbacks.c:102 +#: ../extensions/edit_metadata/callbacks.c:101 msgid "Edit the comment and other information of the selected files" -msgstr "A kiválasztott fájlok megjegyzéseinek és egyéb információinak szerkesztése" +msgstr "" +"A kiválasztott fájlok megjegyzéseinek és egyéb információinak szerkesztése" #: ../extensions/edit_metadata/callbacks.c:107 -msgid "Choose another tag" -msgstr "Válasszon másik címkét" +msgid "Set the tags of the selected files" +msgstr "A kijelölt fájlok címkéjének beállítása" + +#: ../extensions/edit_metadata/callbacks.c:112 +msgid "Delete Metadata" +msgstr "Metaadatok törlése" + +#: ../extensions/edit_metadata/callbacks.c:113 +msgid "Delete the comment and the embedded metadata of the selected files" +msgstr "A kijelölt fájlok megjegyzéseinek és beágyazott metaadatainak törlése" #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:1 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:1 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 msgid "D_escription:" msgstr "_Leírás:" -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:2 +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:3 +msgid "_Place:" +msgstr "_Hely:" + +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 #: ../extensions/edit_metadata/data/ui/tag-chooser.ui.h:1 msgid "T_ags:" msgstr "_Címkék:" -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 -msgid "_Place:" -msgstr "_Hely:" - #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:5 msgid "_Rating:" msgstr "É_rtékelés:" @@ -1033,85 +1632,93 @@ msgid "_Title:" msgstr "Cí_m:" -#: ../extensions/edit_metadata/dlg-edit-metadata.c:56 +#: ../extensions/edit_metadata/dlg-edit-metadata.c:121 msgid "Could not save the file metadata" msgstr "Nem lehet elmenteni a fájl metaadatait" -#: ../extensions/edit_metadata/dlg-edit-metadata.c:109 -#: ../extensions/rename_series/actions.c:37 -#: ../gthumb/gth-overwrite-dialog.c:162 +#: ../extensions/edit_metadata/dlg-edit-metadata.c:234 +#: ../gthumb/gth-overwrite-dialog.c:136 msgid "Cannot read file information" msgstr "Nem olvashatók a fájl információia" #: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:1 +msgid "Edit metadata" +msgstr "Metaadatok szerkesztése" + +#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 msgid "Allow to edit files metadata." msgstr "Fájlok metaadatainak szerkesztésének engedélyezése." -#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 -msgid "Edit metadata" -msgstr "Metaadatok szerkesztése" +#. Translators: the %s symbol in the string is a file name +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:63 +#, c-format +msgid "%s Metadata" +msgstr "%s metaadatai" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:66 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:83 +#: ../extensions/facebook/dlg-import-from-facebook.c:319 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:324 +#, c-format +msgid "%d file" +msgid_plural "%d files" +msgstr[0] "%d fájl" +msgstr[1] "%d fájl" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:144 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:197 +msgid "Sa_ve and Close" +msgstr "Me_ntés és bezárás" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:448 +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:156 +msgid "Save only cha_nged fields" +msgstr "Csak a _változtatott mezők mentése" + +#: ../extensions/edit_metadata/gth-edit-general-page.c:555 msgid "No date" msgstr "Nincs dátum" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:449 +#: ../extensions/edit_metadata/gth-edit-general-page.c:556 msgid "The following date" msgstr "A következő dátum" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:450 -#: ../extensions/importer/gth-import-preferences-dialog.c:328 +#: ../extensions/edit_metadata/gth-edit-general-page.c:557 +#: ../extensions/importer/gth-import-preferences-dialog.c:331 msgid "Current date" msgstr "Mai dátum" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:452 +#: ../extensions/edit_metadata/gth-edit-general-page.c:559 msgid "Last modified date" msgstr "Utolsó módosítás ideje" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:453 +#: ../extensions/edit_metadata/gth-edit-general-page.c:560 msgid "File creation date" msgstr "Fájl létrehozásának ideje" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:454 +#: ../extensions/edit_metadata/gth-edit-general-page.c:561 msgid "Do not modify" msgstr "Ne módosítsa" -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:106 -msgid "Save only cha_nged fields" -msgstr "Csak a _változtatott mezők mentése" - #. Translators: the %s symbol in the string is a file name -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:162 -#, c-format -msgid "%s Metadata" -msgstr "%s metaadatai" - -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:166 -#: ../extensions/flicker/dlg-import-from-flickr.c:331 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:80 #, c-format -msgid "%d file" -msgid_plural "%d files" -msgstr[0] "%d fájl" -msgstr[1] "%d fájl" +msgid "%s Tags" +msgstr "%s címkéi" -#: ../extensions/edit_metadata/gth-tag-chooser-dialog.c:81 -msgid "New tag" -msgstr "Új címke" - -#: ../extensions/edit_metadata/gth-tag-chooser-dialog.c:223 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:189 msgid "Assign Tags" msgstr "Címkék hozzárendelése" -#: ../extensions/edit_metadata/gth-tag-task.c:113 -#: ../extensions/edit_metadata/gth-tag-task.c:130 +#: ../extensions/edit_metadata/gth-tag-task.c:119 +#: ../extensions/edit_metadata/gth-tag-task.c:136 msgid "Assigning tags to the selected files" msgstr "Címkék hozzárendelése a kijelölt fájlokhoz" -#: ../extensions/edit_metadata/gth-tag-task.c:113 +#: ../extensions/edit_metadata/gth-tag-task.c:119 msgid "Writing files" msgstr "Fájlok írása" -#: ../extensions/edit_metadata/gth-tag-task.c:130 +#: ../extensions/edit_metadata/gth-tag-task.c:136 msgid "Reading files" msgstr "Fájlok olvasása" @@ -1124,58 +1731,53 @@ msgstr "Példa kiterjesztés." #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:1 -msgid "Byline _Title:" -msgstr "Ké_paláírás cím:" - -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 msgid "C_opyright:" msgstr "_Szerzői jog:" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:3 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 msgid "Co_untry:" msgstr "_Ország:" +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:3 +msgid "_Code:" +msgstr "_Ir. szám:" + #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:4 msgid "Cr_edit:" msgstr "Sz_erző:" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 -msgid "_Byline:" -msgstr "_Képaláírás:" - #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:6 -msgid "_City:" -msgstr "_Város:" +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 +msgid "_Source:" +msgstr "_Forrás:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:7 -msgid "_Code:" -msgstr "_Ir. szám:" +msgid "_Urgency:" +msgstr "Sü_rgősség:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:8 -#: ../extensions/flicker/data/ui/import-from-flickr.ui.h:4 -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:4 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:41 -msgid "_Destination:" -msgstr "_Cél:" +msgid "_Object Name:" +msgstr "_Objektum neve:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:9 -msgid "_Language:" -msgstr "_Nyelv:" +msgid "Byline _Title:" +msgstr "Ké_paláírás cím:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:10 -msgid "_Object Name:" -msgstr "_Objektum neve:" +msgid "_Byline:" +msgstr "_Képaláírás:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:11 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:7 -msgid "_Source:" -msgstr "_Forrás:" +msgid "_City:" +msgstr "_Város:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:12 -msgid "_Urgency:" -msgstr "Sü_rgősség:" +msgid "_Language:" +msgstr "_Nyelv:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:13 +msgid "State/Province:" +msgstr "Állam/megye:" #: ../extensions/exiv2_tools/exiv2_tools.extension.in.in.h:1 msgid "EXIF, IPTC, XMP support" @@ -1229,291 +1831,247 @@ msgid "XMP Attached" msgstr "XMP csatolt" -#: ../extensions/exiv2_tools/main.c:245 +#: ../extensions/exiv2_tools/main.c:272 msgid "date photo was taken" msgstr "fényképkészítés dátuma" -#: ../extensions/export_tools/callbacks.c:59 +#: ../extensions/export_tools/callbacks.c:99 msgid "Share" msgstr "Megosztás" -#: ../extensions/facebook/callbacks.c:54 +#: ../extensions/facebook/callbacks.c:59 ../extensions/facebook/callbacks.c:64 msgid "Face_book..." msgstr "Face_book…" -#: ../extensions/facebook/callbacks.c:55 +#: ../extensions/facebook/callbacks.c:60 +msgid "Download photos from Facebook" +msgstr "Fényképek letöltése a Facebookról" + +#: ../extensions/facebook/callbacks.c:65 msgid "Upload photos to Facebook" msgstr "Fényképek feltöltése a Facebookra" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:1 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 -msgid "A_lbum:" -msgstr "A_lbum:" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 +msgid "Export to Flickr" +msgstr "Exportálás a Flickrre" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 -msgid "Add a new album" -msgstr "Új album hozzáadása" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 +msgid "_Upload" +msgstr "_Feltöltés" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:3 -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:1 -#: ../extensions/flicker/data/ui/import-from-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 -msgid "Edit accounts" -msgstr "Fiókok szerkesztése" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 +msgid "_Account:" +msgstr "F_iók:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:4 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 -msgid "Export to Flickr" -msgstr "Exportálás a Flickrre" +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:3 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 +msgid "Edit accounts" +msgstr "Fiókok szerkesztése" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:13 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 -msgid "_Account:" -msgstr "F_iók:" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 +msgid "A_lbum:" +msgstr "A_lbum:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:16 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 -msgid "_Upload" -msgstr "_Feltöltés" - -#: ../extensions/facebook/data/ui/facebook-account-chooser.ui.h:1 -#: ../extensions/flicker/data/ui/flicker-account-chooser.ui.h:1 -#: ../extensions/flicker/data/ui/import-from-flickr.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 -#: ../extensions/picasaweb/data/ui/picasa-web-account-chooser.ui.h:1 -msgid "A_ccount:" -msgstr "F_iók:" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 +msgid "Add a new album" +msgstr "Új album hozzáadása" -#: ../extensions/facebook/data/ui/facebook-account-manager.ui.h:1 -#: ../extensions/flicker/data/ui/flicker-account-manager.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-account-manager.ui.h:1 -#: ../extensions/picasaweb/data/ui/picasa-web-account-manager.ui.h:1 -msgid "A_ccounts:" -msgstr "F_iókok:" +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 +msgid "Resize the images if larger than this size" +msgstr "Képek átméretezése, ha nagyobbak ennél a méretnél" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 -msgid "Private" -msgstr "Privát" +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:8 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 +msgid "_Resize if larger than:" +msgstr "Át_méretezés, ha nagyobb mint:" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:9 -msgid "Private photos, visible to friends" -msgstr "Privát fényképek, a barátok számára láthatók" +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:9 +msgid "720 x 720" +msgstr "720 x 720" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:10 +msgid "1024 x 1024" +msgstr "1024 x 1024" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:11 +msgid "1280 x 1280" +msgstr "1280 x 1280" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:12 +msgid "1600 x 1600" +msgstr "1600 x 1600" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:13 +msgid "2048 x 2048" +msgstr "2048 x 2048" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:10 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 msgid "Public photos" msgstr "Nyilvános fényképek" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:5 -msgid "_Location:" -msgstr "_Hely:" +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 +msgid "Private photos, visible to friends" +msgstr "Privát fényképek, a barátok számára láthatók" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 #: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:5 +msgid "Private" +msgstr "Privát" + +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:5 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 msgid "_Visibility:" msgstr "_Láthatóság:" -#: ../extensions/facebook/data/ui/facebook-ask-authorization.ui.h:1 -#: ../extensions/flicker/data/ui/flicker-ask-authorization.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-ask-authorization.ui.h:1 -msgid "_Authorize..." -msgstr "_Engedélyezés…" - -#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:1 -#: ../extensions/flicker/data/ui/flicker-complete-authorization.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-complete-authorization.ui.h:1 -msgid "C_ontinue" -msgstr "F_olytatás" - -#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 -#: ../extensions/facebook/facebook-authentication.c:499 -#: ../extensions/flicker/flickr-authentication.c:438 -#: ../extensions/oauth/oauth-authentication.c:450 -msgid "Once you're done, click the 'Continue' button below." -msgstr "Ha készen van, kattintson a lenti „Folytatás” gombra." - #: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:1 -#: ../extensions/flicker/data/ui/flicker-export-completed.ui.h:1 +#: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:1 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:1 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:1 msgid "Files successfully uploaded to the server." msgstr "A fájlok sikeresen feltöltve a kiszolgálóra." #: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:2 -#: ../extensions/flicker/data/ui/flicker-export-completed.ui.h:2 +#: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:2 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:2 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:2 -#: ../extensions/webalbums/gth-web-exporter.c:1833 +#: ../extensions/webalbums/gth-web-exporter.c:1839 msgid "_Open in the Browser" msgstr "_Megnyitás a böngészőben" -#: ../extensions/facebook/dlg-export-to-facebook.c:121 -#: ../extensions/facebook/dlg-export-to-facebook.c:312 -#: ../extensions/facebook/facebook-authentication.c:219 -#: ../extensions/flicker/dlg-export-to-flickr.c:137 -#: ../extensions/flicker/dlg-export-to-flickr.c:395 -#: ../extensions/flicker/dlg-import-from-flickr.c:234 -#: ../extensions/flicker/flickr-authentication.c:218 -#: ../extensions/oauth/oauth-authentication.c:214 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 +msgid "Import from Picasa Web Album" +msgstr "Importálás Picasa Webalbumból" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:2 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 +msgid "_Import" +msgstr "_Importálás" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:4 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 +#: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 +msgid "A_ccount:" +msgstr "F_iók:" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:5 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 +msgid "_Album:" +msgstr "_Album:" + +#: ../extensions/facebook/dlg-export-to-facebook.c:123 +#: ../extensions/facebook/dlg-export-to-facebook.c:326 +#: ../extensions/facebook/dlg-import-from-facebook.c:226 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:138 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:414 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:231 +#: ../extensions/oauth/web-service.c:380 #: ../extensions/photobucket/dlg-export-to-photobucket.c:131 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:374 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:139 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:421 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:363 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:375 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:124 msgid "Could not connect to the server" msgstr "Nem sikerült csatlakozni a kiszolgálóhoz" -#: ../extensions/facebook/dlg-export-to-facebook.c:172 -#: ../extensions/flicker/dlg-export-to-flickr.c:242 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:181 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:191 +#: ../extensions/facebook/dlg-export-to-facebook.c:175 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:246 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:182 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:176 msgid "Could not upload the files" msgstr "Nem sikerült feltölteni a fájlokat" -#: ../extensions/facebook/dlg-export-to-facebook.c:388 -#: ../extensions/flicker/dlg-export-to-flickr.c:186 -#: ../extensions/flicker/dlg-export-to-flickr.c:220 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:459 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:713 +#: ../extensions/facebook/dlg-export-to-facebook.c:397 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:188 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:223 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:457 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:309 msgid "Could not create the album" msgstr "Nem sikerült létrehozni az albumot" -#: ../extensions/facebook/dlg-export-to-facebook.c:456 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:530 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:778 +#: ../extensions/facebook/dlg-export-to-facebook.c:465 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:528 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:375 msgid "New Album" msgstr "Új album" -#: ../extensions/facebook/dlg-export-to-facebook.c:535 -#: ../extensions/flicker/dlg-export-to-flickr.c:521 -#: ../extensions/image_print/gth-image-print-job.c:1542 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:610 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:997 +#: ../extensions/facebook/dlg-export-to-facebook.c:557 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:583 +#: ../extensions/image_print/gth-image-print-job.c:1739 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:607 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:597 msgid "No valid file selected." msgstr "Nincs érvényes fájl kiválasztva." -#: ../extensions/facebook/dlg-export-to-facebook.c:536 -#: ../extensions/flicker/dlg-export-to-flickr.c:522 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:611 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:998 +#: ../extensions/facebook/dlg-export-to-facebook.c:558 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:584 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:608 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:598 msgid "Could not export the files" msgstr "Nem lehet exportálni a fájlokat" -#: ../extensions/facebook/dlg-export-to-facebook.c:543 -#: ../extensions/flicker/dlg-export-to-flickr.c:529 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:618 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1004 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:785 -#: ../gthumb/gth-browser.c:936 ../gthumb/gth-browser.c:937 +#: ../extensions/facebook/dlg-export-to-facebook.c:566 +#: ../extensions/find_duplicates/gth-find-duplicates.c:277 +#: ../extensions/find_duplicates/gth-find-duplicates.c:470 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:592 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:616 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:605 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:254 +#: ../gthumb/gth-browser.c:1116 #, c-format msgid "%d file (%s)" msgid_plural "%d files (%s)" msgstr[0] "%d fájl (%s)" msgstr[1] "%d fájl (%s)" -#: ../extensions/facebook/dlg-export-to-facebook.c:565 -#: ../extensions/flicker/dlg-export-to-flickr.c:552 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:638 +#: ../extensions/facebook/dlg-export-to-facebook.c:587 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:615 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:635 #, c-format msgid "Export to %s" msgstr "Exportálás ide: %s" -#: ../extensions/facebook/facebook-account-chooser-dialog.c:230 -#: ../extensions/flicker/flickr-account-chooser-dialog.c:230 -#: ../extensions/oauth/oauth-account-chooser-dialog.c:230 -msgid "New authentication..." -msgstr "Új hitelesítés…" - -#: ../extensions/facebook/facebook-authentication.c:221 -#: ../extensions/flicker/flickr-authentication.c:220 -#: ../extensions/oauth/oauth-authentication.c:216 -msgid "Choose _Account..." -msgstr "Válasszon _fiókot…" +#: ../extensions/facebook/dlg-import-from-facebook.c:344 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:349 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:279 +msgid "Could not get the photo list" +msgstr "Nem lehet lekérni a fényképlistát" -#: ../extensions/facebook/facebook-authentication.c:498 -#: ../extensions/flicker/flickr-authentication.c:437 -#: ../extensions/oauth/oauth-authentication.c:449 -#, c-format -msgid "Return to this window when you have finished the authorization process on %s" -msgstr "" -"Térjen vissza ehhez az ablakhoz, ha befejezte az engedélyezési folyamatot " -"itt: %s" +#: ../extensions/facebook/dlg-import-from-facebook.c:378 +#: ../extensions/facebook/dlg-import-from-facebook.c:533 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:386 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:551 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:313 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:586 +msgid "No album selected" +msgstr "Nincs album kiválasztva" -#: ../extensions/facebook/facebook-authentication.c:583 -#: ../extensions/flicker/flickr-authentication.c:517 -#: ../extensions/oauth/oauth-authentication.c:529 -#, c-format -msgid "gthumb requires your authorization to upload the photos to %s" -msgstr "A gthumb megköveteli az engedélyezést a fotók feltöltéséhez ide: %s" - -#: ../extensions/facebook/facebook-authentication.c:584 -#: ../extensions/flicker/flickr-authentication.c:518 -#: ../extensions/oauth/oauth-authentication.c:530 +#: ../extensions/facebook/dlg-import-from-facebook.c:551 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:569 #, c-format -msgid "" -"Click 'Authorize' to open your web browser and authorize gthumb to upload " -"photos to %s. When you're finished, return to this window to complete the " -"authorization." -msgstr "" -"Kattintson az „Engedélyezés” gombra a webböngésző megnyitásához, és " -"engedélyezze a gthumbnak a fényképfeltöltést a(z) %s fiókba. Ha végzett, " -"térjen vissza ehhez az ablakhoz az engedélyezés befejezéséhez." - -#: ../extensions/facebook/facebook-authentication.c:679 -#: ../extensions/flicker/flickr-authentication.c:618 -#: ../extensions/oauth/oauth-authentication.c:632 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:815 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:666 -msgid "Choose Account" -msgstr "Válasszon fiókot" - -#: ../extensions/facebook/facebook-authentication.c:788 -#: ../extensions/flicker/flickr-authentication.c:727 -#: ../extensions/oauth/oauth-authentication.c:741 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:876 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:727 -msgid "Edit Accounts" -msgstr "Fiókok szerkesztése" - -#: ../extensions/facebook/facebook-connection.c:294 -#: ../extensions/facebook/facebook-connection.c:454 -#: ../extensions/facebook/facebook-service.c:188 -#: ../extensions/facebook/facebook-service.c:291 -#: ../extensions/facebook/facebook-service.c:494 -#: ../extensions/flicker/flickr-connection.c:290 -#: ../extensions/flicker/flickr-connection.c:441 -#: ../extensions/flicker/flickr-service.c:220 -#: ../extensions/flicker/flickr-service.c:423 -#: ../extensions/photobucket/photobucket-consumer.c:74 -#: ../extensions/photobucket/photobucket-consumer.c:79 -#: ../extensions/photobucket/photobucket-consumer.c:115 -#: ../extensions/photobucket/photobucket-consumer.c:170 -msgid "Unknown error" -msgstr "Ismeretlen hiba" - -#: ../extensions/facebook/facebook-connection.c:329 -#: ../extensions/facebook/facebook-connection.c:480 -#: ../extensions/facebook/facebook-service.c:214 -#: ../extensions/facebook/facebook-service.c:316 -#: ../extensions/flicker/flickr-connection.c:316 -#: ../extensions/flicker/flickr-connection.c:467 -#: ../extensions/flicker/flickr-service.c:244 -#: ../extensions/oauth/oauth-connection.c:375 -#: ../extensions/oauth/oauth-connection.c:450 -#: ../extensions/oauth/oauth-connection.c:554 -#: ../extensions/picasaweb/google-connection.c:363 -msgid "Connecting to the server" -msgstr "Csatlakozás a kiszolgálóhoz" +msgid "Import from %s" +msgstr "Importálás innen: %s" +#: ../extensions/facebook/dlg-import-from-facebook.c:551 #: ../extensions/facebook/facebook.extension.in.in.h:1 msgid "Facebook" msgstr "Facebook" @@ -1522,207 +2080,216 @@ msgid "Upload images to Facebook" msgstr "Képek feltöltése a Facebookra" -#: ../extensions/facebook/facebook-service.c:214 -#: ../extensions/facebook/facebook-service.c:316 -#: ../extensions/flicker/flickr-service.c:244 -#: ../extensions/oauth/oauth-connection.c:375 -#: ../extensions/oauth/oauth-connection.c:450 -#: ../extensions/oauth/oauth-connection.c:554 -msgid "Getting account information" -msgstr "Fiókinformációk lekérése" - -#: ../extensions/facebook/facebook-service.c:422 -#: ../extensions/flicker/flickr-service.c:348 -#: ../extensions/photobucket/photobucket-service.c:235 -#: ../extensions/picasaweb/picasa-web-service.c:237 +#: ../extensions/facebook/facebook-service.c:462 +#: ../extensions/flicker_utils/flickr-service.c:863 +#: ../extensions/photobucket/photobucket-service.c:310 +#: ../extensions/picasaweb/picasa-web-service.c:711 msgid "Getting the album list" msgstr "Albumok listájának lekérése" -#: ../extensions/facebook/facebook-service.c:551 -#: ../extensions/flicker/flickr-service.c:451 -#: ../extensions/flicker/flickr-service.c:571 -#: ../extensions/flicker/flickr-service.c:609 -#: ../extensions/photobucket/photobucket-service.c:344 -#: ../extensions/picasaweb/picasa-web-service.c:328 +#: ../extensions/facebook/facebook-service.c:584 +#: ../extensions/flicker_utils/flickr-service.c:965 +#: ../extensions/flicker_utils/flickr-service.c:1087 +#: ../extensions/flicker_utils/flickr-service.c:1126 +#: ../extensions/photobucket/photobucket-service.c:423 +#: ../extensions/picasaweb/picasa-web-service.c:805 msgid "Creating the new album" msgstr "Új album létrehozása" -#: ../extensions/facebook/facebook-service.c:610 -#: ../extensions/flicker/flickr-service.c:659 -#: ../extensions/photobucket/photobucket-service.c:401 -#: ../extensions/picasaweb/picasa-web-service.c:385 +#: ../extensions/facebook/facebook-service.c:645 +#: ../extensions/flicker_utils/flickr-service.c:1176 +#: ../extensions/photobucket/photobucket-service.c:485 +#: ../extensions/picasaweb/picasa-web-service.c:860 #, c-format msgid "Could not upload '%s': %s" msgstr "Nem sikerült feltölteni a(z) „%s” fájlt: %s" #. Translators: %s is a filename -#. send the file -#. Translators: %s is a filename -#: ../extensions/facebook/facebook-service.c:810 -#: ../extensions/flicker/flickr-service.c:837 -#: ../extensions/photobucket/photobucket-service.c:524 -#: ../extensions/picasaweb/picasa-web-service.c:520 +#: ../extensions/facebook/facebook-service.c:710 +#: ../extensions/flicker_utils/flickr-service.c:1287 +#: ../extensions/photobucket/photobucket-service.c:542 +#: ../extensions/picasaweb/picasa-web-service.c:917 #, c-format msgid "Uploading '%s'" msgstr "„%s” feltöltése" -#: ../extensions/facebook/facebook-service.c:886 -#: ../extensions/flicker/flickr-service.c:915 -#: ../extensions/photobucket/photobucket-service.c:605 -#: ../extensions/picasaweb/picasa-web-service.c:594 +#: ../extensions/facebook/facebook-service.c:923 +#: ../extensions/flicker_utils/flickr-service.c:1482 +#: ../extensions/photobucket/photobucket-service.c:714 +#: ../extensions/picasaweb/picasa-web-service.c:1138 msgid "Uploading the files to the server" msgstr "Fájlok feltöltése a kiszolgálóra" -#: ../extensions/facebook/facebook-service.c:1002 -#: ../extensions/flicker/flickr-service.c:1031 -#: ../extensions/picasaweb/picasa-web-service.c:715 +#: ../extensions/facebook/facebook-service.c:1022 +#: ../extensions/flicker_utils/flickr-service.c:1651 +#: ../extensions/picasaweb/picasa-web-service.c:1257 msgid "Getting the photo list" msgstr "Fényképek listájának lekérése" -#: ../extensions/file_manager/actions.c:41 -msgid "Enter the folder name: " -msgstr "Adja meg a mappa nevét: " - -#: ../extensions/file_manager/actions.c:69 -msgid "Could not create the folder" -msgstr "Nem sikerült létrehozni a mappát" - -#: ../extensions/file_manager/actions.c:328 -#: ../extensions/file_manager/callbacks.c:315 -#: ../extensions/file_manager/callbacks.c:719 +#: ../extensions/file_manager/actions.c:133 +msgid "New folder" +msgstr "Új mappa" + +#: ../extensions/file_manager/actions.c:134 +msgid "Enter the folder name:" +msgstr "Adja meg a mappa nevét:" + +#: ../extensions/file_manager/actions.c:400 +#: ../extensions/file_manager/callbacks.c:380 +#: ../extensions/file_manager/callbacks.c:838 msgid "Could not move the files" msgstr "Nem sikerült áthelyezni a fájlokat" -#: ../extensions/file_manager/actions.c:329 -#: ../extensions/file_manager/callbacks.c:316 -#: ../extensions/file_manager/callbacks.c:720 +#: ../extensions/file_manager/actions.c:401 +#: ../extensions/file_manager/callbacks.c:381 +#: ../extensions/file_manager/callbacks.c:839 msgid "" "Files cannot be moved to the current location, as alternative you can choose " "to copy them." -msgstr "A fájlokat nem sikerült áthelyezni az aktuális helyre, alternatívaként átmásolhatja azokat." - -#: ../extensions/file_manager/actions.c:421 -#: ../extensions/importer/gth-import-task.c:615 -msgid "Could not delete the files" -msgstr "Nem sikerült törölni a fájlokat" - -#: ../extensions/file_manager/actions.c:464 -msgid "" -"The files cannot be moved to the Trash. Do you want to delete them " -"permanently?" -msgstr "A fájlokat nem sikerült áthelyezni a Kukába. Szeretné véglegesen törölni azt?" - -#: ../extensions/file_manager/actions.c:475 -msgid "Could not move the files to the Trash" -msgstr "Nem sikerült áthelyezni a fájlokat a Kukába" - -#: ../extensions/file_manager/actions.c:524 -#, c-format -msgid "Are you sure you want to move \"%s\" to trash?" -msgstr "Biztos benne, hogy áthelyezi a Kukába ezt a fájlt: „%s”?" - -#: ../extensions/file_manager/actions.c:527 -#, c-format -msgid "Are you sure you want to move to trash the %'d selected file?" -msgid_plural "Are you sure you want to move to trash the %'d selected files?" -msgstr[0] "Biztos benne, hogy áthelyezi a Kukába a kijelölt %'d fájlt?" -msgstr[1] "Biztos benne, hogy áthelyezi a Kukába a kijelölt %'d fájlt?" - -#: ../extensions/file_manager/actions.c:539 -#: ../extensions/file_manager/callbacks.c:168 -#: ../extensions/file_manager/callbacks.c:200 -msgid "Mo_ve to Trash" -msgstr "Áthelyezés a _Kukába" - -#: ../extensions/file_manager/actions.c:571 -#: ../extensions/file_manager/actions.c:862 -#, c-format -msgid "Are you sure you want to permanently delete \"%s\"?" -msgstr "Biztos benne, hogy véglegesen törli ezt a fájlt: „%s”?" - -#: ../extensions/file_manager/actions.c:574 -#, c-format -msgid "Are you sure you want to permanently delete the %'d selected file?" -msgid_plural "Are you sure you want to permanently delete the %'d selected files?" -msgstr[0] "Biztos benne, hogy véglegesen törli a kiválasztott %d fájlt?" -msgstr[1] "Biztos benne, hogy véglegesen törli a kiválasztott %d fájlt?" - -#: ../extensions/file_manager/actions.c:584 -#: ../extensions/file_manager/actions.c:872 -msgid "If you delete a file, it will be permanently lost." -msgstr "Ha törli a fájlt, az azonnal elvész." +msgstr "" +"A fájlokat nem sikerült áthelyezni az aktuális helyre, alternatívaként " +"átmásolhatja azokat." -#: ../extensions/file_manager/actions.c:614 +#: ../extensions/file_manager/actions.c:563 msgid "Could not open the location" msgstr "Nem lehet megnyitni a helyet" -#: ../extensions/file_manager/actions.c:746 +#: ../extensions/file_manager/actions.c:696 msgid "" "The folder is not empty, do you want to delete the folder and its content " "permanently?" -msgstr "A mappa nem üres. Szeretné véglegesen törölni a mappát és annak tartalmát?" +msgstr "" +"A mappa nem üres. Szeretné véglegesen törölni a mappát és annak tartalmát?" -#: ../extensions/file_manager/actions.c:762 +#: ../extensions/file_manager/actions.c:712 msgid "Could not delete the folder" msgstr "Nem lehet törölni a mappát" -#: ../extensions/file_manager/actions.c:821 +#: ../extensions/file_manager/actions.c:773 msgid "" "The folder cannot be moved to the Trash. Do you want to delete it " "permanently?" -msgstr "A mappát nem lehet áthelyezni a Kukába. Szeretné véglegesen törölni azt?" +msgstr "" +"A mappát nem lehet áthelyezni a Kukába. Szeretné véglegesen törölni azt?" -#: ../extensions/file_manager/actions.c:828 +#: ../extensions/file_manager/actions.c:780 msgid "Could not move the folder to the Trash" msgstr "Nem sikerült áthelyezni a mappát a Kukába" -#: ../extensions/file_manager/callbacks.c:148 -#: ../extensions/file_manager/callbacks.c:180 +#: ../extensions/file_manager/actions.c:816 +#: ../gthumb/gth-file-source-vfs.c:841 +#, c-format +msgid "Are you sure you want to permanently delete \"%s\"?" +msgstr "Biztos benne, hogy véglegesen törli ezt a fájlt: „%s”?" + +#: ../extensions/file_manager/actions.c:826 +#: ../gthumb/gth-file-source-vfs.c:854 +msgid "If you delete a file, it will be permanently lost." +msgstr "Ha törli a fájlt, az véglegesen elvész." + +#: ../extensions/file_manager/actions.c:920 +msgid "Move To" +msgstr "Áthelyezés ide" + +#: ../extensions/file_manager/actions.c:920 +msgid "Copy To" +msgstr "Másolás ide" + +#: ../extensions/file_manager/actions.c:924 +msgid "Move" +msgstr "Áthelyezés" + +#: ../extensions/file_manager/actions.c:924 +msgid "Copy" +msgstr "Másolás" + +#: ../extensions/file_manager/callbacks.c:163 +#: ../extensions/file_manager/callbacks.c:199 msgid "Create _Folder" msgstr "Mappa _létrehozása" -#: ../extensions/file_manager/callbacks.c:149 -#: ../extensions/file_manager/callbacks.c:181 +#: ../extensions/file_manager/callbacks.c:164 +#: ../extensions/file_manager/callbacks.c:200 msgid "Create a new empty folder inside this folder" msgstr "Új üres mappa létrehozása ebben a mappában" -#: ../extensions/file_manager/callbacks.c:164 +#: ../extensions/file_manager/callbacks.c:179 msgid "D_uplicate" msgstr "Ke_ttőzés" -#: ../extensions/file_manager/callbacks.c:165 +#: ../extensions/file_manager/callbacks.c:180 msgid "Duplicate the selected files" msgstr "A kijelölt fájlok megkettőzése" -#: ../extensions/file_manager/callbacks.c:169 +#: ../extensions/file_manager/callbacks.c:183 +#: ../extensions/file_manager/callbacks.c:219 +#: ../gthumb/gth-file-source-vfs.c:813 +msgid "Mo_ve to Trash" +msgstr "Áthelyezés a _Kukába" + +#: ../extensions/file_manager/callbacks.c:184 msgid "Move the selected files to the Trash" msgstr "A kijelölt fájlok áthelyezése a Kukába" -#: ../extensions/file_manager/callbacks.c:172 -#: ../extensions/file_manager/callbacks.c:204 +#: ../extensions/file_manager/callbacks.c:187 +#: ../extensions/file_manager/callbacks.c:223 +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:5 +#: ../gthumb/gth-tags-entry.c:871 msgid "_Delete" msgstr "_Törlés" -#: ../extensions/file_manager/callbacks.c:173 +#: ../extensions/file_manager/callbacks.c:188 msgid "Delete the selected files" msgstr "A kijelölt fájlok törlése" -#: ../extensions/file_manager/callbacks.c:176 -msgid "Open with the _File Manager" -msgstr "Megnyitás a _fájlkezelővel" - -#: ../extensions/file_manager/callbacks.c:184 -#: ../extensions/rename_series/callbacks.c:47 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 +#: ../extensions/file_manager/callbacks.c:191 +#: ../extensions/file_manager/callbacks.c:203 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:2 msgid "_Rename" msgstr "Á_tnevezés" -#: ../extensions/file_manager/callbacks.c:196 +#: ../extensions/file_manager/callbacks.c:192 +msgid "Rename the selected files" +msgstr "A kijelölt fájlok átnevezése" + +#: ../extensions/file_manager/callbacks.c:195 +msgid "Open with the _File Manager" +msgstr "Megnyitás a _fájlkezelővel" + +#: ../extensions/file_manager/callbacks.c:215 msgid "_Paste Into Folder" msgstr "_Beillesztés mappába" -#: ../extensions/file_manager/callbacks.c:869 ../gthumb/gth-browser.c:4642 -#: ../gthumb/gth-browser.c:4679 +#: ../extensions/file_manager/callbacks.c:227 +#: ../extensions/file_manager/callbacks.c:236 +msgid "Copy to..." +msgstr "Másolás ide…" + +#: ../extensions/file_manager/callbacks.c:228 +msgid "Copy the selected folder to another folder" +msgstr "A kijelölt mappák másolása egy másik mappába" + +#: ../extensions/file_manager/callbacks.c:231 +#: ../extensions/file_manager/callbacks.c:240 +msgid "Move to..." +msgstr "Mozgatás ide…" + +#: ../extensions/file_manager/callbacks.c:232 +msgid "Move the selected folder to another folder" +msgstr "A kijelölt mappa mozgatása egy másik mappába" + +#: ../extensions/file_manager/callbacks.c:237 +msgid "Copy the selected files to another folder" +msgstr "A kijelölt fájlok átmásolása egy másik mappába" + +#: ../extensions/file_manager/callbacks.c:241 +msgid "Move the selected files to another folder" +msgstr "A kijelölt fájlok áthelyezése egy másik mappába" + +#: ../extensions/file_manager/callbacks.c:999 +#: ../extensions/find_duplicates/gth-find-duplicates.c:766 +#: ../gthumb/gth-browser.c:5234 ../gthumb/gth-browser.c:5268 +#: ../gthumb/gth-progress-dialog.c:406 msgid "Could not perform the operation" msgstr "Nem sikerült végrehajtani a műveletet" @@ -1739,315 +2306,603 @@ msgstr "Fájlok törlése" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:1 -msgid "B_rightness:" -msgstr "_Fényerő:" +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:5 +msgid "_Preview" +msgstr "_Előnézet:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:2 -msgid "Color Levels" -msgstr "Színszintek" +msgid "B_rightness:" +msgstr "_Fényerő:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:3 msgid "Con_trast:" msgstr "_Kontraszt:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:4 -msgid "Cyan-_Red:" -msgstr "_Ciánkék-vörös:" +msgid "_Saturation:" +msgstr "_Telítettség:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:5 msgid "G_amma:" msgstr "_Gamma:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:6 -msgid "_Magenta-Green:" -msgstr "_Magenta-zöld:" +msgid "Cyan-_Red:" +msgstr "_Ciánkék-vörös:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:7 -msgid "_Reset" -msgstr "_Visszaállítás" +msgid "_Magenta-Green:" +msgstr "_Magenta-zöld:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:8 -msgid "_Saturation:" -msgstr "_Telítettség:" - -#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:9 msgid "_Yellow-Blue:" msgstr "_Sárga-kék:" -#. this is used to separate the dimensions, for example: 120 × 250 +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:9 +msgid "Color Levels" +msgstr "Színszintek" + +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:10 +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:5 +msgid "_Reset" +msgstr "_Visszaállítás" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:1 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +msgid "Selection" +msgstr "Kijelölés" + #: ../extensions/file_tools/data/ui/crop-options.ui.h:2 -msgid "×" -msgstr "×" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 +msgid "_Width:" +msgstr "_Szélesség:" #: ../extensions/file_tools/data/ui/crop-options.ui.h:3 #: ../extensions/file_tools/data/ui/resize-options.ui.h:3 -msgid "Aspect ratio" -msgstr "Méretarány" +msgid "Heigh_t:" +msgstr "_Magasság:" #: ../extensions/file_tools/data/ui/crop-options.ui.h:4 -msgid "C_rop" -msgstr "_Levágás" +msgid "_Position:" +msgstr "_Pozíció:" #: ../extensions/file_tools/data/ui/crop-options.ui.h:5 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 -msgid "I_nvert aspect ratio" -msgstr "Méret_arány megfordítása" +msgid "Maximize" +msgstr "Maximalizálás" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:6 +msgid "Center" +msgstr "Középre" -#. after the colon there is a control to select the size in pixels #: ../extensions/file_tools/data/ui/crop-options.ui.h:7 -msgid "M_ultiple of:" -msgstr "Tö_bbszöröse ennek:" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:5 +msgid "Aspect ratio" +msgstr "Méretarány" #: ../extensions/file_tools/data/ui/crop-options.ui.h:8 -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 -msgid "Selection" -msgstr "Kijelölés" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 +msgid "I_nvert aspect ratio" +msgstr "Méret_arány megfordítása" +#. after the colon there is a control to select the size in pixels #: ../extensions/file_tools/data/ui/crop-options.ui.h:10 -msgid "_Grid:" -msgstr "_Rács:" - -#: ../extensions/file_tools/data/ui/crop-options.ui.h:11 -msgid "_Position:" -msgstr "_Pozíció:" +msgid "M_ultiple of:" +msgstr "Tö_bbszöröse ennek:" #. abbreviation of pixel -#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:12 msgid "px" msgstr "px" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:2 -#, no-c-format -msgid "%" -msgstr "%" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 +#: ../gthumb/gth-file-chooser-dialog.c:252 +msgid "Options" +msgstr "Beállítások" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:14 +msgid "_Grid:" +msgstr "_Rács:" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:15 +msgid "C_rop" +msgstr "_Levágás" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:1 +msgid "Method" +msgstr "Módszer" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:2 +msgid "_Brightness" +msgstr "_Fényerősség" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:3 +msgid "_Saturation" +msgstr "_Telítettség" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:4 +msgid "_Average" +msgstr "Átla_gos" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 #: ../gthumb/gth-main-default-metadata.c:47 msgid "Dimensions" msgstr "Méretek" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:5 -msgid "Heigh_t:" -msgstr "_Magasság:" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +msgid "Set the image size to this value" +msgstr "A képméret beállítása erre az értékre" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:8 msgid "High _quality" msgstr "_Jó minőség" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:8 -msgid "Information" -msgstr "Információk" - #: ../extensions/file_tools/data/ui/resize-options.ui.h:9 -msgid "New dimensions:" -msgstr "Új méretek:" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 -msgid "Options" -msgstr "Beállítások" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 msgid "Original dimensions:" msgstr "Eredeti méretek:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 msgid "Scale factor:" msgstr "Léptéktényező:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:13 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 -msgid "_Width:" -msgstr "_Szélesség:" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 +msgid "New dimensions:" +msgstr "Új méretek:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:14 -#: ../extensions/image_print/data/ui/print-layout.ui.h:19 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:29 msgid "pixels" msgstr "képpont" -#: ../extensions/file_tools/file_tools.extension.in.in.h:1 -msgid "Basic tools to modify images." -msgstr "Alap eszközök képek módosításához." +#: ../extensions/file_tools/data/ui/resize-options.ui.h:14 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:12 +#, no-c-format +msgid "%" +msgstr "%" -#: ../extensions/file_tools/file_tools.extension.in.in.h:2 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:1 +msgid "Angle" +msgstr "Szög" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 +msgid "Align" +msgstr "Igazítás" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 +msgid "Image size" +msgstr "Képméret" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 +msgid "Point 1:" +msgstr "1. pont:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 +msgid "Point 2:" +msgstr "2. pont:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 +msgid "Keep aspect ratio" +msgstr "Méretarány megőrzése" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 +msgid "Grid:" +msgstr "Rács:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 +msgid "_Background:" +msgstr "_Háttér:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 +msgid "Pick a background color" +msgstr "Válasszon háttérszínt" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 +msgid "_Transparent" +msgstr "Á_tlátszó" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:12 +msgid "Reset" +msgstr "Visszaállítás" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:13 +msgid "" +"Draw a line on the image \n" +"to set the alignment." +msgstr "" +"Rajzoljon egy vonalat a képre\n" +"az igazítás beállításához." + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:15 +msgid "Parallel" +msgstr "Párhuzamos" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:16 +msgid "Perpendicular" +msgstr "Merőleges" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:17 +msgid "Alignment" +msgstr "Igazítás" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:18 +msgid "Original size" +msgstr "Eredeti méret" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:19 +msgid "Bounding box" +msgstr "Határoló doboz" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:20 +msgid "Crop borders" +msgstr "Szegélyek levágása" + +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:1 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 +msgid "_Preview:" +msgstr "_Előnézet:" + +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:2 +msgid "Threshold:" +msgstr "Küszöbérték:" + +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:3 +msgid "Radius:" +msgstr "Sugár:" + +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:4 +msgid "Amount:" +msgstr "Mennyiség:" + +#: ../extensions/file_tools/file_tools.extension.in.in.h:1 msgid "Image tools" msgstr "Képeszközök" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:310 -#: ../extensions/file_tools/gth-file-tool-negative.c:83 +#: ../extensions/file_tools/file_tools.extension.in.in.h:2 +msgid "Basic tools to modify images." +msgstr "Alap eszközök képek módosításához." + +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:372 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:272 +#: ../extensions/file_tools/gth-file-tool-grayscale.c:248 +#: ../extensions/file_tools/gth-file-tool-negative.c:68 msgid "Applying changes" msgstr "Változások alkalmazása" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:520 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 msgid "Adjust Colors..." msgstr "Színek módosítása…" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:520 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 msgid "Adjust Colors" msgstr "Színek módosítása" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:521 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:619 msgid "Change brightness, contrast, saturation and gamma level of the image" msgstr "Fényerő, kontraszt, telítettség és gamma szintek állítása a képen" -#: ../extensions/file_tools/gth-file-tool-crop.c:399 -#: ../extensions/file_tools/gth-file-tool-resize.c:422 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:304 +msgid "Adjust Contrast" +msgstr "Kontraszt beállítása" + +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:305 +msgid "Automatic contrast adjustment" +msgstr "Automatikus kontraszt beállítás" + +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 msgid "Square" msgstr "Négyzet" -#: ../extensions/file_tools/gth-file-tool-crop.c:400 -#: ../extensions/file_tools/gth-file-tool-resize.c:423 +#: ../extensions/file_tools/gth-file-tool-crop.c:417 +#: ../extensions/file_tools/gth-file-tool-resize.c:590 #, c-format msgid "%d x %d (Image)" msgstr "%d × %d (kép)" -#: ../extensions/file_tools/gth-file-tool-crop.c:403 -#: ../extensions/file_tools/gth-file-tool-resize.c:426 +#: ../extensions/file_tools/gth-file-tool-crop.c:420 +#: ../extensions/file_tools/gth-file-tool-resize.c:594 #, c-format msgid "%d x %d (Screen)" msgstr "%d × %d (képernyő)" -#: ../extensions/file_tools/gth-file-tool-crop.c:407 -#: ../extensions/file_tools/gth-file-tool-resize.c:430 +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-resize.c:599 msgid "5:4" msgstr "5:4" -#: ../extensions/file_tools/gth-file-tool-crop.c:408 -#: ../extensions/file_tools/gth-file-tool-resize.c:431 +#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-resize.c:600 msgid "4:3 (DVD, Book)" msgstr "4:3 (DVD, könyv)" -#: ../extensions/file_tools/gth-file-tool-crop.c:409 -#: ../extensions/file_tools/gth-file-tool-resize.c:432 +#: ../extensions/file_tools/gth-file-tool-crop.c:426 +#: ../extensions/file_tools/gth-file-tool-resize.c:601 msgid "7:5" msgstr "7:5" -#: ../extensions/file_tools/gth-file-tool-crop.c:410 -#: ../extensions/file_tools/gth-file-tool-resize.c:433 +#: ../extensions/file_tools/gth-file-tool-crop.c:427 +#: ../extensions/file_tools/gth-file-tool-resize.c:602 msgid "3:2 (Postcard)" msgstr "3:2 (képeslap)" -#: ../extensions/file_tools/gth-file-tool-crop.c:411 -#: ../extensions/file_tools/gth-file-tool-resize.c:434 +#: ../extensions/file_tools/gth-file-tool-crop.c:428 +#: ../extensions/file_tools/gth-file-tool-resize.c:603 msgid "16:10" msgstr "16:10" -#: ../extensions/file_tools/gth-file-tool-crop.c:412 -#: ../extensions/file_tools/gth-file-tool-resize.c:435 +#: ../extensions/file_tools/gth-file-tool-crop.c:429 +#: ../extensions/file_tools/gth-file-tool-resize.c:604 msgid "16:9 (DVD)" msgstr "16:9 (DVD)" -#: ../extensions/file_tools/gth-file-tool-crop.c:413 -#: ../extensions/file_tools/gth-file-tool-resize.c:436 +#: ../extensions/file_tools/gth-file-tool-crop.c:430 +#: ../extensions/file_tools/gth-file-tool-resize.c:605 msgid "1.85:1" msgstr "1.85:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:414 -#: ../extensions/file_tools/gth-file-tool-resize.c:437 +#: ../extensions/file_tools/gth-file-tool-crop.c:431 +#: ../extensions/file_tools/gth-file-tool-resize.c:606 msgid "2.39:1" msgstr "2.39:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:415 -#: ../extensions/file_tools/gth-file-tool-resize.c:438 -#: ../extensions/image_print/data/ui/print-layout.ui.h:3 +#: ../extensions/file_tools/gth-file-tool-crop.c:432 +#: ../extensions/file_tools/gth-file-tool-resize.c:607 +#: ../extensions/image_print/data/ui/print-layout.ui.h:2 +#: ../extensions/rename_series/gth-template-selector.c:234 msgid "Custom" msgstr "Egyéni" -#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-crop.c:447 +#: ../extensions/file_tools/gth-file-tool-rotate.c:398 msgid "Rule of Thirds" msgstr "Harmadoló rács" -#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-crop.c:448 +#: ../extensions/file_tools/gth-file-tool-rotate.c:399 msgid "Golden Sections" msgstr "Aranymetszés" -#: ../extensions/file_tools/gth-file-tool-crop.c:553 +#: ../extensions/file_tools/gth-file-tool-crop.c:449 +#: ../extensions/file_tools/gth-file-tool-rotate.c:400 +msgid "Center Lines" +msgstr "Középső vonalak" + +#: ../extensions/file_tools/gth-file-tool-crop.c:450 +#: ../extensions/file_tools/gth-file-tool-rotate.c:401 +msgid "Uniform" +msgstr "Egyforma" + +#: ../extensions/file_tools/gth-file-tool-crop.c:608 msgid "Crop..." msgstr "Levágás…" -#: ../extensions/file_tools/gth-file-tool-crop.c:553 +#: ../extensions/file_tools/gth-file-tool-crop.c:608 msgid "Crop" msgstr "Levágás" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:100 -msgid "Desaturating image" -msgstr "Kép telítetlenné tétele" - -#: ../extensions/file_tools/gth-file-tool-desaturate.c:118 -msgid "Desaturate" -msgstr "Telítetlenné tétel" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:248 -msgid "White balance correction" -msgstr "Fehéregyensúly-korrekció" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:280 -msgid "Enhance Colors" -msgstr "Színek fokozása" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:281 -msgid "Automatic white balance correction" -msgstr "Automatikus fehéregyensúly-korrekció" - -#: ../extensions/file_tools/gth-file-tool-equalize.c:168 +#: ../extensions/file_tools/gth-file-tool-equalize.c:45 msgid "Equalizing image histogram" msgstr "Kép hisztogramjának kiegyenlítése" -#: ../extensions/file_tools/gth-file-tool-equalize.c:200 +#: ../extensions/file_tools/gth-file-tool-equalize.c:230 msgid "Equalize" msgstr "Kiegyenlítés" -#: ../extensions/file_tools/gth-file-tool-equalize.c:201 +#: ../extensions/file_tools/gth-file-tool-equalize.c:231 msgid "Equalize image histogram" msgstr "Kép hisztogramjának kiegyenlítése" -#: ../extensions/file_tools/gth-file-tool-flip.c:73 +#: ../extensions/file_tools/gth-file-tool-flip.c:87 msgid "Flip" msgstr "Megfordítás" -#: ../extensions/file_tools/gth-file-tool-mirror.c:73 +#: ../extensions/file_tools/gth-file-tool-flip.c:88 +msgid "Flip the image vertically" +msgstr "Kép tükrözése függőlegesen" + +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale..." +msgstr "Szürkeárnyalatos…" + +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale" +msgstr "Szürkeárnyalatos" + +#: ../extensions/file_tools/gth-file-tool-mirror.c:87 msgid "Mirror" msgstr "Tükrözés" -#: ../extensions/file_tools/gth-file-tool-negative.c:100 +#: ../extensions/file_tools/gth-file-tool-mirror.c:88 +msgid "Mirror the image horizontally" +msgstr "Kép tükrözése vízszintesen" + +#: ../extensions/file_tools/gth-file-tool-negative.c:197 msgid "Negative" msgstr "Negatív" -#: ../extensions/file_tools/gth-file-tool-redo.c:62 +#: ../extensions/file_tools/gth-file-tool-redo.c:75 msgid "Redo" msgstr "Újra" -#: ../extensions/file_tools/gth-file-tool-resize.c:549 +#: ../extensions/file_tools/gth-file-tool-resize.c:214 +#: ../extensions/resize_images/dlg-resize-images.c:180 +msgid "Resizing images" +msgstr "Képek átméretezése" + +#: ../extensions/file_tools/gth-file-tool-resize.c:808 msgid "Resize..." msgstr "Átméretezés…" -#: ../extensions/file_tools/gth-file-tool-resize.c:549 +#: ../extensions/file_tools/gth-file-tool-resize.c:808 msgid "Resize" msgstr "Átméretezés" -#: ../extensions/file_tools/gth-file-tool-rotate-left.c:73 -#: ../extensions/image_rotation/callbacks.c:54 +#: ../extensions/file_tools/gth-file-tool-rotate.c:628 +msgid "Rotate..." +msgstr "Forgatás…" + +#: ../extensions/file_tools/gth-file-tool-rotate.c:628 +msgid "Rotate" +msgstr "Forgatás" + +#: ../extensions/file_tools/gth-file-tool-rotate.c:629 +msgid "Freely rotate the image" +msgstr "A kép szabad forgatása" + +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:87 +#: ../extensions/image_rotation/callbacks.c:55 msgid "Rotate Left" msgstr "Forgatás balra" -#: ../extensions/file_tools/gth-file-tool-rotate-right.c:73 +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:88 +msgid "Rotate the image by 90 degrees counterclockwise" +msgstr "A kép forgatása 90 fokkal balra" + +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:87 #: ../extensions/image_rotation/callbacks.c:49 msgid "Rotate Right" msgstr "Forgatás jobbra" -#: ../extensions/file_tools/gth-file-tool-save-as.c:56 +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:88 +msgid "Rotate the image by 90 degrees clockwise" +msgstr "A kép forgatása 90 fokkal jobbra" + +#: ../extensions/file_tools/gth-file-tool-save-as.c:70 msgid "Save As" msgstr "Mentés másként" -#: ../extensions/file_tools/gth-file-tool-save.c:52 +#: ../extensions/file_tools/gth-file-tool-save.c:66 msgid "Save" msgstr "Mentés" -#: ../extensions/file_tools/gth-file-tool-undo.c:61 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:101 +msgid "Sharpening image" +msgstr "Kép élesítése" + +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 +msgid "Enhance Focus..." +msgstr "Fókusz fokozása…" + +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 +msgid "Enhance Focus" +msgstr "Fókusz fokozása" + +#: ../extensions/file_tools/gth-file-tool-undo.c:75 msgid "Undo" msgstr "Visszavonás" -#: ../extensions/flicker/callbacks.c:59 ../extensions/flicker/callbacks.c:63 +#: ../extensions/find_duplicates/callbacks.c:48 +msgid "Find _Duplicates..." +msgstr "Ke_ttőzöttek keresése…" + +#: ../extensions/find_duplicates/callbacks.c:49 +msgid "Find duplicated files in the current location" +msgstr "Azonos fájlok keresése a jelenlegi helyen" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-choose-folders.ui.h:1 +msgid "_Folders:" +msgstr "_Mappák:" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:1 +msgid "Search for Duplicates" +msgstr "Azonosak keresése" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 +msgid "Duplicates:" +msgstr "Azonosak:" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 +msgid "Files:" +msgstr "Fájlok:" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:4 +#: ../gthumb/gth-browser-actions-entries.h:33 +msgid "_View" +msgstr "_Nézet" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 +msgid "No duplicates found." +msgstr "Nem találhatók azonosak." + +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:1 +#: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:1 +msgid "Find Duplicates" +msgstr "Azonosak keresése" + +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:2 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 +#: ../extensions/search/data/ui/search-editor.ui.h:1 +msgid "Start _at:" +msgstr "Kezdés _itt:" + +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 +msgid "_Filter:" +msgstr "_Szűrő:" + +#: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:2 +msgid "Find duplicated files." +msgstr "Azonos fájlok keresése." + +#: ../extensions/find_duplicates/gth-find-duplicates.c:65 +msgid "leave the newest duplicates" +msgstr "az újabb példány meghagyása" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:66 +msgid "leave the oldest duplicates" +msgstr "a régebbi példány meghagyása" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:67 +msgid "by folder..." +msgstr "mappa szerint…" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:68 +msgid "all files" +msgstr "minden fájl" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:69 +msgid "no file" +msgstr "nincs fájl" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:560 +#: ../extensions/find_duplicates/gth-find-duplicates.c:668 +#, c-format +msgid "%d duplicate" +msgid_plural "%d duplicates" +msgstr[0] "%d azonos" +msgstr[1] "%d azonos" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:712 +msgid "Search completed" +msgstr "A keresés befejeződött" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:725 +msgid "Searching for duplicates" +msgstr "Azonosak keresése" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:728 +#: ../gthumb/gth-load-file-data-task.c:106 +#: ../gthumb/gth-save-file-data-task.c:100 +#, c-format +msgid "%d file remaining" +msgid_plural "%d files remaining" +msgstr[0] "%d fájl van hátra" +msgstr[1] "%d fájl van hátra" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:830 +msgid "Getting the file list" +msgstr "Fájllista lekérése" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:1016 +msgid "Duplicates" +msgstr "Azonosak" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:1306 +msgid "Select" +msgstr "Válasszon" + +#: ../extensions/flicker/callbacks.c:59 ../extensions/flicker/callbacks.c:64 msgid "_Flickr..." msgstr "_Flickr…" @@ -2055,145 +2910,166 @@ msgid "Download photos from Flickr" msgstr "Fényképek letöltése a Flickrről" -#: ../extensions/flicker/callbacks.c:64 +#: ../extensions/flicker/callbacks.c:65 msgid "Upload photos to Flickr" msgstr "Fényképek feltöltése a Flickrre" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 -msgid "Free space:" -msgstr "Szabad hely:" +#: ../extensions/flicker/flicker.extension.in.in.h:1 +msgid "Flicker" +msgstr "Flicker" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:3 -msgid "Hi_de from public searches" -msgstr "_Elrejtés a nyilvános keresés elől" +#: ../extensions/flicker/flicker.extension.in.in.h:2 +msgid "Upload images to Flickr" +msgstr "Képek feltöltése a Flickrre" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:4 -msgid "Moderate content" -msgstr "Tartalom moderálása" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 +msgid "Free space:" +msgstr "Szabad hely:" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:5 -#: ../extensions/flicker/data/ui/import-from-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:5 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 msgid "Ph_otoset:" msgstr "Ph_otoset:" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:6 -msgid "Private photos" -msgstr "Privát fényképek" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:6 +msgid "_Privacy:" +msgstr "_Adatvédelem:" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:7 -msgid "Private photos, visible to family" -msgstr "Privát fényképek, a család számára láthatók" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:7 +msgid "Hi_de from public searches" +msgstr "_Elrejtés a nyilvános keresés elől" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:8 +msgid "_Safety:" +msgstr "_Biztonság:" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:8 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 msgid "Private photos, visible to family and friends" msgstr "Privát fényképek, a család és a barátok számára láthatók" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:11 -msgid "Restricted content" -msgstr "Korlátozott tartalom" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 +msgid "Private photos, visible to family" +msgstr "Privát fényképek, a család számára láthatók" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 +msgid "Private photos" +msgstr "Privát fényképek" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:12 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 msgid "Safe content" msgstr "Biztonságos tartalom" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:14 -msgid "_Privacy:" -msgstr "_Adatvédelem:" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 +msgid "Moderate content" +msgstr "Tartalom moderálása" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:15 -msgid "_Safety:" -msgstr "_Biztonság:" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:17 +msgid "Restricted content" +msgstr "Korlátozott tartalom" -#: ../extensions/flicker/data/ui/import-from-flickr.ui.h:5 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 -msgid "_Import" -msgstr "_Importálás" +#: ../extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui.h:1 +msgid "C_ontinue" +msgstr "F_olytatás" -#: ../extensions/flicker/dlg-import-from-flickr.c:356 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:812 -msgid "Could not get the photo list" -msgstr "Nem lehet lekérni a fényképlistát" +#: ../extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui.h:2 +msgid "_Authorize..." +msgstr "_Engedélyezés…" -#: ../extensions/flicker/dlg-import-from-flickr.c:404 -#: ../extensions/flicker/dlg-import-from-flickr.c:571 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:845 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1008 -msgid "No album selected" -msgstr "Nincs album kiválasztva" +#: ../extensions/flicker_utils/flickr-consumer.c:124 +#: ../extensions/flicker_utils/flickr-service.c:237 +#: ../extensions/flicker_utils/flickr-service.c:348 +#: ../extensions/flicker_utils/flickr-service.c:672 +#: ../extensions/flicker_utils/flickr-service.c:937 +#: ../extensions/oauth/oauth-service.c:154 +#: ../extensions/photobucket/photobucket-consumer.c:74 +#: ../extensions/photobucket/photobucket-consumer.c:82 +#: ../extensions/photobucket/photobucket-consumer.c:149 +#: ../extensions/photobucket/photobucket-service.c:132 +msgid "Unknown error" +msgstr "Ismeretlen hiba" -#: ../extensions/flicker/dlg-import-from-flickr.c:589 +#: ../extensions/flicker_utils/flickr-service.c:502 #, c-format -msgid "Import from %s" -msgstr "Importálás innen: %s" +msgid "" +"Return to this window when you have finished the authorization process on %s" +msgstr "" +"Térjen vissza ehhez az ablakhoz, ha befejezte az engedélyezési folyamatot " +"itt: %s" -#: ../extensions/flicker/flicker.extension.in.in.h:1 -msgid "Flicker" -msgstr "Flicker" +#: ../extensions/flicker_utils/flickr-service.c:503 +msgid "Once you're done, click the 'Continue' button below." +msgstr "Ha készen van, kattintson a lenti „Folytatás” gombra." -#: ../extensions/flicker/flicker.extension.in.in.h:2 -msgid "Upload images to Flickr" -msgstr "Képek feltöltése a Flickrre" +#: ../extensions/flicker_utils/flickr-service.c:571 +#, c-format +msgid "gThumb requires your authorization to upload the photos to %s" +msgstr "A gThumb megköveteli az engedélyezést a fotók feltöltéséhez ide: %s" + +#: ../extensions/flicker_utils/flickr-service.c:572 +#, c-format +msgid "" +"Click 'Authorize' to open your web browser and authorize gthumb to upload " +"photos to %s. When you're finished, return to this window to complete the " +"authorization." +msgstr "" +"Kattintson az „Engedélyezés” gombra a webböngésző megnyitásához, és " +"engedélyezze a gthumbnak a fényképfeltöltést a(z) %s fiókba. Ha végzett, " +"térjen vissza ehhez az ablakhoz az engedélyezés befejezéséhez." -#: ../extensions/gstreamer_tools/actions.c:64 -#: ../extensions/image_viewer/gth-image-viewer-page.c:838 -#: ../gthumb/gth-browser.c:1888 +#: ../extensions/gstreamer_tools/actions.c:66 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1072 +#: ../gthumb/gth-browser.c:2175 msgid "Could not save the file" msgstr "Nem lehet elmenteni a fájlt" -#: ../extensions/gstreamer_tools/actions.c:124 +#: ../extensions/gstreamer_tools/actions.c:130 msgid "Could not take a screenshot" msgstr "Nem lehet képernyőképet készíteni" -#: ../extensions/gstreamer_tools/actions.c:130 -#: ../extensions/image_viewer/gth-image-viewer-page.c:982 +#: ../extensions/gstreamer_tools/actions.c:136 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1245 msgid "Save Image" msgstr "Kép mentése" -#: ../extensions/gstreamer_tools/actions.c:150 +#: ../extensions/gstreamer_tools/actions.c:156 msgctxt "Filename" msgid "Screenshot" msgstr "Képernyőkép" -#. this is an empty time +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:1 +msgid "Slower" +msgstr "Lassabb" + #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 -msgid "--:--" -msgstr "--.--" +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:699 +msgid "Play" +msgstr "Lejátszás" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:3 -msgid "Change volume level" -msgstr "Hangerő módosítása" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 msgid "Faster" msgstr "Gyorsabb" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:627 -msgid "Play" -msgstr "Lejátszás" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 -msgid "Slower" -msgstr "Lassabb" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 msgid "Time:" msgstr "Idő:" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:8 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 +msgid "--:--" +msgstr "--.--" + +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 msgid "Toggle volume" msgstr "Hang be/ki" -#. this is the separator between current position and duration of a media file -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:10 -msgctxt "time" -msgid "/" -msgstr "/" +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 +msgid "Change volume level" +msgstr "Hangerő módosítása" -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 +#: ../extensions/photo_importer/actions.c:67 +#: ../extensions/photo_importer/dlg-photo-importer.c:620 msgid "Choose a folder" msgstr "Válasszon mappát" @@ -2205,25 +3081,29 @@ msgid "Play audio and video files." msgstr "Hang- és videofájlok lejátszása." -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:92 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:104 msgid "Screenshot" msgstr "Képernyőkép" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:93 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:105 msgid "Take a screenshot" msgstr "Képernyőkép készítése" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:617 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 +msgid "Playing video" +msgstr "Videó lejátszása" + +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:689 msgid "Pause" msgstr "Szünet" #: ../extensions/gstreamer_tools/main.c:31 -#: ../gthumb/gth-main-default-tests.c:211 +#: ../gthumb/gth-main-default-tests.c:247 msgid "Video" msgstr "Videó" #: ../extensions/gstreamer_tools/main.c:32 -#: ../gthumb/gth-main-default-tests.c:218 +#: ../gthumb/gth-main-default-tests.c:254 msgid "Audio" msgstr "Hang" @@ -2232,7 +3112,7 @@ msgstr "Előadó" #: ../extensions/gstreamer_tools/main.c:40 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 msgid "Album" msgstr "Album" @@ -2254,13 +3134,13 @@ msgstr "Képfrissítés" #: ../extensions/gstreamer_tools/main.c:46 -#: ../extensions/image_print/data/ui/print-layout.ui.h:15 -#: ../extensions/image_viewer/gth-image-viewer-page.c:192 +#: ../extensions/image_print/data/ui/print-layout.ui.h:24 +#: ../extensions/image_viewer/gth-image-viewer-page.c:209 msgid "Width" msgstr "Szélesség" #: ../extensions/gstreamer_tools/main.c:47 -#: ../extensions/image_print/data/ui/print-layout.ui.h:4 +#: ../extensions/image_print/data/ui/print-layout.ui.h:25 msgid "Height" msgstr "Magasság" @@ -2272,144 +3152,177 @@ msgid "Sample rate" msgstr "Mintavételezési gyakoriság" -#: ../extensions/gstreamer_utils/gstreamer-utils.c:363 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:362 msgid "Stereo" msgstr "Sztereó" -#: ../extensions/gstreamer_utils/gstreamer-utils.c:363 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:362 msgid "Mono" msgstr "Mono" #. Translators: this is an image size, such as 1024 × 768 -#: ../extensions/gstreamer_utils/gstreamer-utils.c:396 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1034 -#: ../extensions/image_viewer/gth-metadata-provider-image.c:77 -#: ../extensions/webalbums/dlg-web-exporter.c:408 -#: ../extensions/webalbums/gth-web-exporter.c:2436 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:395 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1300 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:209 +#: ../extensions/webalbums/gth-web-exporter.c:2446 ../gthumb/gtk-utils.c:1037 #, c-format msgid "%d × %d" msgstr "%d × %d" -#: ../extensions/image_print/actions.c:67 +#: ../extensions/image_print/actions.c:69 msgid "Could not print the selected files" msgstr "A kijelölt fájlok nem nyomtathatók" -#: ../extensions/image_print/callbacks.c:54 +#: ../extensions/image_print/callbacks.c:65 msgid "Print the selected images" msgstr "A kijelölt képek nyomtatása" -#: ../extensions/image_print/data/ui/print-layout.ui.h:2 +#: ../extensions/image_print/data/ui/print-layout.ui.h:1 msgid "Centered" msgstr "Középre igazított" -#: ../extensions/image_print/data/ui/print-layout.ui.h:5 +#: ../extensions/image_print/data/ui/print-layout.ui.h:13 +msgid "The total number of files" +msgstr "A fájlok teljes száma" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:14 +#: ../extensions/importer/data/ui/import-preferences.ui.h:4 +msgid "The event description" +msgstr "Az esemény leírása" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:17 +msgid "_Rows:" +msgstr "So_rok:" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:19 msgid "Image" msgstr "Kép" -#: ../extensions/image_print/data/ui/print-layout.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 -msgid "Images per page:" -msgstr "Képek száma oldalanként:" +#: ../extensions/image_print/data/ui/print-layout.ui.h:20 +msgid "Position:" +msgstr "Pozíció:" -#: ../extensions/image_print/data/ui/print-layout.ui.h:7 +#: ../extensions/image_print/data/ui/print-layout.ui.h:21 msgid "Left" msgstr "Bal" -#: ../extensions/image_print/data/ui/print-layout.ui.h:8 -msgid "Position:" -msgstr "Pozíció:" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:9 -msgid "Preview" -msgstr "Előnézet" +#: ../extensions/image_print/data/ui/print-layout.ui.h:22 +msgid "Top" +msgstr "Fent" -#: ../extensions/image_print/data/ui/print-layout.ui.h:10 +#: ../extensions/image_print/data/ui/print-layout.ui.h:26 msgid "Rotation:" msgstr "Forgatás:" -#: ../extensions/image_print/data/ui/print-layout.ui.h:11 -msgid "Select Caption Font" -msgstr "Válasszon betűkészletet a felirathoz" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:13 -msgid "Top" -msgstr "Fent" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:14 +#: ../extensions/image_print/data/ui/print-layout.ui.h:27 msgid "Unit:" msgstr "Egység:" -#: ../extensions/image_print/data/ui/print-layout.ui.h:16 -msgid "_Font:" -msgstr "_Betűkészlet:" +#: ../extensions/image_print/data/ui/print-layout.ui.h:28 +msgid "Preview" +msgstr "Előnézet" -#: ../extensions/image_print/data/ui/print-layout.ui.h:17 +#: ../extensions/image_print/data/ui/print-layout.ui.h:30 +msgid "millimeters" +msgstr "milliméter" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:31 msgid "inches" msgstr "hüvelyk" -#: ../extensions/image_print/data/ui/print-layout.ui.h:18 -msgid "millimeters" -msgstr "milliméter" +#: ../extensions/image_print/data/ui/print-preferences.ui.h:4 +msgid "Select Caption Font" +msgstr "Válassza ki a felirat betűkészletét" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:5 +msgid "Select Header Font" +msgstr "Válassza ki a fejléc betűkészletét" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 +msgid "Select Footer Font" +msgstr "Válassza ki a lábléc betűkészletét" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 +msgid "Fonts" +msgstr "Betűkészletek" -#: ../extensions/image_print/gth-image-print-job.c:814 +#: ../extensions/image_print/gth-image-print-job.c:914 #: ../extensions/webalbums/data/albumthemes/text.h:31 #, c-format msgid "Page %d of %d" msgstr "%d / %d oldal" -#: ../extensions/image_print/gth-image-print-job.c:1491 -#: ../extensions/image_print/gth-image-print-job.c:1593 -#: ../extensions/image_print/gth-image-print-job.c:1614 +#: ../extensions/image_print/gth-image-print-job.c:1680 +#: ../extensions/image_print/gth-image-print-job.c:1845 +#: ../extensions/image_print/gth-image-print-job.c:1888 msgid "Could not print" msgstr "Nem lehet nyomtatni" -#: ../extensions/image_print/gth-image-print-job.c:1549 -msgid "Layout" -msgstr "Elrendezés" +#: ../extensions/image_print/gth-image-print-job.c:1746 +#: ../gthumb/gth-main-default-tests.c:240 +msgid "Images" +msgstr "Képek" + +#: ../extensions/image_print/gth-image-print-job.c:1847 +#: ../gthumb/gth-image-loader.c:197 ../gthumb/gth-image-loader.c:304 +#: ../gthumb/gth-image-utils.c:131 ../gthumb/gth-image-utils.c:137 +msgid "No suitable loader available for this file type" +msgstr "Nem érhető el megfelelő betöltő ehhez a fájltípushoz" #. translators: %s is a filename -#: ../extensions/image_print/gth-load-image-info-task.c:154 +#: ../extensions/image_print/gth-load-image-info-task.c:164 #, c-format msgid "Loading \"%s\"" msgstr "„%s” betöltése" -#: ../extensions/image_print/gth-load-image-info-task.c:156 -#: ../extensions/webalbums/gth-web-exporter.c:2785 +#: ../extensions/image_print/gth-load-image-info-task.c:166 +#: ../extensions/webalbums/gth-web-exporter.c:2719 msgid "Loading images" msgstr "Képek betöltése" #: ../extensions/image_print/image_print.extension.in.in.h:1 +msgid "Image print" +msgstr "Képnyomtatás" + +#: ../extensions/image_print/image_print.extension.in.in.h:2 msgid "Allow to print images choosing the page layout." msgstr "Képek nyomtatása az oldalelrendezés kiválasztásával." -#: ../extensions/image_print/image_print.extension.in.in.h:2 -msgid "Image print" -msgstr "Képnyomtatás" +#: ../extensions/image_print/preferences.c:79 +msgid "Print" +msgstr "Nyomtatás" #: ../extensions/image_rotation/callbacks.c:50 msgid "Rotate the selected images 90° to the right" msgstr "A kijelölt képek elforgatása 90°-kal jobbra" -#: ../extensions/image_rotation/callbacks.c:55 +#: ../extensions/image_rotation/callbacks.c:56 msgid "Rotate the selected images 90° to the left" msgstr "A kijelölt képek elforgatása 90°-kal balra" -#: ../extensions/image_rotation/callbacks.c:59 +#: ../extensions/image_rotation/callbacks.c:61 msgid "Rotate Physically" msgstr "Forgatás fizikailag" -#: ../extensions/image_rotation/callbacks.c:60 +#: ../extensions/image_rotation/callbacks.c:62 msgid "Rotate the selected images according to the embedded orientation" msgstr "A kijelölt képek elforgatása a beágyazott tájolás szerint" -#: ../extensions/image_rotation/callbacks.c:64 +#: ../extensions/image_rotation/callbacks.c:67 msgid "Reset the EXIF Orientation" msgstr "Az EXIF tájolás visszaállítása" -#: ../extensions/image_rotation/callbacks.c:65 +#: ../extensions/image_rotation/callbacks.c:68 msgid "Reset the embedded orientation without rotating the images" msgstr "A beágyazott tájolás visszaállítása a képek elforgatása nélkül" +#: ../extensions/image_rotation/gth-reset-orientation-task.c:111 +#: ../extensions/image_rotation/gth-transform-task.c:141 +#: ../extensions/webalbums/gth-web-exporter.c:2338 +#: ../extensions/webalbums/gth-web-exporter.c:2423 +msgid "Saving images" +msgstr "Képek mentése" + #: ../extensions/image_rotation/image_rotation.extension.in.in.h:1 msgid "Image rotation" msgstr "Képelforgatás" @@ -2418,12 +3331,12 @@ msgid "Rotate images without data loss." msgstr "Képek elforgatása adatvesztés nélkül." -#: ../extensions/image_rotation/rotation-utils.c:118 +#: ../extensions/image_rotation/rotation-utils.c:117 #, c-format msgid "Problem transforming the image: %s" msgstr "Hiba a(z) „%s” kép átalakítása közben" -#: ../extensions/image_rotation/rotation-utils.c:123 +#: ../extensions/image_rotation/rotation-utils.c:122 msgid "" "This transformation may introduce small image distortions along one or more " "edges, because the image dimensions are not multiples of 8.\n" @@ -2447,234 +3360,260 @@ "szempontból ez a mód adja a legszebb eredményt, de az átalakítás már nem " "teljesen veszteségmentes." -#: ../extensions/image_rotation/rotation-utils.c:129 +#: ../extensions/image_rotation/rotation-utils.c:128 msgid "_Trim" msgstr "_Levágás" -#: ../extensions/image_rotation/rotation-utils.c:131 +#: ../extensions/image_rotation/rotation-utils.c:130 msgid "_Accept distortion" msgstr "_Torzítás elfogadása" -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:1 -msgid "" -"Possible values are: actual-size, keep-prev, fit-size, fit-size-if-larger, " -"fit-width, fit-width-if-larger." -msgstr "" -"Lehetséges értékek: actual-size, keep-prev, fit-size, fit-size-if-larger, " -"fit-width, fit-width-if-larger." - -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:8 -msgid "Whether to resize the window to fit the size of the image" -msgstr "Méretezze-e át az ablakot úgy, hogy illeszkedjen a kép méretéhez" - #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:1 -msgid "After loading an image:" -msgstr "A kép betöltése után:" +msgid "Set to actual size" +msgstr "Beállítás a tényleges mérethez" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:2 -msgid "High" -msgstr "Magas" +msgid "Keep previous zoom" +msgstr "Előző nagyítás megtartása" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:3 -msgid "Low" -msgstr "Alacsony" +msgid "Fit to window" +msgstr "Kép igazítása az ablakmérethez" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 +msgid "Fit to window if larger" +msgstr "Kép igazítása az ablakmérethez, ha nagyobb" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:5 -msgid "Reset scrollbar positions" -msgstr "Görgetősáv-pozíciók visszaállítása" +msgid "Fit to width" +msgstr "Szélességhez igazítás" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:6 -msgid "Transparency _type:" -msgstr "Átlátszóság _típusa:" +msgid "Fit to width if larger" +msgstr "Kép igazítása a szélességhez, ha nagyobb" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:7 +msgid "Reset scrollbar positions" +msgstr "Görgetősáv-pozíciók visszaállítása" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:8 +msgid "After loading an image:" +msgstr "A kép betöltése után:" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:9 msgid "_Zoom quality:" msgstr "_Nagyítás minősége:" -#: ../extensions/image_viewer/gth-image-viewer-page.c:172 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:10 +msgid "Transparency _type:" +msgstr "Átlátszóság _típusa:" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:11 +msgid "High" +msgstr "Magas" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:12 +msgid "Low" +msgstr "Alacsony" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:13 +msgid "White" +msgstr "Fehér" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:15 +msgid "Black" +msgstr "Fekete" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:16 +msgid "Checked" +msgstr "Sakktábla" + +#: ../extensions/image_viewer/gth-image-histogram.c:84 +msgid "Histogram" +msgstr "Hisztogram" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:179 +msgid "Copy Image" +msgstr "Kép másolása" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:180 +msgid "Copy the image to the clipboard" +msgstr "A kép másolása a vágólapra" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:184 +msgid "Paste Image" +msgstr "Kép beillesztése" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:185 +msgid "Paste the image from the clipboard" +msgstr "Kép beillesztése a vágólapról" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:189 msgid "In" msgstr "Nagyítás" -#: ../extensions/image_viewer/gth-image-viewer-page.c:173 +#: ../extensions/image_viewer/gth-image-viewer-page.c:190 msgid "Zoom in" msgstr "Nagyítás" -#: ../extensions/image_viewer/gth-image-viewer-page.c:177 +#: ../extensions/image_viewer/gth-image-viewer-page.c:194 msgid "Out" msgstr "Kicsinyítés" -#: ../extensions/image_viewer/gth-image-viewer-page.c:178 +#: ../extensions/image_viewer/gth-image-viewer-page.c:195 msgid "Zoom out" msgstr "Kicsinyítés" -#: ../extensions/image_viewer/gth-image-viewer-page.c:182 +#: ../extensions/image_viewer/gth-image-viewer-page.c:199 msgid "1:1" msgstr "1:1" -#: ../extensions/image_viewer/gth-image-viewer-page.c:183 +#: ../extensions/image_viewer/gth-image-viewer-page.c:200 msgid "Actual size" msgstr "Tényleges méret" -#: ../extensions/image_viewer/gth-image-viewer-page.c:187 +#: ../extensions/image_viewer/gth-image-viewer-page.c:204 msgid "Fit" msgstr "Igazítás" -#: ../extensions/image_viewer/gth-image-viewer-page.c:188 +#: ../extensions/image_viewer/gth-image-viewer-page.c:205 msgid "Zoom to fit window" msgstr "Igazítás az ablak méretéhez" -#: ../extensions/image_viewer/gth-image-viewer-page.c:193 +#: ../extensions/image_viewer/gth-image-viewer-page.c:210 msgid "Zoom to fit width" msgstr "Szélességhez igazítás" -#: ../extensions/image_viewer/gth-image-viewer-page.c:200 -msgid "_Fit Window to Image" -msgstr "_Ablak igazítása a képhez" - -#: ../extensions/image_viewer/gth-image-viewer-page.c:201 -msgid "Resize the window to the size of the image" -msgstr "Az ablak átméretezése a kép méretéhez" - #: ../extensions/image_viewer/image_viewer.extension.in.in.h:1 -msgid "Basic image viewing." -msgstr "Egyszerű képmegjelenítő." - -#: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 msgid "Image viewer" msgstr "Képmegjelenítő" -#: ../extensions/image_viewer/preferences.c:96 -msgid "Set to actual size" -msgstr "Beállítás a tényleges mérethez" - -#: ../extensions/image_viewer/preferences.c:100 -msgid "Fit to width" -msgstr "Szélességhez igazítás" +#: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 +msgid "Basic image viewing." +msgstr "Egyszerű képmegjelenítő." -#: ../extensions/image_viewer/preferences.c:137 +#: ../extensions/image_viewer/preferences.c:125 msgid "Viewer" msgstr "Megjelenítő" -#: ../extensions/importer/data/gthumb-importer.schemas.in.h:1 -msgid "Possible values are: none, file_date, current_date" -msgstr "Lehetséges értékek: none, file_date, current_date" - -#: ../extensions/importer/data/gthumb-importer.schemas.in.h:2 -msgid "Possible values are: yyyymmdd, yyyymm, yyyy" -msgstr "Lehetséges értékek: yyyymmdd, yyyymm, yyyy" +#: ../extensions/importer/data/ui/import-preferences.ui.h:1 +msgid "_Destination" +msgstr "_Cél" #: ../extensions/importer/data/ui/import-preferences.ui.h:2 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 -msgid "Special code" -msgstr "Speciális kód" +msgid "_Automatic subfolder" +msgstr "_Automatikus almappa" #: ../extensions/importer/data/ui/import-preferences.ui.h:3 -msgid "The day of the month" -msgstr "A hónap napja" - -#: ../extensions/importer/data/ui/import-preferences.ui.h:4 -msgid "The event description" -msgstr "Az esemény leírása" - -#: ../extensions/importer/data/ui/import-preferences.ui.h:5 -msgid "The hour" -msgstr "Az óra" - -#: ../extensions/importer/data/ui/import-preferences.ui.h:6 -msgid "The minutes" -msgstr "A perc" +msgid "as _single subfolder" +msgstr "mint _egyedüli almappa" #: ../extensions/importer/data/ui/import-preferences.ui.h:7 -msgid "The month" -msgstr "A hónap" +msgid "The year" +msgstr "Az év" #: ../extensions/importer/data/ui/import-preferences.ui.h:8 -msgid "The seconds" -msgstr "A másodperc" +msgid "The month" +msgstr "A hónap" #: ../extensions/importer/data/ui/import-preferences.ui.h:9 -msgid "The year" -msgstr "Az év" +msgid "The day of the month" +msgstr "A hónap napja" #: ../extensions/importer/data/ui/import-preferences.ui.h:10 -msgid "_Automatic subfolder" -msgstr "_Automatikus almappa" +msgid "The hour" +msgstr "Az óra" #: ../extensions/importer/data/ui/import-preferences.ui.h:11 -msgid "_Destination" -msgstr "_Cél" +msgid "The minutes" +msgstr "A perc" #: ../extensions/importer/data/ui/import-preferences.ui.h:12 -msgid "as _single subfolder" -msgstr "mint _egyedüli almappa" +msgid "The seconds" +msgstr "A másodperc" -#: ../extensions/importer/gth-import-destination-button.c:212 +#: ../extensions/importer/gth-import-destination-button.c:183 msgid "Invalid Destination" msgstr "Érvénytelen cél" -#: ../extensions/importer/gth-import-preferences-dialog.c:195 +#: ../extensions/importer/gth-import-preferences-dialog.c:198 #, c-format msgid "example: %s" msgstr "például: %s" #. subfolder type -#: ../extensions/importer/gth-import-preferences-dialog.c:327 +#: ../extensions/importer/gth-import-preferences-dialog.c:330 msgid "File date" msgstr "Fájl dátuma" #. gtk_label_set_mnemonic_widget (GTK_LABEL (GET_WIDGET ("subfolder_label")), self->priv->subfolder_type_list); #. subfolder format -#: ../extensions/importer/gth-import-preferences-dialog.c:337 +#: ../extensions/importer/gth-import-preferences-dialog.c:340 msgid "year-month-day" msgstr "év-hónap-nap" -#: ../extensions/importer/gth-import-preferences-dialog.c:338 +#: ../extensions/importer/gth-import-preferences-dialog.c:341 msgid "year-month" msgstr "év-hónap" -#: ../extensions/importer/gth-import-preferences-dialog.c:339 +#: ../extensions/importer/gth-import-preferences-dialog.c:342 msgid "year" msgstr "év" -#: ../extensions/importer/gth-import-preferences-dialog.c:340 +#: ../extensions/importer/gth-import-preferences-dialog.c:343 msgid "custom format" msgstr "egyéni formátum" -#: ../extensions/importer/gth-import-task.c:438 -#: ../extensions/importer/gth-import-task.c:473 -#: ../extensions/importer/gth-import-task.c:639 +#: ../extensions/importer/gth-import-task.c:426 +#: ../extensions/importer/gth-import-task.c:461 +#: ../extensions/importer/gth-import-task.c:671 msgid "Importing files" msgstr "Fájlok importálása" -#: ../extensions/importer/gth-import-task.c:594 +#: ../extensions/importer/gth-import-task.c:620 msgid "No file imported" msgstr "Nem került fájl importálásra" -#: ../extensions/importer/gth-import-task.c:595 +#: ../extensions/importer/gth-import-task.c:621 msgid "The selected files are already present in the destination." msgstr "A kiválasztott fájlok már szerepelnek a célban." -#: ../extensions/importer/gth-import-task.c:616 +#: ../extensions/importer/gth-import-task.c:644 +#: ../gthumb/gth-file-source-vfs.c:694 +msgid "Could not delete the files" +msgstr "Nem sikerült törölni a fájlokat" + +#: ../extensions/importer/gth-import-task.c:645 msgid "Delete operation not supported." msgstr "A törlés művelet nem támogatott." -#: ../extensions/importer/gth-import-task.c:700 +#: ../extensions/importer/gth-import-task.c:732 msgid "Last imported" msgstr "Utoljára importálva" -#: ../extensions/list_tools/callbacks.c:64 ../gthumb/gth-filterbar.c:303 +#: ../extensions/importer/gth-import-task.c:838 +msgid "No file specified." +msgstr "Nincs megadva fájl." + +#. Translators: For example: Not enough free space in '/home/user/Images'.\n1.3 GB of space is required but only 300 MB is available. +#: ../extensions/importer/gth-import-task.c:875 +#, c-format +msgid "" +"Not enough free space in '%s'.\n" +"%s of space is required but only %s is available." +msgstr "" +"Nincs elég szabad hely itt: „%s”.\n" +"%s hely szükséges, de csak %s érhető el." + +#: ../extensions/list_tools/callbacks.c:76 ../gthumb/gth-filterbar.c:311 msgid "Personalize..." msgstr "Személyre szabás…" -#: ../extensions/list_tools/callbacks.c:237 -#: ../extensions/list_tools/callbacks.c:248 +#: ../extensions/list_tools/callbacks.c:320 msgid "Tools" msgstr "Eszközök" -#: ../extensions/list_tools/callbacks.c:239 -#: ../extensions/list_tools/callbacks.c:250 +#: ../extensions/list_tools/callbacks.c:321 msgid "Batch tools for multiple files" msgstr "Kötegelt eszközök több fájlra" @@ -2683,119 +3622,98 @@ msgstr "_Kihagyás" #: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:1 -msgid "Co_mmands:" -msgstr "_Parancsok:" - -#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:2 msgid "Commands" msgstr "Parancsok" +#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:2 +msgid "Co_mmands:" +msgstr "_Parancsok:" + #: ../extensions/list_tools/data/ui/script-editor.ui.h:2 -#, no-c-format -msgid "%B" -msgstr "%B" +msgid "_Wait for the command to finish" +msgstr "_Várjon a parancs befejezéséig" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:3 +msgid "E_xecute command once for every file" +msgstr "Pa_rancs végrehajtása egyszer minden fájlon" #: ../extensions/list_tools/data/ui/script-editor.ui.h:4 -#, no-c-format -msgid "%E" -msgstr "%E" +msgid "_Terminal command (shell script)" +msgstr "_Terminálparancs (shell szkript)" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:5 +msgid "Sh_ortcut:" +msgstr "Gy_orsbillentyű:" #: ../extensions/list_tools/data/ui/script-editor.ui.h:6 -#, no-c-format -msgid "%F" -msgstr "%F" +msgid "The file uri" +msgstr "A fájl URI-ja" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:8 -#, no-c-format -msgid "%N" -msgstr "%N" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:7 +msgid "The file path" +msgstr "Fájl útvonala" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 -#, no-c-format -msgid "%P" -msgstr "%P" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:8 +msgid "The file basename" +msgstr "A fájl neve" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:12 -#, no-c-format -msgid "%U" -msgstr "%U" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:9 +msgid "The parent folder path" +msgstr "A szülőmappa útvonala" #. Translate only 'message' and 'default_value'. -#: ../extensions/list_tools/data/ui/script-editor.ui.h:15 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:14 #, no-c-format msgid "%ask{ message }{ default value }" msgstr "%ask{ üzenet }{ kezdeti érték }" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:15 +msgid "Ask an input value" +msgstr "Bemeneti érték bekérése" + #. Translate only 'attribute name' #: ../extensions/list_tools/data/ui/script-editor.ui.h:18 #, no-c-format msgid "%attr{ attribute name }" msgstr "%attr{ attribútum neve }" -#. Translate only 'text'. -#: ../extensions/list_tools/data/ui/script-editor.ui.h:21 -#, no-c-format -msgid "%quote{ text }" -msgstr "%quote{ szöveg }" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:22 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:19 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 msgid "A file attribute" msgstr "Egy fájl attribútum" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:23 -msgid "Ask an input value" -msgstr "Bemeneti érték bekérése" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:25 -msgid "E_xecute command once for every file" -msgstr "Pa_rancs végrehajtása egyszer minden fájlon" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:26 -msgid "Quote the text " -msgstr "Idézőjelezze a szöveget" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:27 -msgid "Sh_ortcut:" -msgstr "Gy_orsbillentyű:" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:29 -msgid "The file basename" -msgstr "A fájl neve" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:21 +#, no-c-format +msgid "%N" +msgstr "%N" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:30 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:22 msgid "The file basename without extension" msgstr "A fájl neve kiterjesztés nélkül" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:31 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:24 +#, no-c-format +msgid "%E" +msgstr "%E" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:25 msgid "The file extension" msgstr "A fájl kiterjesztése" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:32 -msgid "The file path" -msgstr "Fájl útvonala" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:33 -msgid "The file uri" -msgstr "A fájl URI-ja" +#. Translate only 'text'. +#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 +#, no-c-format +msgid "%quote{ text }" +msgstr "%quote{ szöveg }" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:34 -msgid "The parent folder path" -msgstr "A szülőmappa útvonala" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:29 +msgid "Quote the text " +msgstr "Idézőjelezze a szöveget" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:35 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:30 msgid "_Command:" msgstr "_Parancs:" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:37 -msgid "_Terminal command (shell script)" -msgstr "_Terminálparancs (shell szkript)" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:38 -msgid "_Wait for the command to finish" -msgstr "_Várjon a parancs befejezéséig" - #: ../extensions/list_tools/dlg-personalize-scripts.c:257 msgid "Script" msgstr "Szkript" @@ -2805,7 +3723,7 @@ msgstr "Gyorsbillentyű" #: ../extensions/list_tools/dlg-personalize-scripts.c:285 -#: ../gthumb/dlg-personalize-filters.c:251 +#: ../gthumb/dlg-personalize-filters.c:252 msgid "Show" msgstr "Megjelenítés" @@ -2813,46 +3731,44 @@ msgid "Could not save the script" msgstr "Nem lehet elmenteni a szkriptet" -#: ../extensions/list_tools/dlg-personalize-scripts.c:405 +#: ../extensions/list_tools/dlg-personalize-scripts.c:406 msgid "New Command" msgstr "Új parancs" -#: ../extensions/list_tools/dlg-personalize-scripts.c:432 +#: ../extensions/list_tools/dlg-personalize-scripts.c:433 msgid "Edit Command" msgstr "Parancs szerkesztése" -#: ../extensions/list_tools/gth-script.c:642 +#: ../extensions/list_tools/dlg-personalize-scripts.c:461 +msgid "Are you sure you want to delete the selected command?" +msgstr "Biztosan törölni szeretné a kijelölt parancsot?" + +#: ../extensions/list_tools/gth-script.c:610 msgid "Enter a value:" msgstr "Írjon be egy értéket:" -#: ../extensions/list_tools/gth-script.c:777 -#: ../extensions/webalbums/gth-web-exporter.c:571 -#: ../extensions/webalbums/gth-web-exporter.c:583 -#: ../extensions/webalbums/gth-web-exporter.c:591 +#: ../extensions/list_tools/gth-script.c:745 +#: ../extensions/webalbums/gth-web-exporter.c:558 +#: ../extensions/webalbums/gth-web-exporter.c:570 +#: ../extensions/webalbums/gth-web-exporter.c:578 msgid "Malformed command" msgstr "Hibás formátumú parancs" -#: ../extensions/list_tools/gth-script-editor-dialog.c:177 +#: ../extensions/list_tools/gth-script-editor-dialog.c:147 msgid "none" msgstr "nincs" -#: ../extensions/list_tools/gth-script-editor-dialog.c:183 +#: ../extensions/list_tools/gth-script-editor-dialog.c:153 #, c-format msgid "key %d on the numeric keypad" msgstr "%d gomb a numerikus billentyűn" -#: ../extensions/list_tools/gth-script-editor-dialog.c:320 -#: ../gthumb/gth-filter-editor-dialog.c:492 -#, c-format -msgid "No name specified" -msgstr "Nincs név megadva" - -#: ../extensions/list_tools/gth-script-editor-dialog.c:326 +#: ../extensions/list_tools/gth-script-editor-dialog.c:296 #, c-format msgid "No command specified" msgstr "Nincs parancs megadva" -#: ../extensions/list_tools/gth-script-task.c:84 +#: ../extensions/list_tools/gth-script-task.c:83 #, c-format msgid "Command exited abnormally with status %d" msgstr "A parancs abnormálisan lépett ki %d állapottal" @@ -2865,6 +3781,81 @@ msgid "Scripting and batch manipulation of files." msgstr "Szkriptelés és fájlok kötegelt manipulációja." +#: ../extensions/map_view/gth-map-view.c:130 +msgctxt "Cardinal point" +msgid "S" +msgstr "D" + +#: ../extensions/map_view/gth-map-view.c:130 +msgctxt "Cardinal point" +msgid "N" +msgstr "É" + +#: ../extensions/map_view/gth-map-view.c:132 +msgctxt "Cardinal point" +msgid "W" +msgstr "Ny" + +#: ../extensions/map_view/gth-map-view.c:132 +msgctxt "Cardinal point" +msgid "E" +msgstr "K" + +#: ../extensions/map_view/gth-map-view.c:205 +#: ../extensions/map_view/map_view.extension.in.in.h:1 +msgid "Map" +msgstr "Térkép" + +#. No GPS label +#: ../extensions/map_view/gth-map-view.c:276 +msgid "The geographical position information is not available for this image." +msgstr "A földrajzi pozícióinformációi nem érhetők el ehhez a képhez." + +#: ../extensions/map_view/map_view.extension.in.in.h:2 +msgid "View the photo position on the map" +msgstr "A fénykép pozíciójának megtekintése a térképen" + +#: ../extensions/oauth/data/ui/oauth-account-manager.ui.h:1 +msgid "A_ccounts:" +msgstr "F_iókok:" + +#: ../extensions/oauth/data/ui/oauth-ask-authorization.ui.h:1 +#: ../gthumb/gth-folder-tree.c:1067 +msgid "Loading..." +msgstr "Betöltés…" + +#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 +msgid "New authentication..." +msgstr "Új hitelesítés…" + +#: ../extensions/oauth/oauth-ask-authorization-dialog.c:191 +msgid "Authorization Required" +msgstr "Felhatalmazás szükséges" + +#: ../extensions/oauth/web-service.c:382 +msgid "Choose _Account..." +msgstr "Válasszon _fiókot…" + +#: ../extensions/oauth/web-service.c:660 +msgid "Choose Account" +msgstr "Válasszon fiókot" + +#: ../extensions/oauth/web-service.c:777 +msgid "Edit Accounts" +msgstr "Fiókok szerkesztése" + +#: ../extensions/oauth/web-service.c:795 ../extensions/oauth/web-service.c:812 +msgid "Connecting to the server" +msgstr "Csatlakozás a kiszolgálóhoz" + +#: ../extensions/oauth/web-service.c:796 +msgid "Asking authorization" +msgstr "Felhatalmazás kérése" + +#: ../extensions/oauth/web-service.c:813 +msgid "Getting account information" +msgstr "Fiókinformációk lekérése" + #: ../extensions/photobucket/callbacks.c:54 msgid "Photobucket..." msgstr "Photobucket…" @@ -2873,72 +3864,68 @@ msgid "Upload photos to Photobucket" msgstr "Fényképek feltöltése a Photobucketre" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 -msgid "1 megabyte file size" -msgstr "1 megabájt fájlméret" - -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 -msgid "15ʺ screen ( 800 x 600 )" -msgstr "15ʺ kijelző ( 800 x 600 )" - -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 -msgid "17ʺ screen ( 1024 x 768 )" -msgstr "17ʺ kijelző ( 1024 x 768 )" - #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 -msgid "Large ( 640 x 480 )" -msgstr "Nagy ( 640 x 480 )" +msgid "_Scramble filenames" +msgstr "_Fájlnevek összezavarása" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 -msgid "Medium ( 320 x 240 )" -msgstr "Közepes ( 320 x 240 )" +msgid "Tiny ( 100 x 75 )" +msgstr "Apró ( 100 x 75 )" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 msgid "Small ( 160 x 120 )" msgstr "Kicsi ( 160 x 120 )" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 -msgid "Tiny ( 100 x 75 )" -msgstr "Apró ( 100 x 75 )" +msgid "Medium ( 320 x 240 )" +msgstr "Közepes ( 320 x 240 )" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 +msgid "Large ( 640 x 480 )" +msgstr "Nagy ( 640 x 480 )" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 -msgid "_Resize to:" -msgstr "Á_tméretezés erre:" +msgid "15ʺ screen ( 800 x 600 )" +msgstr "15ʺ kijelző ( 800 x 600 )" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 -msgid "_Scramble filenames" -msgstr "_Fájlnevek összezavarása" +msgid "17ʺ screen ( 1024 x 768 )" +msgstr "17ʺ kijelző ( 1024 x 768 )" -#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 +msgid "1 megabyte file size" +msgstr "1 megabájt fájlméret" + +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 msgid "_Container:" msgstr "_Konténer:" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:289 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:290 msgid "Tiny ( 100 × 75 )" msgstr "Apró ( 100 x 75 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:290 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 msgid "Small ( 160 × 120 )" msgstr "Kicsi ( 160 x 120 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 msgid "Medium ( 320 × 240 )" msgstr "Közepes ( 320 x 240 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 msgid "Large ( 640 × 480 )" msgstr "Nagy ( 640 x 480 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 msgid "15ʺ screen ( 800 × 600 )" msgstr "15ʺ kijelző ( 800 x 600 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 msgid "17ʺ screen ( 1024 × 768 )" msgstr "17ʺ kijelző ( 1024 x 768 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:302 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:303 msgid "2 megabyte file size" msgstr "2 megabájt fájlméret" @@ -2950,63 +3937,84 @@ msgid "Upload images to PhotoBucket" msgstr "Fényképek feltöltése a PhotoBucketre" -#: ../extensions/photo_importer/callbacks.c:51 +#: ../extensions/photo_importer/actions.c:71 +msgid "Import" +msgstr "Importálás" + +#: ../extensions/photo_importer/callbacks.c:52 msgid "_Removable Device..." msgstr "_Eltávolítható eszköz…" -#: ../extensions/photo_importer/callbacks.c:52 +#: ../extensions/photo_importer/callbacks.c:53 msgid "Import photos and other files from a removable device" msgstr "Fényképek és egyéb fájlok importálása eltávolítható eszközről" -#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:1 -msgid "After importing from a device:" -msgstr "Az eszközről importálás után:" +#: ../extensions/photo_importer/callbacks.c:56 +msgid "F_older..." +msgstr "_Mappa…" + +#: ../extensions/photo_importer/callbacks.c:57 +msgid "Import photos and other files from a folder" +msgstr "Fényképek és egyéb fájlok importálása mappából" -#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 +#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:1 msgid "_Rotate the images physically" msgstr "Képek _elforgatása fizikailag" -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 -msgid "Import from Removable Device" -msgstr "Importálás eltávolítható eszközről" +#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 +msgid "After importing from a device:" +msgstr "Az eszközről importálás után:" #. view label -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 -#: ../gthumb/gth-filterbar.c:413 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 +#: ../gthumb/gth-filterbar.c:421 msgid "S_how:" msgstr "_Megjelenítés:" -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 -msgid "_Delete the imported files from the source" -msgstr "Az _importált fájlok törlése a forrásról" +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:4 +msgid "_Tags:" +msgstr "_Címkék:" #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 msgid "_Event:" msgstr "_Esemény:" -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:8 -msgid "_Tags:" -msgstr "_Címkék:" +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:7 +msgid "_Delete the imported files from the source" +msgstr "Az _importált fájlok törlése a forrásról" + +#: ../extensions/photo_importer/dlg-photo-importer.c:227 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:149 +msgid "Could not import the files" +msgstr "Nem sikerült importálni a fájlokat" #. translators: %d is the number of files, %s the total size -#: ../extensions/photo_importer/dlg-photo-importer.c:248 +#: ../extensions/photo_importer/dlg-photo-importer.c:299 #, c-format msgid "Files to import: %d (%s)" msgstr "Fájlok importálása: %d (%s)" -#: ../extensions/photo_importer/dlg-photo-importer.c:288 +#: ../extensions/photo_importer/dlg-photo-importer.c:339 msgid "Could not load the folder" msgstr "Nem lehet betölteni a mappát" -#: ../extensions/photo_importer/dlg-photo-importer.c:318 -#: ../gthumb/gth-browser.c:1801 +#: ../extensions/photo_importer/dlg-photo-importer.c:369 +#: ../gthumb/gth-browser.c:2089 msgid "Getting folder listing..." msgstr "Mappafelsorolás lekérdezése…" -#: ../extensions/photo_importer/dlg-photo-importer.c:364 +#: ../extensions/photo_importer/dlg-photo-importer.c:415 msgid "Empty" msgstr "Üres" +#: ../extensions/photo_importer/dlg-photo-importer.c:586 +msgid "Import from Removable Device" +msgstr "Importálás eltávolítható eszközről" + +#: ../extensions/photo_importer/dlg-photo-importer.c:618 +msgid "Import from Folder" +msgstr "Importálás mappából" + #: ../extensions/photo_importer/photo_importer.extension.in.in.h:1 msgid "Import photos" msgstr "Fényképek importálása" @@ -3016,7 +4024,7 @@ msgstr "Fényképek importálása eltávolítható eszközökről." #: ../extensions/picasaweb/callbacks.c:59 -#: ../extensions/picasaweb/callbacks.c:63 +#: ../extensions/picasaweb/callbacks.c:64 msgid "_Picasa Web Album..." msgstr "_Picasa Webalbum…" @@ -3024,63 +4032,27 @@ msgid "Download photos from Picasa Web Album" msgstr "Fényképek letöltése Picasa Webalbumból" -#: ../extensions/picasaweb/callbacks.c:64 +#: ../extensions/picasaweb/callbacks.c:65 msgid "Upload photos to Picasa Web Album" msgstr "Fényképek feltöltése Picasa Webalbumba" -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 msgid "Export to Picasa Web Albums" msgstr "Exportálás Picasa Webalbumba" -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 msgid "_Albums:" msgstr "_Albumok:" -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 -msgid "Import from Picasa Web Album" -msgstr "Importálás Picasa Webalbumból" - -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 -msgid "_Album:" -msgstr "_Album:" - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:1 -msgid "" -"Type the characters you see in the picture below. Letters are not case-" -"sensitive." -msgstr "Gépelje be a kép alatt látható karaktereket. A betűk nem kis- és nagybetű-érzékenyek." - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 -msgid "_E-Mail:" -msgstr "_E-mail:" - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:3 -msgid "_Password:" -msgstr "_Jelszó:" - -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 msgid "Public" msgstr "Publikus" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:352 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:294 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:458 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:469 msgid "Could not get the album list" msgstr "Nem lehet lekérni az albumlistát" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:434 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:376 -msgid "Picasa Web Album" -msgstr "Picasa Webalbum" - -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:521 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:463 -msgid "Account" -msgstr "Fiók" - -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:134 -msgid "Could not load the file" -msgstr "Nem lehet betölteni a fájlt" - #: ../extensions/picasaweb/picasaweb.extension.in.in.h:1 msgid "Picasa Web Albums" msgstr "Picasa Webalbumok" @@ -3089,112 +4061,14 @@ msgid "Upload images to Picasa Web Albums" msgstr "Fényképek feltöltése a Picasa Webalbumokba" -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:1 -msgid "Possible values are: none, deflate, jpeg." -msgstr "Lehetséges értékek: none, deflate, jpeg." - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:1 -msgid "Opti_mize" -msgstr "Opti_malizálás" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:2 -msgid "_Progressive" -msgstr "_Progresszív" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 -msgid "_Quality:" -msgstr "_Minőség:" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 -msgid "_Smoothing:" -msgstr "_Simítás:" - -#: ../extensions/pixbuf_savers/data/ui/png-options.ui.h:1 -msgid "Compression _level:" -msgstr "Tömörítés _szintje:" - -#: ../extensions/pixbuf_savers/data/ui/save-options-preferences.ui.h:1 -msgid "Default options:" -msgstr "Alapértelmezett beállítások:" - -#: ../extensions/pixbuf_savers/data/ui/tga-options.ui.h:1 -msgid "_RLE compression" -msgstr "_RLE tömörítés" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:1 -msgid "Compression" -msgstr "Tömörítés" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:2 -msgid "No_rmal (Deflate)" -msgstr "No_rmál (Deflate)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:3 -msgid "Resolution" -msgstr "Felbontás" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 -msgid "_Horizontal:" -msgstr "_Vízszintes:" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 -msgid "_Loss compression (JPEG)" -msgstr "V_eszteséges tömörítés (JPEG)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 -msgid "_No compression" -msgstr "_Nincs tömörítés" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 -msgid "_Vertical:" -msgstr "_Függőleges:" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 -msgid "dpi" -msgstr "dpi" - -#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:478 -msgid "JPEG" -msgstr "JPEG" - -#: ../extensions/pixbuf_savers/gth-png-saver.c:145 -msgid "PNG" -msgstr "PNG" - -#: ../extensions/pixbuf_savers/gth-tga-saver.c:291 -#: ../gthumb/gth-buffer-data.c:84 -msgid "Insufficient memory" -msgstr "Kevés a memória" - -#: ../extensions/pixbuf_savers/gth-tga-saver.c:378 -msgid "TGA" -msgstr "TGA" - -#: ../extensions/pixbuf_savers/gth-tiff-saver.c:497 -msgid "TIFF" -msgstr "TIFF" - -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:1 -msgid "Save images" -msgstr "Képek mentése" - -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:2 -msgid "Save images in common file formats such as JPEG, PNG and TIFF" -msgstr "Képek mentése gyakori fájlformátumokba, mint a JPEG, PNG és TIFF" - -#: ../extensions/pixbuf_savers/preferences.c:134 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 -msgid "Saving" -msgstr "Mentés" - #: ../extensions/raw_files/raw_files.extension.in.in.h:1 -msgid "Allow to load raw format images." -msgstr "Hagyja betölteni a nyers formátumú képeket." - -#: ../extensions/raw_files/raw_files.extension.in.in.h:2 msgid "Raw format support" msgstr "Nyers formátum támogatás" +#: ../extensions/raw_files/raw_files.extension.in.in.h:2 +msgid "Allow to load raw format images." +msgstr "Hagyja betölteni a nyers formátumú képeket." + #: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 msgid "_X:" msgstr "_X:" @@ -3203,17 +4077,18 @@ msgid "_Y:" msgstr "_Y:" -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:437 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 msgid "Red Eye Removal..." msgstr "Vörösszem-eltávolítás…" -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:437 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 msgid "Red Eye Removal" msgstr "Vörösszem-eltávolítás" -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:438 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:511 msgid "Remove the red eye effect caused by camera flashes" -msgstr "A fényképező vakuja következtében kialakult vörösszemhatás eltávolítása" +msgstr "" +"A fényképező vakuja következtében kialakult vörösszemhatás eltávolítása" #: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:1 msgid "Red-eye removal" @@ -3221,118 +4096,140 @@ #: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:2 msgid "Tool to remove the red-eye effect from a photo." -msgstr "Eszköz a vörösszemhatás eltávolítására a fényképről." - -#: ../extensions/rename_series/callbacks.c:48 -msgid "Rename the selected files" -msgstr "A kijelölt fájlok átnevezése" - -#: ../extensions/rename_series/data/gthumb_rename_series.schemas.in.h:1 -msgid "" -"Possible values include: general::unsorted, file::name, file::size, file::" -"mtime, exif::photo::datetimeoriginal" -msgstr "" -"Lehetséges értékek: general::unsorted, file::name, file::size, file::mtime, " -"exif::photo::datetimeoriginal" - -#: ../extensions/rename_series/data/gthumb_rename_series.schemas.in.h:2 -msgid "Possible values: 0 (none), 1 (lower), 2 (upper)" -msgstr "Lehetséges értékek: 0 (nincs), 1 (kisbetű), 2 (nagybetű)" - -#. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 -#, no-c-format -msgid "%A{ identifier }" -msgstr "%A{ azonosító }" - -#. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 -#, no-c-format -msgid "%D{ format }" -msgstr "%D{ formátum }" - -#. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 -#, no-c-format -msgid "%M{ format }" -msgstr "%M{ formátum }" +msgstr "Eszköz a vörösszemhatás eltávolítására a fényképről." + +#: ../extensions/rename_series/data/ui/code-selector.ui.h:1 +msgid "digits" +msgstr "számjegy" + +#: ../extensions/rename_series/data/ui/code-selector.ui.h:2 +msgid "format:" +msgstr "formátum:" + +#: ../extensions/rename_series/data/ui/code-selector.ui.h:3 +msgid "remove" +msgstr "eltávolítás" + +#: ../extensions/rename_series/data/ui/code-selector.ui.h:4 +msgid "add" +msgstr "hozzáadás" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:1 +msgid "Rename" +msgstr "Átnevezés" #. Translators: this is the text case (upper or lower case). -#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 msgid "Cas_e:" msgstr "B_etűfajta:" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:14 -msgid "New enumerator digit" -msgstr "Új számláló számjegy" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:7 +msgid "Edit template" +msgstr "Sablon szerkesztése" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:15 -msgid "Re_verse Order" -msgstr "Fo_rdított sorrend" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 +msgid "The original filename" +msgstr "Az eredeti fájlnév" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 -msgid "Rename" -msgstr "Átnevezés" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 +msgid "The original extension" +msgstr "Az eredeti kiterjesztés" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:18 -#: ../extensions/search/data/ui/search-editor.ui.h:1 -msgid "Start _at:" -msgstr "Kezdés _itt:" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:13 +msgid "The original enumerator" +msgstr "Az eredeti számláló" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:19 -msgid "The digitalization date" -msgstr "A digitalizálás dátuma" +#. translate only the text in the curly brackets +#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 +#, no-c-format +msgid "%M{ format }" +msgstr "%M{ formátum }" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 msgid "The modification date" msgstr "A módosítás dátuma" #: ../extensions/rename_series/data/ui/rename-series.ui.h:21 -msgid "The original enumerator" -msgstr "Az eredeti számláló" - -#: ../extensions/rename_series/data/ui/rename-series.ui.h:22 -msgid "The original extension" -msgstr "Az eredeti kiterjesztés" - -#: ../extensions/rename_series/data/ui/rename-series.ui.h:23 -msgid "The original filename" -msgstr "Az eredeti fájlnév" +msgid "The digitalization date" +msgstr "A digitalizálás dátuma" +#. translate only the text in the curly brackets #: ../extensions/rename_series/data/ui/rename-series.ui.h:24 -msgid "_Preview:" -msgstr "_Előnézet:" +#, no-c-format +msgid "%A{ identifier }" +msgstr "%A{ azonosító }" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 msgid "_Template:" msgstr "_Sablon:" -#: ../extensions/rename_series/dlg-rename-series.c:380 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +msgid "Re_verse Order" +msgstr "Fo_rdított sorrend" + +#: ../extensions/rename_series/dlg-rename-series.c:58 +msgid "Enumerator" +msgstr "Számláló" + +#: ../extensions/rename_series/dlg-rename-series.c:59 +msgid "Original filename" +msgstr "Eredeti fájlnév" + +#: ../extensions/rename_series/dlg-rename-series.c:60 +msgid "Original extension" +msgstr "Eredeti kiterjesztés" + +#: ../extensions/rename_series/dlg-rename-series.c:61 +msgid "Original enumerator" +msgstr "Eredeti számláló" + +#: ../extensions/rename_series/dlg-rename-series.c:62 +msgid "Modification date" +msgstr "Módosítás dátuma" + +#: ../extensions/rename_series/dlg-rename-series.c:63 +msgid "Digitalization date" +msgstr "Digitalizálás dátuma" + +#: ../extensions/rename_series/dlg-rename-series.c:64 +msgid "File attribute" +msgstr "Fájl attribútum" + +#: ../extensions/rename_series/dlg-rename-series.c:558 +#: ../extensions/rename_series/dlg-rename-series.c:689 msgid "Could not rename the files" msgstr "Nem lehet átnevezni a fájlt" -#: ../extensions/rename_series/dlg-rename-series.c:469 +#: ../extensions/rename_series/dlg-rename-series.c:786 +msgid "Could not save the template" +msgstr "Nem sikerült elmenteni a sablont" + +#: ../extensions/rename_series/dlg-rename-series.c:804 +msgid "Edit Template" +msgstr "Sablon szerkesztése" + +#: ../extensions/rename_series/dlg-rename-series.c:862 msgid "Old Name" msgstr "Régi név" -#: ../extensions/rename_series/dlg-rename-series.c:477 +#: ../extensions/rename_series/dlg-rename-series.c:873 msgid "New Name" msgstr "Új név" -#: ../extensions/rename_series/dlg-rename-series.c:554 +#: ../extensions/rename_series/dlg-rename-series.c:950 msgid "Keep original case" msgstr "Eredeti betűfajta megtartása" -#: ../extensions/rename_series/dlg-rename-series.c:555 +#: ../extensions/rename_series/dlg-rename-series.c:951 msgid "Convert to lower-case" msgstr "Átalakítás kisbetűsre" -#: ../extensions/rename_series/dlg-rename-series.c:556 +#: ../extensions/rename_series/dlg-rename-series.c:952 msgid "Convert to upper-case" msgstr "Átalakítás nagybetűsre" -#: ../extensions/rename_series/gth-rename-task.c:166 +#: ../extensions/rename_series/gth-rename-task.c:167 msgid "Renaming files" msgstr "Fájlok átnevezése" @@ -3352,33 +4249,34 @@ msgid "Resize the selected images" msgstr "A kijelölt képek átméretezése" -#: ../extensions/resize_images/data/gthumb_resize_images.schemas.in.h:1 -msgid "Possible values: pixels, percentage" -msgstr "Lehetséges értékek: pixels, percentage" +#: ../extensions/resize_images/data/ui/resize-images.ui.h:1 +msgid "Resize Images" +msgstr "Képek átméretezése" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:5 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:2 msgid "New dimensions" msgstr "Új méretek" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 -msgid "Resize Images" -msgstr "Képek átméretezése" - -#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:4 msgid "_Height:" msgstr "_Magasság:" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:5 msgid "_Preserve original aspect ratios" msgstr "_Eredeti méretarány megtartása" +#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 +#: ../gthumb/gth-main-default-metadata.c:49 +msgid "Format" +msgstr "Formátum" + #: ../extensions/resize_images/data/ui/resize-images.ui.h:10 msgid "pixel" msgstr "pixel" -#: ../extensions/resize_images/dlg-resize-images.c:140 -msgid "Resizing images" -msgstr "Képek átméretezése" +#: ../extensions/resize_images/dlg-resize-images.c:423 +msgid "Keep the original format" +msgstr "Az eredeti formátum megtartása" #: ../extensions/resize_images/resize_images.extension.in.in.h:1 msgid "Resize images" @@ -3388,16 +4286,16 @@ msgid "Resize series of images." msgstr "Képek sorozatának átméretezése." -#: ../extensions/search/actions.c:49 ../extensions/search/actions.c:116 -#: ../extensions/search/actions.c:122 +#: ../extensions/search/actions.c:49 ../extensions/search/actions.c:117 +#: ../extensions/search/actions.c:123 msgid "Could not perform the search" msgstr "Nem lehet végrehajtani a keresést" -#: ../extensions/search/actions.c:53 +#: ../extensions/search/actions.c:54 msgid "Search Result" msgstr "Keresés eredménye" -#: ../extensions/search/actions.c:75 +#: ../extensions/search/actions.c:76 msgid "Find" msgstr "Keresés" @@ -3405,42 +4303,81 @@ msgid "Find files" msgstr "Fájlok keresése" -#: ../extensions/search/callbacks.c:133 +#: ../extensions/search/callbacks.c:132 msgid "Search again" msgstr "Keresés újra" #. Translators: This is not a verb, it's a name as in "the search properties". -#: ../extensions/search/callbacks.c:175 -#: ../extensions/search/search.extension.in.in.h:2 +#: ../extensions/search/callbacks.c:174 +#: ../extensions/search/search.extension.in.in.h:1 msgid "Search" msgstr "Keresés" -#: ../extensions/search/gth-search-editor.c:138 -#: ../gthumb/gth-filter-editor-dialog.c:196 +#: ../extensions/search/gth-search-editor.c:112 +#: ../gthumb/gth-filter-editor-dialog.c:165 msgid "all the following rules" msgstr "az alábbi összes szabály" -#: ../extensions/search/gth-search-editor.c:139 -#: ../gthumb/gth-filter-editor-dialog.c:197 +#: ../extensions/search/gth-search-editor.c:113 +#: ../gthumb/gth-filter-editor-dialog.c:166 msgid "any of the following rules" msgstr "bármelyik az alábbi szabályok közül" -#: ../extensions/search/gth-search-task.c:178 -msgid "Files found untill now: %" -msgstr "Mostanáig megtalált fájlok: %" +#: ../extensions/search/gth-search-task.c:181 +#, c-format +msgid "Files found until now: %s" +msgstr "Mostanáig megtalált fájlok: %s" -#: ../extensions/search/gth-search-task.c:251 +#: ../extensions/search/gth-search-task.c:271 msgid "Searching..." msgstr "Keresés…" -#: ../extensions/search/gth-search-task.c:257 +#: ../extensions/search/gth-search-task.c:277 msgid "Cancel the operation" msgstr "A művelet megszakítása" -#: ../extensions/search/search.extension.in.in.h:1 +#: ../extensions/search/search.extension.in.in.h:2 msgid "File search tool." msgstr "Fájlkereső eszköz." +#: ../extensions/selections/callbacks.c:77 +msgid "Add to _Selection" +msgstr "Hozzáadás a _kijelöléshez" + +#: ../extensions/selections/callbacks.c:86 +msgid "Selection 1" +msgstr "1. kijelölés" + +#: ../extensions/selections/callbacks.c:91 +msgid "Selection 2" +msgstr "2. kijelölés" + +#: ../extensions/selections/callbacks.c:96 +msgid "Selection 3" +msgstr "3. kijelölés" + +#: ../extensions/selections/callbacks.c:285 +#, c-format +msgid "" +"Use Alt-%d to add files to this selection, Ctrl-%d to view this selection." +msgstr "" +"Az Alt-%d használatával adhatók hozzá fájlok a kijelöléshez, a Ctrl-%d " +"használatával nézhető meg a kijelölés." + +#: ../extensions/selections/gth-selections-manager.c:239 +#, c-format +msgid "Selection %d" +msgstr "%d. kijelölés" + +#: ../extensions/selections/gth-selections-manager.c:242 +#: ../extensions/selections/selections.extension.in.in.h:1 +msgid "Selections" +msgstr "Kijelölések" + +#: ../extensions/selections/selections.extension.in.in.h:2 +msgid "Advanced file selection." +msgstr "Speciális fájlkijelölés." + #: ../extensions/slideshow/callbacks.c:56 msgid "_Slideshow" msgstr "_Diavetítés" @@ -3449,91 +4386,91 @@ msgid "View as a slideshow" msgstr "Megtekintés diavetítésként" -#: ../extensions/slideshow/callbacks.c:406 -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 -#: ../extensions/slideshow/preferences.c:138 +#: ../extensions/slideshow/callbacks.c:410 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 +#: ../extensions/slideshow/preferences.c:162 #: ../extensions/slideshow/slideshow.extension.in.in.h:1 msgid "Slideshow" msgstr "Diavetítés" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:1 -msgid "Add files to the playlist" -msgstr "Fájlok hozzáadása a lejátszólistához" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 -msgid "Playlist" -msgstr "Lejátszólista" +msgid "_Personalize" +msgstr "_Személyre szabás" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:3 -msgid "R_andom order" -msgstr "_Véletlen sorrend" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:4 -msgid "Remove the selected files" -msgstr "A kijelölt fájlok eltávolítása" +msgid "_Transition effect:" +msgstr "Á_tmeneti hatás:" #. This is the first part of the phrase "change automatically, every x seconds", where x is an input control that let the user choose a value. -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 msgid "_Change automatically, every" msgstr "_Váltás automatikusan minden" +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 +msgid "_Restart when finished" +msgstr "Új_rakezdés, ha befejezte" + #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:8 -msgid "_Personalize" -msgstr "_Személyre szabás" +msgid "R_andom order" +msgstr "_Véletlen sorrend" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:9 -msgid "_Restart when finished" -msgstr "Új_rakezdés, ha befejezte" +msgid "Playlist" +msgstr "Lejátszólista" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:10 -msgid "_Transition effect:" -msgstr "Á_tmeneti hatás:" +msgid "Add files to the playlist" +msgstr "Fájlok hozzáadása a lejátszólistához" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:11 -msgid "seconds" -msgstr "másodperc" +msgid "Remove the selected files" +msgstr "A kijelölt fájlok eltávolítása" + +#: ../extensions/slideshow/gth-slideshow.c:231 +msgid "Playing slideshow" +msgstr "Diavetítés indítása" -#: ../extensions/slideshow/gth-slideshow-preferences.c:214 +#: ../extensions/slideshow/gth-slideshow-preferences.c:184 msgid "Choose the files to play" msgstr "Válassza ki a lejátszandó fájlokat" -#: ../extensions/slideshow/gth-slideshow-preferences.c:223 +#: ../extensions/slideshow/gth-slideshow-preferences.c:193 msgid "Audio files" msgstr "Hangfájlok" -#: ../extensions/slideshow/gth-slideshow-preferences.c:289 +#: ../extensions/slideshow/gth-slideshow-preferences.c:259 msgid "Random" msgstr "Véletlenszerű" -#: ../extensions/slideshow/main.c:284 +#: ../extensions/slideshow/main.c:283 msgid "Push from right" msgstr "Eltolás jobbról" -#: ../extensions/slideshow/main.c:290 +#: ../extensions/slideshow/main.c:289 msgid "Push from bottom" msgstr "Eltolás lentről" -#: ../extensions/slideshow/main.c:296 +#: ../extensions/slideshow/main.c:295 msgid "Slide from right" msgstr "Csúsztatás jobbról" -#: ../extensions/slideshow/main.c:302 +#: ../extensions/slideshow/main.c:301 msgid "Slide from bottom" msgstr "Csúsztatás lentről" -#: ../extensions/slideshow/main.c:308 +#: ../extensions/slideshow/main.c:307 msgid "Fade in" msgstr "Előtűnés" -#: ../extensions/slideshow/main.c:314 +#: ../extensions/slideshow/main.c:313 msgid "Flip page" msgstr "Oldal fordítása" -#: ../extensions/slideshow/main.c:320 +#: ../extensions/slideshow/main.c:319 msgid "Cube from right" msgstr "Kocka jobbról" -#: ../extensions/slideshow/main.c:326 +#: ../extensions/slideshow/main.c:325 msgid "Cube from bottom" msgstr "Kocka lentről" @@ -3567,12 +4504,12 @@ msgstr "Index" #: ../extensions/webalbums/data/albumthemes/text.h:30 -#: ../gthumb/gth-browser-actions-entries.h:115 +#: ../gthumb/gth-browser-actions-entries.h:125 msgid "Next" msgstr "Következő" #: ../extensions/webalbums/data/albumthemes/text.h:32 -#: ../gthumb/gth-browser-actions-entries.h:110 +#: ../gthumb/gth-browser-actions-entries.h:119 msgid "Previous" msgstr "Előző" @@ -3597,316 +4534,221 @@ msgid "View the previous page" msgstr "Az előző oldal megtekintése" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:5 -#, no-c-format -msgid "%I" -msgstr "%I" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 -#, no-c-format -msgid "%i" -msgstr "%i" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:11 -#, no-c-format -msgid "%p" -msgstr "%p" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 -msgid "Adapts to the window width" -msgstr "Alkalmazkodjon az ablak szélességéhez" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:1 msgid "All images on a single image" msgstr "Minden kép egy képen" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 -msgid "All images on a single page" -msgstr "Minden kép egy oldalon" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 -msgid "Columns:" -msgstr "Oszlopok:" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 -msgid "Image Attributes" -msgstr "Képattribútumok" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 -msgid "Image Page" -msgstr "Kép oldal" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:2 +msgid "Adapts to the window width" +msgstr "Alkalmazkodjon az ablak szélességéhez" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 -msgid "Index Page" -msgstr "Index oldal" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 +msgid "Web Album" +msgstr "Webalbum" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 -msgid "Re_verse order" -msgstr "_Fordított sorrend" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:5 +#, no-c-format +msgid "%P" +msgstr "%P" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 -msgid "S_ort:" -msgstr "_Rendezés:" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 +msgid "_Copy originals to destination" +msgstr "Eredeti képek _másolása a célba" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 -msgid "Show the description, if available" -msgstr "Cél megjelenítése, ha elérhető" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 -msgid "Show the following attributes:" -msgstr "A következő attribútumok megjelenítése:" +msgid "_Adapt to the window width " +msgstr "_Alkalmazkodjon az ablak szélességéhez " #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 -msgid "The current date" -msgstr "A mai dátum" +msgid "Index Page" +msgstr "Index oldal" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 -msgid "The current image number" -msgstr "A jelenlegi képszám" +msgid "Thumbnail Caption" +msgstr "Bélyegkép felirata" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 -msgid "The current page number" -msgstr "A jelenlegi oldalszám" +msgid "The current image number" +msgstr "A jelenlegi képszám" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 msgid "The total number of images" -msgstr "Az összes kép száma" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 -msgid "The total number of pages" -msgstr "Az összes oldal száma" +msgstr "A képek teljes száma" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 -msgid "Theme" -msgstr "Téma" +msgid "The file comment" +msgstr "A fájl megjegyzése" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 -msgid "Thumbnail Caption" -msgstr "Bélyegkép felirata" +msgid "Image Page" +msgstr "Kép oldal" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 -msgid "Use subfolders to organize files" -msgstr "Almappák használata a fájlok kezeléséhez" +msgid "Show the description, if available" +msgstr "Cél megjelenítése, ha elérhető" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 -msgid "Web Album" -msgstr "Webalbum" +msgid "Show the following attributes:" +msgstr "A következő attribútumok megjelenítése:" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:39 -msgid "_Adapt to the window width " -msgstr "_Alkalmazkodjon az ablak szélességéhez " - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:40 -msgid "_Copy originals to destination" -msgstr "Eredeti képek _másolása a célba" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:42 -msgid "_Footer:" -msgstr "_Lábléc:" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:43 -msgid "_Header:" -msgstr "F_ejléc:" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:44 -msgid "_Resize if larger than:" -msgstr "Át_méretezés, ha nagyobb mint:" +msgid "Image Attributes" +msgstr "Képattribútumok" -#: ../extensions/webalbums/gth-web-exporter.c:1795 +#: ../extensions/webalbums/gth-web-exporter.c:1800 msgid "Could not show the destination" msgstr "Nem jeleníthető meg a cél" -#: ../extensions/webalbums/gth-web-exporter.c:1830 +#: ../extensions/webalbums/gth-web-exporter.c:1836 msgid "The album has been created successfully." msgstr "Az album sikeresen létrejött." -#: ../extensions/webalbums/gth-web-exporter.c:2096 -#: ../extensions/webalbums/gth-web-exporter.c:2123 +#: ../extensions/webalbums/gth-web-exporter.c:2104 +#: ../extensions/webalbums/gth-web-exporter.c:2132 msgid "Saving thumbnails" msgstr "Bélyegképek mentése" -#: ../extensions/webalbums/gth-web-exporter.c:2151 +#: ../extensions/webalbums/gth-web-exporter.c:2160 msgid "Saving HTML pages: Images" msgstr "HTML-oldalak mentése: képek" -#: ../extensions/webalbums/gth-web-exporter.c:2209 +#: ../extensions/webalbums/gth-web-exporter.c:2218 msgid "Saving HTML pages: Indexes" msgstr "HTML-oldalak mentése: mutatók" -#: ../extensions/webalbums/gth-web-exporter.c:2329 -#: ../extensions/webalbums/gth-web-exporter.c:2413 -msgid "Saving images" -msgstr "Képek mentése" - -#: ../extensions/webalbums/gth-web-exporter.c:2492 +#: ../extensions/webalbums/gth-web-exporter.c:2503 msgid "Copying original images" msgstr "Eredeti képek másolása" -#: ../extensions/webalbums/gth-web-exporter.c:3028 +#: ../extensions/webalbums/gth-web-exporter.c:2963 msgid "Could not find the style folder" msgstr "Nem található a stílus mappa" -#: ../extensions/webalbums/gth-web-exporter.c:3061 +#: ../extensions/webalbums/gth-web-exporter.c:3001 msgid "Could not create a temporary folder" msgstr "Nem lehet létrehozni az átmeneti könyvtárat" #: ../extensions/webalbums/webalbums.extension.in.in.h:1 +msgid "Web Albums" +msgstr "Webalbumok" + +#: ../extensions/webalbums/webalbums.extension.in.in.h:2 msgid "Create static web albums." msgstr "Statikus webalbumok létrehozása." -#: ../extensions/webalbums/webalbums.extension.in.in.h:2 -msgid "Web Albums" -msgstr "Webalbumok" +#: ../gthumb/dlg-location.c:200 ../gthumb/gth-browser.c:1396 +#: ../gthumb/gth-browser.c:1969 ../gthumb/gth-browser.c:6214 +#: ../gthumb/gth-browser.c:6233 ../gthumb/gth-browser.c:6257 +#, c-format +msgid "Could not load the position \"%s\"" +msgstr "Nem lehet betölteni a(z) „%s” pozíciót" + +#: ../gthumb/dlg-personalize-filters.c:237 +msgid "Filter" +msgstr "Szűrő" + +#: ../gthumb/dlg-personalize-filters.c:315 +msgid "Could not save the filter" +msgstr "Nem lehet elmenteni a szűrőt" + +#: ../gthumb/dlg-personalize-filters.c:358 +msgid "New Filter" +msgstr "Új szűrő" + +#: ../gthumb/dlg-personalize-filters.c:387 +msgid "Edit Filter" +msgstr "Szűrő szerkesztése" -#: ../gthumb/dlg-extensions.c:65 ../gthumb/gth-filterbar.c:269 +#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:277 msgid "All" msgstr "Minden" -#: ../gthumb/dlg-extensions.c:66 +#: ../gthumb/dlg-preferences-extensions.c:68 msgid "Enabled" msgstr "Engedélyezve" -#: ../gthumb/dlg-extensions.c:67 +#: ../gthumb/dlg-preferences-extensions.c:69 msgid "Disabled" msgstr "Tiltva" -#: ../gthumb/dlg-extensions.c:70 +#: ../gthumb/dlg-preferences-extensions.c:72 msgid "Viewers" msgstr "Megjelenítők" -#: ../gthumb/dlg-extensions.c:71 +#: ../gthumb/dlg-preferences-extensions.c:73 msgid "Metadata" msgstr "Metaadatok" -#: ../gthumb/dlg-extensions.c:72 +#: ../gthumb/dlg-preferences-extensions.c:74 msgid "File tools" msgstr "Fájl eszközök" -#: ../gthumb/dlg-extensions.c:73 +#: ../gthumb/dlg-preferences-extensions.c:75 msgid "List tools" msgstr "Lista eszközök" -#: ../gthumb/dlg-extensions.c:74 +#: ../gthumb/dlg-preferences-extensions.c:76 msgid "Importers" msgstr "Importálók" -#: ../gthumb/dlg-extensions.c:75 +#: ../gthumb/dlg-preferences-extensions.c:77 msgid "Exporters" msgstr "Exportálók" -#: ../gthumb/dlg-extensions.c:154 +#: ../gthumb/dlg-preferences-extensions.c:216 +msgid "Could not activate the extension" +msgstr "Nem lehet aktiválni a kiterjesztést" + +#: ../gthumb/dlg-preferences-extensions.c:226 +msgid "Could not deactivate the extension" +msgstr "Nem lehet deaktiválni a kiterjesztést" + +#. add the page to the preferences dialog +#: ../gthumb/dlg-preferences-extensions.c:772 +msgid "Extensions" +msgstr "Kiterjesztések" + +#: ../gthumb/dlg-preferences-extensions.c:819 msgid "Restart required" msgstr "Újraindítás szükséges" -#: ../gthumb/dlg-extensions.c:155 +#: ../gthumb/dlg-preferences-extensions.c:820 msgid "You need to restart gthumb for these changes to take effect" msgstr "A változások életbe lépéséhez a gthumb újraindítása szükséges" -#: ../gthumb/dlg-extensions.c:156 +#: ../gthumb/dlg-preferences-extensions.c:821 msgid "_Continue" msgstr "_Folytatás" -#: ../gthumb/dlg-extensions.c:157 +#: ../gthumb/dlg-preferences-extensions.c:822 msgid "_Restart" msgstr "Új_raindítás" -#: ../gthumb/dlg-extensions.c:258 -msgid "Could not activate the extension" -msgstr "Nem lehet aktiválni a kiterjesztést" - -#: ../gthumb/dlg-extensions.c:264 -msgid "Could not deactivate the extension" -msgstr "Nem lehet deaktiválni a kiterjesztést" - -#: ../gthumb/dlg-extensions.c:286 -msgid "Use" -msgstr "Használatban" - -#: ../gthumb/dlg-extensions.c:302 -msgid "Extension" -msgstr "Kiterjesztés" - -#: ../gthumb/dlg-personalize-filters.c:236 -msgid "Filter" -msgstr "Szűrő" - -#: ../gthumb/dlg-personalize-filters.c:314 -msgid "Could not save the filter" -msgstr "Nem lehet elmenteni a szűrőt" - -#: ../gthumb/dlg-personalize-filters.c:356 -msgid "New Filter" -msgstr "Új szűrő" - -#: ../gthumb/dlg-personalize-filters.c:385 -msgid "Edit Filter" -msgstr "Szűrő szerkesztése" - -#: ../gthumb/eggfileformatchooser.c:236 -#, c-format -msgid "File _Format: %s" -msgstr "_Fájlformátum: %s" - -#: ../gthumb/eggfileformatchooser.c:397 ../gthumb/gth-main-default-tests.c:197 -msgid "All Files" -msgstr "Minden fájl" - -#: ../gthumb/eggfileformatchooser.c:398 -msgid "All Supported Files" -msgstr "Minden támogatott fájl" - -#: ../gthumb/eggfileformatchooser.c:407 -msgid "By Extension" -msgstr "Kiterjesztés szerint" - -#: ../gthumb/eggfileformatchooser.c:422 -msgid "File Format" -msgstr "Fájlformátum" - -#: ../gthumb/eggfileformatchooser.c:440 -msgid "Extension(s)" -msgstr "Kiterjesztések" - -#: ../gthumb/eggfileformatchooser.c:681 -#, c-format -msgid "" -"The program was not able to find out the file format you want to use for `" -"%s'. Please make sure to use a known extension for that file or manually " -"choose a file format from the list below." -msgstr "" -"A program nem tudta meghatározni a fájlformátumot, amelyet a(z) „%s” fájlhoz " -"szeretett volna használni. Győződjön meg arról, hogy ismert kiterjesztést " -"adott-e meg, vagy válasszon kézzel egy kiterjesztést a lenti listából." - -#: ../gthumb/eggfileformatchooser.c:688 -msgid "File format not recognized" -msgstr "A fájlformátum nem ismerhető fel" - #. For translators: This is a progress size indicator, for example: 230.4 MB of 512.8 MB -#: ../gthumb/gio-utils.c:1364 +#: ../gthumb/gio-utils.c:1351 #, c-format msgid "%s of %s" msgstr "%s / %s" -#: ../gthumb/gio-utils.c:1399 +#: ../gthumb/gio-utils.c:1386 #, c-format msgid "Moving \"%s\" to \"%s\"" msgstr "„%s” áthelyezése ide: „%s”" -#: ../gthumb/gio-utils.c:1401 +#: ../gthumb/gio-utils.c:1388 #, c-format msgid "Copying \"%s\" to \"%s\"" msgstr "„%s” másolása ide: „%s”" -#: ../gthumb/gio-utils.c:1740 +#: ../gthumb/gio-utils.c:1750 msgid "Moving files" msgstr "Fájlok áthelyezése" -#: ../gthumb/gio-utils.c:1740 +#: ../gthumb/gio-utils.c:1750 msgid "Copying files" msgstr "Fájlok másolása" -#: ../gthumb/gio-utils.c:1741 +#: ../gthumb/gio-utils.c:1751 msgid "Getting file information" msgstr "Fájlinformációk lekérése" @@ -3916,7 +4758,7 @@ #. * the separator that your locale uses or use "%Id" instead #. * of "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2817 +#: ../gthumb/glib-utils.c:3068 #, c-format msgctxt "long time format" msgid "%d:%02d:%02d" @@ -3928,13 +4770,13 @@ #. * separator that your locale uses or use "%Id" instead of #. * "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2826 +#: ../gthumb/glib-utils.c:3077 #, c-format msgctxt "short time format" msgid "%d:%02d" msgstr "%d.%02d" -#: ../gthumb/gth-browser-actions-callbacks.c:370 +#: ../gthumb/gth-browser-actions-callbacks.c:414 msgid "" "gthumb is free software; you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -3945,7 +4787,7 @@ "Foundation által kiadott GNU General Public License dokumentumában leírtak " "szerint; akár a licenc 2-es, akár (tetszőleges) későbbi változata szerint." -#: ../gthumb/gth-browser-actions-callbacks.c:374 +#: ../gthumb/gth-browser-actions-callbacks.c:418 msgid "" "gthumb is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -3957,20 +4799,19 @@ "alkalmas-e a KÖZREADÁSRA vagy EGY BIZONYOS FELADAT ELVÉGZÉSÉRE. További " "részletekért tanulmányozza a GNU GPL licencet." -#: ../gthumb/gth-browser-actions-callbacks.c:378 +#: ../gthumb/gth-browser-actions-callbacks.c:422 msgid "" "You should have received a copy of the GNU General Public License along with " "gthumb. If not, see http://www.gnu.org/licenses/." msgstr "" -"A gthumb programmal együtt meg kell kapnia a GNU General Public " -"License egy példányát; ha mégsem, akkor itt megtekintheti: http://www.gnu." -"org/licenses/." +"A gthumb programmal együtt meg kell kapnia a GNU General Public License egy " +"példányát; ha mégsem, akkor itt megtekintheti: http://www.gnu.org/licenses/." -#: ../gthumb/gth-browser-actions-callbacks.c:397 +#: ../gthumb/gth-browser-actions-callbacks.c:441 msgid "An image viewer and browser for GNOME." msgstr "Képmegjelenítő és képböngésző a GNOME-hoz." -#: ../gthumb/gth-browser-actions-callbacks.c:400 +#: ../gthumb/gth-browser-actions-callbacks.c:444 msgid "translator_credits" msgstr "" "Dvornik László \n" @@ -3978,347 +4819,425 @@ "Tímár András \n" "Úr Balázs " -#: ../gthumb/gth-browser-actions-entries.h:30 +#: ../gthumb/gth-browser-actions-entries.h:31 msgid "_File" msgstr "_Fájl" -#: ../gthumb/gth-browser-actions-entries.h:31 +#: ../gthumb/gth-browser-actions-entries.h:32 msgid "_Edit" msgstr "S_zerkesztés" -#: ../gthumb/gth-browser-actions-entries.h:32 -msgid "_View" -msgstr "_Nézet" - -#: ../gthumb/gth-browser-actions-entries.h:33 +#: ../gthumb/gth-browser-actions-entries.h:34 msgid "_Go" msgstr "_Ugrás" -#: ../gthumb/gth-browser-actions-entries.h:34 +#: ../gthumb/gth-browser-actions-entries.h:35 msgid "_Help" msgstr "_Súgó" -#: ../gthumb/gth-browser-actions-entries.h:35 +#: ../gthumb/gth-browser-actions-entries.h:36 msgid "Open _With" msgstr "Megnyitás _ezzel" -#: ../gthumb/gth-browser-actions-entries.h:36 +#: ../gthumb/gth-browser-actions-entries.h:37 msgid "I_mport From" msgstr "_Importálás innen" -#: ../gthumb/gth-browser-actions-entries.h:37 +#: ../gthumb/gth-browser-actions-entries.h:38 msgid "E_xport To" msgstr "E_xportálás ide" -#: ../gthumb/gth-browser-actions-entries.h:40 +#: ../gthumb/gth-browser-actions-entries.h:41 msgid "New _Window" msgstr "Új _ablak" -#: ../gthumb/gth-browser-actions-entries.h:41 +#: ../gthumb/gth-browser-actions-entries.h:42 msgid "Open another window" msgstr "Megnyitás másik ablakban" -#: ../gthumb/gth-browser-actions-entries.h:65 +#: ../gthumb/gth-browser-actions-entries.h:71 msgid "Open" msgstr "Megnyitás" -#: ../gthumb/gth-browser-actions-entries.h:70 +#: ../gthumb/gth-browser-actions-entries.h:77 msgid "Open in New Window" msgstr "Megnyitás új ablakban" -#: ../gthumb/gth-browser-actions-entries.h:76 +#: ../gthumb/gth-browser-actions-entries.h:84 msgid "Edit various preferences" msgstr "Különféle beállítások megváltoztatása" -#: ../gthumb/gth-browser-actions-entries.h:80 -msgid "Extensions" -msgstr "Kiterjesztések" - -#: ../gthumb/gth-browser-actions-entries.h:81 -msgid "Activate, deactivate and configure the gthumb extensions" -msgstr "A gthumb kiterjesztések aktiválása, deaktiválása és konfigurálása" - -#: ../gthumb/gth-browser-actions-entries.h:90 +#: ../gthumb/gth-browser-actions-entries.h:95 msgid "_Sort By..." msgstr "_Rendezés…" -#: ../gthumb/gth-browser-actions-entries.h:95 +#: ../gthumb/gth-browser-actions-entries.h:101 msgid "_Filter..." msgstr "_Szűrő…" -#: ../gthumb/gth-browser-actions-entries.h:101 +#: ../gthumb/gth-browser-actions-entries.h:108 msgid "Stop loading the current location" msgstr "A jelenlegi hely betöltésének leállítása" -#: ../gthumb/gth-browser-actions-entries.h:106 +#: ../gthumb/gth-browser-actions-entries.h:114 msgid "Reload the current location" msgstr "A jelenlegi hely újratöltése" -#: ../gthumb/gth-browser-actions-entries.h:111 +#: ../gthumb/gth-browser-actions-entries.h:120 msgid "View previous image" msgstr "Az előző kép megtekintése" -#: ../gthumb/gth-browser-actions-entries.h:116 +#: ../gthumb/gth-browser-actions-entries.h:126 msgid "View next image" msgstr "A következő kép megtekintése" -#: ../gthumb/gth-browser-actions-entries.h:121 +#: ../gthumb/gth-browser-actions-entries.h:132 msgid "Switch to fullscreen" msgstr "Átváltás teljes képernyőre" -#: ../gthumb/gth-browser-actions-entries.h:126 +#: ../gthumb/gth-browser-actions-entries.h:138 msgid "Leave Fullscreen" msgstr "Teljes képernyő elhagyása" -#: ../gthumb/gth-browser-actions-entries.h:131 ../gthumb/gth-browser.c:3376 +#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3841 msgid "Go to the previous visited location" msgstr "Ugrás az előző meglátogatott helyre" -#: ../gthumb/gth-browser-actions-entries.h:136 ../gthumb/gth-browser.c:3397 +#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3859 msgid "Go to the next visited location" msgstr "Ugrás a következő meglátogatott helyre" -#: ../gthumb/gth-browser-actions-entries.h:141 ../gthumb/gth-browser.c:3418 +#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3877 msgid "Go up one level" msgstr "Ugrás egy szinttel feljebb" -#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:650 +#: ../gthumb/gth-browser-actions-entries.h:161 +msgid "_Location..." +msgstr "_Hely…" + +#: ../gthumb/gth-browser-actions-entries.h:162 +msgid "Specify a location to open" +msgstr "Adja meg a megnyitandó helyet" + +#: ../gthumb/gth-browser-actions-entries.h:173 ../gthumb/gth-browser.c:721 msgid "_Delete History" msgstr "Előzmények _törlése" -#: ../gthumb/gth-browser-actions-entries.h:151 +#: ../gthumb/gth-browser-actions-entries.h:174 msgid "Delete the list of visited locations" msgstr "A meglátogatott helyek listájának törlése" -#: ../gthumb/gth-browser-actions-entries.h:156 +#: ../gthumb/gth-browser-actions-entries.h:180 msgid "View the folders" msgstr "A mappák megtekintése" -#: ../gthumb/gth-browser-actions-entries.h:161 +#: ../gthumb/gth-browser-actions-entries.h:186 msgid "Show information about gthumb" msgstr "Információk megjelenítése a gthumbról" -#: ../gthumb/gth-browser-actions-entries.h:165 +#: ../gthumb/gth-browser-actions-entries.h:191 msgid "Contents" msgstr "Tartalom" -#: ../gthumb/gth-browser-actions-entries.h:166 +#: ../gthumb/gth-browser-actions-entries.h:192 msgid "Display the gthumb Manual" msgstr "A gthumb kézikönyvének megjelenítése" -#: ../gthumb/gth-browser-actions-entries.h:170 +#: ../gthumb/gth-browser-actions-entries.h:197 msgid "_Keyboard Shortcuts" msgstr "_Gyorsbillentyűk" -#: ../gthumb/gth-browser-actions-entries.h:179 +#: ../gthumb/gth-browser-actions-entries.h:203 +#: ../gthumb/gth-browser-actions-entries.h:257 +msgid "Edit" +msgstr "Szerkesztés" + +#: ../gthumb/gth-browser-actions-entries.h:204 +#: ../gthumb/gth-browser-actions-entries.h:258 +msgid "Edit file" +msgstr "Fájl szerkesztése" + +#: ../gthumb/gth-browser-actions-entries.h:212 msgid "_Toolbar" msgstr "_Eszköztár" -#: ../gthumb/gth-browser-actions-entries.h:180 +#: ../gthumb/gth-browser-actions-entries.h:213 msgid "View or hide the toolbar of this window" msgstr "Az ablak eszköztárának megjelenítése vagy elrejtése" -#: ../gthumb/gth-browser-actions-entries.h:184 +#: ../gthumb/gth-browser-actions-entries.h:217 msgid "_Statusbar" msgstr "Á_llapotsor" -#: ../gthumb/gth-browser-actions-entries.h:185 +#: ../gthumb/gth-browser-actions-entries.h:218 msgid "View or hide the statusbar of this window" msgstr "Az ablak állapotsorának megjelenítése vagy elrejtése" -#: ../gthumb/gth-browser-actions-entries.h:189 +#: ../gthumb/gth-browser-actions-entries.h:222 msgid "_Filterbar" msgstr "S_zűrősor" -#: ../gthumb/gth-browser-actions-entries.h:190 +#: ../gthumb/gth-browser-actions-entries.h:223 msgid "View or hide the filterbar of this window" msgstr "Az ablak szűrősorának megjelenítése vagy elrejtése" -#: ../gthumb/gth-browser-actions-entries.h:194 +#: ../gthumb/gth-browser-actions-entries.h:227 msgid "_Sidebar" msgstr "_Oldalsáv" -#: ../gthumb/gth-browser-actions-entries.h:195 +#: ../gthumb/gth-browser-actions-entries.h:228 msgid "View or hide the sidebar of this window" msgstr "Az ablak szűrősorának megjelenítése vagy elrejtése" -#: ../gthumb/gth-browser-actions-entries.h:199 +#: ../gthumb/gth-browser-actions-entries.h:232 msgid "_Thumbnail Pane" msgstr "_Bélyegkép ablaktábla" -#: ../gthumb/gth-browser-actions-entries.h:200 +#: ../gthumb/gth-browser-actions-entries.h:233 msgid "View or hide the thumbnail pane in viewer mode" -msgstr "A bélyegképek ablakának megjelenítése vagy elrejtése megjelenítő módban" +msgstr "" +"A bélyegképek ablakának megjelenítése vagy elrejtése megjelenítő módban" -#: ../gthumb/gth-browser-actions-entries.h:204 +#: ../gthumb/gth-browser-actions-entries.h:237 msgid "_Thumbnails" msgstr "_Bélyegképek" -#: ../gthumb/gth-browser-actions-entries.h:205 +#: ../gthumb/gth-browser-actions-entries.h:238 msgid "View thumbnails" msgstr "Bélyegképek megjelenítése" -#: ../gthumb/gth-browser-actions-entries.h:209 +#: ../gthumb/gth-browser-actions-entries.h:242 msgid "_Hidden Files" msgstr "Re_jtett fájlok" -#: ../gthumb/gth-browser-actions-entries.h:210 +#: ../gthumb/gth-browser-actions-entries.h:243 msgid "Show hidden files and folders" msgstr "Rejtett fájlok és mappák megjelenítése" -#: ../gthumb/gth-browser-actions-entries.h:215 +#: ../gthumb/gth-browser-actions-entries.h:248 +#: ../gthumb/gth-browser-actions-entries.h:253 msgid "View file properties" msgstr "A fájl tulajdonságainak megtekintése" -#: ../gthumb/gth-browser-actions-entries.h:219 -msgid "Edit" -msgstr "Szerkesztés" +#: ../gthumb/gth-browser-actions-entries.h:262 +msgid "_Fit Window to Image" +msgstr "_Ablak igazítása a képhez" -#: ../gthumb/gth-browser-actions-entries.h:220 -msgid "Edit file" -msgstr "Fájl szerkesztése" +#: ../gthumb/gth-browser-actions-entries.h:263 +msgid "Resize the window to the size of the image" +msgstr "Az ablak átméretezése a kép méretéhez" -#: ../gthumb/gth-browser.c:355 +#: ../gthumb/gth-browser.c:418 #, c-format msgid "Open %s" msgstr "%s megnyitása" -#: ../gthumb/gth-browser.c:494 +#: ../gthumb/gth-browser.c:558 msgid "[modified]" msgstr "[módosítva]" -#: ../gthumb/gth-browser.c:498 ../gthumb/gth-main.c:259 -msgid "gthumb" -msgstr "gthumb" - -#: ../gthumb/gth-browser.c:1118 ../gthumb/gth-browser.c:1692 -#: ../gthumb/gth-browser.c:5456 ../gthumb/gth-browser.c:5475 -#: ../gthumb/gth-browser.c:5500 +#: ../gthumb/gth-browser.c:1117 #, c-format -msgid "Could not load the position \"%s\"" -msgstr "Nem lehet betölteni a(z) „%s” pozíciót" +msgid "%d file selected (%s)" +msgid_plural "%d files selected (%s)" +msgstr[0] "%d fájl kijelölve (%s)" +msgstr[1] "%d fájl kijelölve (%s)" + +#: ../gthumb/gth-browser.c:1152 +#, c-format +msgid "%s of free space" +msgstr "%s szabad hely" -#: ../gthumb/gth-browser.c:1785 ../gthumb/gth-browser.c:1812 +#: ../gthumb/gth-browser.c:2073 ../gthumb/gth-browser.c:2100 #, c-format msgid "No suitable module found for %s" msgstr "Nem található megfelelő modul ehhez: %s" -#: ../gthumb/gth-browser.c:1930 +#: ../gthumb/gth-browser.c:2219 #, c-format msgid "Save changes to file '%s'?" msgstr "Menti a módosításokat a(z) „%s” fájlba?" -#: ../gthumb/gth-browser.c:1935 +#: ../gthumb/gth-browser.c:2224 msgid "If you don't save, changes to the file will be permanently lost." msgstr "Ha nem menti, a fájl módosításai azonnal elvesznek." -#: ../gthumb/gth-browser.c:1936 +#: ../gthumb/gth-browser.c:2225 msgid "Do _Not Save" msgstr "_Ne mentse" -#: ../gthumb/gth-browser.c:2641 ../gthumb/gth-browser.c:2663 -#: ../gthumb/gth-source-tree.c:178 ../gthumb/gth-source-tree.c:200 +#: ../gthumb/gth-browser.c:3020 ../gthumb/gth-source-tree.c:182 msgid "Could not change name" msgstr "Nem lehet megváltoztatni a nevet" -#: ../gthumb/gth-browser.c:3060 ../gthumb/gth-main-default-metadata.c:41 +#: ../gthumb/gth-browser.c:3451 ../gthumb/gth-main-default-metadata.c:41 msgid "Modified" msgstr "Módosítva" -#: ../gthumb/gth-browser.c:3377 ../gthumb/gth-browser.c:3398 +#: ../gthumb/gth-browser.c:3842 ../gthumb/gth-browser.c:3860 msgid "View the list of visited locations" msgstr "A meglátogatott helyek listájának megtekintése" -#: ../gthumb/gth-browser.c:3419 +#: ../gthumb/gth-browser.c:3878 msgid "View the list of upper locations" msgstr "A felső helyek listájának megtekintése" -#: ../gthumb/gth-browser.c:5457 +#: ../gthumb/gth-browser.c:6215 #, c-format msgid "File type not supported" msgstr "A fájltípus nem támogatott" -#: ../gthumb/gth-browser.c:5501 +#: ../gthumb/gth-browser.c:6258 #, c-format msgid "No suitable module found" msgstr "Nem található megfelelő modul" -#: ../gthumb/gth-extensions.c:228 +#: ../gthumb/gth-extensions.c:203 #, c-format msgid "Could not open the module `%s`: %s" msgstr "Nem lehet megnyitni a(z) „%s” modult: %s" -#: ../gthumb/gth-extensions.c:827 +#: ../gthumb/gth-extensions.c:754 #, c-format -msgid "The extension '%s' is required by the extension '%s'" -msgstr "A(z) „%s” kiterjesztés szükséges „%s” kiterjesztéshez" +msgid "The extension '%1$s' is required by the extension '%2$s'" +msgstr "A(z) „%1$s” kiterjesztés szükséges a(z) „%2$s” kiterjesztéshez" -#: ../gthumb/gth-file-source-vfs.c:82 +#: ../gthumb/gth-file-chooser-dialog.c:144 +msgid "All Supported Files" +msgstr "Minden támogatott fájl" + +#: ../gthumb/gth-file-source-vfs.c:121 msgid "Home Folder" msgstr "Saját mappa" -#: ../gthumb/gth-file-source-vfs.c:89 +#: ../gthumb/gth-file-source-vfs.c:126 msgid "File System" msgstr "Fájlrendszer" -#: ../gthumb/gth-filterbar.c:405 +#: ../gthumb/gth-file-source-vfs.c:739 +msgid "" +"The files cannot be moved to the Trash. Do you want to delete them " +"permanently?" +msgstr "" +"A fájlokat nem sikerült áthelyezni a Kukába. Szeretné véglegesen törölni azt?" + +#: ../gthumb/gth-file-source-vfs.c:750 +msgid "Could not move the files to the Trash" +msgstr "Nem sikerült áthelyezni a fájlokat a Kukába" + +#: ../gthumb/gth-file-source-vfs.c:797 +#, c-format +msgid "Are you sure you want to move \"%s\" to trash?" +msgstr "Biztos benne, hogy áthelyezi a Kukába ezt a fájlt: „%s”?" + +#: ../gthumb/gth-file-source-vfs.c:801 +#, c-format +msgid "Are you sure you want to move to trash the %'d selected file?" +msgid_plural "Are you sure you want to move to trash the %'d selected files?" +msgstr[0] "Biztos benne, hogy áthelyezi a Kukába a kijelölt %'d fájlt?" +msgstr[1] "Biztos benne, hogy áthelyezi a Kukába a kijelölt %'d fájlt?" + +#: ../gthumb/gth-file-source-vfs.c:844 +#, c-format +msgid "Are you sure you want to permanently delete the %'d selected file?" +msgid_plural "" +"Are you sure you want to permanently delete the %'d selected files?" +msgstr[0] "Biztos benne, hogy véglegesen törli a kiválasztott %d fájlt?" +msgstr[1] "Biztos benne, hogy véglegesen törli a kiválasztott %d fájlt?" + +#: ../gthumb/gth-filterbar.c:413 msgid "Hide the filterbar" msgstr "Szűrősor elrejtése" -#: ../gthumb/gth-filter.c:43 ../gthumb/gth-filter-editor-dialog.c:209 +#: ../gthumb/gth-filter.c:43 ../gthumb/gth-filter-editor-dialog.c:178 #: ../gthumb/gth-test-simple.c:75 msgid "kB" msgstr "kB" -#: ../gthumb/gth-filter.c:44 ../gthumb/gth-filter-editor-dialog.c:210 +#: ../gthumb/gth-filter.c:44 ../gthumb/gth-filter-editor-dialog.c:179 #: ../gthumb/gth-test-simple.c:76 msgid "MB" msgstr "MB" -#: ../gthumb/gth-filter.c:45 ../gthumb/gth-filter-editor-dialog.c:211 +#: ../gthumb/gth-filter.c:45 ../gthumb/gth-filter-editor-dialog.c:180 #: ../gthumb/gth-test-simple.c:77 msgid "GB" msgstr "GB" #. "files" label -#: ../gthumb/gth-filter.c:279 ../gthumb/gth-filter-editor-dialog.c:208 +#: ../gthumb/gth-filter.c:286 ../gthumb/gth-filter-editor-dialog.c:177 msgid "files" msgstr "fájl" -#: ../gthumb/gth-filter-editor-dialog.c:255 +#: ../gthumb/gth-filter-editor-dialog.c:224 msgid "ascending" msgstr "növekvő" -#: ../gthumb/gth-filter-editor-dialog.c:256 +#: ../gthumb/gth-filter-editor-dialog.c:225 msgid "descending" msgstr "csökkenő" -#: ../gthumb/gth-filter-editor-dialog.c:546 +#: ../gthumb/gth-filter-editor-dialog.c:515 #, c-format msgid "No limit specified" msgstr "Nincs korlát meghatározva" -#: ../gthumb/gth-folder-tree.c:848 -msgid "Loading..." -msgstr "Betöltés…" - -#: ../gthumb/gth-folder-tree.c:1119 +#: ../gthumb/gth-folder-tree.c:1369 msgid "(Open Parent)" msgstr "(Szülő megnyitása)" -#: ../gthumb/gth-image-loader.c:222 ../gthumb/gth-image-loader.c:294 -msgid "No suitable loader available for this file type" -msgstr "Nem érhető el megfelelő betöltő ehhez a fájltípushoz" +#: ../gthumb/gth-histogram-view.c:825 +msgid "Linear scale" +msgstr "Lineáris méretezés" + +#: ../gthumb/gth-histogram-view.c:837 +msgid "Logarithmic scale" +msgstr "Logaritmikus méretezés" + +#: ../gthumb/gth-histogram-view.c:857 +msgid "Channel:" +msgstr "Csatorna:" + +#: ../gthumb/gth-histogram-view.c:878 +msgid "Value" +msgstr "Érték" + +#: ../gthumb/gth-histogram-view.c:883 +msgid "Red" +msgstr "Vörös" + +#: ../gthumb/gth-histogram-view.c:888 +msgid "Green" +msgstr "Zöld" + +#: ../gthumb/gth-histogram-view.c:893 +msgid "Blue" +msgstr "Kék" + +#: ../gthumb/gth-histogram-view.c:898 +msgid "Alpha" +msgstr "Alfa" + +#: ../gthumb/gth-histogram-view.c:904 +msgid "RGB" +msgstr "RGB" -#: ../gthumb/gth-main.c:222 -#, c-format -msgid "Unable to show '%s'" -msgstr "A(z) „%s” nem jeleníthető meg" +#: ../gthumb/gth-image-list-task.c:141 +msgid "Could not rename the file" +msgstr "Nem lehet átnevezni fájlt" + +#: ../gthumb/gth-image-saver.c:39 +msgid "No options available for this file type" +msgstr "Nincs elérhető beállítás ehhez a fájltípushoz" -#: ../gthumb/gth-main.c:242 +#: ../gthumb/gth-image-saver.c:185 #, c-format -msgid "Unable to open '%s'" -msgstr "A(z) „%s” nem nyitható meg" +msgid "Could not find a suitable module to save the image as \"%s\"" +msgstr "Nem található megfelelő modul a kép „%s”-ként való mentéséhez" + +#: ../gthumb/gth-load-file-data-task.c:108 +msgid "Reading file information" +msgstr "Fájlinformációk olvasása" #: ../gthumb/gth-main-default-metadata.c:32 msgid "File" @@ -4329,7 +5248,7 @@ msgstr "Név" #: ../gthumb/gth-main-default-metadata.c:40 -#: ../gthumb/gth-main-default-tests.c:248 +#: ../gthumb/gth-main-default-tests.c:284 msgid "Size" msgstr "Méret" @@ -4341,26 +5260,10 @@ msgid "Full Name" msgstr "Teljes név" -#: ../gthumb/gth-main-default-metadata.c:46 -msgid "Title" -msgstr "Cím" - #: ../gthumb/gth-main-default-metadata.c:48 msgid "Duration" msgstr "Időtartam" -#: ../gthumb/gth-main-default-metadata.c:49 -msgid "Format" -msgstr "Formátum" - -#: ../gthumb/gth-main-default-metadata.c:51 -msgid "Date" -msgstr "Dátum" - -#: ../gthumb/gth-main-default-metadata.c:54 -msgid "Rating" -msgstr "Értékelés" - #: ../gthumb/gth-main-default-sort-types.c:131 msgid "file name" msgstr "fájlnév" @@ -4385,96 +5288,99 @@ msgid "dimensions" msgstr "méretek" -#: ../gthumb/gth-main-default-tests.c:204 -msgid "Images" -msgstr "Képek" +#: ../gthumb/gth-main-default-tests.c:233 +msgid "All Files" +msgstr "Minden fájl" -#: ../gthumb/gth-main-default-tests.c:225 +#: ../gthumb/gth-main-default-tests.c:261 msgid "Media" msgstr "Média" -#: ../gthumb/gth-main-default-tests.c:232 +#: ../gthumb/gth-main-default-tests.c:268 msgid "Text Files" msgstr "Szövegfájlok" -#: ../gthumb/gth-main-default-tests.c:240 +#: ../gthumb/gth-main-default-tests.c:276 msgid "Filename" msgstr "Fájlnév" -#: ../gthumb/gth-main-default-tests.c:272 +#: ../gthumb/gth-main-default-tests.c:308 msgid "Title (embedded)" msgstr "Cím (beágyazott)" -#: ../gthumb/gth-main-default-tests.c:278 +#: ../gthumb/gth-main-default-tests.c:316 msgid "Description (embedded)" msgstr "Leírás (beágyazott)" -#: ../gthumb/gth-pixbuf-list-task.c:139 -msgid "Could not rename the file" -msgstr "Nem lehet átnevezni fájlt" - -#: ../gthumb/gth-pixbuf-saver.c:34 -msgid "No options available for this file type" -msgstr "Nincs elérhető beállítás ehhez a fájltípushoz" - -#: ../gthumb/gth-progress-dialog.c:140 +#: ../gthumb/gth-progress-dialog.c:146 msgid "Cancel operation" msgstr "Művelet megszakítása" -#: ../gthumb/gth-tags-entry.c:373 +#: ../gthumb/gth-save-file-data-task.c:102 +msgid "Saving file information" +msgstr "Fájlinformációk mentése" + +#. Translators: %s is a filename +#: ../gthumb/gth-save-image-task.c:160 +#, c-format +#| msgid "Starting %s" +msgid "Saving '%s'" +msgstr "„%s” mentése" + +#: ../gthumb/gth-tags-entry.c:390 #, c-format msgid "Create tag «%s»" msgstr "„%s” címke létrehozása" -#: ../gthumb/gth-tags-entry.c:719 +#: ../gthumb/gth-tags-entry.c:814 msgid "Show all the tags" msgstr "Minden címke megjelenítése" -#: ../gthumb/gth-tags-file.c:234 +#: ../gthumb/gth-tags-file.c:235 msgid "Holidays" msgstr "Szabadság" -#: ../gthumb/gth-tags-file.c:235 +#: ../gthumb/gth-tags-file.c:236 msgid "Temporary" msgstr "Átmeneti" -#: ../gthumb/gth-tags-file.c:236 +#: ../gthumb/gth-tags-file.c:237 msgid "Screenshots" msgstr "Képernyőképek" -#: ../gthumb/gth-tags-file.c:237 +#: ../gthumb/gth-tags-file.c:238 msgid "Science" msgstr "Tudomány" -#: ../gthumb/gth-tags-file.c:238 +#: ../gthumb/gth-tags-file.c:239 msgid "Favorite" msgstr "Kedvenc" -#: ../gthumb/gth-tags-file.c:239 +#: ../gthumb/gth-tags-file.c:240 msgid "Important" msgstr "Fontos" -#: ../gthumb/gth-tags-file.c:240 +#: ../gthumb/gth-tags-file.c:241 msgid "GNOME" msgstr "GNOME" -#: ../gthumb/gth-tags-file.c:241 +#: ../gthumb/gth-tags-file.c:242 msgid "Games" msgstr "Játékok" -#: ../gthumb/gth-tags-file.c:242 +#: ../gthumb/gth-tags-file.c:243 msgid "Party" msgstr "Buli" -#: ../gthumb/gth-tags-file.c:243 +#: ../gthumb/gth-tags-file.c:244 msgid "Birthday" msgstr "Születésnap" -#: ../gthumb/gth-tags-file.c:244 +#: ../gthumb/gth-tags-file.c:245 msgid "Astronomy" msgstr "Csillagászat" -#: ../gthumb/gth-tags-file.c:245 +#: ../gthumb/gth-tags-file.c:246 msgid "Family" msgstr "Család" @@ -4483,23 +5389,27 @@ msgid "is" msgstr "=" -#: ../gthumb/gth-test-category.c:47 ../gthumb/gth-test-simple.c:50 +#: ../gthumb/gth-test-category.c:47 +msgid "is only" +msgstr "csak" + +#: ../gthumb/gth-test-category.c:48 ../gthumb/gth-test-simple.c:50 #: ../gthumb/gth-test-simple.c:65 msgid "is not" msgstr "nem" -#: ../gthumb/gth-test-category.c:361 ../gthumb/gth-test-simple.c:796 -#: ../gthumb/gth-test-simple.c:822 ../gthumb/gth-test-simple.c:843 -#: ../gthumb/gth-test-simple.c:869 +#: ../gthumb/gth-test-category.c:407 ../gthumb/gth-test-simple.c:812 +#: ../gthumb/gth-test-simple.c:838 ../gthumb/gth-test-simple.c:859 +#: ../gthumb/gth-test-simple.c:885 #, c-format msgid "The test definition is incomplete" msgstr "A teszt meghatározása nem teljes" -#: ../gthumb/gth-test-selector.c:278 +#: ../gthumb/gth-test-selector.c:252 msgid "Add a new rule" msgstr "Új szabály hozzáadása" -#: ../gthumb/gth-test-selector.c:289 +#: ../gthumb/gth-test-selector.c:263 msgid "Remove this rule" msgstr "Szabály eltávolítása" @@ -4543,11 +5453,11 @@ msgid "is after" msgstr "ez után" -#: ../gthumb/gth-time-selector.c:471 +#: ../gthumb/gth-time-selector.c:478 msgid "Today" msgstr "Ma" -#: ../gthumb/gth-time-selector.c:479 +#: ../gthumb/gth-time-selector.c:486 msgid "Now" msgstr "Most" @@ -4555,41 +5465,258 @@ msgid "Close this window" msgstr "A jelenlegi ablak bezárása" -#: ../gthumb/gtk-utils.c:800 +#: ../gthumb/gth-window-actions-entries.h:36 +msgid "Close _All Windows" +msgstr "Min_den ablak bezárása" + +#: ../gthumb/gtk-utils.c:490 msgid "Could not display help" msgstr "Nem jeleníthető meg a súgó" -#: ../gthumb/gtk-utils.c:1087 ../gthumb/gtk-utils.c:1095 +#: ../gthumb/gtk-utils.c:810 ../gthumb/gtk-utils.c:817 msgid "Could not launch the application" msgstr "Nem indítható el az alkalmazás" -#: ../gthumb/main.c:67 +#: ../gthumb/gtk-utils.c:920 +msgid "_Copy Here" +msgstr "_Másolás ide" + +#: ../gthumb/gtk-utils.c:925 +msgid "_Move Here" +msgstr "Á_thelyezés ide" + +#: ../gthumb/gtk-utils.c:930 +msgid "_Link Here" +msgstr "_Linkelés ide" + +#: ../gthumb/gtk-utils.c:939 +msgid "Cancel" +msgstr "Mégse" + +#: ../gthumb/main.c:61 msgid "Open a new window" msgstr "Új ablak megnyitása" -#: ../gthumb/main.c:71 +#: ../gthumb/main.c:65 msgid "Start in fullscreen mode" msgstr "Indítás teljes képernyős módban" -#: ../gthumb/main.c:75 +#: ../gthumb/main.c:69 msgid "Automatically start a slideshow" msgstr "Diavetítés automatikus indítása" -#: ../gthumb/main.c:79 +#: ../gthumb/main.c:73 msgid "Automatically import digital camera photos" msgstr "Fényképek automatikus importálása a digitális fényképezőgépből" -#: ../gthumb/main.c:83 +#: ../gthumb/main.c:77 msgid "Show version" msgstr "Verzió megjelenítése" -#. command line options -#: ../gthumb/main.c:413 +#: ../gthumb/main.c:483 msgid "- Image browser and viewer" msgstr "– Képböngésző és -megjelenítő" -#: ../gthumb/pixbuf-io.c:174 -#, c-format -msgid "Could not find a suitable module to save the image as \"%s\"" -msgstr "Nem található megfelelő modul a kép „%s”-ként való mentéséhez" +#~ msgid "Exif DateTimeOriginal tag" +#~ msgstr "Exif DateTimeOriginal címke" + +#~ msgid "_Resize to:" +#~ msgstr "Á_tméretezés erre:" + +#~ msgid "×" +#~ msgstr "×" + +#~ msgid "Desaturate" +#~ msgstr "Telítetlenné tétel" + +#~ msgid "White balance correction" +#~ msgstr "Fehéregyensúly-korrekció" + +#~ msgid "Enhance Colors" +#~ msgstr "Színek fokozása" + +#~ msgid "Automatic white balance correction" +#~ msgstr "Automatikus fehéregyensúly-korrekció" + +#~ msgid "_E-Mail:" +#~ msgstr "_E-mail:" + +#~ msgid "" +#~ "Type the characters you see in the picture below. Letters are not case-" +#~ "sensitive." +#~ msgstr "" +#~ "Gépelje be a kép alatt látható karaktereket. A betűk nem kis- és nagybetű-" +#~ "érzékenyek." + +#~ msgid "_Password:" +#~ msgstr "_Jelszó:" + +#~ msgid "Picasa Web Album" +#~ msgstr "Picasa Webalbum" + +#~ msgid "Account" +#~ msgstr "Fiók" + +#~ msgid "Could not load the file" +#~ msgstr "Nem lehet betölteni a fájlt" + +#~ msgid "Save images" +#~ msgstr "Képek mentése" + +#~ msgid "Save images in common file formats such as JPEG, PNG and TIFF" +#~ msgstr "Képek mentése gyakori fájlformátumokba, mint a JPEG, PNG és TIFF" + +#~ msgid "File _Format: %s" +#~ msgstr "_Fájlformátum: %s" + +#~ msgid "By Extension" +#~ msgstr "Kiterjesztés szerint" + +#~ msgid "File Format" +#~ msgstr "Fájlformátum" + +#~ msgid "Extension(s)" +#~ msgstr "Kiterjesztések" + +#~ msgid "" +#~ "The program was not able to find out the file format you want to use for `" +#~ "%s'. Please make sure to use a known extension for that file or manually " +#~ "choose a file format from the list below." +#~ msgstr "" +#~ "A program nem tudta meghatározni a fájlformátumot, amelyet a(z) „%s” " +#~ "fájlhoz szeretett volna használni. Győződjön meg arról, hogy ismert " +#~ "kiterjesztést adott-e meg, vagy válasszon kézzel egy kiterjesztést a " +#~ "lenti listából." + +#~ msgid "File format not recognized" +#~ msgstr "A fájlformátum nem ismerhető fel" + +#~ msgid "" +#~ "Possible values are: actual_size, fit, keep_prev, fit_if_larger, " +#~ "fit_width_if_larger." +#~ msgstr "" +#~ "Lehetséges értékek: actual_size, fit, keep_prev, fit_if_larger, " +#~ "fit_width_if_larger." + +#~ msgid "Possible values are: light, midtone, dark." +#~ msgstr "Lehetséges értékek: light, midtone, dark." + +#~ msgid "Possible values are: list, thumbnails." +#~ msgstr "Lehetséges értékek: list, thumbnails." + +#~ msgid "Possible values are: small, medium, large." +#~ msgstr "Lehetséges értékek: small, medium, large." + +#~ msgid "" +#~ "Possible values are: system, text_below, text_beside, text_only, " +#~ "icons_only." +#~ msgstr "" +#~ "Lehetséges értékek: system, text_below, text_beside, text_only, " +#~ "icons_only." + +#~ msgid "Available _extensions:" +#~ msgstr "_Elérhető kiterjesztések:" + +#~ msgid "_Categories:" +#~ msgstr "_Kategóriák:" + +#~ msgid "gthumb Extensions" +#~ msgstr "gthumb kiterjesztések" + +#~ msgid "Activate items with a double click" +#~ msgstr "Elemek aktiválása dupla kattintással" + +#~ msgid "Activate items with a single click" +#~ msgstr "Elemek aktiválása egy kattintással" + +#~ msgid "Follow Nautilus behaviour" +#~ msgstr "A Nautilus viselkedésének átvétele" + +#~ msgid "Set image to actual size" +#~ msgstr "Kép megjelenítése a tényleges méretében" + +#~ msgid "Could not create the library" +#~ msgstr "Nem lehet létrehozni gyűjteményt" + +#~ msgid "Choose another tag" +#~ msgstr "Válasszon másik címkét" + +#~ msgid "New tag" +#~ msgstr "Új címke" + +#~ msgid "Could not create the folder" +#~ msgstr "Nem sikerült létrehozni a mappát" + +#~ msgid "×" +#~ msgstr "×" + +#~ msgid "Information" +#~ msgstr "Információk" + +#~ msgid "Desaturating image" +#~ msgstr "Kép telítetlenné tétele" + +#~ msgctxt "time" +#~ msgid "/" +#~ msgstr "/" + +#~ msgid "" +#~ "Possible values are: actual-size, keep-prev, fit-size, fit-size-if-" +#~ "larger, fit-width, fit-width-if-larger." +#~ msgstr "" +#~ "Lehetséges értékek: actual-size, keep-prev, fit-size, fit-size-if-larger, " +#~ "fit-width, fit-width-if-larger." + +#~ msgid "Possible values are: none, file_date, current_date" +#~ msgstr "Lehetséges értékek: none, file_date, current_date" + +#~ msgid "Possible values are: yyyymmdd, yyyymm, yyyy" +#~ msgstr "Lehetséges értékek: yyyymmdd, yyyymm, yyyy" + +#~ msgid "%B" +#~ msgstr "%B" + +#~ msgid "%F" +#~ msgstr "%F" + +#~ msgid "%U" +#~ msgstr "%U" + +#~ msgid "Possible values are: none, deflate, jpeg." +#~ msgstr "Lehetséges értékek: none, deflate, jpeg." + +#~ msgid "Possible values: 0 (none), 1 (lower), 2 (upper)" +#~ msgstr "Lehetséges értékek: 0 (nincs), 1 (kisbetű), 2 (nagybetű)" + +#~ msgid "Possible values: pixels, percentage" +#~ msgstr "Lehetséges értékek: pixels, percentage" + +#~ msgid "%I" +#~ msgstr "%I" + +#~ msgid "%i" +#~ msgstr "%i" + +#~ msgid "%p" +#~ msgstr "%p" + +#~ msgid "Use subfolders to organize files" +#~ msgstr "Almappák használata a fájlok kezeléséhez" + +#~ msgid "Use" +#~ msgstr "Használatban" + +#~ msgid "Extension" +#~ msgstr "Kiterjesztés" + +#~ msgid "Activate, deactivate and configure the gthumb extensions" +#~ msgstr "A gthumb kiterjesztések aktiválása, deaktiválása és konfigurálása" + +#~ msgid "gthumb" +#~ msgstr "gthumb" + +#~ msgid "Unable to show '%s'" +#~ msgstr "A(z) „%s” nem jeleníthető meg" +#~ msgid "Unable to open '%s'" +#~ msgstr "A(z) „%s” nem nyitható meg" diff -Nru gthumb-3.0.2/po/id.po gthumb-3.2.3/po/id.po --- gthumb-3.0.2/po/id.po 2012-08-14 16:25:43.000000000 +0000 +++ gthumb-3.2.3/po/id.po 2013-04-30 16:56:13.000000000 +0000 @@ -2,193 +2,199 @@ # Copyright (C) 2004 THE gthumb'S COPYRIGHT HOLDER # This file is distributed under the same license as the gthumb package. # Abdul Hamid.A.N , 2004. -# Andika Triwidada , 2010, 2011. +# Andika Triwidada , 2010, 2011, 2012. # msgid "" msgstr "" "Project-Id-Version: gthumb master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gthumb&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-09-26 15:47+0000\n" -"PO-Revision-Date: 2011-10-10 20:17+0700\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=gthumb&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-09-15 08:22+0000\n" +"PO-Revision-Date: 2012-09-17 12:49+0700\n" "Last-Translator: Andika Triwidada \n" "Language-Team: GNOME Indonesian Translation Team \n" +"Language: id_ID\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-Poedit-Language: Indonesian\n" -"X-Poedit-Country: Indonesia\n" +"X-Generator: Poedit 1.5.3\n" -#: ../copy-n-paste/eggdesktopfile.c:164 +#: ../copy-n-paste/eggdesktopfile.c:165 #, c-format msgid "File is not a valid .desktop file" msgstr "Ini bukan berkas .desktop yang valid" -#: ../copy-n-paste/eggdesktopfile.c:187 +#. translators: 'Version' is from a desktop file, and +#. * should not be translated. '%s' would probably be a +#. * version number. +#: ../copy-n-paste/eggdesktopfile.c:191 #, c-format msgid "Unrecognized desktop file Version '%s'" msgstr "Berkas desktop tak dikenal Versi '%s'" -#: ../copy-n-paste/eggdesktopfile.c:957 +#: ../copy-n-paste/eggdesktopfile.c:974 #, c-format msgid "Starting %s" msgstr "Memulai %s" -#: ../copy-n-paste/eggdesktopfile.c:1099 +#: ../copy-n-paste/eggdesktopfile.c:1116 #, c-format msgid "Application does not accept documents on command line" msgstr "Aplikasi tak menerima dokumen pada baris perintah" -#: ../copy-n-paste/eggdesktopfile.c:1167 +#: ../copy-n-paste/eggdesktopfile.c:1184 #, c-format msgid "Unrecognized launch option: %d" msgstr "Opsi peluncuran tak dikenal: %d" -#: ../copy-n-paste/eggdesktopfile.c:1372 +#. translators: The 'Type=Link' string is found in a +#. * desktop file, and should not be translated. +#: ../copy-n-paste/eggdesktopfile.c:1391 #, c-format msgid "Can't pass document URIs to a 'Type=Link' desktop entry" msgstr "Tak bisa melewatkan URI dokumen ke suatu entri desktop 'Type=Link'" -#: ../copy-n-paste/eggdesktopfile.c:1391 +#: ../copy-n-paste/eggdesktopfile.c:1412 #, c-format msgid "Not a launchable item" msgstr "Bukan item yang dapat diluncurkan" -#: ../copy-n-paste/eggsmclient.c:225 +#: ../copy-n-paste/eggsmclient.c:226 msgid "Disable connection to session manager" msgstr "Matikan sambungan ke manajer sesi" -#: ../copy-n-paste/eggsmclient.c:228 +#: ../copy-n-paste/eggsmclient.c:229 msgid "Specify file containing saved configuration" msgstr "Nyatakan berkas yang memuat konfigurasi tersimpan" -#: ../copy-n-paste/eggsmclient.c:228 +#: ../copy-n-paste/eggsmclient.c:229 msgid "FILE" msgstr "BERKAS" -#: ../copy-n-paste/eggsmclient.c:231 +#: ../copy-n-paste/eggsmclient.c:232 msgid "Specify session management ID" msgstr "Nyatakan ID manajemen sesi" -#: ../copy-n-paste/eggsmclient.c:231 +#: ../copy-n-paste/eggsmclient.c:232 msgid "ID" msgstr "ID" -#: ../copy-n-paste/eggsmclient.c:252 +#: ../copy-n-paste/eggsmclient.c:253 msgid "Session management options:" msgstr "Opsi manajemen sesi:" -#: ../copy-n-paste/eggsmclient.c:253 +#: ../copy-n-paste/eggsmclient.c:254 msgid "Show session management options" msgstr "Tampilkan opsi manajemen sesi" -#: ../data/gthumb.desktop.in.in.h:1 -msgid "Image Viewer" -msgstr "Penampil Gambar" - -#: ../data/gthumb.desktop.in.in.h:2 -msgid "View and organize your images" -msgstr "Tampilkan dan atur gambar-gambar Anda" - #. manually set name and icon -#: ../data/gthumb.desktop.in.in.h:3 -#: ../data/gthumb-import.desktop.in.in.h:3 -#: ../gthumb/gth-browser.c:523 -#: ../gthumb/gth-main.c:229 -#: ../gthumb/gth-progress-dialog.c:443 +#: ../data/gthumb.desktop.in.in.h:1 ../gthumb/gth-browser.c:532 +#: ../gthumb/gth-progress-dialog.c:388 ../gthumb/main.c:315 msgid "gThumb" msgstr "gThumb" -#: ../data/gthumb.desktop.in.in.h:4 +#: ../data/gthumb.desktop.in.in.h:2 +msgid "Image Viewer" +msgstr "Penampil Gambar" + +#: ../data/gthumb.desktop.in.in.h:3 msgid "gThumb Image Viewer" msgstr "gThumb Penampil Gambar" +#: ../data/gthumb.desktop.in.in.h:4 +msgid "View and organize your images" +msgstr "Tampilkan dan atur gambar-gambar Anda" + #: ../data/gthumb-import.desktop.in.in.h:1 -msgid "Import the photos on your camera card" -msgstr "Impor foto pada kartu kamera Anda" +msgid "Import with gThumb" +msgstr "Impor dengan gThumb" #: ../data/gthumb-import.desktop.in.in.h:2 msgid "Photo Import Tool" msgstr "Alat Impor Foto" -#: ../data/gthumb-import.desktop.in.in.h:4 +#: ../data/gthumb-import.desktop.in.in.h:3 msgid "gThumb Photo Import Tool" msgstr "Alat Impor Foto gThumb" -#: ../data/gthumb.schemas.in.h:1 -msgid "Images over this size (in bytes) will not be thumbnailed. Use 0 if you want to generate thumbnails for all images." -msgstr "Gambar melebihi ukuran ini (dalam byte) tidak akan disketsakan. Gunakan 0 jika anda ingin menghasilkan sketsa untuk seluruh gambar" - -#: ../data/gthumb.schemas.in.h:2 -msgid "Possible values are: actual_size, fit, keep_prev, fit_if_larger, fit_width_if_larger." -msgstr "Nilai yang mungkin: actual_size (ukuran sebenarnya), fit (pas), keep_prev (pertahankan sebelumnya), fit_if_larger (paskan bila lebih besar), fit_width_if_larger (paskan lebar bila lebih besar)." - -#: ../data/gthumb.schemas.in.h:3 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:2 -msgid "Possible values are: high, low." -msgstr "Nilai yang mungkin adalah: high (tinggi), low (rendah)." - -#: ../data/gthumb.schemas.in.h:4 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:3 -msgid "Possible values are: light, midtone, dark." -msgstr "Nilai yang mungkin: light (terang), midtone, dark (gelap)." - -#: ../data/gthumb.schemas.in.h:5 -msgid "Possible values are: list, thumbnails." -msgstr "Nilai yang mungkin: list (daftar), thumbnails (gambar mini)." - -#: ../data/gthumb.schemas.in.h:6 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:4 -msgid "Possible values are: small, medium, large." -msgstr "Nilai yang mungkin: small (kecil), medium (sedang), large (besar)." - -#: ../data/gthumb.schemas.in.h:7 -msgid "Possible values are: system, text_below, text_beside, text_only, icons_only." -msgstr "Nilai yang memungkinkan: system, text_below, text_beside, text_only, icons_only." +#: ../data/gthumb-import.desktop.in.in.h:4 +msgid "Import the photos on your camera card" +msgstr "Impor foto pada kartu kamera Anda" + +#: ../data/org.gnome.gthumb.gschema.xml.in.h:1 +msgid "" +"Images over this size (in bytes) will not be thumbnailed. Use 0 if you want " +"to generate thumbnails for all images." +msgstr "" +"Gambar melebihi ukuran ini (dalam byte) tidak akan disketsakan. Gunakan 0 " +"jika anda ingin menghasilkan sketsa untuk seluruh gambar" + +#: ../data/org.gnome.gthumb.gschema.xml.in.h:2 +msgid "Whether to resize the window to fit the size of the image" +msgstr "Apakah mengubah ukuran jendela agar pas dengan ukuran gambar" + +#: ../data/org.gnome.gthumb.gschema.xml.in.h:3 +#| msgid "Open another window" +msgid "Open files in the active window" +msgstr "Buka berkas dalam jendela aktif" -#: ../data/gthumb.schemas.in.h:8 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:5 +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:1 msgid "Possible values are: white, black, checked, none." msgstr "Nilai yang mungkin: white, black, checked, none." -#: ../data/gthumb.schemas.in.h:9 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:6 +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:2 +#| msgid "Whether to reset the scrollbar positions after changing image" +msgid "Whether to reset the scrollbars position after changing image" +msgstr "Apakah mereset posisi bilah penggulung setelah mengganti gambar" + +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:3 msgid "Whether to always use a black background." msgstr "Apakah selalu menggunakan latar belakang warna hitam" -#: ../data/gthumb.schemas.in.h:10 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:7 -msgid "Whether to reset the scrollbar positions after changing image" -msgstr "Apakah mereset posisi bilah penggulung setelah mengganti gambar" +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:1 +msgid "Possible values are: jpeg, jpg." +msgstr "Nilai yang mungkin: jpeg, jpg." + +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:2 +msgid "Possible values are: tiff, tif." +msgstr "Nilai yang mungkin: tiff, tif." + +#: ../data/org.gnome.gthumb.rename-series.gschema.xml.in.h:1 +msgid "" +"Possible values include: general::unsorted, file::name, file::size, file::" +"mtime, exif::photo::datetimeoriginal" +msgstr "" +"Nilai yang mungkin termasuk: general::unsorted, file::name, file::size, " +"file::mtime, exif::photo::datetimeoriginal" #: ../data/ui/extensions-preferences.ui.h:1 +msgid "_Extensions:" +msgstr "_Ekstensi:" + +#: ../data/ui/extensions-preferences.ui.h:2 msgid "More extensions..." msgstr "Lebih banyak ekstensi..." -#: ../data/ui/extensions-preferences.ui.h:2 +#: ../data/ui/extensions-preferences.ui.h:3 msgid "Some extensions are configurable." msgstr "Beberapa ekstensi dapat ditata." -#: ../data/ui/extensions-preferences.ui.h:3 -msgid "_Extensions:" -msgstr "_Ekstensi:" - #: ../data/ui/filter-editor.ui.h:1 msgid "Filter _Name:" msgstr "_Nama Tapis:" -#. limit label #: ../data/ui/filter-editor.ui.h:2 -#: ../gthumb/gth-filter.c:258 -#: ../gthumb/gth-filter.c:330 -msgid "_Limit to" -msgstr "_Batasi sampai" - -#: ../data/ui/filter-editor.ui.h:3 #: ../extensions/search/data/ui/search-editor.ui.h:3 msgid "_Match" msgstr "_Cocok" +#. limit label +#: ../data/ui/filter-editor.ui.h:3 ../gthumb/gth-filter.c:269 +#: ../gthumb/gth-filter.c:337 +msgid "_Limit to" +msgstr "_Batasi sampai" + #: ../data/ui/filter-editor.ui.h:4 msgid "selected by" msgstr "dipilih oleh" @@ -197,69 +203,73 @@ msgid "Mean:" msgstr "Rata-rata:" -#: ../data/ui/histogram-info.ui.h:2 +#. Short for "Standard deviation". Try to keep it under the 12 characters in the translation or it will be ellipsizied at the end. +#: ../data/ui/histogram-info.ui.h:3 +msgid "Std dev:" +msgstr "Dev std:" + +#: ../data/ui/histogram-info.ui.h:4 msgid "Median:" msgstr "Median:" +#. After the colon there is the total number of pixels +#: ../data/ui/histogram-info.ui.h:6 +msgid "Pixels:" +msgstr "Piksel:" + #. After the colon there is a percentile. -#: ../data/ui/histogram-info.ui.h:4 +#: ../data/ui/histogram-info.ui.h:8 msgctxt "Pixels" msgid "Max:" msgstr "Maks:" #. After the colon there is the percentile of selected pixels. -#: ../data/ui/histogram-info.ui.h:6 +#: ../data/ui/histogram-info.ui.h:10 msgctxt "Pixels" msgid "Selected:" msgstr "Dipilih:" -#. After the colon there is the total number of pixels -#: ../data/ui/histogram-info.ui.h:8 -msgid "Pixels:" -msgstr "Piksel:" - -#. Short for "Standard deviation". Try to keep it short in the translation. -#: ../data/ui/histogram-info.ui.h:10 -msgid "Std dev:" -msgstr "Dev std:" +#: ../data/ui/location.ui.h:1 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 +msgid "_Location:" +msgstr "_Lokasi:" #: ../data/ui/overwrite-dialog.ui.h:1 -msgid "Do not overwrite _the old file" -msgstr "Jangan _timpa berkas lama" +msgid "Overwrite the old file with the new one?" +msgstr "Timpa berkas lama dengan yang baru?" #: ../data/ui/overwrite-dialog.ui.h:2 +msgid "Old File:" +msgstr "Berkas Lama:" + +#: ../data/ui/overwrite-dialog.ui.h:3 msgid "Filename:" msgstr "Nama Berkas:" -#: ../data/ui/overwrite-dialog.ui.h:3 +#: ../data/ui/overwrite-dialog.ui.h:4 +#: ../extensions/image_print/data/ui/print-layout.ui.h:23 +msgid "Size:" +msgstr "Ukuran:" + +#: ../data/ui/overwrite-dialog.ui.h:5 msgid "Modified:" msgstr "Diubah:" -#: ../data/ui/overwrite-dialog.ui.h:4 +#: ../data/ui/overwrite-dialog.ui.h:6 msgid "New File:" msgstr "Berkas Baru:" -#: ../data/ui/overwrite-dialog.ui.h:5 -msgid "Old File:" -msgstr "Berkas Lama:" - -#: ../data/ui/overwrite-dialog.ui.h:6 +#: ../data/ui/overwrite-dialog.ui.h:7 msgid "Over_write the old file" msgstr "Timpa _ulang berkas lama" -#: ../data/ui/overwrite-dialog.ui.h:7 -msgid "Overwrite _all files" -msgstr "Timp_a semua berkas" - #: ../data/ui/overwrite-dialog.ui.h:8 -msgid "Overwrite the old file with the new one?" -msgstr "Timpa berkas lama dengan yang baru?" +msgid "Do not overwrite _the old file" +msgstr "Jangan _timpa berkas lama" #: ../data/ui/overwrite-dialog.ui.h:9 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:11 -#: ../extensions/image_print/data/ui/print-layout.ui.h:16 -msgid "Size:" -msgstr "Ukuran:" +msgid "Overwrite _all files" +msgstr "Timp_a semua berkas" #: ../data/ui/overwrite-dialog.ui.h:10 msgid "_Do not overwrite any file" @@ -282,198 +292,186 @@ msgstr "Tapis _lain:" #: ../data/ui/preferences.ui.h:1 -msgid "Activate items with a double click" -msgstr "Aktifkan item dengan klik ganda" +#| msgid "View the folders" +msgid "below the folder list" +msgstr "di bawah daftar folder" #: ../data/ui/preferences.ui.h:2 -msgid "Activate items with a single click" -msgstr "Aktifkan item dengan klik tunggal" +#| msgid "on the side" +msgid "on the right" +msgstr "di kanan" #: ../data/ui/preferences.ui.h:3 -msgid "Appearance" -msgstr "Penampilan" +#| msgid "gthumb Preferences" +msgid "gThumb Preferences" +msgstr "Preferensi gThumb" #: ../data/ui/preferences.ui.h:4 -msgid "As_k confirmation before deleting files or catalogs" -msgstr "_Konfirmasikan sebelum menghapus berkas atau katalog" +msgid "_Toolbar style:" +msgstr "Gaya bilah ala_t:" #: ../data/ui/preferences.ui.h:5 -msgid "Ask whether to save _modified files" -msgstr "Tanyakan apakah _menyimpan berkas yang diubah" +msgid "T_humbnails in viewer:" +msgstr "_Gambar miniatur dalam penilik:" #: ../data/ui/preferences.ui.h:6 -#: ../extensions/image_viewer/preferences.c:111 -msgid "Black" -msgstr "Hitam" +msgid "System settings" +msgstr "Tatanan sistem" #: ../data/ui/preferences.ui.h:7 -#: ../gthumb/dlg-preferences-extensions.c:72 -#: ../gthumb/gth-browser-actions-entries.h:150 -msgid "Browser" -msgstr "Peramban" +msgid "Text below icons" +msgstr "Teks di bawah ikon" #: ../data/ui/preferences.ui.h:8 -#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 -#: ../extensions/image_print/data/ui/print-layout.ui.h:4 -msgid "Caption" -msgstr "Judul" +msgid "Text beside icons" +msgstr "Teks di samping ikon" #: ../data/ui/preferences.ui.h:9 -#: ../extensions/image_viewer/preferences.c:112 -msgid "Checked" -msgstr "Diperiksa" +msgid "Icons only" +msgstr "Hanya ikon" #: ../data/ui/preferences.ui.h:10 -msgid "Choose startup folder" -msgstr "Pilih folder awal mula" +msgid "Text only" +msgstr "Hanya teks" #: ../data/ui/preferences.ui.h:11 -msgid "D_etermine image type from content (slower)" -msgstr "T_entukan jenis gambar dari isinya (lebih lambat)" +msgid "on the bottom" +msgstr "di dasar" #: ../data/ui/preferences.ui.h:12 -#: ../extensions/image_viewer/preferences.c:101 -msgid "Fit to width if larger" -msgstr "Paskan lebarnya jika lebih besar" +msgid "on the side" +msgstr "di sisi" #: ../data/ui/preferences.ui.h:13 -#: ../extensions/image_viewer/preferences.c:98 -msgid "Fit to window" -msgstr "Paskan ke jendela" +msgid "File _properties in browser:" +msgstr "_Properti berkas dalam peramban:" #: ../data/ui/preferences.ui.h:14 -#: ../extensions/image_viewer/preferences.c:99 -msgid "Fit to window if larger" -msgstr "Paskan ke jendela jika lebih besar" +msgid "Appearance" +msgstr "Penampilan" #: ../data/ui/preferences.ui.h:15 -msgid "Follow Nautilus behaviour" -msgstr "Ikuti kelakuan Nautilus" +msgid "Go to last _visited location" +msgstr "Pergi ke lokasi yang terakhir _dikunjungi" #: ../data/ui/preferences.ui.h:16 -#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:21 -#: ../extensions/edit_metadata/gth-edit-comment-page.c:393 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 -#: ../gthumb/gth-main-default-metadata.c:33 -msgid "General" -msgstr "Umum" +msgid "Go to this _folder:" +msgstr "Menuju _folder ini:" #: ../data/ui/preferences.ui.h:17 -msgid "Go to last _visited location" -msgstr "Pergi ke lokasi yang terakhir _dikunjungi" +msgid "Choose startup folder" +msgstr "Pilih folder awal mula" #: ../data/ui/preferences.ui.h:18 -msgid "Go to this _folder:" -msgstr "Menuju _folder ini:" +msgid "Set to C_urrent" +msgstr "Set ke _Kini" #: ../data/ui/preferences.ui.h:19 -#: ../gthumb/dlg-preferences.c:231 -msgid "Icons only" -msgstr "Hanya ikon" +#| msgid "Resize the window to the size of the image" +msgid "_Reuse the active window to open files" +msgstr "Pakai lagi jendela aktif untuk membuka be_rkas" #: ../data/ui/preferences.ui.h:20 -#: ../extensions/image_viewer/preferences.c:97 -msgid "Keep previous zoom" -msgstr "Pertahankan zum" +msgid "On startup:" +msgstr "Saat awal mula:" #: ../data/ui/preferences.ui.h:21 -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:7 -#: ../extensions/file_tools/gth-file-tool-crop.c:422 -#: ../extensions/file_tools/gth-file-tool-crop.c:448 -#: ../extensions/file_tools/gth-file-tool-resize.c:493 -#: ../extensions/file_tools/gth-file-tool-rotate.c:414 -#: ../extensions/image_viewer/preferences.c:110 -#: ../extensions/slideshow/main.c:277 -msgid "None" -msgstr "Tidak ada" +msgid "As_k confirmation before deleting files or catalogs" +msgstr "_Konfirmasikan sebelum menghapus berkas atau katalog" #: ../data/ui/preferences.ui.h:22 -msgid "On startup:" -msgstr "Saat awal mula:" +msgid "Ask whether to save _modified files" +msgstr "Tanyakan apakah _menyimpan berkas yang diubah" #: ../data/ui/preferences.ui.h:23 -#: ../extensions/exiv2_tools/gth-edit-exiv2-page.c:192 +msgid "_Store metadata inside files if possible" +msgstr "_Simpan metadata di dalam berkas bila memungkinkan" + +#: ../data/ui/preferences.ui.h:24 +#: ../extensions/exiv2_tools/gth-edit-iptc-page.c:198 #: ../extensions/gstreamer_tools/main.c:33 -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:17 msgid "Other" msgstr "Lainnya" -#: ../data/ui/preferences.ui.h:24 -msgid "Set image to actual size" -msgstr "Set gambar ke ukuran sebenarnya" - #: ../data/ui/preferences.ui.h:25 -msgid "Set to C_urrent" -msgstr "Set ke _Kini" +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 +#: ../extensions/edit_metadata/gth-edit-general-page.c:481 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 +#: ../gthumb/gth-main-default-metadata.c:33 +msgid "General" +msgstr "Umum" -#. Set widgets data. #: ../data/ui/preferences.ui.h:26 -#: ../gthumb/dlg-preferences.c:231 -msgid "System settings" -msgstr "Tatanan sistem" +#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 +#: ../extensions/image_print/data/ui/print-layout.ui.h:18 +msgid "Caption" +msgstr "Judul" #: ../data/ui/preferences.ui.h:27 -msgid "T_humbnails in viewer:" -msgstr "_Gambar miniatur dalam penilik:" +msgid "Thumbnail _size:" +msgstr "_Ukuran gambar miniatur:" #: ../data/ui/preferences.ui.h:28 -#: ../gthumb/dlg-preferences.c:231 -msgid "Text below icons" -msgstr "Teks di bawah ikon" +msgid "48" +msgstr "48" #: ../data/ui/preferences.ui.h:29 -#: ../gthumb/dlg-preferences.c:231 -msgid "Text beside icons" -msgstr "Teks di samping ikon" +msgid "64" +msgstr "64" #: ../data/ui/preferences.ui.h:30 -#: ../gthumb/dlg-preferences.c:231 -msgid "Text only" -msgstr "Hanya teks" +msgid "85" +msgstr "85" #: ../data/ui/preferences.ui.h:31 -msgid "Thumbnail _size:" -msgstr "_Ukuran gambar miniatur:" +msgid "95" +msgstr "95" #: ../data/ui/preferences.ui.h:32 -#: ../extensions/image_viewer/preferences.c:109 -msgid "White" -msgstr "Putih" +#| msgid "1:1" +msgid "112" +msgstr "112" #: ../data/ui/preferences.ui.h:33 -msgid "_Store metadata inside files if possible" -msgstr "_Simpan metadata di dalam berkas bila memungkinkan" +msgid "128" +msgstr "128" #: ../data/ui/preferences.ui.h:34 -msgid "_Toolbar style:" -msgstr "Gaya bilah ala_t:" +msgid "164" +msgstr "164" #: ../data/ui/preferences.ui.h:35 -msgid "gthumb Preferences" -msgstr "Preferensi gThumb" +msgid "200" +msgstr "200" #: ../data/ui/preferences.ui.h:36 -msgid "on the bottom" -msgstr "di dasar" +msgid "256" +msgstr "256" #: ../data/ui/preferences.ui.h:37 -msgid "on the side" -msgstr "di sisi" +msgid "D_etermine image type from content (slower)" +msgstr "T_entukan jenis gambar dari isinya (lebih lambat)" -#: ../data/ui/sort-order.ui.h:1 +#: ../data/ui/preferences.ui.h:38 ../gthumb/dlg-preferences-extensions.c:71 +#: ../gthumb/gth-browser-actions-entries.h:179 +msgid "Browser" +msgstr "Peramban" + +#: ../data/ui/sort-order.ui.h:1 msgid "Sort By" msgstr "Urut Berdasarkan" #: ../data/ui/sort-order.ui.h:2 -msgid "_Inverse order" -msgstr "Bal_ikkan urutan" - -#: ../data/ui/sort-order.ui.h:3 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:4 msgid "_Sort by:" msgstr "Urut berda_sarkan:" +#: ../data/ui/sort-order.ui.h:3 +msgid "_Inverse order" +msgstr "Bal_ikkan urutan" + #: ../extensions/23hq/23hq.extension.in.in.h:1 msgid "23" msgstr "23" @@ -482,23 +480,23 @@ msgid "Upload images to 23hq.com" msgstr "Unggah gambar ke 23hq.com" -#: ../extensions/23hq/callbacks.c:67 +#: ../extensions/23hq/callbacks.c:68 msgid "_23..." msgstr "_23..." -#: ../extensions/23hq/callbacks.c:68 +#: ../extensions/23hq/callbacks.c:69 msgid "Upload photos to 23" msgstr "Mengunggah foto ke 23" #: ../extensions/bookmarks/bookmarks.extension.in.in.h:1 -msgid "Add bookmarks support." -msgstr "Tambahkan dukungan penanda taut." - -#: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:1 msgid "Bookmarks" msgstr "Penanda taut" +#: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 +msgid "Add bookmarks support." +msgstr "Tambahkan dukungan penanda taut." + #: ../extensions/bookmarks/bookmarks.extension.in.in.h:3 #: ../extensions/burn_disc/burn_disc.extension.in.in.h:3 #: ../extensions/catalogs/catalogs.extension.in.in.h:3 @@ -518,12 +516,12 @@ #: ../extensions/image_viewer/image_viewer.extension.in.in.h:3 #: ../extensions/list_tools/list_tools.extension.in.in.h:3 #: ../extensions/photo_importer/photo_importer.extension.in.in.h:3 -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:3 #: ../extensions/raw_files/raw_files.extension.in.in.h:3 #: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:3 #: ../extensions/rename_series/rename_series.extension.in.in.h:3 #: ../extensions/resize_images/resize_images.extension.in.in.h:3 #: ../extensions/search/search.extension.in.in.h:3 +#: ../extensions/selections/selections.extension.in.in.h:3 #: ../extensions/slideshow/slideshow.extension.in.in.h:3 #: ../extensions/webalbums/webalbums.extension.in.in.h:3 msgid "gthumb development team" @@ -558,13 +556,13 @@ msgstr "_Penanda taut:" #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:3 -msgid "_Location" -msgstr "_Lokasi" - -#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:4 msgid "_Name" msgstr "_Nama" +#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:4 +msgid "_Location" +msgstr "_Lokasi" + #: ../extensions/bookmarks/dlg-bookmarks.c:70 msgid "Could not remove the bookmark" msgstr "Tak dapat menghapus penanda taut" @@ -598,54 +596,164 @@ msgstr "Folder kini dan _anaknya" #: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:3 -msgid "Source" -msgstr "Sumber" - -#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:4 msgid "_Selected files" msgstr "Berka_s yang dipilih" +#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:4 +msgid "Source" +msgstr "Sumber" + #: ../extensions/burn_disc/gth-burn-task.c:238 #: ../extensions/burn_disc/gth-burn-task.c:259 -#: ../extensions/burn_disc/gth-burn-task.c:393 +#: ../extensions/burn_disc/gth-burn-task.c:397 msgid "Write to Disc" msgstr "Tulis ke Cakram" -#: ../extensions/cairo_io/cairo-io-jpeg.c:62 +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:62 #, c-format msgid "Error interpreting JPEG image file: %s" msgstr "Galat menginterpretasi berkas citra JPEG (%s)" -#: ../extensions/cairo_io/cairo-io-jpeg.c:482 +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:483 #, c-format msgid "Unknown JPEG color space (%d)" msgstr "Ruang warna JPEG tak dikenal (%d)" -#: ../extensions/catalogs/actions.c:92 -#: ../extensions/catalogs/actions.c:213 +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:1 +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:1 +msgid "_Default extension:" +msgstr "Ekstensi _baku:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:2 +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:1 +msgid "_Quality:" +msgstr "_Kualitas:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:3 +msgid "_Smoothing:" +msgstr "Halu_skan:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:4 +msgid "Opti_mize" +msgstr "Opti_masi" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:5 +msgid "_Progressive" +msgstr "_Progresif" + +#: ../extensions/cairo_io/data/ui/png-options.ui.h:1 +msgid "Compression _level:" +msgstr "_level Kompresi" + +#: ../extensions/cairo_io/data/ui/save-options-preferences.ui.h:1 +msgid "Default options:" +msgstr "Opsi baku:" + +#: ../extensions/cairo_io/data/ui/tga-options.ui.h:1 +msgid "_RLE compression" +msgstr "kompresi _RLE" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:2 +msgid "Compression" +msgstr "Kompresi" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:3 +msgid "_No compression" +msgstr "_Tidak kompresi" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:4 +msgid "No_rmal (Deflate)" +msgstr "No_rmal (Menurun)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:5 +msgid "_Loss compression (JPEG)" +msgstr "Kompresi Hi_lang (JPEG)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:6 +msgid "Resolution" +msgstr "Resolusi" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:7 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 +msgid "_Horizontal:" +msgstr "_Horisontal:" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:8 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 +msgid "_Vertical:" +msgstr "_Vertikal:" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:9 +msgid "dpi" +msgstr "dpi" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:2 +msgid "_Method:" +msgstr "_Metoda:" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:3 +msgid "_Lossless" +msgstr "Nirhi_lang" + +#: ../extensions/cairo_io/gth-image-saver-jpeg.c:515 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:140 +msgid "JPEG" +msgstr "JPEG" + +#: ../extensions/cairo_io/gth-image-saver-png.c:352 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:110 +msgid "PNG" +msgstr "PNG" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:257 +#: ../extensions/cairo_io/gth-image-saver-tiff.c:435 +#: ../gthumb/gth-buffer-data.c:84 +msgid "Insufficient memory" +msgstr "Memori tidak cukup" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:343 +msgid "TGA" +msgstr "TGA" + +#: ../extensions/cairo_io/gth-image-saver-tiff.c:558 +msgid "TIFF" +msgstr "TIFF" + +#: ../extensions/cairo_io/gth-image-saver-webp.c:381 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:165 +msgid "WebP" +msgstr "WebP" + +#: ../extensions/cairo_io/preferences.c:134 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 +msgid "Saving" +msgstr "Menyimpan" + +#: ../extensions/catalogs/actions.c:92 ../extensions/catalogs/actions.c:213 #: ../extensions/catalogs/dlg-add-to-catalog.c:274 #: ../extensions/catalogs/dlg-add-to-catalog.c:394 -#: ../extensions/file_manager/actions.c:65 -#: ../extensions/list_tools/gth-script-editor-dialog.c:319 -#: ../gthumb/gth-filter-editor-dialog.c:491 +#: ../extensions/file_manager/actions.c:68 +#: ../extensions/list_tools/gth-script-editor-dialog.c:290 +#: ../gthumb/gth-filter-editor-dialog.c:461 #, c-format msgid "No name specified" msgstr "Nama tak dinyatakan" -#: ../extensions/catalogs/actions.c:99 -#: ../extensions/catalogs/actions.c:220 +#: ../extensions/catalogs/actions.c:99 ../extensions/catalogs/actions.c:220 #: ../extensions/catalogs/dlg-add-to-catalog.c:281 #: ../extensions/catalogs/dlg-add-to-catalog.c:401 -#: ../extensions/file_manager/actions.c:72 +#: ../extensions/file_manager/actions.c:75 #, c-format msgid "Invalid name. The following characters are not allowed: %s" msgstr "Nama tak valid. Karakter berikut tak diijinkan: %s" -#: ../extensions/catalogs/actions.c:155 -#: ../extensions/catalogs/actions.c:267 +#: ../extensions/catalogs/actions.c:155 ../extensions/catalogs/actions.c:267 #: ../extensions/catalogs/dlg-add-to-catalog.c:338 #: ../extensions/catalogs/dlg-add-to-catalog.c:448 -#: ../extensions/file_manager/actions.c:103 +#: ../extensions/catalogs/gth-file-source-catalogs.c:508 +#: ../extensions/file_manager/actions.c:106 msgid "Name already used" msgstr "Nama sudah dipakai" @@ -659,11 +767,10 @@ msgid "Enter the catalog name:" msgstr "Masukkan nama katalog: " -#: ../extensions/catalogs/actions.c:181 -#: ../extensions/catalogs/actions.c:293 +#: ../extensions/catalogs/actions.c:181 ../extensions/catalogs/actions.c:293 #: ../extensions/catalogs/dlg-add-to-catalog.c:362 #: ../extensions/catalogs/dlg-add-to-catalog.c:474 -#: ../extensions/file_manager/actions.c:133 +#: ../extensions/file_manager/actions.c:136 msgid "C_reate" msgstr "B_uat" @@ -681,7 +788,7 @@ msgid "Could not remove the catalog" msgstr "Tidak dapat menghapus katalog" -#: ../extensions/catalogs/actions.c:361 +#: ../extensions/catalogs/actions.c:363 #, c-format msgid "Are you sure you want to remove \"%s\"?" msgstr "Anda yakin ingin menghapus \"%s\"?" @@ -691,16 +798,17 @@ msgstr "T_ambah ke Katalog" #: ../extensions/catalogs/callbacks.c:105 +#: ../extensions/selections/callbacks.c:80 msgid "Open _Folder" msgstr "Buka _Folder" #: ../extensions/catalogs/callbacks.c:106 +#: ../extensions/selections/callbacks.c:81 msgid "Go to the folder that contains the selected file" msgstr "Pergi ke folder yang mengandung berkas terpilih" #: ../extensions/catalogs/callbacks.c:110 -#: ../extensions/edit_metadata/callbacks.c:116 -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:86 +#: ../extensions/picasaweb/picasa-account-properties-dialog.c:85 msgid "Other..." msgstr "Lainnya..." @@ -736,37 +844,36 @@ msgid "Rena_me" msgstr "Ganti na_ma" -#: ../extensions/catalogs/callbacks.c:279 -#: ../extensions/catalogs/callbacks.c:282 +#: ../extensions/catalogs/callbacks.c:281 +#: ../extensions/catalogs/callbacks.c:284 msgid "Command Line" msgstr "Baris Perintah" -#: ../extensions/catalogs/callbacks.c:497 -#: ../extensions/catalogs/callbacks.c:502 -#: ../extensions/photo_importer/dlg-photo-importer.c:359 -#: ../extensions/photo_importer/dlg-photo-importer.c:399 -#: ../gthumb/gth-file-list.c:45 -#: ../gthumb/gth-folder-tree.c:874 +#: ../extensions/catalogs/callbacks.c:496 +#: ../extensions/catalogs/callbacks.c:501 +#: ../extensions/photo_importer/dlg-photo-importer.c:364 +#: ../extensions/photo_importer/dlg-photo-importer.c:404 +#: ../gthumb/gth-file-list.c:43 ../gthumb/gth-folder-tree.c:883 msgid "(Empty)" msgstr "(Kosong)" -#: ../extensions/catalogs/callbacks.c:695 +#: ../extensions/catalogs/callbacks.c:700 msgid "Catalog Properties" msgstr "Properti Katalog" -#: ../extensions/catalogs/callbacks.c:709 +#: ../extensions/catalogs/callbacks.c:714 msgid "Organize" msgstr "Atur" -#: ../extensions/catalogs/callbacks.c:710 +#: ../extensions/catalogs/callbacks.c:715 msgid "Automatically organize files by date" msgstr "Otomatis atur berkas menurut tanggal" #: ../extensions/catalogs/catalogs.extension.in.in.h:1 -#: ../extensions/catalogs/gth-catalog.c:641 -#: ../extensions/catalogs/gth-catalog.c:690 -#: ../extensions/catalogs/gth-catalog.c:1047 -#: ../extensions/catalogs/gth-catalog.c:1048 +#: ../extensions/catalogs/gth-catalog.c:611 +#: ../extensions/catalogs/gth-catalog.c:662 +#: ../extensions/catalogs/gth-catalog.c:1016 +#: ../extensions/catalogs/gth-catalog.c:1017 msgid "Catalogs" msgstr "Katalog" @@ -783,114 +890,114 @@ msgstr "K_atalog:" #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:3 -msgid "New _Library" -msgstr "_Pustaka Baru" - -#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:4 msgid "_New Catalog" msgstr "Ka_talog Baru" +#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:4 +msgid "New _Library" +msgstr "_Pustaka Baru" + #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:5 -#: ../extensions/file_manager/actions.c:922 -#: ../extensions/webalbums/gth-web-exporter.c:1852 +#: ../extensions/file_manager/actions.c:945 +#: ../extensions/webalbums/gth-web-exporter.c:1840 msgid "_View the destination" msgstr "_Tilik tujuan" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:1 -msgid "Catalog" -msgstr "Katalog" - -#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 -#: ../gthumb/gth-file-properties.c:201 +#: ../gthumb/gth-file-properties.c:209 msgid "Properties" msgstr "Tag (tertanam)" +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:1 +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:1 +msgid "_Name:" +msgstr "_Nama:" + #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:4 -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:3 +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:2 msgid "_Date:" msgstr "Tan_ggal:" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:5 -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:20 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:36 -#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 -msgid "_Name:" -msgstr "_Nama:" +msgid "Catalog" +msgstr "Katalog" #: ../extensions/catalogs/data/ui/organize-files-task.ui.h:1 -msgid "Catalog _Preview:" -msgstr "_Pratilik Katalog:" - -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:2 -msgid "Organization:" -msgstr "Organisasi:" - -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 -#: ../extensions/catalogs/data/ui/organize-files.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 msgid "Organize Files" msgstr "Atur Berkas" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:2 msgid "Organizing files" msgstr "Mengatur berkas" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 +msgid "Organization:" +msgstr "Organisasi:" + +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:4 msgid "Select All" msgstr "Pilih Semua" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 msgid "Select None" msgstr "Tiada Pilihan" +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 +msgid "Catalog _Preview:" +msgstr "_Pratilik Katalog:" + #: ../extensions/catalogs/data/ui/organize-files.ui.h:1 -#: ../extensions/edit_metadata/gth-edit-comment-page.c:470 -#: ../gthumb/gth-main-default-tests.c:264 +#: ../extensions/edit_metadata/gth-edit-general-page.c:558 +#: ../gthumb/gth-main-default-tests.c:300 msgid "Date photo was taken" msgstr "Tanggal pengambilan foto" #: ../extensions/catalogs/data/ui/organize-files.ui.h:2 -#: ../gthumb/gth-main-default-tests.c:256 +#: ../gthumb/gth-main-default-tests.c:292 msgid "File modified date" msgstr "Tanggal berkas diubah" #: ../extensions/catalogs/data/ui/organize-files.ui.h:3 -msgid "Ignore catalogs with a single file" -msgstr "Abaikan katalog dengan berkas tunggal" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:5 -msgid "Put single files in the catalog:" -msgstr "Letakkan berkas tunggal dalam katalog:" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 -msgid "Singles" -msgstr "Tunggal" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:7 -#: ../extensions/comments/main.c:261 +#: ../extensions/comments/main.c:159 msgid "Tag" msgstr "Tag" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:8 -#: ../gthumb/gth-main-default-tests.c:284 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:4 +msgid "tag" +msgstr "tag" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:5 +#: ../gthumb/gth-main-default-tests.c:324 msgid "Tag (embedded)" msgstr "Tag (tertanam)" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:9 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:7 msgid "_Group files by:" msgstr "_Kelompokkan berkas menurut:" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:10 -#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:8 +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 #: ../extensions/search/data/ui/search-editor.ui.h:2 msgid "_Include sub-folders" msgstr "_Sertakan sub folder" +#: ../extensions/catalogs/data/ui/organize-files.ui.h:9 +msgid "Ignore catalogs with a single file" +msgstr "Abaikan katalog dengan berkas tunggal" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:10 +msgid "Put single files in the catalog:" +msgstr "Letakkan berkas tunggal dalam katalog:" + #: ../extensions/catalogs/data/ui/organize-files.ui.h:11 -msgid "tag" -msgstr "tag" +msgid "Singles" +msgstr "Tunggal" #: ../extensions/catalogs/dlg-add-to-catalog.c:105 #: ../extensions/catalogs/dlg-add-to-catalog.c:136 @@ -898,7 +1005,7 @@ msgstr "Tak dapat menambahkan berkas ke katalog" #: ../extensions/catalogs/dlg-add-to-catalog.c:217 -#: ../extensions/search/gth-search-task.c:352 +#: ../extensions/search/gth-search-task.c:356 msgid "Could not create the catalog" msgstr "Tidak dapat membuat katalog" @@ -906,61 +1013,63 @@ msgid "Could not save the catalog" msgstr "Tak dapat menyimpan katalog" -#: ../extensions/catalogs/dlg-catalog-properties.c:166 +#: ../extensions/catalogs/dlg-catalog-properties.c:159 msgid "Could not load the catalog" msgstr "Tak dapat memuat katalog" #: ../extensions/catalogs/dlg-organize-files.c:120 msgid "Files will be organized in catalogs. No file will be moved on disk." -msgstr "Berkas akan diorganisasi dalam katalog. Tak ada berkas yang dipindahkan di disk." +msgstr "" +"Berkas akan diorganisasi dalam katalog. Tak ada berkas yang dipindahkan di " +"disk." -#: ../extensions/catalogs/gth-catalog.c:1145 -#: ../extensions/comments/main.c:43 +#: ../extensions/catalogs/gth-catalog.c:1114 ../extensions/comments/main.c:44 +#: ../extensions/edit_metadata/callbacks.c:106 #: ../gthumb/gth-main-default-metadata.c:53 msgid "Tags" msgstr "Tag" -#: ../extensions/catalogs/gth-file-source-catalogs.c:848 +#: ../extensions/catalogs/gth-file-source-catalogs.c:953 #, c-format msgid "The catalog '%s' already exists, do you want to overwrite it?" msgstr "Katalog '%s' sudah ada, apakah Anda ingin menimpanya?" -#: ../extensions/catalogs/gth-file-source-catalogs.c:850 +#: ../extensions/catalogs/gth-file-source-catalogs.c:955 #, c-format msgid "The library '%s' already exists, do you want to overwrite it?" msgstr "Pustaka '%s' sudah ada, apakah Anda ingin menimpanya?" -#: ../extensions/catalogs/gth-file-source-catalogs.c:858 +#: ../extensions/catalogs/gth-file-source-catalogs.c:963 msgid "Over_write" msgstr "Ti_mpa" -#: ../extensions/catalogs/gth-file-source-catalogs.c:976 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1081 msgid "Cannot move the files" msgstr "Tak bisa memindah berkas" -#: ../extensions/catalogs/gth-file-source-catalogs.c:978 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1083 msgid "Cannot copy the files" msgstr "Tak bisa menyalin berkas" -#: ../extensions/catalogs/gth-file-source-catalogs.c:983 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1088 msgid "Invalid destination." msgstr "Tujuan tak valid." -#: ../extensions/catalogs/gth-file-source-catalogs.c:1030 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1135 #, c-format msgid "Copying files to '%s'" msgstr "Menyalin berkas ke '%s'" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1283 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1322 msgid "Could not remove the files from the catalog" msgstr "Tidak dapat menghapus berkas dari katalog" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1341 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:674 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:683 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:711 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:1214 -#: ../extensions/search/gth-search.c:295 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1380 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:733 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:742 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:771 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:1304 +#: ../extensions/search/gth-search.c:265 msgid "Invalid file format" msgstr "Format berkas tak valid" @@ -985,11 +1094,6 @@ msgid "Change the files date" msgstr "Ubah tanggal berkas" -#: ../extensions/change_date/data/gthumb_change_date.schemas.in.h:1 -#: ../extensions/resize_images/data/gthumb_resize_images.schemas.in.h:1 -msgid "Possible values: pixels, percentage" -msgstr "Nilai yang mungkin: pixels, percentage" - #: ../extensions/change_date/data/ui/change-date.ui.h:1 msgid "+" msgstr "+" @@ -999,72 +1103,77 @@ msgstr "-" #: ../extensions/change_date/data/ui/change-date.ui.h:3 -msgid "A_djust by" -msgstr "" - -#: ../extensions/change_date/data/ui/change-date.ui.h:4 msgid "Change Date" msgstr "Ubah Tanggal" -#: ../extensions/change_date/data/ui/change-date.ui.h:5 +#: ../extensions/change_date/data/ui/change-date.ui.h:4 msgid "Change the following values:" msgstr "Ubah nilai berikut:" -#: ../extensions/change_date/data/ui/change-date.ui.h:6 -msgid "Change to:" -msgstr "Ubah ke:" +#: ../extensions/change_date/data/ui/change-date.ui.h:5 +msgid "_Last modified date" +msgstr "Tangga_l pengubahan terakhir" -#: ../extensions/change_date/data/ui/change-date.ui.h:7 +#: ../extensions/change_date/data/ui/change-date.ui.h:6 msgid "Co_mment date" msgstr "Tanggal ko_mentar" +#: ../extensions/change_date/data/ui/change-date.ui.h:7 +msgid "Change to:" +msgstr "Ubah ke:" + #: ../extensions/change_date/data/ui/change-date.ui.h:8 -msgid "Date p_hoto was taken" -msgstr "Tanggal _foto diambil" +msgid "The _following date:" +msgstr "tanggal _berikut:" #: ../extensions/change_date/data/ui/change-date.ui.h:9 -msgid "Exif DateTimeOriginal tag" -msgstr "Tag DateTimeOriginal Exif" - -#: ../extensions/change_date/data/ui/change-date.ui.h:10 msgid "File _modified date" msgstr "T_anggal berkas diubah" -#: ../extensions/change_date/data/ui/change-date.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:10 msgid "File c_reation date" msgstr "Tanggal _pembuatan" +#: ../extensions/change_date/data/ui/change-date.ui.h:11 +msgid "Date p_hoto was taken" +msgstr "Tanggal _foto diambil" + #: ../extensions/change_date/data/ui/change-date.ui.h:12 -msgid "The _following date:" -msgstr "tanggal _berikut:" +msgid "A_djust by" +msgstr "_Setel sebanyak" #: ../extensions/change_date/data/ui/change-date.ui.h:13 -msgid "_Last modified date" -msgstr "Tangga_l pengubahan terakhir" - -#: ../extensions/change_date/data/ui/change-date.ui.h:14 msgid "hours" msgstr "jam" -#: ../extensions/change_date/data/ui/change-date.ui.h:15 +#: ../extensions/change_date/data/ui/change-date.ui.h:14 msgid "minutes" msgstr "menit" -#: ../extensions/change_date/data/ui/change-date.ui.h:16 -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:15 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:6 msgid "seconds" msgstr "detik" -#: ../extensions/comments/comments.extension.in.in.h:1 -msgid "Add comments and tags to any file type." -msgstr "Tambahkan komentar dan tag ke sebarang jenis berkas" +#: ../extensions/comments/callbacks.c:46 +msgid "Import Embedded Metadata" +msgstr "Impor Metadata Tertanam" -#: ../extensions/comments/comments.extension.in.in.h:2 +#: ../extensions/comments/callbacks.c:47 +msgid "Import the metadata stored inside files into the gThumb comment system" +msgstr "" +"Impor metadata yang tersimpan di dalam berkas ke dalam sistem komentar gThumb" + +#: ../extensions/comments/comments.extension.in.in.h:1 msgid "Comments and tags" msgstr "Komentar dan Tag" +#: ../extensions/comments/comments.extension.in.in.h:2 +msgid "Add comments and tags to any file type." +msgstr "Tambahkan komentar dan tag ke sebarang jenis berkas" + #: ../extensions/comments/data/ui/comments-preferences.ui.h:1 -#: ../extensions/importer/gth-import-preferences-dialog.c:314 +#: ../extensions/importer/gth-import-preferences-dialog.c:318 msgid "Preferences" msgstr "Preferensi" @@ -1072,354 +1181,318 @@ msgid "_Synchronize with the embedded metadata" msgstr "_Selaraskan dengan metadata tertanam" -#: ../extensions/comments/main.c:33 -#: ../extensions/edit_metadata/callbacks.c:111 +#: ../extensions/comments/main.c:34 +#: ../extensions/edit_metadata/callbacks.c:100 msgid "Comment" msgstr "Komentar" -#: ../extensions/comments/main.c:39 -#: ../gthumb/gth-main-default-metadata.c:46 +#: ../extensions/comments/main.c:40 ../gthumb/gth-main-default-metadata.c:46 msgid "Title" msgstr "Judul" -#: ../extensions/comments/main.c:40 -#: ../extensions/comments/main.c:245 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 +#: ../extensions/comments/main.c:41 ../extensions/comments/main.c:143 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 #: ../extensions/image_print/data/ui/print-layout.ui.h:8 -#: ../extensions/importer/data/ui/import-preferences.ui.h:1 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:24 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:13 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 +#: ../extensions/importer/data/ui/import-preferences.ui.h:6 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 #: ../gthumb/gth-main-default-metadata.c:52 msgid "Description" msgstr "Deskripsi" -#: ../extensions/comments/main.c:41 -#: ../extensions/comments/main.c:253 +#: ../extensions/comments/main.c:42 ../extensions/comments/main.c:151 #: ../gthumb/gth-main-default-metadata.c:50 msgid "Place" msgstr "Tempat" -#: ../extensions/comments/main.c:42 -#: ../gthumb/gth-main-default-metadata.c:51 +#: ../extensions/comments/main.c:43 ../gthumb/gth-main-default-metadata.c:51 msgid "Date" msgstr "Tanggal" -#: ../extensions/comments/main.c:44 -#: ../gthumb/gth-main-default-metadata.c:54 +#: ../extensions/comments/main.c:45 ../gthumb/gth-main-default-metadata.c:54 msgid "Rating" msgstr "Peringkat" #: ../extensions/contact_sheet/callbacks.c:59 msgid "Contact _Sheet" -msgstr "" +msgstr "Contact _Sheet" #: ../extensions/contact_sheet/callbacks.c:61 msgid "Contact _Sheet..." -msgstr "" +msgstr "Contact _Sheet…" #: ../extensions/contact_sheet/callbacks.c:62 msgid "Create a contact sheet" -msgstr "" +msgstr "Buat contact sheet" #: ../extensions/contact_sheet/callbacks.c:65 msgid "Image _Wall..." -msgstr "" +msgstr "_Dinding Citra…" #: ../extensions/contact_sheet/callbacks.c:66 msgid "Create an image-wall" -msgstr "" +msgstr "Buat dinding-citra" #: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:1 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:14 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:1 msgid "Contact Sheet" -msgstr "" +msgstr "Contact Sheet" #: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:2 msgid "Create an index image displaying the thumbnails of the selected files." -msgstr "Buat suatu indeks gambar yang menampilkan gambar miniatur dari berkas-berkas yang dipilih." +msgstr "" +"Buat suatu indeks gambar yang menampilkan gambar miniatur dari berkas-berkas " +"yang dipilih." #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:1 -msgid " " -msgstr " " +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:446 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 +#: ../extensions/file_tools/gth-file-tool-rotate.c:403 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:14 +#: ../extensions/slideshow/main.c:277 +msgid "None" +msgstr "Tidak ada" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:2 -msgid "Background" -msgstr "Latar belakang" +msgid "Simple" +msgstr "Sederhana" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:3 -msgid "C_olor:" -msgstr "_Warna:" +msgid "Simple with shadow" +msgstr "Sederhana dengan bayangan" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:4 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 -msgid "Caption:" -msgstr "" +msgid "Shadow only" +msgstr "Hanya bayangan" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:5 -msgid "Frame" -msgstr "Bingkai" +msgid "Slide" +msgstr "Slide" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:6 msgid "Inward Shadow" -msgstr "" +msgstr "Bayangan Ke Dalam" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:7 msgid "Outward Shadow" -msgstr "" +msgstr "Bayangan Ke Luar" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:9 -msgid "Select a color" -msgstr "Pilih sebuah warna" +msgid "Background" +msgstr "Latar belakang" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:10 -msgid "Select a font" -msgstr "Pilih fonta" +msgid "_Solid color" +msgstr "_Warna polos" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:11 -msgid "Shadow only" -msgstr "Hanya bayangan" - -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 -msgid "Simple" -msgstr "Sederhana" - -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 -msgid "Simple with shadow" -msgstr "Sederhana dengan bayangan" +msgid "_Gradient" +msgstr "_Gradien" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:14 -#, fuzzy -msgid "Slide" -msgstr "Slide" +msgid "Select a color" +msgstr "Pilih sebuah warna" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:15 -#: ../extensions/rename_series/dlg-rename-series.c:63 -msgid "Text" -msgstr "Teks" +msgid "Frame" +msgstr "Bingkai" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:16 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:37 -#: ../extensions/image_print/data/ui/print-layout.ui.h:26 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:47 -msgid "_Footer:" -msgstr "_Kaki:" +msgid "_Style:" +msgstr "_Gaya:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:17 -msgid "_Gradient" -msgstr "_Gradien" +msgid "C_olor:" +msgstr "_Warna:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:18 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:38 -#: ../extensions/image_print/data/ui/print-layout.ui.h:27 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:48 +#: ../extensions/rename_series/dlg-rename-series.c:57 +msgid "Text" +msgstr "Teks" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 +#: ../extensions/image_print/data/ui/print-layout.ui.h:3 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 msgid "_Header:" msgstr "_Header:" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 -msgid "_Horizontal:" -msgstr "_Horisontal:" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:20 +msgid "Select a font" +msgstr "Pilih fonta" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:21 -msgid "_Solid color" -msgstr "_Warna polos" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 +#: ../extensions/image_print/data/ui/print-layout.ui.h:4 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 +msgid "_Footer:" +msgstr "_Kaki:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:22 -msgid "_Style:" -msgstr "_Gaya:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 +msgid "Caption:" +msgstr "Keterangan:" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:23 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 -msgid "_Vertical:" -msgstr "_Vertikal:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:2 +#: ../extensions/image_print/data/ui/print-layout.ui.h:5 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:6 +msgid "The current page number" +msgstr "Nomor halaman kini" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:1 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 -msgid "#" -msgstr "#" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:3 +#: ../extensions/image_print/data/ui/print-layout.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 +msgid "The total number of pages" +msgstr "Total cacah halaman" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:2 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 -msgid "###" -msgstr "###" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:4 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 +#: ../extensions/image_print/data/ui/print-layout.ui.h:7 +#: ../extensions/importer/data/ui/import-preferences.ui.h:5 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:8 +msgid "Special code" +msgstr "Kode khusus" #. translate only the text in the curly brackets -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 -#: ../extensions/image_print/data/ui/print-layout.ui.h:3 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:5 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:8 +#: ../extensions/image_print/data/ui/print-layout.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 #, no-c-format msgid "%D{ format }" msgstr "%D{ format }" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:7 -#, no-c-format -msgid "%n" -msgstr "%n" - #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:9 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 -#, no-c-format -msgid "%p" -msgstr "%p" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:3 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 -msgid "All images on a single page" -msgstr "Semua gambar pada halaman tunggal" +#: ../extensions/image_print/data/ui/print-layout.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 +msgid "The current date" +msgstr "Tanggal kini" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 -#: ../extensions/convert_format/data/ui/convert-format.ui.h:1 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 +msgid "_Destination:" +msgstr "_Tujuan:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:13 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:3 +#: ../extensions/convert_format/data/ui/convert-format.ui.h:4 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 msgid "Choose destination folder" msgstr "Pilih folder tujuan" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:13 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 -#: ../extensions/image_print/data/ui/print-layout.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 -msgid "Columns:" -msgstr "Kolom:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:14 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 +msgid "File_name:" +msgstr "Nama berkas:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:8 +msgid "New enumerator digit" +msgstr "Digit enumerator baru" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:16 msgid "Create _HTML image map" msgstr "Buat peta gambar _HTML" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:16 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 msgid "Create a new theme" msgstr "Buat tema baru" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 -msgid "Delete the selected theme" -msgstr "Hapus tema yang dipilih" - #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:19 msgid "Edit the selected theme" msgstr "Sunting tema yang dipilih" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:20 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 -msgid "File_name:" -msgstr "Nama berkas:" +msgid "Delete the selected theme" +msgstr "Hapus tema yang dipilih" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 -msgid "Images per page:" -msgstr "Gambar per halaman:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:21 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 +msgid "Theme" +msgstr "Tema" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:23 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:10 -#: ../extensions/image_print/data/ui/print-layout.ui.h:11 -msgid "Layout" -msgstr "Tampilan" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:16 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 +msgid "Columns:" +msgstr "Kolom:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:24 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:11 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:15 -msgid "New enumerator digit" -msgstr "Digit enumerator baru" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:10 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 +msgid "Images per page:" +msgstr "Gambar per halaman:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:25 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:11 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 -msgid "Re_verse order" -msgstr "urutkan Ter_balik" +msgid "All images on a single page" +msgstr "Semua gambar pada halaman tunggal" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:26 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:13 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 -msgid "S_ort:" -msgstr "_Urutkan:" +msgid "_All pages with the same size" +msgstr "Semua h_alaman dengan ukuran sama" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:27 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:14 -#: ../extensions/pixbuf_savers/preferences.c:134 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 -msgid "Saving" -msgstr "Menyimpan" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:15 +msgid "Layout" +msgstr "Tampilan" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:28 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:15 -#: ../extensions/image_print/data/ui/print-layout.ui.h:17 -#: ../extensions/importer/data/ui/import-preferences.ui.h:2 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:18 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 -msgid "Special code" -msgstr "Kode khusus" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:13 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 +msgid "S_ort:" +msgstr "_Urutkan:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:29 -msgid "Sq_uared" -msgstr "K_uadrat" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:14 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 +msgid "Re_verse order" +msgstr "urutkan Ter_balik" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:30 -#: ../extensions/image_print/data/ui/print-layout.ui.h:18 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 -msgid "The current date" -msgstr "Tanggal kini" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:15 +msgid "_Size:" +msgstr "_Ukuran:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 -#: ../extensions/image_print/data/ui/print-layout.ui.h:19 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 -msgid "The current page number" -msgstr "Nomor halaman kini" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 -#: ../extensions/image_print/data/ui/print-layout.ui.h:22 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:40 -msgid "The total number of pages" -msgstr "Total cacah halaman" +msgid "Sq_uared" +msgstr "K_uadrat" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:33 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:41 -msgid "Theme" -msgstr "Tema" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:34 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:16 msgid "Thumbnails" msgstr "Gambar miniatur" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:35 -msgid "_All pages with the same size" -msgstr "Semua h_alaman dengan ukuran sama" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:36 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:17 -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:9 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:46 -msgid "_Destination:" -msgstr "_Tujuan:" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:39 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:18 -msgid "_Size:" -msgstr "_Ukuran:" - -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 msgid "Image Wall" -msgstr "" +msgstr "Dinding Citra" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:483 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:495 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:509 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:481 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:492 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:506 msgid "Could not save the theme" msgstr "Tak bisa menyimpan tema" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:654 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:651 msgid "Could not delete the theme" msgstr "Tak bisa menghapus tema" @@ -1427,7 +1500,7 @@ msgid "Creating images" msgstr "Membuat gambar" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:896 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:895 msgid "Generating thumbnails" msgstr "Membentuk gambar miniatur" @@ -1439,15 +1512,15 @@ msgid "Footer" msgstr "Kaki" -#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:197 +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:193 msgid "Theme Properties" msgstr "Properti Tema" -#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:212 +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:208 msgid "Copy _From" msgstr "Salin _Dari" -#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:348 +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:316 msgid "New theme" msgstr "Tema baru" @@ -1467,34 +1540,34 @@ msgid "Save images in a different format" msgstr "Simpan gambar ke dalam format yang berbeda" -#: ../extensions/convert_format/data/ui/convert-format.ui.h:2 +#: ../extensions/convert_format/data/ui/convert-format.ui.h:1 msgid "Convert Format" msgstr "Ubah Format" +#: ../extensions/convert_format/data/ui/convert-format.ui.h:2 +msgid "New format" +msgstr "Format baru" + #: ../extensions/convert_format/data/ui/convert-format.ui.h:3 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:4 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 msgid "Destination" msgstr "Tujuan" -#: ../extensions/convert_format/data/ui/convert-format.ui.h:4 -msgid "New format" -msgstr "Format baru" - #: ../extensions/convert_format/data/ui/convert-format.ui.h:5 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 msgid "_Use the original image folder" msgstr "G_unakan folder gambar asli" -#: ../extensions/convert_format/dlg-convert-format.c:91 +#: ../extensions/convert_format/dlg-convert-format.c:95 msgid "Converting images" msgstr "Mengonversi gambar" -#: ../extensions/desktop_background/actions.c:203 +#: ../extensions/desktop_background/actions.c:158 msgid "Could not show the desktop background properties" msgstr "Tak bisa tampilkan properti latar belakang desktop" -#: ../extensions/desktop_background/actions.c:269 -#: ../extensions/desktop_background/actions.c:287 +#: ../extensions/desktop_background/actions.c:224 +#: ../extensions/desktop_background/actions.c:242 msgid "Could not set the desktop background" msgstr "Tak bisa menata latar belakang desktop" @@ -1511,49 +1584,52 @@ msgid "Desktop background" msgstr "Latar belakang desktop" -#: ../extensions/edit_metadata/actions.c:129 -msgid "Are you sure you want to permanently delete the metadata of the selected files?" +#: ../extensions/edit_metadata/actions.c:66 +msgid "" +"Are you sure you want to permanently delete the metadata of the selected " +"files?" msgstr "Anda yakin ingin menghapus permanen metadata dari berkas yang dipilih?" -#: ../extensions/edit_metadata/actions.c:136 +#: ../extensions/edit_metadata/actions.c:73 msgid "If you delete the metadata, it will be permanently lost." msgstr "Apabila Anda menghapus metadata, itu akan dihapus permanen." -#: ../extensions/edit_metadata/callbacks.c:108 +#: ../extensions/edit_metadata/callbacks.c:97 msgid "T_ags" msgstr "T_ag" -#: ../extensions/edit_metadata/callbacks.c:112 +#: ../extensions/edit_metadata/callbacks.c:101 msgid "Edit the comment and other information of the selected files" msgstr "Sunting komentar dan informasi lain dari berkas yang dipilih" -#: ../extensions/edit_metadata/callbacks.c:117 -msgid "Choose another tag" -msgstr "Pilih tag lain" +#: ../extensions/edit_metadata/callbacks.c:107 +#| msgid "Delete the selected files" +msgid "Set the tags of the selected files" +msgstr "Atur tag dari berkas yang dipilih" -#: ../extensions/edit_metadata/callbacks.c:121 +#: ../extensions/edit_metadata/callbacks.c:112 msgid "Delete Metadata" msgstr "Hapus Metadata" -#: ../extensions/edit_metadata/callbacks.c:122 +#: ../extensions/edit_metadata/callbacks.c:113 msgid "Delete the comment and the embedded metadata of the selected files" msgstr "Hapus komentar dan metadata tertanam dari berkas yang dipilih" #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:1 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:1 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 msgid "D_escription:" msgstr "D_eskripsi:" -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:2 +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:3 +msgid "_Place:" +msgstr "Tem_pat" + +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 #: ../extensions/edit_metadata/data/ui/tag-chooser.ui.h:1 msgid "T_ags:" msgstr "T_ag:" -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 -msgid "_Place:" -msgstr "Tem_pat" - #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:5 msgid "_Rating:" msgstr "Pe_ringkat:" @@ -1562,83 +1638,92 @@ msgid "_Title:" msgstr "_Judul:" -#: ../extensions/edit_metadata/dlg-edit-metadata.c:63 +#: ../extensions/edit_metadata/dlg-edit-metadata.c:121 msgid "Could not save the file metadata" msgstr "Tak bisa menyimpan metadata berkas" -#: ../extensions/edit_metadata/dlg-edit-metadata.c:150 -#: ../gthumb/gth-overwrite-dialog.c:166 +#: ../extensions/edit_metadata/dlg-edit-metadata.c:234 +#: ../gthumb/gth-overwrite-dialog.c:136 msgid "Cannot read file information" msgstr "Tak bisa membaca informasi berkas" #: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:1 +msgid "Edit metadata" +msgstr "Sunting metadata" + +#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 msgid "Allow to edit files metadata." msgstr "Bolehkan menyunting metadata berkas." -#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 -msgid "Edit metadata" -msgstr "Sunting metadata" +#. Translators: the %s symbol in the string is a file name +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:63 +#, c-format +msgid "%s Metadata" +msgstr "Metadata %s" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:66 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:83 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:335 +#, c-format +msgid "%d file" +msgid_plural "%d files" +msgstr[0] "%d berkas" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:144 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:197 +msgid "Sa_ve and Close" +msgstr "Sim_pan dan Tutup" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:156 +msgid "Save only cha_nged fields" +msgstr "Simpa_n hanya bagian yang berubah" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:467 +#: ../extensions/edit_metadata/gth-edit-general-page.c:555 msgid "No date" msgstr "Tidak bertanggal" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:468 +#: ../extensions/edit_metadata/gth-edit-general-page.c:556 msgid "The following date" msgstr "tanggal Berikut" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:469 -#: ../extensions/importer/gth-import-preferences-dialog.c:327 +#: ../extensions/edit_metadata/gth-edit-general-page.c:557 +#: ../extensions/importer/gth-import-preferences-dialog.c:331 msgid "Current date" msgstr "tanggal Sekarang" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:471 +#: ../extensions/edit_metadata/gth-edit-general-page.c:559 msgid "Last modified date" msgstr "tanggal Pengubahan terakhir" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:472 +#: ../extensions/edit_metadata/gth-edit-general-page.c:560 msgid "File creation date" msgstr "Tanggal pembuatan gambar" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:473 +#: ../extensions/edit_metadata/gth-edit-general-page.c:561 msgid "Do not modify" msgstr "Jangan diubah" -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:105 -msgid "Save only cha_nged fields" -msgstr "Simpa_n hanya bagian yang berubah" - #. Translators: the %s symbol in the string is a file name -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:161 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:80 #, c-format -msgid "%s Metadata" -msgstr "Metadata %s" - -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:165 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:332 -#, c-format -msgid "%d file" -msgid_plural "%d files" -msgstr[0] "%d berkas" - -#: ../extensions/edit_metadata/gth-tag-chooser-dialog.c:81 -msgid "New tag" -msgstr "Tag baru" +#| msgid "Tags" +msgid "%s Tags" +msgstr "Tag %s" -#: ../extensions/edit_metadata/gth-tag-chooser-dialog.c:223 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:189 msgid "Assign Tags" -msgstr "" +msgstr "Berikan Tag" -#: ../extensions/edit_metadata/gth-tag-task.c:115 -#: ../extensions/edit_metadata/gth-tag-task.c:132 +#: ../extensions/edit_metadata/gth-tag-task.c:119 +#: ../extensions/edit_metadata/gth-tag-task.c:136 msgid "Assigning tags to the selected files" -msgstr "" +msgstr "Berikan tag ke berkas yang dipilih" -#: ../extensions/edit_metadata/gth-tag-task.c:115 +#: ../extensions/edit_metadata/gth-tag-task.c:119 msgid "Writing files" msgstr "Menulis berkas" -#: ../extensions/edit_metadata/gth-tag-task.c:132 +#: ../extensions/edit_metadata/gth-tag-task.c:136 msgid "Reading files" msgstr "Membaca berkas" @@ -1651,53 +1736,54 @@ msgstr "Contoh ekstensi." #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:1 -msgid "Byline _Title:" -msgstr "" - -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 msgid "C_opyright:" msgstr "_Hak Cipta:" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:3 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 msgid "Co_untry:" msgstr "_Negara:" +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:3 +msgid "_Code:" +msgstr "_Kode:" + #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:4 msgid "Cr_edit:" msgstr "Kr_edit:" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 -msgid "State/Provence:" -msgstr "Negara Bagian/Propinsi:" - #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:6 -msgid "_Byline:" -msgstr "" +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 +msgid "_Source:" +msgstr "_Sumber:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:7 -msgid "_City:" -msgstr "_Kota:" +msgid "_Urgency:" +msgstr "_Urgensi:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:8 -msgid "_Code:" -msgstr "_Kode:" +msgid "_Object Name:" +msgstr "Nama _Objek:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:9 +msgid "Byline _Title:" +msgstr "_Judul Byline:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:10 -msgid "_Language:" -msgstr "_Bahasa:" +msgid "_Byline:" +msgstr "_Byline:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:11 -msgid "_Object Name:" -msgstr "Nama _Objek:" +msgid "_City:" +msgstr "_Kota:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:12 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 -msgid "_Source:" -msgstr "_Sumber:" +msgid "_Language:" +msgstr "_Bahasa:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:13 -msgid "_Urgency:" -msgstr "_Urgensi:" +#| msgid "State/Provence:" +msgid "State/Province:" +msgstr "Negara Bagian/Propinsi:" #: ../extensions/exiv2_tools/exiv2_tools.extension.in.in.h:1 msgid "EXIF, IPTC, XMP support" @@ -1751,14 +1837,13 @@ msgid "XMP Attached" msgstr "XMP Terlampir" -#: ../extensions/exiv2_tools/main.c:255 +#: ../extensions/exiv2_tools/main.c:267 msgid "date photo was taken" msgstr "tanggal foto diambil" -#: ../extensions/export_tools/callbacks.c:59 -#, fuzzy +#: ../extensions/export_tools/callbacks.c:99 msgid "Share" -msgstr "Bagi-Pakai" +msgstr "Berbagi" #: ../extensions/facebook/callbacks.c:54 msgid "Face_book..." @@ -1769,76 +1854,80 @@ msgstr "Unggah foto ke Facebook" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:1 -msgid "1024 x 1024" -msgstr "1024 x 1024" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 +msgid "Export to Flickr" +msgstr "Ekspor ke Flickr" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:2 -msgid "1280 x 1280" -msgstr "1280 x 1280" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 +msgid "_Upload" +msgstr "_Unggah" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:3 -msgid "1600 x 1600" -msgstr "1600 x 1600" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 +msgid "_Account:" +msgstr "_Akun:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:4 -msgid "2048 x 2048" -msgstr "2048 x 2048" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 +msgid "Edit accounts" +msgstr "Sunting akun" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 -msgid "720 x 720" -msgstr "720 x 720" - -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 msgid "A_lbum:" msgstr "A_lbum" -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 msgid "Add a new album" msgstr "Tambahkan album baru" +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 +#| msgid "Resize the images if larger then this size" +msgid "Resize the images if larger than this size" +msgstr "Ubah ukuran gambar jika lebih dari ukuran ini" + #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:8 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 -msgid "Edit accounts" -msgstr "Sunting akun" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 +msgid "_Resize if larger than:" +msgstr "Ubah uku_ran jika lebih besar dari:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:9 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 -msgid "Export to Flickr" -msgstr "Ekspor ke Flickr" +msgid "720 x 720" +msgstr "720 x 720" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:10 -msgid "Resize the images if larger then this size" -msgstr "Ubah ukuran gambar jika lebih dari ukuran ini" +msgid "1024 x 1024" +msgstr "1024 x 1024" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:11 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 -msgid "_Account:" -msgstr "_Akun:" +msgid "1280 x 1280" +msgstr "1280 x 1280" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:12 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 -msgid "_Resize to:" -msgstr "Ubah uku_ran ke:" +msgid "1600 x 1600" +msgstr "1600 x 1600" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:13 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 -msgid "_Upload" -msgstr "_Unggah" +msgid "2048 x 2048" +msgstr "2048 x 2048" #: ../extensions/facebook/data/ui/facebook-account-chooser.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-account-chooser.ui.h:1 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 #: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 #: ../extensions/picasaweb/data/ui/picasa-web-account-chooser.ui.h:1 msgid "A_ccount:" msgstr "A_kun:" @@ -1850,27 +1939,23 @@ msgid "A_ccounts:" msgstr "A_kun:" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 -msgid "Private" -msgstr "Privat" - -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 -msgid "Private photos, visible to friends" -msgstr "Foto privat, nampak ke teman" - -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 msgid "Public photos" msgstr "Foto publik" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:5 -msgid "_Location:" -msgstr "_Lokasi:" +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 +msgid "Private photos, visible to friends" +msgstr "Foto privat, nampak ke teman" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 #: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:5 +msgid "Private" +msgstr "Privat" + +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:5 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 msgid "_Visibility:" msgstr "_Visibilitas:" @@ -1881,18 +1966,18 @@ msgstr "Otoris_asikan..." #: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:1 +#: ../extensions/facebook/facebook-authentication.c:472 +#: ../extensions/flicker_utils/flickr-authentication.c:408 +#: ../extensions/oauth/oauth-authentication.c:423 +msgid "Once you're done, click the 'Continue' button below." +msgstr "Setelah Anda selesai, klik tombol 'Lanjutkan' di bawah." + +#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 #: ../extensions/flicker_utils/data/ui/flicker-complete-authorization.ui.h:1 #: ../extensions/oauth/data/ui/oauth-complete-authorization.ui.h:1 msgid "C_ontinue" msgstr "_Lanjut" -#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 -#: ../extensions/facebook/facebook-authentication.c:499 -#: ../extensions/flicker_utils/flickr-authentication.c:435 -#: ../extensions/oauth/oauth-authentication.c:450 -msgid "Once you're done, click the 'Continue' button below." -msgstr "Setelah Anda selesai, klik tombol 'Lanjutkan' di bawah." - #: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:1 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:1 @@ -1904,140 +1989,148 @@ #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:2 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:2 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:2 -#: ../extensions/webalbums/gth-web-exporter.c:1851 +#: ../extensions/webalbums/gth-web-exporter.c:1839 msgid "_Open in the Browser" msgstr "_Buka dalam Peramban" -#: ../extensions/facebook/dlg-export-to-facebook.c:128 -#: ../extensions/facebook/dlg-export-to-facebook.c:333 -#: ../extensions/facebook/facebook-authentication.c:219 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:138 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:399 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:234 -#: ../extensions/flicker_utils/flickr-authentication.c:218 -#: ../extensions/oauth/oauth-authentication.c:214 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:131 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:376 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:139 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:424 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:377 +#: ../extensions/facebook/dlg-export-to-facebook.c:130 +#: ../extensions/facebook/dlg-export-to-facebook.c:335 +#: ../extensions/facebook/facebook-authentication.c:192 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:141 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:417 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:237 +#: ../extensions/flicker_utils/flickr-authentication.c:191 +#: ../extensions/oauth/oauth-authentication.c:187 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:133 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:378 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:142 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:442 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:380 msgid "Could not connect to the server" msgstr "Tak bisa menyambung ke server" -#: ../extensions/facebook/dlg-export-to-facebook.c:180 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:246 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:182 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:192 +#: ../extensions/facebook/dlg-export-to-facebook.c:182 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:249 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:184 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:195 msgid "Could not upload the files" msgstr "Tak bisa mengunggah berkas" -#: ../extensions/facebook/dlg-export-to-facebook.c:410 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:188 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:223 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:462 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:717 +#: ../extensions/facebook/dlg-export-to-facebook.c:412 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:191 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:226 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:464 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:735 msgid "Could not create the album" msgstr "Tak bisa membuat album" -#: ../extensions/facebook/dlg-export-to-facebook.c:479 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:534 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:783 +#: ../extensions/facebook/dlg-export-to-facebook.c:481 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:536 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:801 msgid "New Album" msgstr "Album Baru" -#: ../extensions/facebook/dlg-export-to-facebook.c:558 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:557 -#: ../extensions/image_print/gth-image-print-job.c:1816 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:614 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1002 +#: ../extensions/facebook/dlg-export-to-facebook.c:561 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:591 +#: ../extensions/image_print/gth-image-print-job.c:1739 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:615 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1036 msgid "No valid file selected." msgstr "Tak ada berkas valid yang dipilih." -#: ../extensions/facebook/dlg-export-to-facebook.c:559 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:558 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:615 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1003 +#: ../extensions/facebook/dlg-export-to-facebook.c:562 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:592 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:616 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1037 msgid "Could not export the files" msgstr "Tak bisa mengekspor berkas" -#: ../extensions/facebook/dlg-export-to-facebook.c:567 -#: ../extensions/find_duplicates/gth-find-duplicates.c:284 -#: ../extensions/find_duplicates/gth-find-duplicates.c:376 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:566 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:623 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1010 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:800 -#: ../gthumb/gth-browser.c:990 +#: ../extensions/facebook/dlg-export-to-facebook.c:570 +#: ../extensions/find_duplicates/gth-find-duplicates.c:277 +#: ../extensions/find_duplicates/gth-find-duplicates.c:470 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:600 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:624 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1044 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:803 +#: ../gthumb/gth-browser.c:1070 #, c-format msgid "%d file (%s)" msgid_plural "%d files (%s)" msgstr[0] "%d berkas (%s)" -#: ../extensions/facebook/dlg-export-to-facebook.c:589 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:590 +#: ../extensions/facebook/dlg-export-to-facebook.c:591 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:623 #: ../extensions/photobucket/dlg-export-to-photobucket.c:643 #, c-format msgid "Export to %s" msgstr "Ekspor ke %s" -#: ../extensions/facebook/facebook-account-chooser-dialog.c:229 -#: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:229 -#: ../extensions/oauth/oauth-account-chooser-dialog.c:229 +#: ../extensions/facebook/facebook-account-chooser-dialog.c:200 +#: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:200 +#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 msgid "New authentication..." msgstr "Otentikasi baru..." -#: ../extensions/facebook/facebook-authentication.c:221 -#: ../extensions/flicker_utils/flickr-authentication.c:220 -#: ../extensions/oauth/oauth-authentication.c:216 +#: ../extensions/facebook/facebook-authentication.c:194 +#: ../extensions/flicker_utils/flickr-authentication.c:193 +#: ../extensions/oauth/oauth-authentication.c:189 msgid "Choose _Account..." msgstr "Pilih _Akun..." -#: ../extensions/facebook/facebook-authentication.c:498 -#: ../extensions/flicker_utils/flickr-authentication.c:434 -#: ../extensions/oauth/oauth-authentication.c:449 -#, c-format -msgid "Return to this window when you have finished the authorization process on %s" -msgstr "Kembali ke jendela ini setelah Anda menyelesaikan proses otorisasi pada %s" - -#: ../extensions/facebook/facebook-authentication.c:583 -#: ../extensions/flicker_utils/flickr-authentication.c:514 -#: ../extensions/oauth/oauth-authentication.c:529 +#: ../extensions/facebook/facebook-authentication.c:471 +#: ../extensions/flicker_utils/flickr-authentication.c:407 +#: ../extensions/oauth/oauth-authentication.c:422 +#, c-format +msgid "" +"Return to this window when you have finished the authorization process on %s" +msgstr "" +"Kembali ke jendela ini setelah Anda menyelesaikan proses otorisasi pada %s" + +#: ../extensions/facebook/facebook-authentication.c:556 +#: ../extensions/flicker_utils/flickr-authentication.c:487 +#: ../extensions/oauth/oauth-authentication.c:502 #, c-format msgid "gthumb requires your authorization to upload the photos to %s" msgstr "gthumb memerlukan otorisasi Anda untuk mengunggah foto ke %s" -#: ../extensions/facebook/facebook-authentication.c:584 -#: ../extensions/flicker_utils/flickr-authentication.c:515 -#: ../extensions/oauth/oauth-authentication.c:530 -#, c-format -msgid "Click 'Authorize' to open your web browser and authorize gthumb to upload photos to %s. When you're finished, return to this window to complete the authorization." -msgstr "Klik 'Otorisasi' untuk membuka peramban web Anda dan mengotorisasi gthumb untuk mengunggah foto ke %s. Setelah selesai, kembalilah ke jendela ini untuk melengkapi otorisasi." - -#: ../extensions/facebook/facebook-authentication.c:679 -#: ../extensions/flicker_utils/flickr-authentication.c:615 -#: ../extensions/oauth/oauth-authentication.c:632 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:820 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:681 +#: ../extensions/facebook/facebook-authentication.c:557 +#: ../extensions/flicker_utils/flickr-authentication.c:488 +#: ../extensions/oauth/oauth-authentication.c:503 +#, c-format +msgid "" +"Click 'Authorize' to open your web browser and authorize gthumb to upload " +"photos to %s. When you're finished, return to this window to complete the " +"authorization." +msgstr "" +"Klik 'Otorisasi' untuk membuka peramban web Anda dan mengotorisasi gthumb " +"untuk mengunggah foto ke %s. Setelah selesai, kembalilah ke jendela ini " +"untuk melengkapi otorisasi." + +#: ../extensions/facebook/facebook-authentication.c:652 +#: ../extensions/flicker_utils/flickr-authentication.c:588 +#: ../extensions/oauth/oauth-authentication.c:605 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:838 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:684 msgid "Choose Account" msgstr "Pilih Akun" -#: ../extensions/facebook/facebook-authentication.c:788 -#: ../extensions/flicker_utils/flickr-authentication.c:724 -#: ../extensions/oauth/oauth-authentication.c:741 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:881 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:742 +#: ../extensions/facebook/facebook-authentication.c:761 +#: ../extensions/flicker_utils/flickr-authentication.c:697 +#: ../extensions/oauth/oauth-authentication.c:714 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:899 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:745 msgid "Edit Accounts" msgstr "Sunting Akun" -#: ../extensions/facebook/facebook-connection.c:304 -#: ../extensions/facebook/facebook-connection.c:464 -#: ../extensions/facebook/facebook-service.c:191 -#: ../extensions/facebook/facebook-service.c:294 -#: ../extensions/facebook/facebook-service.c:497 -#: ../extensions/flicker_utils/flickr-connection.c:295 -#: ../extensions/flicker_utils/flickr-connection.c:442 -#: ../extensions/flicker_utils/flickr-service.c:224 -#: ../extensions/flicker_utils/flickr-service.c:427 +#: ../extensions/facebook/facebook-connection.c:275 +#: ../extensions/facebook/facebook-connection.c:435 +#: ../extensions/facebook/facebook-service.c:162 +#: ../extensions/facebook/facebook-service.c:265 +#: ../extensions/facebook/facebook-service.c:468 +#: ../extensions/flicker_utils/flickr-connection.c:266 +#: ../extensions/flicker_utils/flickr-connection.c:413 +#: ../extensions/flicker_utils/flickr-service.c:197 +#: ../extensions/flicker_utils/flickr-service.c:400 #: ../extensions/photobucket/photobucket-consumer.c:74 #: ../extensions/photobucket/photobucket-consumer.c:79 #: ../extensions/photobucket/photobucket-consumer.c:115 @@ -2045,17 +2138,17 @@ msgid "Unknown error" msgstr "Galat tak dikenal" -#: ../extensions/facebook/facebook-connection.c:339 -#: ../extensions/facebook/facebook-connection.c:490 -#: ../extensions/facebook/facebook-service.c:217 -#: ../extensions/facebook/facebook-service.c:319 -#: ../extensions/flicker_utils/flickr-connection.c:321 -#: ../extensions/flicker_utils/flickr-connection.c:468 -#: ../extensions/flicker_utils/flickr-service.c:248 -#: ../extensions/oauth/oauth-connection.c:385 -#: ../extensions/oauth/oauth-connection.c:460 -#: ../extensions/oauth/oauth-connection.c:564 -#: ../extensions/picasaweb/google-connection.c:373 +#: ../extensions/facebook/facebook-connection.c:310 +#: ../extensions/facebook/facebook-connection.c:461 +#: ../extensions/facebook/facebook-service.c:188 +#: ../extensions/facebook/facebook-service.c:290 +#: ../extensions/flicker_utils/flickr-connection.c:292 +#: ../extensions/flicker_utils/flickr-connection.c:439 +#: ../extensions/flicker_utils/flickr-service.c:221 +#: ../extensions/oauth/oauth-connection.c:356 +#: ../extensions/oauth/oauth-connection.c:431 +#: ../extensions/oauth/oauth-connection.c:535 +#: ../extensions/picasaweb/google-connection.c:344 msgid "Connecting to the server" msgstr "Meyambung ke server" @@ -2067,125 +2160,137 @@ msgid "Upload images to Facebook" msgstr "Unggah gambar ke Facebook" -#: ../extensions/facebook/facebook-service.c:217 -#: ../extensions/facebook/facebook-service.c:319 -#: ../extensions/flicker_utils/flickr-service.c:248 -#: ../extensions/oauth/oauth-connection.c:385 -#: ../extensions/oauth/oauth-connection.c:460 -#: ../extensions/oauth/oauth-connection.c:564 +#: ../extensions/facebook/facebook-service.c:188 +#: ../extensions/facebook/facebook-service.c:290 +#: ../extensions/flicker_utils/flickr-service.c:221 +#: ../extensions/oauth/oauth-connection.c:356 +#: ../extensions/oauth/oauth-connection.c:431 +#: ../extensions/oauth/oauth-connection.c:535 msgid "Getting account information" msgstr "Mengambil informasi akun" -#: ../extensions/facebook/facebook-service.c:425 -#: ../extensions/flicker_utils/flickr-service.c:352 -#: ../extensions/photobucket/photobucket-service.c:236 -#: ../extensions/picasaweb/picasa-web-service.c:238 +#: ../extensions/facebook/facebook-service.c:396 +#: ../extensions/flicker_utils/flickr-service.c:325 +#: ../extensions/photobucket/photobucket-service.c:207 +#: ../extensions/picasaweb/picasa-web-service.c:211 msgid "Getting the album list" msgstr "Mengambil daftar album" -#: ../extensions/facebook/facebook-service.c:554 -#: ../extensions/flicker_utils/flickr-service.c:455 -#: ../extensions/flicker_utils/flickr-service.c:575 -#: ../extensions/flicker_utils/flickr-service.c:613 -#: ../extensions/photobucket/photobucket-service.c:345 -#: ../extensions/picasaweb/picasa-web-service.c:329 +#: ../extensions/facebook/facebook-service.c:525 +#: ../extensions/flicker_utils/flickr-service.c:428 +#: ../extensions/flicker_utils/flickr-service.c:548 +#: ../extensions/flicker_utils/flickr-service.c:586 +#: ../extensions/photobucket/photobucket-service.c:316 +#: ../extensions/picasaweb/picasa-web-service.c:302 msgid "Creating the new album" msgstr "Membuatan album baru" -#: ../extensions/facebook/facebook-service.c:613 -#: ../extensions/flicker_utils/flickr-service.c:663 -#: ../extensions/photobucket/photobucket-service.c:402 -#: ../extensions/picasaweb/picasa-web-service.c:386 +#: ../extensions/facebook/facebook-service.c:584 +#: ../extensions/flicker_utils/flickr-service.c:636 +#: ../extensions/photobucket/photobucket-service.c:373 +#: ../extensions/picasaweb/picasa-web-service.c:359 #, c-format msgid "Could not upload '%s': %s" msgstr "Tak bisa mengunggah '%s': %s" #. Translators: %s is a filename -#: ../extensions/facebook/facebook-service.c:699 -#: ../extensions/flicker_utils/flickr-service.c:774 -#: ../extensions/photobucket/photobucket-service.c:459 -#: ../extensions/picasaweb/picasa-web-service.c:441 +#: ../extensions/facebook/facebook-service.c:670 +#: ../extensions/flicker_utils/flickr-service.c:747 +#: ../extensions/photobucket/photobucket-service.c:430 +#: ../extensions/picasaweb/picasa-web-service.c:414 #, c-format msgid "Uploading '%s'" msgstr "Mengunggah '%s'" -#: ../extensions/facebook/facebook-service.c:915 -#: ../extensions/flicker_utils/flickr-service.c:943 -#: ../extensions/photobucket/photobucket-service.c:628 -#: ../extensions/picasaweb/picasa-web-service.c:634 +#: ../extensions/facebook/facebook-service.c:884 +#: ../extensions/flicker_utils/flickr-service.c:940 +#: ../extensions/photobucket/photobucket-service.c:599 +#: ../extensions/picasaweb/picasa-web-service.c:631 msgid "Uploading the files to the server" msgstr "Mengunggah berkas ke server" -#: ../extensions/facebook/facebook-service.c:1032 -#: ../extensions/flicker_utils/flickr-service.c:1106 -#: ../extensions/picasaweb/picasa-web-service.c:747 +#: ../extensions/facebook/facebook-service.c:1001 +#: ../extensions/flicker_utils/flickr-service.c:1105 +#: ../extensions/picasaweb/picasa-web-service.c:746 msgid "Getting the photo list" msgstr "Mengambil daftar foto" -#: ../extensions/file_manager/actions.c:130 +#: ../extensions/file_manager/actions.c:133 msgid "New folder" msgstr "Folder baru" -#: ../extensions/file_manager/actions.c:131 +#: ../extensions/file_manager/actions.c:134 msgid "Enter the folder name:" msgstr "Masukkan nama folder: " -#: ../extensions/file_manager/actions.c:397 +#: ../extensions/file_manager/actions.c:400 #: ../extensions/file_manager/callbacks.c:380 -#: ../extensions/file_manager/callbacks.c:847 +#: ../extensions/file_manager/callbacks.c:842 msgid "Could not move the files" msgstr "Tak bisa memindah berkas" -#: ../extensions/file_manager/actions.c:398 +#: ../extensions/file_manager/actions.c:401 #: ../extensions/file_manager/callbacks.c:381 -#: ../extensions/file_manager/callbacks.c:848 -msgid "Files cannot be moved to the current location, as alternative you can choose to copy them." -msgstr "Berkas tak bisa dipindah ke lokasi kini, sebagai alternatif Anda dapat memilih untuk menyalin mereka." +#: ../extensions/file_manager/callbacks.c:843 +msgid "" +"Files cannot be moved to the current location, as alternative you can choose " +"to copy them." +msgstr "" +"Berkas tak bisa dipindah ke lokasi kini, sebagai alternatif Anda dapat " +"memilih untuk menyalin mereka." -#: ../extensions/file_manager/actions.c:555 +#: ../extensions/file_manager/actions.c:563 msgid "Could not open the location" msgstr "Tak bisa membuka lokasi" -#: ../extensions/file_manager/actions.c:688 -msgid "The folder is not empty, do you want to delete the folder and its content permanently?" -msgstr "Folder tak kosong, apakah Anda ingin menghapus folder dan isinya secara permanen?" +#: ../extensions/file_manager/actions.c:696 +msgid "" +"The folder is not empty, do you want to delete the folder and its content " +"permanently?" +msgstr "" +"Folder tak kosong, apakah Anda ingin menghapus folder dan isinya secara " +"permanen?" -#: ../extensions/file_manager/actions.c:704 +#: ../extensions/file_manager/actions.c:712 msgid "Could not delete the folder" msgstr "Tak bisa menghapus folder" -#: ../extensions/file_manager/actions.c:765 -msgid "The folder cannot be moved to the Trash. Do you want to delete it permanently?" -msgstr "Folder tak bisa dipindah ke Tong Sampah. Apakah Anda ingin menghapusnya secara permanen?" +#: ../extensions/file_manager/actions.c:773 +msgid "" +"The folder cannot be moved to the Trash. Do you want to delete it " +"permanently?" +msgstr "" +"Folder tak bisa dipindah ke Tong Sampah. Apakah Anda ingin menghapusnya " +"secara permanen?" -#: ../extensions/file_manager/actions.c:772 +#: ../extensions/file_manager/actions.c:780 msgid "Could not move the folder to the Trash" msgstr "Tak bisa memindah berkas ke Tong Sampah" -#: ../extensions/file_manager/actions.c:808 -#: ../gthumb/gth-file-source-vfs.c:826 +#: ../extensions/file_manager/actions.c:816 +#: ../gthumb/gth-file-source-vfs.c:841 #, c-format msgid "Are you sure you want to permanently delete \"%s\"?" msgstr "Anda yakin ingin menghapus permanen \"%s\"?" -#: ../extensions/file_manager/actions.c:818 -#: ../gthumb/gth-file-source-vfs.c:839 +#: ../extensions/file_manager/actions.c:826 +#: ../gthumb/gth-file-source-vfs.c:854 msgid "If you delete a file, it will be permanently lost." msgstr "Apabila Anda menghapus sebuah berkas, itu akan dihapus permanen." -#: ../extensions/file_manager/actions.c:907 +#: ../extensions/file_manager/actions.c:920 msgid "Move To" msgstr "Pindah Ke" -#: ../extensions/file_manager/actions.c:907 +#: ../extensions/file_manager/actions.c:920 msgid "Copy To" msgstr "Salin Ke" -#: ../extensions/file_manager/actions.c:911 +#: ../extensions/file_manager/actions.c:924 msgid "Move" msgstr "Pindah" -#: ../extensions/file_manager/actions.c:911 +#: ../extensions/file_manager/actions.c:924 msgid "Copy" msgstr "Salin" @@ -2209,7 +2314,7 @@ #: ../extensions/file_manager/callbacks.c:183 #: ../extensions/file_manager/callbacks.c:219 -#: ../gthumb/gth-file-source-vfs.c:800 +#: ../gthumb/gth-file-source-vfs.c:813 msgid "Mo_ve to Trash" msgstr "Pindahkan ke Tong _Sampah" @@ -2229,7 +2334,7 @@ #: ../extensions/file_manager/callbacks.c:191 #: ../extensions/file_manager/callbacks.c:203 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:2 msgid "_Rename" msgstr "_Ganti nama" @@ -2271,10 +2376,9 @@ msgid "Move the selected files to another folder" msgstr "Pindahkan berkas yang dipilih ke folder lain" -#: ../extensions/file_manager/callbacks.c:1009 -#: ../extensions/find_duplicates/gth-find-duplicates.c:610 -#: ../gthumb/gth-browser.c:4945 -#: ../gthumb/gth-browser.c:4979 +#: ../extensions/file_manager/callbacks.c:1003 +#: ../extensions/find_duplicates/gth-find-duplicates.c:766 +#: ../gthumb/gth-browser.c:5112 ../gthumb/gth-browser.c:5146 msgid "Could not perform the operation" msgstr "Operasi tidak dapat dilakukan" @@ -2291,478 +2395,494 @@ msgstr "Menghapus berkas" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:1 -msgid "B_rightness:" -msgstr "Kece_rahan:" +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:5 +msgid "_Preview" +msgstr "_Pratinjau" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:2 -msgid "Color Levels" -msgstr "Tingkatan Warna" +msgid "B_rightness:" +msgstr "Kece_rahan:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:3 msgid "Con_trast:" msgstr "Kon_tras:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:4 -msgid "Cyan-_Red:" -msgstr "Cyan _Merah:" +msgid "_Saturation:" +msgstr "_Penjenuhan:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:5 msgid "G_amma:" msgstr "G_amma:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:6 -msgid "_Magenta-Green:" -msgstr "_Magenta-Hijau:" +msgid "Cyan-_Red:" +msgstr "Cyan _Merah:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:7 -msgid "_Preview" -msgstr "_Pratinjau" +msgid "_Magenta-Green:" +msgstr "_Magenta-Hijau:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:8 -#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:5 -msgid "_Reset" -msgstr "_Set-ulang" +msgid "_Yellow-Blue:" +msgstr "_Kuning-Biru:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:9 -msgid "_Saturation:" -msgstr "_Penjenuhan:" +msgid "Color Levels" +msgstr "Tingkatan Warna" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:10 -msgid "_Yellow-Blue:" -msgstr "_Kuning-Biru:" +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:5 +msgid "_Reset" +msgstr "_Set-ulang" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:1 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +msgid "Selection" +msgstr "Pilihan" -#. this is used to separate the dimensions, for example: 120 × 250 #: ../extensions/file_tools/data/ui/crop-options.ui.h:2 -msgid "×" -msgstr "×" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 +msgid "_Width:" +msgstr "_Lebar:" #: ../extensions/file_tools/data/ui/crop-options.ui.h:3 #: ../extensions/file_tools/data/ui/resize-options.ui.h:3 -msgid "Aspect ratio" -msgstr "Rasio aspek" +msgid "Heigh_t:" +msgstr "_Tinggi:" #: ../extensions/file_tools/data/ui/crop-options.ui.h:4 -msgid "C_rop" -msgstr "" +msgid "_Position:" +msgstr "_Posisi:" #: ../extensions/file_tools/data/ui/crop-options.ui.h:5 -msgid "Center" -msgstr "" +msgid "Maximize" +msgstr "Maksimalkan" #: ../extensions/file_tools/data/ui/crop-options.ui.h:6 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 -#, fuzzy +msgid "Center" +msgstr "Pusat" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:5 +msgid "Aspect ratio" +msgstr "Rasio aspek" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 msgid "I_nvert aspect ratio" -msgstr "Jaga rasio aspek" +msgstr "Balikka_n rasio aspek" #. after the colon there is a control to select the size in pixels -#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:10 msgid "M_ultiple of:" msgstr "Kelipa_tan dari:" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:9 -msgid "Maximize" -msgstr "Maksimalkan" +#. abbreviation of pixel +#: ../extensions/file_tools/data/ui/crop-options.ui.h:12 +msgid "px" +msgstr "px" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:10 -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 -msgid "Selection" -msgstr "Pilihan" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 +#: ../gthumb/gth-file-chooser-dialog.c:252 +msgid "Options" +msgstr "Opsi" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:12 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:14 msgid "_Grid:" msgstr "_Kisi:" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 -msgid "_Position:" -msgstr "_Posisi:" - -#. abbreviation of pixel #: ../extensions/file_tools/data/ui/crop-options.ui.h:15 -msgid "px" -msgstr "px" +msgid "C_rop" +msgstr "_Potong" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:2 -#, no-c-format -msgid "%" -msgstr "%" +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:1 +msgid "Method" +msgstr "Metode" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:2 +#| msgid "B_rightness:" +msgid "_Brightness" +msgstr "_Kecerahan" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:3 +#| msgid "_Saturation:" +msgid "_Saturation" +msgstr "_Saturasi" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:4 +msgid "_Average" +msgstr "R_ata-rata" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 #: ../gthumb/gth-main-default-metadata.c:47 msgid "Dimensions" msgstr "Dimensi" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:5 -msgid "Heigh_t:" -msgstr "_Tinggi:" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +msgid "Set the image size to this value" +msgstr "Tata ukuran gambar ke nilai ini" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:8 msgid "High _quality" msgstr "_kualitas Tinggi" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:8 -msgid "New dimensions:" -msgstr "Dimensi baru:" - #: ../extensions/file_tools/data/ui/resize-options.ui.h:9 -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 -msgid "Options" -msgstr "Opsi" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 msgid "Original dimensions:" msgstr "Dimensi asli" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 msgid "Scale factor:" msgstr "Faktor skala:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 -msgid "Set the image size to this value" -msgstr "Tata ukuran gambar ke nilai ini" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:13 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:11 -msgid "_Width:" -msgstr "_Lebar:" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 +msgid "New dimensions:" +msgstr "Dimensi baru:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:14 -#: ../extensions/image_print/data/ui/print-layout.ui.h:31 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:29 msgid "pixels" msgstr "piksel" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:14 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:12 +#, no-c-format +msgid "%" +msgstr "%" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:1 -msgid "Align" -msgstr "Ratakan" +msgid "Angle" +msgstr "Sudut" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 -msgid "Alignment" -msgstr "Perataan" +msgid "Align" +msgstr "Ratakan" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 -msgid "Angle" -msgstr "Sudut" +msgid "Image size" +msgstr "Ukuran gambar" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 -#, fuzzy -msgid "Bounding box" -msgstr "kotak cek" +msgid "Point 1:" +msgstr "Titik 1:" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 -#, fuzzy -msgid "Crop borders" -msgstr "Tepi putih" +msgid "Point 2:" +msgstr "Titik 2:" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 -msgid "" -"Draw a line on the image \n" -"to set the alignment." -msgstr "" +msgid "Keep aspect ratio" +msgstr "Jaga rasio aspek" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 msgid "Grid:" msgstr "Kisi:" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 -msgid "Image size" -msgstr "Ukuran gambar" +msgid "_Background:" +msgstr "Latar _Belakang:" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 -msgid "Keep aspect ratio" -msgstr "Jaga rasio aspek" +msgid "Pick a background color" +msgstr "Pilih warna latar" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 +msgid "_Transparent" +msgstr "_Transparan" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:12 -msgid "Original size" -msgstr "Ukuran asli" +msgid "Reset" +msgstr "Reset" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:13 +msgid "" +"Draw a line on the image \n" +"to set the alignment." +msgstr "" +"Gambarlah garis pada citra \n" +"untuk mengatur perataan." + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:15 msgid "Parallel" msgstr "Paralel" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:14 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:16 msgid "Perpendicular" msgstr "Tegak lurus" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:15 -msgid "Pick a background color" -msgstr "Pilih warna latar" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:16 -msgid "Point 1:" -msgstr "Titik 1:" - #: ../extensions/file_tools/data/ui/rotate-options.ui.h:17 -msgid "Point 2:" -msgstr "Titik 2:" +msgid "Alignment" +msgstr "Perataan" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:18 -#, fuzzy -msgid "Reset" -msgstr "Reset" +msgid "Original size" +msgstr "Ukuran asli" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:19 -msgid "_Background:" -msgstr "Latar _Belakang:" +msgid "Bounding box" +msgstr "Kotak pembatas" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:20 -msgid "_Transparent" -msgstr "_Transparan" +msgid "Crop borders" +msgstr "Potong tepi" #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:1 -msgid "Amount:" -msgstr "Banyaknya:" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 +msgid "_Preview:" +msgstr "_Pratilik:" #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:2 -msgid "Radius:" -msgstr "Jari-jari:" - -#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:3 msgid "Threshold:" msgstr "Ambang:" +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:3 +msgid "Radius:" +msgstr "Jari-jari:" + #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:4 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 -msgid "_Preview:" -msgstr "_Pratilik:" +msgid "Amount:" +msgstr "Banyaknya:" #: ../extensions/file_tools/file_tools.extension.in.in.h:1 +msgid "Image tools" +msgstr "Perkakas gambar" + +#: ../extensions/file_tools/file_tools.extension.in.in.h:2 msgid "Basic tools to modify images." msgstr "Perkakas dasar untuk mengubah gambar." -#: ../extensions/file_tools/file_tools.extension.in.in.h:2 -msgid "Image tools" -msgstr "Perkakas gambar" +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:372 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:272 +#: ../extensions/file_tools/gth-file-tool-grayscale.c:248 +#: ../extensions/file_tools/gth-file-tool-negative.c:68 +msgid "Applying changes" +msgstr "Menerapkan perubahan" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:527 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 msgid "Adjust Colors..." msgstr "Atur Warna..." -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:527 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 msgid "Adjust Colors" msgstr "Atur Warna" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:528 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:619 msgid "Change brightness, contrast, saturation and gamma level of the image" msgstr "Ubah tingkat kecerahan, kontras, kejenuhan, dan gamma dari gambar" -#: ../extensions/file_tools/gth-file-tool-crop.c:422 -#: ../extensions/file_tools/gth-file-tool-resize.c:493 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:304 +#| msgid "Adjust Colors" +msgid "Adjust Contrast" +msgstr "Atur Kontras" + +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:305 +msgid "Automatic contrast adjustment" +msgstr "Pengaturan kontras otomatis" + +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 msgid "Square" msgstr "Kwadrat" -#: ../extensions/file_tools/gth-file-tool-crop.c:423 -#: ../extensions/file_tools/gth-file-tool-resize.c:494 +#: ../extensions/file_tools/gth-file-tool-crop.c:417 +#: ../extensions/file_tools/gth-file-tool-resize.c:590 #, c-format msgid "%d x %d (Image)" msgstr "%d x %d (Gambar)" -#: ../extensions/file_tools/gth-file-tool-crop.c:426 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-crop.c:420 +#: ../extensions/file_tools/gth-file-tool-resize.c:594 #, c-format msgid "%d x %d (Screen)" msgstr "%d x %d (Layar)" -#: ../extensions/file_tools/gth-file-tool-crop.c:430 -#: ../extensions/file_tools/gth-file-tool-resize.c:503 +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-resize.c:599 msgid "5:4" msgstr "5:4" -#: ../extensions/file_tools/gth-file-tool-crop.c:431 -#: ../extensions/file_tools/gth-file-tool-resize.c:504 +#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-resize.c:600 msgid "4:3 (DVD, Book)" msgstr "4:3 (Buku, DVD)" -#: ../extensions/file_tools/gth-file-tool-crop.c:432 -#: ../extensions/file_tools/gth-file-tool-resize.c:505 +#: ../extensions/file_tools/gth-file-tool-crop.c:426 +#: ../extensions/file_tools/gth-file-tool-resize.c:601 msgid "7:5" msgstr "7:5" -#: ../extensions/file_tools/gth-file-tool-crop.c:433 -#: ../extensions/file_tools/gth-file-tool-resize.c:506 +#: ../extensions/file_tools/gth-file-tool-crop.c:427 +#: ../extensions/file_tools/gth-file-tool-resize.c:602 msgid "3:2 (Postcard)" msgstr "3:2 (Kartu pos)" -#: ../extensions/file_tools/gth-file-tool-crop.c:434 -#: ../extensions/file_tools/gth-file-tool-resize.c:507 +#: ../extensions/file_tools/gth-file-tool-crop.c:428 +#: ../extensions/file_tools/gth-file-tool-resize.c:603 msgid "16:10" msgstr "16:10" -#: ../extensions/file_tools/gth-file-tool-crop.c:435 -#: ../extensions/file_tools/gth-file-tool-resize.c:508 +#: ../extensions/file_tools/gth-file-tool-crop.c:429 +#: ../extensions/file_tools/gth-file-tool-resize.c:604 msgid "16:9 (DVD)" msgstr "16:9 (DVD)" -#: ../extensions/file_tools/gth-file-tool-crop.c:436 -#: ../extensions/file_tools/gth-file-tool-resize.c:509 +#: ../extensions/file_tools/gth-file-tool-crop.c:430 +#: ../extensions/file_tools/gth-file-tool-resize.c:605 msgid "1.85:1" msgstr "1.85:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:437 -#: ../extensions/file_tools/gth-file-tool-resize.c:510 +#: ../extensions/file_tools/gth-file-tool-crop.c:431 +#: ../extensions/file_tools/gth-file-tool-resize.c:606 msgid "2.39:1" msgstr "2.39:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:438 -#: ../extensions/file_tools/gth-file-tool-resize.c:511 -#: ../extensions/image_print/data/ui/print-layout.ui.h:7 -#: ../extensions/rename_series/gth-template-selector.c:260 +#: ../extensions/file_tools/gth-file-tool-crop.c:432 +#: ../extensions/file_tools/gth-file-tool-resize.c:607 +#: ../extensions/image_print/data/ui/print-layout.ui.h:2 +#: ../extensions/rename_series/gth-template-selector.c:234 msgid "Custom" msgstr "Ubahan" -#: ../extensions/file_tools/gth-file-tool-crop.c:449 -#: ../extensions/file_tools/gth-file-tool-rotate.c:415 -#, fuzzy +#: ../extensions/file_tools/gth-file-tool-crop.c:447 +#: ../extensions/file_tools/gth-file-tool-rotate.c:404 msgid "Rule of Thirds" -msgstr "Aturan generik" +msgstr "Aturan Sepertiga" -#: ../extensions/file_tools/gth-file-tool-crop.c:450 -#: ../extensions/file_tools/gth-file-tool-rotate.c:416 -#, fuzzy +#: ../extensions/file_tools/gth-file-tool-crop.c:448 +#: ../extensions/file_tools/gth-file-tool-rotate.c:405 msgid "Golden Sections" -msgstr "Golden Rock" +msgstr "Golden Section" -#: ../extensions/file_tools/gth-file-tool-crop.c:451 -#: ../extensions/file_tools/gth-file-tool-rotate.c:417 -#, fuzzy +#: ../extensions/file_tools/gth-file-tool-crop.c:449 +#: ../extensions/file_tools/gth-file-tool-rotate.c:406 msgid "Center Lines" -msgstr "Garis Grid" +msgstr "Garis Tengah" -#: ../extensions/file_tools/gth-file-tool-crop.c:452 -#: ../extensions/file_tools/gth-file-tool-rotate.c:418 +#: ../extensions/file_tools/gth-file-tool-crop.c:450 +#: ../extensions/file_tools/gth-file-tool-rotate.c:407 msgid "Uniform" msgstr "Seragam" -#: ../extensions/file_tools/gth-file-tool-crop.c:595 -#, fuzzy +#: ../extensions/file_tools/gth-file-tool-crop.c:608 msgid "Crop..." -msgstr "Potong" +msgstr "Potong…" -#: ../extensions/file_tools/gth-file-tool-crop.c:595 +#: ../extensions/file_tools/gth-file-tool-crop.c:608 msgid "Crop" -msgstr "" - -#: ../extensions/file_tools/gth-file-tool-desaturate.c:65 -#: ../extensions/file_tools/gth-file-tool-negative.c:65 -msgid "Applying changes" -msgstr "Menerapkan perubahan" - -#: ../extensions/file_tools/gth-file-tool-desaturate.c:189 -msgid "Desaturate" -msgstr "Desaturasi" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:116 -msgid "White balance correction" -msgstr "Koreksi white balance" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:339 -msgid "Enhance Colors" -msgstr "Tingkatkan Warna" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:340 -msgid "Automatic white balance correction" -msgstr "Koreksi white balance otomatis" +msgstr "Potong" -#: ../extensions/file_tools/gth-file-tool-equalize.c:83 +#: ../extensions/file_tools/gth-file-tool-equalize.c:45 msgid "Equalizing image histogram" msgstr "Menyetarakan histogram gambar" -#: ../extensions/file_tools/gth-file-tool-equalize.c:261 +#: ../extensions/file_tools/gth-file-tool-equalize.c:230 msgid "Equalize" msgstr "Setarakan" -#: ../extensions/file_tools/gth-file-tool-equalize.c:262 +#: ../extensions/file_tools/gth-file-tool-equalize.c:231 msgid "Equalize image histogram" msgstr "Setarakan histogram gambar" -#: ../extensions/file_tools/gth-file-tool-flip.c:73 +#: ../extensions/file_tools/gth-file-tool-flip.c:87 msgid "Flip" msgstr "Balikkan" -#: ../extensions/file_tools/gth-file-tool-flip.c:74 +#: ../extensions/file_tools/gth-file-tool-flip.c:88 msgid "Flip the image vertically" msgstr "Balikkan gambar secara vertikal" -#: ../extensions/file_tools/gth-file-tool-mirror.c:73 +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +#| msgid "Personalize..." +msgid "Grayscale..." +msgstr "Skala kelabu..." + +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale" +msgstr "Skala kelabu" + +#: ../extensions/file_tools/gth-file-tool-mirror.c:87 msgid "Mirror" msgstr "Cerminkan" -#: ../extensions/file_tools/gth-file-tool-mirror.c:74 +#: ../extensions/file_tools/gth-file-tool-mirror.c:88 msgid "Mirror the image horizontally" msgstr "Cerminkan gambar secara horisontal" -#: ../extensions/file_tools/gth-file-tool-negative.c:183 +#: ../extensions/file_tools/gth-file-tool-negative.c:197 msgid "Negative" msgstr "Negatif" -#: ../extensions/file_tools/gth-file-tool-redo.c:62 -#, fuzzy +#: ../extensions/file_tools/gth-file-tool-redo.c:75 msgid "Redo" msgstr "Jadi lagi" -#: ../extensions/file_tools/gth-file-tool-resize.c:630 +#: ../extensions/file_tools/gth-file-tool-resize.c:214 +#: ../extensions/resize_images/dlg-resize-images.c:180 +msgid "Resizing images" +msgstr "Mengubah ukuran gambar" + +#: ../extensions/file_tools/gth-file-tool-resize.c:808 msgid "Resize..." msgstr "Ubah Ukuran..." -#: ../extensions/file_tools/gth-file-tool-resize.c:630 +#: ../extensions/file_tools/gth-file-tool-resize.c:808 msgid "Resize" msgstr "Ubah Ukuran" -#: ../extensions/file_tools/gth-file-tool-rotate.c:596 +#: ../extensions/file_tools/gth-file-tool-rotate.c:637 msgid "Rotate..." msgstr "Putar..." -#: ../extensions/file_tools/gth-file-tool-rotate.c:596 +#: ../extensions/file_tools/gth-file-tool-rotate.c:637 msgid "Rotate" msgstr "Putar" -#: ../extensions/file_tools/gth-file-tool-rotate.c:597 +#: ../extensions/file_tools/gth-file-tool-rotate.c:638 msgid "Freely rotate the image" msgstr "Putar gambar secara bebas" -#: ../extensions/file_tools/gth-file-tool-rotate-left.c:73 -#: ../extensions/image_rotation/callbacks.c:54 +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:87 +#: ../extensions/image_rotation/callbacks.c:55 msgid "Rotate Left" msgstr "Putar Kiri" -#: ../extensions/file_tools/gth-file-tool-rotate-left.c:74 +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:88 msgid "Rotate the image by 90 degrees counterclockwise" -msgstr "" +msgstr "Putar citra 90 derajat berlawanan dengan arah jarum jam" -#: ../extensions/file_tools/gth-file-tool-rotate-right.c:73 +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:87 #: ../extensions/image_rotation/callbacks.c:49 msgid "Rotate Right" msgstr "Putar Kanan" -#: ../extensions/file_tools/gth-file-tool-rotate-right.c:74 +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:88 msgid "Rotate the image by 90 degrees clockwise" msgstr "Putar gambar 90 derajat searah jarum jam" -#: ../extensions/file_tools/gth-file-tool-save-as.c:56 +#: ../extensions/file_tools/gth-file-tool-save-as.c:70 msgid "Save As" msgstr "Simpan Sebagai" -#: ../extensions/file_tools/gth-file-tool-save.c:52 +#: ../extensions/file_tools/gth-file-tool-save.c:66 msgid "Save" msgstr "Simpan" #: ../extensions/file_tools/gth-file-tool-sharpen.c:100 -#, fuzzy msgid "Sharpening image" -msgstr "Render citra" +msgstr "Pertajam citra" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:420 -#, fuzzy +#: ../extensions/file_tools/gth-file-tool-sharpen.c:459 msgid "Enhance Focus..." -msgstr "Ambil Fokus" +msgstr "Tingkatkan Fokus…" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:420 -#, fuzzy +#: ../extensions/file_tools/gth-file-tool-sharpen.c:459 msgid "Enhance Focus" -msgstr "Ambil Fokus" +msgstr "Tingkatkan Fokus" -#: ../extensions/file_tools/gth-file-tool-undo.c:61 -#, fuzzy +#: ../extensions/file_tools/gth-file-tool-undo.c:75 msgid "Undo" msgstr "Tak Jadi" @@ -2779,38 +2899,38 @@ msgstr "_Folder:" #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:1 +msgid "Search for Duplicates" +msgstr "Cari Duplikat" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 msgid "Duplicates:" msgstr "Duplikat:" -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 msgid "Files:" msgstr "Berkas:" -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 -msgid "No duplicates found." -msgstr "Duplikat tak ditemukan." - #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:4 -msgid "Search for Duplicates" -msgstr "Cari Duplikat" - -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 -#: ../gthumb/gth-browser-actions-entries.h:32 +#: ../gthumb/gth-browser-actions-entries.h:33 msgid "_View" msgstr "_Lihat" +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 +msgid "No duplicates found." +msgstr "Duplikat tak ditemukan." + #: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:1 #: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:1 msgid "Find Duplicates" msgstr "Cari Duplikat" #: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:2 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:19 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 #: ../extensions/search/data/ui/search-editor.ui.h:1 msgid "Start _at:" msgstr "Mul_ai di:" -#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 msgid "_Filter:" msgstr "_Tapis:" @@ -2818,42 +2938,42 @@ msgid "Find duplicated files." msgstr "Cari berkas duplikat." -#: ../extensions/find_duplicates/gth-find-duplicates.c:53 +#: ../extensions/find_duplicates/gth-find-duplicates.c:65 msgid "leave the newest duplicates" msgstr "biarkan duplikat terbaru" -#: ../extensions/find_duplicates/gth-find-duplicates.c:54 +#: ../extensions/find_duplicates/gth-find-duplicates.c:66 msgid "leave the oldest duplicates" msgstr "biarkan duplikat terlama" -#: ../extensions/find_duplicates/gth-find-duplicates.c:55 +#: ../extensions/find_duplicates/gth-find-duplicates.c:67 msgid "by folder..." msgstr "menurut folder..." -#: ../extensions/find_duplicates/gth-find-duplicates.c:56 +#: ../extensions/find_duplicates/gth-find-duplicates.c:68 msgid "all files" msgstr "semua berkas" -#: ../extensions/find_duplicates/gth-find-duplicates.c:57 +#: ../extensions/find_duplicates/gth-find-duplicates.c:69 msgid "no file" msgstr "tak ada berkas" -#: ../extensions/find_duplicates/gth-find-duplicates.c:426 -#: ../extensions/find_duplicates/gth-find-duplicates.c:521 +#: ../extensions/find_duplicates/gth-find-duplicates.c:560 +#: ../extensions/find_duplicates/gth-find-duplicates.c:668 #, c-format msgid "%d duplicate" msgid_plural "%d duplicates" msgstr[0] "%d duplikat" -#: ../extensions/find_duplicates/gth-find-duplicates.c:565 +#: ../extensions/find_duplicates/gth-find-duplicates.c:712 msgid "Search completed" msgstr "Pencarian selesai" -#: ../extensions/find_duplicates/gth-find-duplicates.c:577 +#: ../extensions/find_duplicates/gth-find-duplicates.c:725 msgid "Searching for duplicates" msgstr "Mencari duplikat" -#: ../extensions/find_duplicates/gth-find-duplicates.c:580 +#: ../extensions/find_duplicates/gth-find-duplicates.c:728 #: ../gthumb/gth-load-file-data-task.c:106 #: ../gthumb/gth-save-file-data-task.c:100 #, c-format @@ -2861,20 +2981,19 @@ msgid_plural "%d files remaining" msgstr[0] "%d berkas lagi" -#: ../extensions/find_duplicates/gth-find-duplicates.c:663 +#: ../extensions/find_duplicates/gth-find-duplicates.c:830 msgid "Getting the file list" msgstr "Mengambil daftar berkas" -#: ../extensions/find_duplicates/gth-find-duplicates.c:769 +#: ../extensions/find_duplicates/gth-find-duplicates.c:1016 msgid "Duplicates" msgstr "Duplikat" -#: ../extensions/find_duplicates/gth-find-duplicates.c:1023 +#: ../extensions/find_duplicates/gth-find-duplicates.c:1306 msgid "Select" msgstr "Pilih" -#: ../extensions/flicker/callbacks.c:59 -#: ../extensions/flicker/callbacks.c:63 +#: ../extensions/flicker/callbacks.c:59 ../extensions/flicker/callbacks.c:64 msgid "_Flickr..." msgstr "_Flickr..." @@ -2882,7 +3001,7 @@ msgid "Download photos from Flickr" msgstr "Unduh foto dari Flickr" -#: ../extensions/flicker/callbacks.c:64 +#: ../extensions/flicker/callbacks.c:65 msgid "Upload photos to Flickr" msgstr "Unggah foto ke Flickr" @@ -2894,137 +3013,128 @@ msgid "Upload images to Flickr" msgstr "Unggah gambar ke Flickr" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 msgid "Free space:" msgstr "Ruang kosong:" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 -msgid "Hi_de from public searches" -msgstr "Sembunyikan _dari pencarian publik" - -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 -msgid "Moderate content" -msgstr "Isi sedang" - #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:5 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 msgid "Ph_otoset:" msgstr "Set F_oto:" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:6 -msgid "Private photos" -msgstr "Foto pivat" +msgid "_Privacy:" +msgstr "_Privasi:" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:7 -msgid "Private photos, visible to family" -msgstr "Foto privat, dapat dilihat oleh famili" +msgid "Hi_de from public searches" +msgstr "Sembunyikan _dari pencarian publik" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:8 +msgid "_Safety:" +msgstr "Ke_selamatan:" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 msgid "Private photos, visible to family and friends" msgstr "Foto privat, dapat dilihat oleh famili dan teman" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 -msgid "Restricted content" -msgstr "Isi terbatas" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 +msgid "Private photos, visible to family" +msgstr "Foto privat, dapat dilihat oleh famili" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 +msgid "Private photos" +msgstr "Foto pivat" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 msgid "Safe content" msgstr "Isi aman" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 -msgid "_Privacy:" -msgstr "_Privasi:" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 +msgid "Moderate content" +msgstr "Isi sedang" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 -#, fuzzy -msgid "_Safety:" -msgstr "Batas keselamatan" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:17 +msgid "Restricted content" +msgstr "Isi terbatas" -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 msgid "_Import" msgstr "_Impor" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:357 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:827 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:360 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:830 msgid "Could not get the photo list" msgstr "Tak bisa mendapat daftar foto" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:394 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:559 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:861 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1024 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:397 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:562 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:864 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1027 msgid "No album selected" msgstr "Tak ada album yang dipilih" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:577 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:580 #, c-format msgid "Import from %s" msgstr "Impor dari %s" -#: ../extensions/gstreamer_tools/actions.c:64 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1118 -#: ../gthumb/gth-browser.c:2008 +#: ../extensions/gstreamer_tools/actions.c:66 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1080 +#: ../gthumb/gth-browser.c:2098 msgid "Could not save the file" msgstr "Tak bisa menyimpan berkas" -#: ../extensions/gstreamer_tools/actions.c:124 +#: ../extensions/gstreamer_tools/actions.c:126 msgid "Could not take a screenshot" msgstr "Tak bisa mengambil cuplikan layar" -#: ../extensions/gstreamer_tools/actions.c:130 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1266 +#: ../extensions/gstreamer_tools/actions.c:132 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1251 msgid "Save Image" msgstr "Simpan Gambar" -#: ../extensions/gstreamer_tools/actions.c:150 +#: ../extensions/gstreamer_tools/actions.c:152 msgctxt "Filename" msgid "Screenshot" msgstr "Cuplikan layar" -#. this is an empty time +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:1 +msgid "Slower" +msgstr "Lebih lambat" + #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 -msgid "--:--" -msgstr "--:--" +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:687 +msgid "Play" +msgstr "Mainkan" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:3 -msgid "Change volume level" -msgstr "Ubah tingkat volume" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 msgid "Faster" msgstr "Lebih cepat" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:656 -msgid "Play" -msgstr "Mainkan" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 -msgid "Slower" -msgstr "Lebih lambat" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 msgid "Time:" msgstr "Waktu:" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:8 -#, fuzzy +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 +msgid "--:--" +msgstr "--:--" + +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 msgid "Toggle volume" -msgstr "Tombol Volume" +msgstr "Jungkitkan volume" -#. this is the separator between current position and duration of a media file -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:10 -msgctxt "time" -msgid "/" -msgstr "/" +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 +msgid "Change volume level" +msgstr "Ubah tingkat volume" -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 #: ../extensions/photo_importer/actions.c:67 -#: ../extensions/photo_importer/dlg-photo-importer.c:614 +#: ../extensions/photo_importer/dlg-photo-importer.c:620 msgid "Choose a folder" msgstr "Pilih folder" @@ -3036,29 +3146,29 @@ msgid "Play audio and video files." msgstr "Putar berkas audio dan video." -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:93 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:104 msgid "Screenshot" msgstr "Cuplikan layar" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:94 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:105 msgid "Take a screenshot" msgstr "Ambil cuplikan layar" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:633 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:664 msgid "Playing video" msgstr "Memutar video" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:646 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:677 msgid "Pause" msgstr "Jeda" #: ../extensions/gstreamer_tools/main.c:31 -#: ../gthumb/gth-main-default-tests.c:211 +#: ../gthumb/gth-main-default-tests.c:247 msgid "Video" msgstr "Video" #: ../extensions/gstreamer_tools/main.c:32 -#: ../gthumb/gth-main-default-tests.c:218 +#: ../gthumb/gth-main-default-tests.c:254 msgid "Audio" msgstr "Suara" @@ -3067,7 +3177,7 @@ msgstr "Artis" #: ../extensions/gstreamer_tools/main.c:40 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 msgid "Album" msgstr "Album" @@ -3077,7 +3187,7 @@ #: ../extensions/gstreamer_tools/main.c:42 msgid "Encoder" -msgstr "" +msgstr "Enkoder" #: ../extensions/gstreamer_tools/main.c:44 #: ../extensions/gstreamer_tools/main.c:49 @@ -3089,13 +3199,13 @@ msgstr "Laju frame:" #: ../extensions/gstreamer_tools/main.c:46 -#: ../extensions/image_print/data/ui/print-layout.ui.h:25 -#: ../extensions/image_viewer/gth-image-viewer-page.c:222 +#: ../extensions/image_print/data/ui/print-layout.ui.h:24 +#: ../extensions/image_viewer/gth-image-viewer-page.c:209 msgid "Width" msgstr "Lebar" #: ../extensions/gstreamer_tools/main.c:47 -#: ../extensions/image_print/data/ui/print-layout.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:25 msgid "Height" msgstr "Tinggi" @@ -3117,10 +3227,9 @@ #. Translators: this is an image size, such as 1024 × 768 #: ../extensions/gstreamer_utils/gstreamer-utils.c:396 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1318 -#: ../extensions/image_viewer/gth-metadata-provider-image.c:190 -#: ../extensions/webalbums/dlg-web-exporter.c:429 -#: ../extensions/webalbums/gth-web-exporter.c:2456 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1306 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:209 +#: ../extensions/webalbums/gth-web-exporter.c:2444 ../gthumb/gtk-utils.c:1055 #, c-format msgid "%d × %d" msgstr "%d × %d" @@ -3129,101 +3238,99 @@ msgid "Could not print the selected files" msgstr "Tak bisa mencetak berkas yang dipilih" -#: ../extensions/image_print/callbacks.c:54 +#: ../extensions/image_print/callbacks.c:65 msgid "Print the selected images" msgstr "Cetak gambar yang dipilih" -#: ../extensions/image_print/data/ui/print-layout.ui.h:5 -#, fuzzy +#: ../extensions/image_print/data/ui/print-layout.ui.h:1 msgid "Centered" msgstr "Tengah" -#: ../extensions/image_print/data/ui/print-layout.ui.h:10 -msgid "Image" -msgstr "Gambar" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:12 -msgid "Left" -msgstr "Kiri" - #: ../extensions/image_print/data/ui/print-layout.ui.h:13 -msgid "Position:" -msgstr "Posisi:" +msgid "The total number of files" +msgstr "Total cacah berkas" #: ../extensions/image_print/data/ui/print-layout.ui.h:14 -msgid "Preview" -msgstr "Pratilik" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:15 -msgid "Rotation:" -msgstr "Rotasi:" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:20 #: ../extensions/importer/data/ui/import-preferences.ui.h:4 msgid "The event description" msgstr "Keterangan acara" +#: ../extensions/image_print/data/ui/print-layout.ui.h:17 +msgid "_Rows:" +msgstr "Ba_ris:" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:19 +msgid "Image" +msgstr "Gambar" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:20 +msgid "Position:" +msgstr "Posisi:" + #: ../extensions/image_print/data/ui/print-layout.ui.h:21 -msgid "The total number of files" -msgstr "Total cacah berkas" +msgid "Left" +msgstr "Kiri" -#: ../extensions/image_print/data/ui/print-layout.ui.h:23 +#: ../extensions/image_print/data/ui/print-layout.ui.h:22 msgid "Top" msgstr "Puncak" -#: ../extensions/image_print/data/ui/print-layout.ui.h:24 +#: ../extensions/image_print/data/ui/print-layout.ui.h:26 +msgid "Rotation:" +msgstr "Rotasi:" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:27 msgid "Unit:" msgstr "Satuan:" #: ../extensions/image_print/data/ui/print-layout.ui.h:28 -msgid "_Rows:" -msgstr "Ba_ris:" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:29 -msgid "inches" -msgstr "inci" +msgid "Preview" +msgstr "Pratilik" #: ../extensions/image_print/data/ui/print-layout.ui.h:30 msgid "millimeters" msgstr "milimeter" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 -msgid "Fonts" -msgstr "Fonta" - -#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 -#, fuzzy -msgid "Select Caption Font" -msgstr "Pilih Fonta Dasher" +#: ../extensions/image_print/data/ui/print-layout.ui.h:31 +msgid "inches" +msgstr "inci" #: ../extensions/image_print/data/ui/print-preferences.ui.h:4 -msgid "Select Footer Font" -msgstr "Pilih Fonta Kaki" +msgid "Select Caption Font" +msgstr "Pilih Fonta Keterangan" #: ../extensions/image_print/data/ui/print-preferences.ui.h:5 msgid "Select Header Font" msgstr "Pilih Fonta Tajuk" -#: ../extensions/image_print/gth-image-print-job.c:997 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 +msgid "Select Footer Font" +msgstr "Pilih Fonta Kaki" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 +msgid "Fonts" +msgstr "Fonta" + +#: ../extensions/image_print/gth-image-print-job.c:914 #: ../extensions/webalbums/data/albumthemes/text.h:31 #, c-format msgid "Page %d of %d" msgstr "Halaman %d dari %d" -#: ../extensions/image_print/gth-image-print-job.c:1761 +#: ../extensions/image_print/gth-image-print-job.c:1680 +#: ../extensions/image_print/gth-image-print-job.c:1845 #: ../extensions/image_print/gth-image-print-job.c:1888 -#: ../extensions/image_print/gth-image-print-job.c:1925 msgid "Could not print" msgstr "Tak bisa mencetak" -#: ../extensions/image_print/gth-image-print-job.c:1823 -#: ../gthumb/gth-main-default-tests.c:204 +#: ../extensions/image_print/gth-image-print-job.c:1746 +#: ../gthumb/gth-main-default-tests.c:240 msgid "Images" msgstr "Gambar" -#: ../extensions/image_print/gth-image-print-job.c:1890 -#: ../gthumb/gth-image-loader.c:233 -#: ../gthumb/gth-image-loader.c:306 +#: ../extensions/image_print/gth-image-print-job.c:1847 +#: ../gthumb/gth-image-loader.c:197 ../gthumb/gth-image-loader.c:304 +#: ../gthumb/gth-image-utils.c:131 ../gthumb/gth-image-utils.c:137 msgid "No suitable loader available for this file type" msgstr "Tak ada pemuat yang cocok bagi berkas jenis ini" @@ -3234,19 +3341,19 @@ msgstr "Memuat \"%s\"" #: ../extensions/image_print/gth-load-image-info-task.c:166 -#: ../extensions/webalbums/gth-web-exporter.c:2695 +#: ../extensions/webalbums/gth-web-exporter.c:2716 msgid "Loading images" msgstr "Meload gambar" #: ../extensions/image_print/image_print.extension.in.in.h:1 -msgid "Allow to print images choosing the page layout." -msgstr "" +msgid "Image print" +msgstr "Cetak citra" #: ../extensions/image_print/image_print.extension.in.in.h:2 -msgid "Image print" -msgstr "" +msgid "Allow to print images choosing the page layout." +msgstr "Memungkinkan mencetak citra dengan memilih tata letak halaman." -#: ../extensions/image_print/preferences.c:76 +#: ../extensions/image_print/preferences.c:79 msgid "Print" msgstr "Cetak" @@ -3254,30 +3361,30 @@ msgid "Rotate the selected images 90° to the right" msgstr "Putar gambar yang dipilih 90° ke kanan" -#: ../extensions/image_rotation/callbacks.c:55 +#: ../extensions/image_rotation/callbacks.c:56 msgid "Rotate the selected images 90° to the left" msgstr "Putar gambar yang dipilih 90° ke kiri" -#: ../extensions/image_rotation/callbacks.c:59 +#: ../extensions/image_rotation/callbacks.c:61 msgid "Rotate Physically" msgstr "Putar Secara Fisik" -#: ../extensions/image_rotation/callbacks.c:60 +#: ../extensions/image_rotation/callbacks.c:62 msgid "Rotate the selected images according to the embedded orientation" msgstr "Putar gambar yang dipilih menurut orientasi tertempel" -#: ../extensions/image_rotation/callbacks.c:64 +#: ../extensions/image_rotation/callbacks.c:67 msgid "Reset the EXIF Orientation" msgstr "Reset Orientasi EXIF" -#: ../extensions/image_rotation/callbacks.c:65 +#: ../extensions/image_rotation/callbacks.c:68 msgid "Reset the embedded orientation without rotating the images" msgstr "Reset orientasi penempelan tanpa memutar gambar" #: ../extensions/image_rotation/gth-reset-orientation-task.c:111 #: ../extensions/image_rotation/gth-transform-task.c:141 -#: ../extensions/webalbums/gth-web-exporter.c:2349 -#: ../extensions/webalbums/gth-web-exporter.c:2433 +#: ../extensions/webalbums/gth-web-exporter.c:2337 +#: ../extensions/webalbums/gth-web-exporter.c:2421 msgid "Saving images" msgstr "Menyimpan gambar" @@ -3289,273 +3396,288 @@ msgid "Rotate images without data loss." msgstr "Putar gambar tanpa kehilangan data." -#: ../extensions/image_rotation/rotation-utils.c:118 +#: ../extensions/image_rotation/rotation-utils.c:117 #, c-format msgid "Problem transforming the image: %s" msgstr "Masalah saat menransformasi gambar: %s" -#: ../extensions/image_rotation/rotation-utils.c:123 +#: ../extensions/image_rotation/rotation-utils.c:122 msgid "" -"This transformation may introduce small image distortions along one or more edges, because the image dimensions are not multiples of 8.\n" +"This transformation may introduce small image distortions along one or more " +"edges, because the image dimensions are not multiples of 8.\n" "\n" -"The distortion is reversible, however. If the resulting image is unacceptable, simply apply the reverse transformation to return to the original image.\n" +"The distortion is reversible, however. If the resulting image is " +"unacceptable, simply apply the reverse transformation to return to the " +"original image.\n" "\n" -"You can also choose to discard (or trim) any untransformable edge pixels. For practical use, this mode gives the best looking results, but the transformation is not strictly lossless anymore." +"You can also choose to discard (or trim) any untransformable edge pixels. " +"For practical use, this mode gives the best looking results, but the " +"transformation is not strictly lossless anymore." msgstr "" +"Transformasi ini mungkin menambahkan distorsi kecil ke citra pada satu tepi " +"atau lebih, karena dimensi citra bukan kelipatan 8.\n" +"\n" +"Namun distorsi ini dapat dibatalkan. Bila citra hasil tak dapat diterima, " +"terapkan saja transformasi balik untuk kembali ke citra asli.\n" +"\n" +"Anda juga dapat memilih untuk membuang (atau merapikan) piksel tepi yang tak " +"dapat ditransformasi. Untuk keperluan praktis, mode ini memberikan hasil " +"dengan penampakan terbaik, tapi transformasinya tak lagi lossless." -#: ../extensions/image_rotation/rotation-utils.c:129 -#, fuzzy +#: ../extensions/image_rotation/rotation-utils.c:128 msgid "_Trim" -msgstr "Potong:" +msgstr "Po_tong" -#: ../extensions/image_rotation/rotation-utils.c:131 +#: ../extensions/image_rotation/rotation-utils.c:130 msgid "_Accept distortion" msgstr "Terim_a distorsi" -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:1 -msgid "Possible values are: actual-size, keep-prev, fit-size, fit-size-if-larger, fit-width, fit-width-if-larger." -msgstr "Nilai yang mungkin: actual-size (ukuran sebenarnya), keep-prev (pertahankan sebelumnya), fit-size (pas ukuran), fit-size-if-larger (paskan bila lebih besar), fit-width (paskan lebar), fit-width-if-larger (paskan lebar bila lebih besar)." - -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:8 -msgid "Whether to resize the window to fit the size of the image" -msgstr "Apakah mengubah ukuran jendela agar pas dengan ukuran gambar" - #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:1 -msgid "After loading an image:" -msgstr "Setelah memuat gambar:" +msgid "Set to actual size" +msgstr "Tata ke ukuran sebenarnya" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:2 -msgid "High" -msgstr "Tinggi" +msgid "Keep previous zoom" +msgstr "Pertahankan zum" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:3 -msgid "Low" -msgstr "Rendah" +msgid "Fit to window" +msgstr "Paskan ke jendela" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 +msgid "Fit to window if larger" +msgstr "Paskan ke jendela jika lebih besar" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:5 -msgid "Reset scrollbar positions" -msgstr "Reset posisi bilah penggulung" +msgid "Fit to width" +msgstr "Pas lebar" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:6 -msgid "Transparency _type:" -msgstr "_tipe Transparansi:" +msgid "Fit to width if larger" +msgstr "Paskan lebarnya jika lebih besar" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:7 +msgid "Reset scrollbar positions" +msgstr "Reset posisi bilah penggulung" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:8 +msgid "After loading an image:" +msgstr "Setelah memuat gambar:" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:9 msgid "_Zoom quality:" msgstr "Kualitas _zum:" -#: ../extensions/image_viewer/gth-image-histogram.c:74 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:10 +msgid "Transparency _type:" +msgstr "_tipe Transparansi:" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:11 +msgid "High" +msgstr "Tinggi" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:12 +msgid "Low" +msgstr "Rendah" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:13 +msgid "White" +msgstr "Putih" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:15 +msgid "Black" +msgstr "Hitam" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:16 +msgid "Checked" +msgstr "Diperiksa" + +#: ../extensions/image_viewer/gth-image-histogram.c:84 msgid "Histogram" msgstr "Histogram" -#: ../extensions/image_viewer/gth-image-viewer-page.c:192 +#: ../extensions/image_viewer/gth-image-viewer-page.c:179 msgid "Copy Image" msgstr "Salin Gambar" -#: ../extensions/image_viewer/gth-image-viewer-page.c:193 +#: ../extensions/image_viewer/gth-image-viewer-page.c:180 msgid "Copy the image to the clipboard" msgstr "Salin gambar ke papan klip" -#: ../extensions/image_viewer/gth-image-viewer-page.c:197 +#: ../extensions/image_viewer/gth-image-viewer-page.c:184 msgid "Paste Image" msgstr "Salin Gambar" -#: ../extensions/image_viewer/gth-image-viewer-page.c:198 +#: ../extensions/image_viewer/gth-image-viewer-page.c:185 msgid "Paste the image from the clipboard" msgstr "Tempel gambar dari papan klip" -#: ../extensions/image_viewer/gth-image-viewer-page.c:202 +#: ../extensions/image_viewer/gth-image-viewer-page.c:189 msgid "In" msgstr "Dalam" -#: ../extensions/image_viewer/gth-image-viewer-page.c:203 +#: ../extensions/image_viewer/gth-image-viewer-page.c:190 msgid "Zoom in" msgstr "Zoom perbesar" -#: ../extensions/image_viewer/gth-image-viewer-page.c:207 +#: ../extensions/image_viewer/gth-image-viewer-page.c:194 msgid "Out" msgstr "Luar" -#: ../extensions/image_viewer/gth-image-viewer-page.c:208 +#: ../extensions/image_viewer/gth-image-viewer-page.c:195 msgid "Zoom out" msgstr "Zoom perkecil" -#: ../extensions/image_viewer/gth-image-viewer-page.c:212 +#: ../extensions/image_viewer/gth-image-viewer-page.c:199 msgid "1:1" msgstr "1:1" -#: ../extensions/image_viewer/gth-image-viewer-page.c:213 +#: ../extensions/image_viewer/gth-image-viewer-page.c:200 msgid "Actual size" msgstr "Ukuran Sebenarnya" -#: ../extensions/image_viewer/gth-image-viewer-page.c:217 +#: ../extensions/image_viewer/gth-image-viewer-page.c:204 msgid "Fit" msgstr "Sesuaikan" -#: ../extensions/image_viewer/gth-image-viewer-page.c:218 +#: ../extensions/image_viewer/gth-image-viewer-page.c:205 msgid "Zoom to fit window" msgstr "Zoom sesuaikan dengan jendela" -#: ../extensions/image_viewer/gth-image-viewer-page.c:223 +#: ../extensions/image_viewer/gth-image-viewer-page.c:210 msgid "Zoom to fit width" msgstr "Zum agar pas lebar" -#: ../extensions/image_viewer/gth-image-viewer-page.c:230 -msgid "_Fit Window to Image" -msgstr "_Paskan Jendela ke Gambar" - -#: ../extensions/image_viewer/gth-image-viewer-page.c:231 -msgid "Resize the window to the size of the image" -msgstr "Ubah ukuran jendela ke ukuran gambar" - #: ../extensions/image_viewer/image_viewer.extension.in.in.h:1 -msgid "Basic image viewing." -msgstr "Penilikan gambar dasar." - -#: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 msgid "Image viewer" msgstr "Penampil gambar" -#: ../extensions/image_viewer/preferences.c:96 -msgid "Set to actual size" -msgstr "Tata ke ukuran sebenarnya" - -#: ../extensions/image_viewer/preferences.c:100 -msgid "Fit to width" -msgstr "Pas lebar" +#: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 +msgid "Basic image viewing." +msgstr "Penilikan gambar dasar." -#: ../extensions/image_viewer/preferences.c:137 +#: ../extensions/image_viewer/preferences.c:125 msgid "Viewer" msgstr "Penampil" -#: ../extensions/importer/data/gthumb-importer.schemas.in.h:1 -msgid "Possible values are: none, file_date, current_date" -msgstr "Nilai yang mungkin: none, file_date, current_date" - -#: ../extensions/importer/data/gthumb-importer.schemas.in.h:2 -msgid "Possible values are: yyyymmdd, yyyymm, yyyy" -msgstr "Nilai yang mungkin: yyyymmdd, yyyymm, yyyy" - -#: ../extensions/importer/data/ui/import-preferences.ui.h:3 -#, fuzzy -msgid "The day of the month" -msgstr "Hari/Bulan/Tahun" +#: ../extensions/importer/data/ui/import-preferences.ui.h:1 +msgid "_Destination" +msgstr "_Tujuan" -#: ../extensions/importer/data/ui/import-preferences.ui.h:5 -msgid "The hour" -msgstr "Jam" +#: ../extensions/importer/data/ui/import-preferences.ui.h:2 +msgid "_Automatic subfolder" +msgstr "Sub folder otom_atis" -#: ../extensions/importer/data/ui/import-preferences.ui.h:6 -msgid "The minutes" -msgstr "Menit" +#: ../extensions/importer/data/ui/import-preferences.ui.h:3 +msgid "as _single subfolder" +msgstr "_sebagai sub folder tunggal" #: ../extensions/importer/data/ui/import-preferences.ui.h:7 -msgid "The month" -msgstr "Bulan" +msgid "The year" +msgstr "Tahun" #: ../extensions/importer/data/ui/import-preferences.ui.h:8 -msgid "The seconds" -msgstr "Detik" +msgid "The month" +msgstr "Bulan" #: ../extensions/importer/data/ui/import-preferences.ui.h:9 -msgid "The year" -msgstr "Tahun" +msgid "The day of the month" +msgstr "Hari dalam tanggal" #: ../extensions/importer/data/ui/import-preferences.ui.h:10 -msgid "_Automatic subfolder" -msgstr "Sub folder otom_atis" +msgid "The hour" +msgstr "Jam" #: ../extensions/importer/data/ui/import-preferences.ui.h:11 -msgid "_Destination" -msgstr "_Tujuan" +msgid "The minutes" +msgstr "Menit" #: ../extensions/importer/data/ui/import-preferences.ui.h:12 -msgid "as _single subfolder" -msgstr "_sebagai sub folder tunggal" +msgid "The seconds" +msgstr "Detik" -#: ../extensions/importer/gth-import-destination-button.c:212 +#: ../extensions/importer/gth-import-destination-button.c:183 msgid "Invalid Destination" msgstr "Tujuan Tak Valid" -#: ../extensions/importer/gth-import-preferences-dialog.c:195 +#: ../extensions/importer/gth-import-preferences-dialog.c:198 #, c-format msgid "example: %s" msgstr "contoh: %s" #. subfolder type -#: ../extensions/importer/gth-import-preferences-dialog.c:326 +#: ../extensions/importer/gth-import-preferences-dialog.c:330 msgid "File date" msgstr "Tanggal berkas" #. gtk_label_set_mnemonic_widget (GTK_LABEL (GET_WIDGET ("subfolder_label")), self->priv->subfolder_type_list); #. subfolder format -#: ../extensions/importer/gth-import-preferences-dialog.c:336 +#: ../extensions/importer/gth-import-preferences-dialog.c:340 msgid "year-month-day" -msgstr "" +msgstr "year-month-day" -#: ../extensions/importer/gth-import-preferences-dialog.c:337 +#: ../extensions/importer/gth-import-preferences-dialog.c:341 msgid "year-month" -msgstr "" +msgstr "year-month" -#: ../extensions/importer/gth-import-preferences-dialog.c:338 +#: ../extensions/importer/gth-import-preferences-dialog.c:342 msgid "year" msgstr "tahun" -#: ../extensions/importer/gth-import-preferences-dialog.c:339 +#: ../extensions/importer/gth-import-preferences-dialog.c:343 msgid "custom format" msgstr "format ubahan" -#: ../extensions/importer/gth-import-task.c:442 -#: ../extensions/importer/gth-import-task.c:477 -#: ../extensions/importer/gth-import-task.c:643 +#: ../extensions/importer/gth-import-task.c:445 +#: ../extensions/importer/gth-import-task.c:480 +#: ../extensions/importer/gth-import-task.c:651 msgid "Importing files" msgstr "Mengimpor berkas" -#: ../extensions/importer/gth-import-task.c:598 +#: ../extensions/importer/gth-import-task.c:601 msgid "No file imported" msgstr "Tak ada berkas yang diimpor" -#: ../extensions/importer/gth-import-task.c:599 +#: ../extensions/importer/gth-import-task.c:602 msgid "The selected files are already present in the destination." msgstr "Berkas yang dipilih telah ada di tujuan." -#: ../extensions/importer/gth-import-task.c:619 -#: ../gthumb/gth-file-source-vfs.c:685 +#: ../extensions/importer/gth-import-task.c:625 +#: ../gthumb/gth-file-source-vfs.c:694 msgid "Could not delete the files" msgstr "Tak bisa menghapus berkas" -#: ../extensions/importer/gth-import-task.c:620 +#: ../extensions/importer/gth-import-task.c:626 msgid "Delete operation not supported." msgstr "Operasi penghapusan tak didukung." -#: ../extensions/importer/gth-import-task.c:704 +#: ../extensions/importer/gth-import-task.c:712 msgid "Last imported" msgstr "Terakhir diimpor" -#: ../extensions/importer/gth-import-task.c:839 +#: ../extensions/importer/gth-import-task.c:818 msgid "No file specified." msgstr "Tak ada berkas yang dinyatakan." #. Translators: For example: Not enough free space in '/home/user/Images'.\n1.3 GB of space is required but only 300 MB is available. -#: ../extensions/importer/gth-import-task.c:876 +#: ../extensions/importer/gth-import-task.c:855 #, c-format msgid "" "Not enough free space in '%s'.\n" "%s of space is required but only %s is available." msgstr "" +"Tak cukup ruang kosong dalam '%s'.\n" +"Diperlukan %s tapi hanya tersedia %s." -#: ../extensions/list_tools/callbacks.c:65 -#: ../gthumb/gth-filterbar.c:303 +#: ../extensions/list_tools/callbacks.c:76 ../gthumb/gth-filterbar.c:311 msgid "Personalize..." msgstr "Personalisasikan..." -#: ../extensions/list_tools/callbacks.c:238 -#: ../extensions/list_tools/callbacks.c:249 +#: ../extensions/list_tools/callbacks.c:320 msgid "Tools" msgstr "Perkakas" -#: ../extensions/list_tools/callbacks.c:240 -#: ../extensions/list_tools/callbacks.c:251 +#: ../extensions/list_tools/callbacks.c:321 msgid "Batch tools for multiple files" msgstr "Perkakas batch bagi berkas berganda" @@ -3564,120 +3686,98 @@ msgstr "_Lewati" #: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:1 -msgid "Co_mmands:" -msgstr "_Perintah:" - -#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:2 msgid "Commands" msgstr "Perintah" +#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:2 +msgid "Co_mmands:" +msgstr "_Perintah:" + #: ../extensions/list_tools/data/ui/script-editor.ui.h:2 -#, no-c-format -msgid "%B" -msgstr "%B" +msgid "_Wait for the command to finish" +msgstr "_Tunggu perintah berakhir" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:3 +msgid "E_xecute command once for every file" +msgstr "E_ksekusi perintah sekali bagi setiap berkas" #: ../extensions/list_tools/data/ui/script-editor.ui.h:4 -#, no-c-format -msgid "%E" -msgstr "%E" +msgid "_Terminal command (shell script)" +msgstr "Perintah _terminal (skrip shell)" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:5 +msgid "Sh_ortcut:" +msgstr "Pintasa_n:" #: ../extensions/list_tools/data/ui/script-editor.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 -#, no-c-format -msgid "%F" -msgstr "%F" +msgid "The file uri" +msgstr "URI berkas" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:8 -#, no-c-format -msgid "%N" -msgstr "%N" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:7 +msgid "The file path" +msgstr "Path berkas" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:11 -#, no-c-format -msgid "%P" -msgstr "%P" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:8 +msgid "The file basename" +msgstr "Nama dasar berkas" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:12 -#, no-c-format -msgid "%U" -msgstr "%U" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:9 +msgid "The parent folder path" +msgstr "Path folder induk" #. Translate only 'message' and 'default_value'. -#: ../extensions/list_tools/data/ui/script-editor.ui.h:15 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:14 #, no-c-format msgid "%ask{ message }{ default value }" -msgstr "" +msgstr "%ask{ pesan }{ nilai baku }" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:15 +msgid "Ask an input value" +msgstr "Minta masukan suatu nilai" #. Translate only 'attribute name' #: ../extensions/list_tools/data/ui/script-editor.ui.h:18 -#, fuzzy, no-c-format +#, no-c-format msgid "%attr{ attribute name }" -msgstr "Nama atribut tambahan yang tak valid" - -#. Translate only 'text'. -#: ../extensions/list_tools/data/ui/script-editor.ui.h:21 -#, fuzzy, no-c-format -msgid "%quote{ text }" -msgstr "Berkas Teks" +msgstr "%attr{ nama atribut }" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:22 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:19 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 msgid "A file attribute" msgstr "Suatu atribut berkas" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:23 -msgid "Ask an input value" -msgstr "Minta masukan suatu nilai" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:25 -msgid "E_xecute command once for every file" -msgstr "E_ksekusi perintah sekali bagi setiap berkas" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:26 -msgid "Quote the text " -msgstr "Kutip teks" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:27 -msgid "Sh_ortcut:" -msgstr "Pintasa_n:" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:29 -msgid "The file basename" -msgstr "Nama dasar berkas" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:21 +#, no-c-format +msgid "%N" +msgstr "%N" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:30 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:22 msgid "The file basename without extension" msgstr "Nama berkas tanpa ekstensi" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:31 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:24 +#, no-c-format +msgid "%E" +msgstr "%E" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:25 msgid "The file extension" msgstr "Ekstensi berkas" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:32 -msgid "The file path" -msgstr "Path berkas" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:33 -msgid "The file uri" -msgstr "URI berkas" +#. Translate only 'text'. +#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 +#, no-c-format +msgid "%quote{ text }" +msgstr "%quote{ teks }" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:34 -msgid "The parent folder path" -msgstr "Path folder induk" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:29 +msgid "Quote the text " +msgstr "Kutip teks" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:35 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:30 msgid "_Command:" msgstr "_Perintah:" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:37 -msgid "_Terminal command (shell script)" -msgstr "Perintah _terminal (skrip shell)" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:38 -msgid "_Wait for the command to finish" -msgstr "_Tunggu perintah berakhir" - #: ../extensions/list_tools/dlg-personalize-scripts.c:257 msgid "Script" msgstr "Skrip" @@ -3687,7 +3787,7 @@ msgstr "Pintas" #: ../extensions/list_tools/dlg-personalize-scripts.c:285 -#: ../gthumb/dlg-personalize-filters.c:251 +#: ../gthumb/dlg-personalize-filters.c:252 msgid "Show" msgstr "Tampilkan" @@ -3707,32 +3807,32 @@ msgid "Are you sure you want to delete the selected command?" msgstr "Anda yakin akan menghapus perintah yang dipilih?" -#: ../extensions/list_tools/gth-script.c:642 +#: ../extensions/list_tools/gth-script.c:610 msgid "Enter a value:" msgstr "Masukkan nilai:" -#: ../extensions/list_tools/gth-script.c:777 +#: ../extensions/list_tools/gth-script.c:745 +#: ../extensions/webalbums/gth-web-exporter.c:558 #: ../extensions/webalbums/gth-web-exporter.c:570 -#: ../extensions/webalbums/gth-web-exporter.c:582 -#: ../extensions/webalbums/gth-web-exporter.c:590 +#: ../extensions/webalbums/gth-web-exporter.c:578 msgid "Malformed command" msgstr "Perintah salah bentuk" -#: ../extensions/list_tools/gth-script-editor-dialog.c:176 +#: ../extensions/list_tools/gth-script-editor-dialog.c:147 msgid "none" msgstr "tidak ada" -#: ../extensions/list_tools/gth-script-editor-dialog.c:182 +#: ../extensions/list_tools/gth-script-editor-dialog.c:153 #, c-format msgid "key %d on the numeric keypad" msgstr "tombol %d pada papan tombol numerik" -#: ../extensions/list_tools/gth-script-editor-dialog.c:325 +#: ../extensions/list_tools/gth-script-editor-dialog.c:296 #, c-format msgid "No command specified" msgstr "Perintah tak dinyatakan" -#: ../extensions/list_tools/gth-script-task.c:84 +#: ../extensions/list_tools/gth-script-task.c:83 #, c-format msgid "Command exited abnormally with status %d" msgstr "Perintah berakhir tak normal dengan status %d" @@ -3745,33 +3845,33 @@ msgid "Scripting and batch manipulation of files." msgstr "Skrip dan manipulasi berkas secara batch." -#: ../extensions/map_view/gth-map-view.c:121 +#: ../extensions/map_view/gth-map-view.c:130 msgctxt "Cardinal point" msgid "S" msgstr "S" -#: ../extensions/map_view/gth-map-view.c:121 +#: ../extensions/map_view/gth-map-view.c:130 msgctxt "Cardinal point" msgid "N" msgstr "U" -#: ../extensions/map_view/gth-map-view.c:123 +#: ../extensions/map_view/gth-map-view.c:132 msgctxt "Cardinal point" msgid "W" msgstr "B" -#: ../extensions/map_view/gth-map-view.c:123 +#: ../extensions/map_view/gth-map-view.c:132 msgctxt "Cardinal point" msgid "E" msgstr "T" -#: ../extensions/map_view/gth-map-view.c:196 +#: ../extensions/map_view/gth-map-view.c:205 #: ../extensions/map_view/map_view.extension.in.in.h:1 msgid "Map" msgstr "Peta" #. No GPS label -#: ../extensions/map_view/gth-map-view.c:265 +#: ../extensions/map_view/gth-map-view.c:276 msgid "The geographical position information is not available for this image." msgstr "Informasi posisi geografis tak tersedia bagi gambar ini." @@ -3787,68 +3887,68 @@ msgid "Upload photos to Photobucket" msgstr "Unggah foto ke Photobucket" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 -msgid "1 megabyte file size" -msgstr "Ukuran berkas 1 mega byte" - -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 -msgid "15ʺ screen ( 800 x 600 )" -msgstr "Layar 15ʺ ( 800 x 600 )" - -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 -msgid "17ʺ screen ( 1024 x 768 )" -msgstr "Layar 17ʺ ( 1024 x 768 )" - #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 -msgid "Large ( 640 x 480 )" -msgstr "Besar ( 640 x 480 )" +msgid "_Scramble filenames" +msgstr "_Acak nama berkas" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 -msgid "Medium ( 320 x 240 )" -msgstr "Sedang ( 320 x 240 )" +msgid "Tiny ( 100 x 75 )" +msgstr "Mungil ( 100 x 75 )" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 msgid "Small ( 160 x 120 )" msgstr "Kecil ( 160 x 120 )" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 -msgid "Tiny ( 100 x 75 )" -msgstr "Mungil ( 100 x 75 )" +msgid "Medium ( 320 x 240 )" +msgstr "Sedang ( 320 x 240 )" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 +msgid "Large ( 640 x 480 )" +msgstr "Besar ( 640 x 480 )" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 +msgid "15ʺ screen ( 800 x 600 )" +msgstr "Layar 15ʺ ( 800 x 600 )" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 -msgid "_Scramble filenames" -msgstr "_Acak nama berkas" +msgid "17ʺ screen ( 1024 x 768 )" +msgstr "Layar 17ʺ ( 1024 x 768 )" -#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:299 +msgid "1 megabyte file size" +msgstr "Ukuran berkas 1 mega byte" + +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 msgid "_Container:" msgstr "_Kontainer:" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 msgid "Tiny ( 100 × 75 )" msgstr "Mungil ( 100 × 75 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 msgid "Small ( 160 × 120 )" msgstr "Kecil ( 160 × 120 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 msgid "Medium ( 320 × 240 )" msgstr "Sedang ( 320 × 240 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 msgid "Large ( 640 × 480 )" msgstr "Besar ( 640 × 480 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 msgid "15ʺ screen ( 800 × 600 )" msgstr "Layar 15ʺ ( 800 × 600 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:298 msgid "17ʺ screen ( 1024 × 768 )" msgstr "Layar 17ʺ ( 1024 × 768 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:304 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:306 msgid "2 megabyte file size" msgstr "Ukuran berkas 2 mega byte" @@ -3881,60 +3981,60 @@ msgstr "Impor foto dan berkas lain dari suatu folder" #: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:1 -msgid "After importing from a device:" -msgstr "Setelah mengimpor dari suatu perangkat:" - -#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 msgid "_Rotate the images physically" msgstr "Puta_r gambar secara fisik" +#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 +msgid "After importing from a device:" +msgstr "Setelah mengimpor dari suatu perangkat:" + #. view label -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 -#: ../gthumb/gth-filterbar.c:413 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 +#: ../gthumb/gth-filterbar.c:421 msgid "S_how:" msgstr "_Tampilkan:" -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 -msgid "_Delete the imported files from the source" -msgstr "Hapus berkas yang _diimpor dari sumber" - #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:4 +msgid "_Tags:" +msgstr "_Tag:" + +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 msgid "_Event:" msgstr "K_ejadian:" #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:7 -msgid "_Tags:" -msgstr "_Tag:" +msgid "_Delete the imported files from the source" +msgstr "Hapus berkas yang _diimpor dari sumber" -#: ../extensions/photo_importer/dlg-photo-importer.c:222 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:173 +#: ../extensions/photo_importer/dlg-photo-importer.c:227 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:174 msgid "Could not import the files" msgstr "Tak bisa mengimpor berkas" #. translators: %d is the number of files, %s the total size -#: ../extensions/photo_importer/dlg-photo-importer.c:294 +#: ../extensions/photo_importer/dlg-photo-importer.c:299 #, c-format msgid "Files to import: %d (%s)" msgstr "Berkas yang akan diimpor: %d (%s)" -#: ../extensions/photo_importer/dlg-photo-importer.c:334 +#: ../extensions/photo_importer/dlg-photo-importer.c:339 msgid "Could not load the folder" msgstr "Tak bisa memuat folder" -#: ../extensions/photo_importer/dlg-photo-importer.c:364 -#: ../gthumb/gth-browser.c:1921 +#: ../extensions/photo_importer/dlg-photo-importer.c:369 +#: ../gthumb/gth-browser.c:2012 msgid "Getting folder listing..." msgstr "Mengambil daftar isi folder..." -#: ../extensions/photo_importer/dlg-photo-importer.c:410 +#: ../extensions/photo_importer/dlg-photo-importer.c:415 msgid "Empty" msgstr "Kosong" -#: ../extensions/photo_importer/dlg-photo-importer.c:580 +#: ../extensions/photo_importer/dlg-photo-importer.c:586 msgid "Import from Removable Device" msgstr "Impor dari Perangkat Lepas Pasang" -#: ../extensions/photo_importer/dlg-photo-importer.c:612 +#: ../extensions/photo_importer/dlg-photo-importer.c:618 msgid "Import from Folder" msgstr "Impor dari Folder" @@ -3947,7 +4047,7 @@ msgstr "Impor foto dari media lepas pasang." #: ../extensions/picasaweb/callbacks.c:59 -#: ../extensions/picasaweb/callbacks.c:63 +#: ../extensions/picasaweb/callbacks.c:64 msgid "_Picasa Web Album..." msgstr "Album Web _Picasa..." @@ -3955,58 +4055,62 @@ msgid "Download photos from Picasa Web Album" msgstr "Unduh foto dari Album Web Picasa" -#: ../extensions/picasaweb/callbacks.c:64 +#: ../extensions/picasaweb/callbacks.c:65 msgid "Upload photos to Picasa Web Album" msgstr "Unggah foto ke Album Web Picasa" -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 msgid "Export to Picasa Web Albums" msgstr "Ekspor ke Album Web Picasa" -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 msgid "_Albums:" msgstr "_Album:" -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 msgid "Import from Picasa Web Album" msgstr "Impor dari Album Web Picasa" -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 msgid "_Album:" msgstr "_Album:" #: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:1 -msgid "Type the characters you see in the picture below. Letters are not case-sensitive." -msgstr "Ketikkan karakter yang Anda lihat dalam gambar di bawah. Tidak dibedakan huruf besar kecil." - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 msgid "_E-Mail:" msgstr "Sur_el:" +#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 +msgid "" +"Type the characters you see in the picture below. Letters are not case-" +"sensitive." +msgstr "" +"Ketikkan karakter yang Anda lihat dalam gambar di bawah. Tidak dibedakan " +"huruf besar kecil." + #: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:3 msgid "_Password:" msgstr "Kata _Sandi:" -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 msgid "Public" msgstr "Publik" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:354 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:307 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:372 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:310 msgid "Could not get the album list" msgstr "Tak bisa mendapat daftar album" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:438 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:391 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:456 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:394 msgid "Picasa Web Album" msgstr "Album Web Picasa" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:525 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:478 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:543 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:481 msgid "Account" msgstr "Akun" -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:133 +#: ../extensions/picasaweb/picasa-account-properties-dialog.c:104 msgid "Could not load the file" msgstr "Tidak bisa memuat berkas" @@ -4018,112 +4122,14 @@ msgid "Upload images to Picasa Web Albums" msgstr "Unggah gambar ke Album Web Picasa" -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:1 -msgid "Possible values are: jpeg, jpg." -msgstr "Nilai yang mungkin: jpeg, jpg." - -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:2 -msgid "Possible values are: none, deflate, jpeg." -msgstr "Nilai yang mungkin: tidak_samasekali, turunkan, jpeg." - -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:3 -msgid "Possible values are: tiff, tif." -msgstr "Nilai yang mungkin: tiff, tif." - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:1 -msgid "Opti_mize" -msgstr "Opti_masi" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:2 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 -msgid "_Default extension:" -msgstr "Ekstensi _baku:" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 -msgid "_Progressive" -msgstr "_Progresif" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 -msgid "_Quality:" -msgstr "_Kualitas:" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:5 -msgid "_Smoothing:" -msgstr "Halu_skan:" - -#: ../extensions/pixbuf_savers/data/ui/png-options.ui.h:1 -msgid "Compression _level:" -msgstr "_level Kompresi" - -#: ../extensions/pixbuf_savers/data/ui/save-options-preferences.ui.h:1 -msgid "Default options:" -msgstr "Opsi baku:" - -#: ../extensions/pixbuf_savers/data/ui/tga-options.ui.h:1 -msgid "_RLE compression" -msgstr "kompresi _RLE" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:1 -msgid "Compression" -msgstr "Kompresi" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:2 -msgid "No_rmal (Deflate)" -msgstr "No_rmal (Menurun)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:3 -msgid "Resolution" -msgstr "Resolusi" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 -msgid "_Loss compression (JPEG)" -msgstr "Kompresi Hi_lang (JPEG)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 -msgid "_No compression" -msgstr "_Tidak kompresi" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:9 -msgid "dpi" -msgstr "dpi" - -#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:527 -msgid "JPEG" -msgstr "JPEG" - -#: ../extensions/pixbuf_savers/gth-png-saver.c:145 -msgid "PNG" -msgstr "PNG" - -#: ../extensions/pixbuf_savers/gth-tga-saver.c:291 -#: ../gthumb/gth-buffer-data.c:84 -msgid "Insufficient memory" -msgstr "Memori tidak cukup" - -#: ../extensions/pixbuf_savers/gth-tga-saver.c:378 -msgid "TGA" -msgstr "TGA" - -#: ../extensions/pixbuf_savers/gth-tiff-saver.c:542 -msgid "TIFF" -msgstr "TIFF" - -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:1 -msgid "Save images" -msgstr "Simpan gambar" - -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:2 -msgid "Save images in common file formats such as JPEG, PNG and TIFF" -msgstr "Simpan gambar dalam format berkas umum seperti JPEG, PNG, dan TIFF" - #: ../extensions/raw_files/raw_files.extension.in.in.h:1 -msgid "Allow to load raw format images." -msgstr "Ijinkan memuat gambar format mentah." - -#: ../extensions/raw_files/raw_files.extension.in.in.h:2 msgid "Raw format support" msgstr "Dukungan format mentah" +#: ../extensions/raw_files/raw_files.extension.in.in.h:2 +msgid "Allow to load raw format images." +msgstr "Ijinkan memuat gambar format mentah." + #: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 msgid "_X:" msgstr "_X:" @@ -4132,15 +4138,15 @@ msgid "_Y:" msgstr "_Y:" -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:469 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 msgid "Red Eye Removal..." msgstr "Penghapusan Mata Merah..." -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:469 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 msgid "Red Eye Removal" msgstr "Penghapusan Mata Merah" -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:470 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:511 msgid "Remove the red eye effect caused by camera flashes" msgstr "Hapus mata merah yang disebabkan oleh lampu kilat" @@ -4152,147 +4158,136 @@ msgid "Tool to remove the red-eye effect from a photo." msgstr "Perkakas untuk menghapus efek mata merah dari foto." -#: ../extensions/rename_series/data/gthumb_rename_series.schemas.in.h:1 -msgid "Possible values include: general::unsorted, file::name, file::size, file::mtime, exif::photo::datetimeoriginal" -msgstr "Nilai yang mungkin termasuk: general::unsorted, file::name, file::size, file::mtime, exif::photo::datetimeoriginal" - -#: ../extensions/rename_series/data/gthumb_rename_series.schemas.in.h:2 -msgid "Possible values: 0 (none), 1 (lower), 2 (upper)" -msgstr "Nilai yang mungkin: 0 (tanpa), 1 (lebih bawah), 2 (lebih atas)" - #: ../extensions/rename_series/data/ui/code-selector.ui.h:1 -msgid "add" -msgstr "tambah" - -#: ../extensions/rename_series/data/ui/code-selector.ui.h:2 msgid "digits" msgstr "digit" -#: ../extensions/rename_series/data/ui/code-selector.ui.h:3 +#: ../extensions/rename_series/data/ui/code-selector.ui.h:2 msgid "format:" msgstr "format:" -#: ../extensions/rename_series/data/ui/code-selector.ui.h:4 +#: ../extensions/rename_series/data/ui/code-selector.ui.h:3 msgid "remove" msgstr "hapus" -#. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 -#, fuzzy, no-c-format -msgid "%A{ identifier }" -msgstr "Identifair" +#: ../extensions/rename_series/data/ui/code-selector.ui.h:4 +msgid "add" +msgstr "tambah" -#. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 -#, fuzzy, no-c-format -msgid "%M{ format }" -msgstr "Format:" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:1 +msgid "Rename" +msgstr "Ganti nama" #. Translators: this is the text case (upper or lower case). -#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 msgid "Cas_e:" -msgstr "" +msgstr "Huruf B_esar Kecil:" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:14 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:7 msgid "Edit template" msgstr "Sunting templat" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 -msgid "Re_verse Order" -msgstr "Urut Ter_balik" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 +msgid "The original filename" +msgstr "Nama berkas asli" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 -msgid "Rename" -msgstr "Ganti nama" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 +msgid "The original extension" +msgstr "Ekstensi asli" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 -msgid "The digitalization date" -msgstr "Tanggal digitalisasi" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:13 +msgid "The original enumerator" +msgstr "Enumerator asli" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:21 +#. translate only the text in the curly brackets +#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 +#, no-c-format +msgid "%M{ format }" +msgstr "%M{ format }" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 msgid "The modification date" msgstr "Tanggal modifikasi" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:22 -msgid "The original enumerator" -msgstr "Enumerator asli" - -#: ../extensions/rename_series/data/ui/rename-series.ui.h:23 -msgid "The original extension" -msgstr "Ekstensi asli" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:21 +msgid "The digitalization date" +msgstr "Tanggal digitalisasi" +#. translate only the text in the curly brackets #: ../extensions/rename_series/data/ui/rename-series.ui.h:24 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 -msgid "The original filename" -msgstr "Nama berkas asli" +#, no-c-format +msgid "%A{ identifier }" +msgstr "%A{ identifier }" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 msgid "_Template:" msgstr "_Template:" -#: ../extensions/rename_series/dlg-rename-series.c:64 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +msgid "Re_verse Order" +msgstr "Urut Ter_balik" + +#: ../extensions/rename_series/dlg-rename-series.c:58 msgid "Enumerator" -msgstr "" +msgstr "Enumerator" -#: ../extensions/rename_series/dlg-rename-series.c:65 +#: ../extensions/rename_series/dlg-rename-series.c:59 msgid "Original filename" msgstr "Nama asli berkas" -#: ../extensions/rename_series/dlg-rename-series.c:66 +#: ../extensions/rename_series/dlg-rename-series.c:60 msgid "Original extension" msgstr "Ekstensi asli" -#: ../extensions/rename_series/dlg-rename-series.c:67 +#: ../extensions/rename_series/dlg-rename-series.c:61 msgid "Original enumerator" -msgstr "" +msgstr "Enumerator asli" -#: ../extensions/rename_series/dlg-rename-series.c:68 +#: ../extensions/rename_series/dlg-rename-series.c:62 msgid "Modification date" msgstr "Tanggal modifikasi" -#: ../extensions/rename_series/dlg-rename-series.c:69 +#: ../extensions/rename_series/dlg-rename-series.c:63 msgid "Digitalization date" msgstr "Tanggal digitalisasi" -#: ../extensions/rename_series/dlg-rename-series.c:70 +#: ../extensions/rename_series/dlg-rename-series.c:64 msgid "File attribute" msgstr "Atribut berkas" -#: ../extensions/rename_series/dlg-rename-series.c:556 -#: ../extensions/rename_series/dlg-rename-series.c:687 +#: ../extensions/rename_series/dlg-rename-series.c:552 +#: ../extensions/rename_series/dlg-rename-series.c:683 msgid "Could not rename the files" msgstr "Tidak dapat mengganti nama berkas" -#: ../extensions/rename_series/dlg-rename-series.c:784 +#: ../extensions/rename_series/dlg-rename-series.c:780 msgid "Could not save the template" msgstr "Tak bisa menyimpan templat" -#: ../extensions/rename_series/dlg-rename-series.c:802 +#: ../extensions/rename_series/dlg-rename-series.c:798 msgid "Edit Template" msgstr "Sunting Templat" -#: ../extensions/rename_series/dlg-rename-series.c:859 +#: ../extensions/rename_series/dlg-rename-series.c:856 msgid "Old Name" msgstr "Nama Lama" -#: ../extensions/rename_series/dlg-rename-series.c:870 +#: ../extensions/rename_series/dlg-rename-series.c:867 msgid "New Name" msgstr "Nama Baru" -#: ../extensions/rename_series/dlg-rename-series.c:945 -#, fuzzy +#: ../extensions/rename_series/dlg-rename-series.c:944 msgid "Keep original case" -msgstr "Pertahankan item asli?" +msgstr "Pertahankan huruf besar kecil seperti semula" -#: ../extensions/rename_series/dlg-rename-series.c:946 -#, fuzzy +#: ../extensions/rename_series/dlg-rename-series.c:945 msgid "Convert to lower-case" -msgstr "Ganti teks terpilih ke huruf kecil semua" +msgstr "Ubah ke huruf kecil" -#: ../extensions/rename_series/dlg-rename-series.c:947 -#, fuzzy +#: ../extensions/rename_series/dlg-rename-series.c:946 msgid "Convert to upper-case" -msgstr "Ganti teks terpilih ke huruf besar semua" +msgstr "Ubah ke huruf besar" #: ../extensions/rename_series/gth-rename-task.c:167 msgid "Renaming files" @@ -4314,36 +4309,32 @@ msgid "Resize the selected images" msgstr "Ubah ukuran gambar terpilih" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:5 -#: ../gthumb/gth-main-default-metadata.c:49 -msgid "Format" -msgstr "Format" +#: ../extensions/resize_images/data/ui/resize-images.ui.h:1 +msgid "Resize Images" +msgstr "Ubah Ukuran Gambar" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:2 msgid "New dimensions" msgstr "Dimensi baru" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 -msgid "Resize Images" -msgstr "Ubah Ukuran Gambar" - -#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:4 msgid "_Height:" msgstr "_Tinggi:" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:5 msgid "_Preserve original aspect ratios" msgstr "_Pertahankan rasio aspek semula" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:12 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 +#: ../gthumb/gth-main-default-metadata.c:49 +msgid "Format" +msgstr "Format" + +#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 msgid "pixel" msgstr "piksel" -#: ../extensions/resize_images/dlg-resize-images.c:163 -msgid "Resizing images" -msgstr "Mengubah ukuran gambar" - -#: ../extensions/resize_images/dlg-resize-images.c:358 +#: ../extensions/resize_images/dlg-resize-images.c:423 msgid "Keep the original format" msgstr "Pertahankan format asli" @@ -4355,8 +4346,7 @@ msgid "Resize series of images." msgstr "Ubah ukuran seri gambar." -#: ../extensions/search/actions.c:49 -#: ../extensions/search/actions.c:117 +#: ../extensions/search/actions.c:49 ../extensions/search/actions.c:117 #: ../extensions/search/actions.c:123 msgid "Could not perform the search" msgstr "Tak bisa melakukan pencarian" @@ -4373,23 +4363,23 @@ msgid "Find files" msgstr "Cari berkas" -#: ../extensions/search/callbacks.c:133 +#: ../extensions/search/callbacks.c:132 msgid "Search again" msgstr "Cari lagi" #. Translators: This is not a verb, it's a name as in "the search properties". -#: ../extensions/search/callbacks.c:175 -#: ../extensions/search/search.extension.in.in.h:2 +#: ../extensions/search/callbacks.c:174 +#: ../extensions/search/search.extension.in.in.h:1 msgid "Search" msgstr "Cari" -#: ../extensions/search/gth-search-editor.c:138 -#: ../gthumb/gth-filter-editor-dialog.c:195 +#: ../extensions/search/gth-search-editor.c:112 +#: ../gthumb/gth-filter-editor-dialog.c:165 msgid "all the following rules" msgstr "semua aturan berikut" -#: ../extensions/search/gth-search-editor.c:139 -#: ../gthumb/gth-filter-editor-dialog.c:196 +#: ../extensions/search/gth-search-editor.c:113 +#: ../gthumb/gth-filter-editor-dialog.c:166 msgid "any of the following rules" msgstr "sebarang aturan berikut" @@ -4398,17 +4388,62 @@ msgid "Files found until now: %s" msgstr "Berkas yang ditemukan sampai kini: %s" -#: ../extensions/search/gth-search-task.c:270 +#: ../extensions/search/gth-search-task.c:271 msgid "Searching..." msgstr "Mencari..." -#: ../extensions/search/gth-search-task.c:276 +#: ../extensions/search/gth-search-task.c:277 msgid "Cancel the operation" msgstr "Batalkan operasi" -#: ../extensions/search/search.extension.in.in.h:1 -msgid "File search tool." -msgstr "Perkakas pencarian berkas." +#: ../extensions/search/search.extension.in.in.h:2 +msgid "File search tool." +msgstr "Perkakas pencarian berkas." + +#: ../extensions/selections/callbacks.c:77 +#| msgid "Selection" +msgid "Add to _Selection" +msgstr "_Tambahkan ke Pilihan" + +#: ../extensions/selections/callbacks.c:86 +#| msgid "Selection" +msgid "Selection 1" +msgstr "Seleksi 1" + +#: ../extensions/selections/callbacks.c:91 +#| msgid "Selection" +msgid "Selection 2" +msgstr "Seleksi 2" + +#: ../extensions/selections/callbacks.c:96 +#| msgid "Selection" +msgid "Selection 3" +msgstr "Seleksi 3" + +#: ../extensions/selections/callbacks.c:285 +#, c-format +msgid "" +"Use Alt-%d to add files to this selection, Ctrl-%d to view this selection." +msgstr "" +"Pakai Alt-%d untuk menambah berkas ke pilihan ini, Ctrl-%d untuk melihat " +"pilihan ini." + +#: ../extensions/selections/gth-selections-manager.c:239 +#, c-format +#| msgid "Selection" +msgid "Selection %d" +msgstr "Seleksi %d" + +#: ../extensions/selections/gth-selections-manager.c:242 +#: ../extensions/selections/selections.extension.in.in.h:1 +#| msgid "Selection" +msgid "Selections" +msgstr "Pilihan" + +#: ../extensions/selections/selections.extension.in.in.h:2 +#| msgid "No valid file selected." +msgid "Advanced file selection." +msgstr "Pemilihan berkas tingkat lanjut." #: ../extensions/slideshow/callbacks.c:56 msgid "_Slideshow" @@ -4418,60 +4453,59 @@ msgid "View as a slideshow" msgstr "Tilik sebagai pertunjukan slide" -#: ../extensions/slideshow/callbacks.c:406 -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 -#: ../extensions/slideshow/preferences.c:138 +#: ../extensions/slideshow/callbacks.c:410 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 +#: ../extensions/slideshow/preferences.c:162 #: ../extensions/slideshow/slideshow.extension.in.in.h:1 msgid "Slideshow" msgstr "Pertunjukan Slide" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:1 -msgid "Add files to the playlist" -msgstr "Tambahkan berkas ke daftar main" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 -msgid "Playlist" -msgstr "Daftar Main" +msgid "_Personalize" +msgstr "_Personalisasi" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:3 -msgid "R_andom order" -msgstr "Urutan _acak" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:4 -msgid "Remove the selected files" -msgstr "Hapus berkas yang dipilih" +msgid "_Transition effect:" +msgstr "Efek _transisi:" #. This is the first part of the phrase "change automatically, every x seconds", where x is an input control that let the user choose a value. -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 msgid "_Change automatically, every" msgstr "_Ubah otomatis setiap" +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 +msgid "_Restart when finished" +msgstr "Sta_rt ulang setelah selesai" + #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:8 -msgid "_Personalize" -msgstr "_Personalisasi" +msgid "R_andom order" +msgstr "Urutan _acak" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:9 -msgid "_Restart when finished" -msgstr "Sta_rt ulang setelah selesai" +msgid "Playlist" +msgstr "Daftar Main" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:10 -msgid "_Transition effect:" -msgstr "Efek _transisi:" +msgid "Add files to the playlist" +msgstr "Tambahkan berkas ke daftar main" + +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:11 +msgid "Remove the selected files" +msgstr "Hapus berkas yang dipilih" -#: ../extensions/slideshow/gth-slideshow.c:229 -#, fuzzy +#: ../extensions/slideshow/gth-slideshow.c:231 msgid "Playing slideshow" -msgstr "Tahan Deretan Gambar" +msgstr "Putar slideshow" -#: ../extensions/slideshow/gth-slideshow-preferences.c:214 +#: ../extensions/slideshow/gth-slideshow-preferences.c:184 msgid "Choose the files to play" msgstr "Pilih berkas untuk diputar" -#: ../extensions/slideshow/gth-slideshow-preferences.c:223 +#: ../extensions/slideshow/gth-slideshow-preferences.c:193 msgid "Audio files" msgstr "Berkas suara" -#: ../extensions/slideshow/gth-slideshow-preferences.c:289 +#: ../extensions/slideshow/gth-slideshow-preferences.c:259 msgid "Random" msgstr "Acak" @@ -4484,24 +4518,20 @@ msgstr "Dorong dari dasar" #: ../extensions/slideshow/main.c:295 -#, fuzzy msgid "Slide from right" msgstr "Geser dari kanan" #: ../extensions/slideshow/main.c:301 -#, fuzzy msgid "Slide from bottom" msgstr "Geser dari dasar" #: ../extensions/slideshow/main.c:307 -#, fuzzy msgid "Fade in" -msgstr "Fade In:" +msgstr "Memudar" #: ../extensions/slideshow/main.c:313 -#, fuzzy msgid "Flip page" -msgstr "halaman tab" +msgstr "Balik halaman" #: ../extensions/slideshow/main.c:319 msgid "Cube from right" @@ -4541,12 +4571,12 @@ msgstr "Indeks" #: ../extensions/webalbums/data/albumthemes/text.h:30 -#: ../gthumb/gth-browser-actions-entries.h:110 +#: ../gthumb/gth-browser-actions-entries.h:125 msgid "Next" msgstr "Selanjutnya" #: ../extensions/webalbums/data/albumthemes/text.h:32 -#: ../gthumb/gth-browser-actions-entries.h:105 +#: ../gthumb/gth-browser-actions-entries.h:119 msgid "Previous" msgstr "Sebelum" @@ -4571,180 +4601,172 @@ msgid "View the previous page" msgstr "Tilik halaman sebelumnya" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:2 -#, no-c-format -msgid "%C" -msgstr "%C" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 -#, no-c-format -msgid "%I" -msgstr "%I" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 -#, no-c-format -msgid "%i" -msgstr "%i" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:1 +msgid "All images on a single image" +msgstr "Semua gambar pada gambar tunggal" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:2 msgid "Adapts to the window width" msgstr "Sesuaikan ke lebar jendela" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 -msgid "All images on a single image" -msgstr "Semua gambar pada gambar tunggal" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 +msgid "Web Album" +msgstr "Album Web" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 -msgid "Image Attributes" -msgstr "Atribut Gambar" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:5 +#, no-c-format +msgid "%P" +msgstr "%P" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 -msgid "Image Page" -msgstr "Halaman Gambar" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 +msgid "_Copy originals to destination" +msgstr "_Salin yang asli ke tujuan" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 +msgid "_Adapt to the window width " +msgstr "Sesuaik_an ke lebar jendela" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 msgid "Index Page" msgstr "Halaman Indeks" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 -msgid "Show the description, if available" -msgstr "Tampilkan penjelasan, bila tersedia" +msgid "Thumbnail Caption" +msgstr "Keterangan Gambar Miniatur" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 -msgid "Show the following attributes:" -msgstr "Tampilkan atribut berikut:" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 msgid "The current image number" msgstr "Nomor gambar kini" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 -msgid "The file comment" -msgstr "Komentar berkas" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:39 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 msgid "The total number of images" msgstr "Total cacah gambar" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:42 -msgid "Thumbnail Caption" -msgstr "Keterangan Gambar Miniatur" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 +msgid "The file comment" +msgstr "Komentar berkas" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:43 -msgid "Web Album" -msgstr "Album Web" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 +msgid "Image Page" +msgstr "Halaman Gambar" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:44 -msgid "_Adapt to the window width " -msgstr "Sesuaik_an ke lebar jendela" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 +msgid "Show the description, if available" +msgstr "Tampilkan penjelasan, bila tersedia" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:45 -msgid "_Copy originals to destination" -msgstr "_Salin yang asli ke tujuan" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 +msgid "Show the following attributes:" +msgstr "Tampilkan atribut berikut:" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:49 -msgid "_Resize if larger than:" -msgstr "Ubah uku_ran jika lebih besar dari:" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:39 +msgid "Image Attributes" +msgstr "Atribut Gambar" -#: ../extensions/webalbums/gth-web-exporter.c:1812 +#: ../extensions/webalbums/gth-web-exporter.c:1800 msgid "Could not show the destination" msgstr "Tidak dapat meampilkan tujuan" -#: ../extensions/webalbums/gth-web-exporter.c:1848 +#: ../extensions/webalbums/gth-web-exporter.c:1836 msgid "The album has been created successfully." msgstr "Album telah sukses dibuat." -#: ../extensions/webalbums/gth-web-exporter.c:2116 -#: ../extensions/webalbums/gth-web-exporter.c:2143 +#: ../extensions/webalbums/gth-web-exporter.c:2104 +#: ../extensions/webalbums/gth-web-exporter.c:2131 msgid "Saving thumbnails" msgstr "Menyimpan sketsa" -#: ../extensions/webalbums/gth-web-exporter.c:2171 +#: ../extensions/webalbums/gth-web-exporter.c:2159 msgid "Saving HTML pages: Images" msgstr "Menyimpan halaman HTML: Gambar" -#: ../extensions/webalbums/gth-web-exporter.c:2229 +#: ../extensions/webalbums/gth-web-exporter.c:2217 msgid "Saving HTML pages: Indexes" msgstr "Simpan halaman HTML: Indeks" -#: ../extensions/webalbums/gth-web-exporter.c:2512 +#: ../extensions/webalbums/gth-web-exporter.c:2500 msgid "Copying original images" msgstr "Menyaling gambar asli" -#: ../extensions/webalbums/gth-web-exporter.c:2938 +#: ../extensions/webalbums/gth-web-exporter.c:2960 msgid "Could not find the style folder" msgstr "Tak bisa menemukan folder gaya" -#: ../extensions/webalbums/gth-web-exporter.c:2971 +#: ../extensions/webalbums/gth-web-exporter.c:2998 msgid "Could not create a temporary folder" msgstr "Tidak dapat membuat folder sementara" #: ../extensions/webalbums/webalbums.extension.in.in.h:1 +msgid "Web Albums" +msgstr "Album Web" + +#: ../extensions/webalbums/webalbums.extension.in.in.h:2 msgid "Create static web albums." msgstr "Buat album web statik." -#: ../extensions/webalbums/webalbums.extension.in.in.h:2 -msgid "Web Albums" -msgstr "Album Web" +#: ../gthumb/dlg-location.c:200 ../gthumb/gth-browser.c:1334 +#: ../gthumb/gth-browser.c:1903 ../gthumb/gth-browser.c:6086 +#: ../gthumb/gth-browser.c:6105 ../gthumb/gth-browser.c:6129 +#, c-format +msgid "Could not load the position \"%s\"" +msgstr "Tidak dapat memuat posisi \"%s\"" -#: ../gthumb/dlg-personalize-filters.c:236 +#: ../gthumb/dlg-personalize-filters.c:237 msgid "Filter" msgstr "Tapis" -#: ../gthumb/dlg-personalize-filters.c:314 +#: ../gthumb/dlg-personalize-filters.c:315 msgid "Could not save the filter" msgstr "Tak bisa menyimpan tapis" -#: ../gthumb/dlg-personalize-filters.c:357 +#: ../gthumb/dlg-personalize-filters.c:358 msgid "New Filter" msgstr "Tapis Baru" -#: ../gthumb/dlg-personalize-filters.c:386 +#: ../gthumb/dlg-personalize-filters.c:387 msgid "Edit Filter" msgstr "Sunting Tapis" -#: ../gthumb/dlg-preferences-extensions.c:68 -#: ../gthumb/gth-filterbar.c:269 +#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:277 msgid "All" msgstr "Semua" -#: ../gthumb/dlg-preferences-extensions.c:69 +#: ../gthumb/dlg-preferences-extensions.c:68 msgid "Enabled" msgstr "Diaktifkan" -#: ../gthumb/dlg-preferences-extensions.c:70 +#: ../gthumb/dlg-preferences-extensions.c:69 msgid "Disabled" msgstr "Dimatikan" -#: ../gthumb/dlg-preferences-extensions.c:73 +#: ../gthumb/dlg-preferences-extensions.c:72 msgid "Viewers" msgstr "Penampil" -#: ../gthumb/dlg-preferences-extensions.c:74 +#: ../gthumb/dlg-preferences-extensions.c:73 msgid "Metadata" msgstr "Metadata" -#: ../gthumb/dlg-preferences-extensions.c:75 +#: ../gthumb/dlg-preferences-extensions.c:74 msgid "File tools" msgstr "Perkakas berkas" -#: ../gthumb/dlg-preferences-extensions.c:76 +#: ../gthumb/dlg-preferences-extensions.c:75 msgid "List tools" msgstr "Perkakas daftar" -#: ../gthumb/dlg-preferences-extensions.c:77 +#: ../gthumb/dlg-preferences-extensions.c:76 msgid "Importers" msgstr "Pengimpor" -#: ../gthumb/dlg-preferences-extensions.c:78 +#: ../gthumb/dlg-preferences-extensions.c:77 msgid "Exporters" msgstr "Pengekspor" -#: ../gthumb/dlg-preferences-extensions.c:215 +#: ../gthumb/dlg-preferences-extensions.c:216 msgid "Could not activate the extension" msgstr "Tidak dapat mengaktifkan ekstensi" -#: ../gthumb/dlg-preferences-extensions.c:225 +#: ../gthumb/dlg-preferences-extensions.c:226 msgid "Could not deactivate the extension" msgstr "Tidak dapat menonaktifkan ekstensi" @@ -4769,66 +4791,31 @@ msgid "_Restart" msgstr "_Restart" -#: ../gthumb/eggfileformatchooser.c:236 -#, c-format -msgid "File _Format: %s" -msgstr "_Format Berkas: %s" - -#: ../gthumb/eggfileformatchooser.c:397 -#: ../gthumb/gth-main-default-tests.c:197 -msgid "All Files" -msgstr "Semua Berkas" - -#: ../gthumb/eggfileformatchooser.c:398 -msgid "All Supported Files" -msgstr "Semua Berkas Yang Didukung" - -#: ../gthumb/eggfileformatchooser.c:407 -msgid "By Extension" -msgstr "Berdasar Ekstensi" - -#: ../gthumb/eggfileformatchooser.c:422 -msgid "File Format" -msgstr "Format Berkas" - -#: ../gthumb/eggfileformatchooser.c:440 -msgid "Extension(s)" -msgstr "Ekstensi" - -#: ../gthumb/eggfileformatchooser.c:681 -#, c-format -msgid "The program was not able to find out the file format you want to use for `%s'. Please make sure to use a known extension for that file or manually choose a file format from the list below." -msgstr "Program tidak dapat menentukan format berkas yang ingin Anda pakai untuk '%s'. Pastikan untuk memakai ekstensi yang dikenali untuk berkas tersebut atau pilih sendiri format berkasnya dari daftar berikut." - -#: ../gthumb/eggfileformatchooser.c:688 -msgid "File format not recognized" -msgstr "Format berkas tak dikenal" - #. For translators: This is a progress size indicator, for example: 230.4 MB of 512.8 MB -#: ../gthumb/gio-utils.c:1355 +#: ../gthumb/gio-utils.c:1351 #, c-format msgid "%s of %s" msgstr "%s dari %s" -#: ../gthumb/gio-utils.c:1390 +#: ../gthumb/gio-utils.c:1386 #, c-format msgid "Moving \"%s\" to \"%s\"" msgstr "Memindahkan \"%s\" ke \"%s\"" -#: ../gthumb/gio-utils.c:1392 +#: ../gthumb/gio-utils.c:1388 #, c-format msgid "Copying \"%s\" to \"%s\"" msgstr "Menyalin \"%s\" ke \"%s\"" -#: ../gthumb/gio-utils.c:1733 +#: ../gthumb/gio-utils.c:1750 msgid "Moving files" msgstr "Memindah berkas" -#: ../gthumb/gio-utils.c:1733 +#: ../gthumb/gio-utils.c:1750 msgid "Copying files" msgstr "Menyalin berkas" -#: ../gthumb/gio-utils.c:1734 +#: ../gthumb/gio-utils.c:1751 msgid "Getting file information" msgstr "Mengambil informasi berkas" @@ -4838,7 +4825,7 @@ #. * the separator that your locale uses or use "%Id" instead #. * of "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2749 +#: ../gthumb/glib-utils.c:3068 #, c-format msgctxt "long time format" msgid "%d:%02d:%02d" @@ -4850,434 +4837,471 @@ #. * separator that your locale uses or use "%Id" instead of #. * "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2758 +#: ../gthumb/glib-utils.c:3077 #, c-format msgctxt "short time format" msgid "%d:%02d" msgstr "%d:%02d" -#: ../gthumb/gth-browser-actions-callbacks.c:361 -msgid "gthumb is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version." -msgstr "gthumb adalah perangkat lunak bebas; Anda dapat menyebar ulang dan/atau mengubahnya di bawah syarat GNU General Public License sebagaimana dipublikasikan oleh Free Software Foundation; boleh Lisensi versi 3 atau (sesuai pilihan Anda) versi selanjutnya." - -#: ../gthumb/gth-browser-actions-callbacks.c:365 -msgid "gthumb is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details." -msgstr "gthumb didistribusikan dengan harapan bahwa program ini akan berguna, tetapi TANPA JAMINAN; bahkan tanpa jaminan tersirat atas KETERDAGANGAN atau KECOCOKAN UNTUK TUJUAN TERTENTU. Lihat GNU General Public License untuk rincian lebih lanjut." - -#: ../gthumb/gth-browser-actions-callbacks.c:369 -msgid "You should have received a copy of the GNU General Public License along with gthumb. If not, see http://www.gnu.org/licenses/." -msgstr "Anda mestinya menerima salinan GNU General Public License bersamaan dengan gthumb. Jika tidak, lihat ." +#: ../gthumb/gth-browser-actions-callbacks.c:400 +msgid "" +"gthumb is free software; you can redistribute it and/or modify it under the " +"terms of the GNU General Public License as published by the Free Software " +"Foundation; either version 2 of the License, or (at your option) any later " +"version." +msgstr "" +"gthumb adalah perangkat lunak bebas; Anda dapat menyebar ulang dan/atau " +"mengubahnya di bawah syarat GNU General Public License sebagaimana " +"dipublikasikan oleh Free Software Foundation; boleh Lisensi versi 3 atau " +"(sesuai pilihan Anda) versi selanjutnya." + +#: ../gthumb/gth-browser-actions-callbacks.c:404 +msgid "" +"gthumb is distributed in the hope that it will be useful, but WITHOUT ANY " +"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " +"details." +msgstr "" +"gthumb didistribusikan dengan harapan bahwa program ini akan berguna, tetapi " +"TANPA JAMINAN; bahkan tanpa jaminan tersirat atas KETERDAGANGAN atau " +"KECOCOKAN UNTUK TUJUAN TERTENTU. Lihat GNU General Public License untuk " +"rincian lebih lanjut." + +#: ../gthumb/gth-browser-actions-callbacks.c:408 +msgid "" +"You should have received a copy of the GNU General Public License along with " +"gthumb. If not, see http://www.gnu.org/licenses/." +msgstr "" +"Anda mestinya menerima salinan GNU General Public License bersamaan dengan " +"gthumb. Jika tidak, lihat ." -#: ../gthumb/gth-browser-actions-callbacks.c:388 +#: ../gthumb/gth-browser-actions-callbacks.c:427 msgid "An image viewer and browser for GNOME." msgstr "Sebuah penampil dan browser gambar untuk GNOME" -#: ../gthumb/gth-browser-actions-callbacks.c:391 +#: ../gthumb/gth-browser-actions-callbacks.c:430 msgid "translator_credits" msgstr "" "Abdul Hamid.A.N , 2004.\n" -"Andika Triwidada , 2010, 2011." +"Andika Triwidada , 2010, 2011, 2012." -#: ../gthumb/gth-browser-actions-entries.h:30 +#: ../gthumb/gth-browser-actions-entries.h:31 msgid "_File" msgstr "_File" -#: ../gthumb/gth-browser-actions-entries.h:31 +#: ../gthumb/gth-browser-actions-entries.h:32 msgid "_Edit" msgstr "_Edit" -#: ../gthumb/gth-browser-actions-entries.h:33 +#: ../gthumb/gth-browser-actions-entries.h:34 msgid "_Go" msgstr "Per_gi" -#: ../gthumb/gth-browser-actions-entries.h:34 +#: ../gthumb/gth-browser-actions-entries.h:35 msgid "_Help" msgstr "_Bantuan" -#: ../gthumb/gth-browser-actions-entries.h:35 +#: ../gthumb/gth-browser-actions-entries.h:36 msgid "Open _With" msgstr "Buka _Dengan" -#: ../gthumb/gth-browser-actions-entries.h:36 +#: ../gthumb/gth-browser-actions-entries.h:37 msgid "I_mport From" msgstr "I_mpor Dari" -#: ../gthumb/gth-browser-actions-entries.h:37 +#: ../gthumb/gth-browser-actions-entries.h:38 msgid "E_xport To" msgstr "E_kspor Ke" -#: ../gthumb/gth-browser-actions-entries.h:40 +#: ../gthumb/gth-browser-actions-entries.h:41 msgid "New _Window" msgstr "_Jendela Baru" -#: ../gthumb/gth-browser-actions-entries.h:41 +#: ../gthumb/gth-browser-actions-entries.h:42 msgid "Open another window" msgstr "Buka jendela lain" -#: ../gthumb/gth-browser-actions-entries.h:65 +#: ../gthumb/gth-browser-actions-entries.h:71 msgid "Open" msgstr "Buka" -#: ../gthumb/gth-browser-actions-entries.h:70 +#: ../gthumb/gth-browser-actions-entries.h:77 msgid "Open in New Window" msgstr "Buka di Window Baru" -#: ../gthumb/gth-browser-actions-entries.h:76 +#: ../gthumb/gth-browser-actions-entries.h:84 msgid "Edit various preferences" msgstr "Edit beragam settingan " -#: ../gthumb/gth-browser-actions-entries.h:85 +#: ../gthumb/gth-browser-actions-entries.h:95 msgid "_Sort By..." msgstr "Urut Berda_sar..." -#: ../gthumb/gth-browser-actions-entries.h:90 +#: ../gthumb/gth-browser-actions-entries.h:101 msgid "_Filter..." msgstr "_Tapis..." -#: ../gthumb/gth-browser-actions-entries.h:96 +#: ../gthumb/gth-browser-actions-entries.h:108 msgid "Stop loading the current location" msgstr "Berhenti memuat lokasi yang sekarang" -#: ../gthumb/gth-browser-actions-entries.h:101 +#: ../gthumb/gth-browser-actions-entries.h:114 msgid "Reload the current location" msgstr "Load-ulang lokasi aktif sekarang" -#: ../gthumb/gth-browser-actions-entries.h:106 +#: ../gthumb/gth-browser-actions-entries.h:120 msgid "View previous image" msgstr "Tampilkan gambar sebelumnya" -#: ../gthumb/gth-browser-actions-entries.h:111 +#: ../gthumb/gth-browser-actions-entries.h:126 msgid "View next image" msgstr "Tampilan gambar selanjutnya" -#: ../gthumb/gth-browser-actions-entries.h:116 +#: ../gthumb/gth-browser-actions-entries.h:132 msgid "Switch to fullscreen" msgstr "Tukar ke layar penuh" -#: ../gthumb/gth-browser-actions-entries.h:121 +#: ../gthumb/gth-browser-actions-entries.h:138 msgid "Leave Fullscreen" msgstr "Tinggalkan Layar Penuh" -#: ../gthumb/gth-browser-actions-entries.h:126 -#: ../gthumb/gth-browser.c:3647 +#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3745 msgid "Go to the previous visited location" msgstr "Pergi ke lokasi sebelumnya yang telah dikunjungi" -#: ../gthumb/gth-browser-actions-entries.h:131 -#: ../gthumb/gth-browser.c:3668 +#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3763 msgid "Go to the next visited location" msgstr "Pergi ke lokasi selanjutnya yang telah dikunjungi" -#: ../gthumb/gth-browser-actions-entries.h:136 -#: ../gthumb/gth-browser.c:3689 +#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3781 msgid "Go up one level" msgstr "Pergi ke atas satu tingkat" -#: ../gthumb/gth-browser-actions-entries.h:145 -#: ../gthumb/gth-browser.c:667 +#: ../gthumb/gth-browser-actions-entries.h:161 +#| msgid "_Location" +msgid "_Location..." +msgstr "_Lokasi…" + +#: ../gthumb/gth-browser-actions-entries.h:162 +msgid "Specify a location to open" +msgstr "Menentukan lokasi untuk dibuka" + +#: ../gthumb/gth-browser-actions-entries.h:173 ../gthumb/gth-browser.c:675 msgid "_Delete History" msgstr "Hap_us History" -#: ../gthumb/gth-browser-actions-entries.h:146 +#: ../gthumb/gth-browser-actions-entries.h:174 msgid "Delete the list of visited locations" msgstr "Hapus daftar lokasi yang telah dikunjungi" -#: ../gthumb/gth-browser-actions-entries.h:151 +#: ../gthumb/gth-browser-actions-entries.h:180 msgid "View the folders" msgstr "Tampilkan folder" -#: ../gthumb/gth-browser-actions-entries.h:156 +#: ../gthumb/gth-browser-actions-entries.h:186 msgid "Show information about gthumb" msgstr "Tampilkan informasi tentang gthumb" -#: ../gthumb/gth-browser-actions-entries.h:160 +#: ../gthumb/gth-browser-actions-entries.h:191 msgid "Contents" msgstr "Isi" -#: ../gthumb/gth-browser-actions-entries.h:161 +#: ../gthumb/gth-browser-actions-entries.h:192 msgid "Display the gthumb Manual" msgstr "Tampilkan Manual gthumb" -#: ../gthumb/gth-browser-actions-entries.h:165 +#: ../gthumb/gth-browser-actions-entries.h:197 msgid "_Keyboard Shortcuts" msgstr "_Keyboard Shortcuts" -#: ../gthumb/gth-browser-actions-entries.h:174 +#: ../gthumb/gth-browser-actions-entries.h:206 msgid "_Toolbar" msgstr "_Toolbar" -#: ../gthumb/gth-browser-actions-entries.h:175 +#: ../gthumb/gth-browser-actions-entries.h:207 msgid "View or hide the toolbar of this window" msgstr "Tampikan atau sembunyikan toolbar dari window ini" -#: ../gthumb/gth-browser-actions-entries.h:179 +#: ../gthumb/gth-browser-actions-entries.h:211 msgid "_Statusbar" msgstr "_Statusbar" -#: ../gthumb/gth-browser-actions-entries.h:180 +#: ../gthumb/gth-browser-actions-entries.h:212 msgid "View or hide the statusbar of this window" msgstr "Tampil atau sembunyikan statusbar dari window ini" -#: ../gthumb/gth-browser-actions-entries.h:184 +#: ../gthumb/gth-browser-actions-entries.h:216 msgid "_Filterbar" msgstr "Bilah _Tapis" -#: ../gthumb/gth-browser-actions-entries.h:185 +#: ../gthumb/gth-browser-actions-entries.h:217 msgid "View or hide the filterbar of this window" msgstr "Tampikan atau sembunyikan bilah tapis dari jendela ini" -#: ../gthumb/gth-browser-actions-entries.h:189 +#: ../gthumb/gth-browser-actions-entries.h:221 msgid "_Sidebar" msgstr "Bilah _Sisi" -#: ../gthumb/gth-browser-actions-entries.h:190 +#: ../gthumb/gth-browser-actions-entries.h:222 msgid "View or hide the sidebar of this window" msgstr "Tampikan atau sembunyikan bilah sisi dari jendela ini" -#: ../gthumb/gth-browser-actions-entries.h:194 +#: ../gthumb/gth-browser-actions-entries.h:226 msgid "_Thumbnail Pane" msgstr "Panel Gambar _Kecil" -#: ../gthumb/gth-browser-actions-entries.h:195 +#: ../gthumb/gth-browser-actions-entries.h:227 msgid "View or hide the thumbnail pane in viewer mode" msgstr "Tampil atau sembunyikan panel gambar kecil dalam moda penilik" -#: ../gthumb/gth-browser-actions-entries.h:199 +#: ../gthumb/gth-browser-actions-entries.h:231 msgid "_Thumbnails" msgstr "Ske_tsa" -#: ../gthumb/gth-browser-actions-entries.h:200 +#: ../gthumb/gth-browser-actions-entries.h:232 msgid "View thumbnails" msgstr "Tampilkan sketsa" -#: ../gthumb/gth-browser-actions-entries.h:204 +#: ../gthumb/gth-browser-actions-entries.h:236 msgid "_Hidden Files" msgstr "Berkas _Tersembunyi" -#: ../gthumb/gth-browser-actions-entries.h:205 +#: ../gthumb/gth-browser-actions-entries.h:237 msgid "Show hidden files and folders" msgstr "Tampilkan berkas dan folder tersembunyi" -#: ../gthumb/gth-browser-actions-entries.h:210 +#: ../gthumb/gth-browser-actions-entries.h:242 +#: ../gthumb/gth-browser-actions-entries.h:247 msgid "View file properties" msgstr "Tilik properti berkas" -#: ../gthumb/gth-browser-actions-entries.h:214 +#: ../gthumb/gth-browser-actions-entries.h:251 msgid "Edit" msgstr "Sunting" -#: ../gthumb/gth-browser-actions-entries.h:215 +#: ../gthumb/gth-browser-actions-entries.h:252 msgid "Edit file" msgstr "Sunting berkas" -#: ../gthumb/gth-browser.c:363 +#: ../gthumb/gth-browser-actions-entries.h:256 +msgid "_Fit Window to Image" +msgstr "_Paskan Jendela ke Gambar" + +#: ../gthumb/gth-browser-actions-entries.h:257 +msgid "Resize the window to the size of the image" +msgstr "Ubah ukuran jendela ke ukuran gambar" + +#: ../gthumb/gth-browser.c:372 #, c-format msgid "Open %s" msgstr "Buka %s" -#: ../gthumb/gth-browser.c:503 +#: ../gthumb/gth-browser.c:512 msgid "[modified]" msgstr "[diubah]" -#: ../gthumb/gth-browser.c:991 +#: ../gthumb/gth-browser.c:1071 #, c-format msgid "%d file selected (%s)" msgid_plural "%d files selected (%s)" msgstr[0] "%d berkas dipilih (%s)" -#: ../gthumb/gth-browser.c:1026 +#: ../gthumb/gth-browser.c:1106 #, c-format msgid "%s of free space" msgstr "%s dari ruang bebas" -#: ../gthumb/gth-browser.c:1235 -#: ../gthumb/gth-browser.c:1809 -#: ../gthumb/gth-browser.c:5795 -#: ../gthumb/gth-browser.c:5814 -#: ../gthumb/gth-browser.c:5839 -#, c-format -msgid "Could not load the position \"%s\"" -msgstr "Tidak dapat memuat posisi \"%s\"" - -#: ../gthumb/gth-browser.c:1905 -#: ../gthumb/gth-browser.c:1932 +#: ../gthumb/gth-browser.c:1996 ../gthumb/gth-browser.c:2023 #, c-format msgid "No suitable module found for %s" msgstr "Tak ditemukan modul yang cocok bagi %s" -#: ../gthumb/gth-browser.c:2052 +#: ../gthumb/gth-browser.c:2142 #, c-format msgid "Save changes to file '%s'?" msgstr "Simpan perubahan ke berkas '%s'?" -#: ../gthumb/gth-browser.c:2057 +#: ../gthumb/gth-browser.c:2147 msgid "If you don't save, changes to the file will be permanently lost." msgstr "Bila Anda tidak menyimpan, perubahan ke berkas akan hilang selamanya." -#: ../gthumb/gth-browser.c:2058 +#: ../gthumb/gth-browser.c:2148 msgid "Do _Not Save" msgstr "Janga_n Simpan" -#: ../gthumb/gth-browser.c:2863 -#: ../gthumb/gth-browser.c:2883 -#: ../gthumb/gth-source-tree.c:178 -#: ../gthumb/gth-source-tree.c:200 +#: ../gthumb/gth-browser.c:2927 ../gthumb/gth-source-tree.c:182 msgid "Could not change name" msgstr "Tidak dapat mengubah nama" -#: ../gthumb/gth-browser.c:3328 -#: ../gthumb/gth-main-default-metadata.c:41 +#: ../gthumb/gth-browser.c:3358 ../gthumb/gth-main-default-metadata.c:41 msgid "Modified" msgstr "Diubah" -#: ../gthumb/gth-browser.c:3648 -#: ../gthumb/gth-browser.c:3669 +#: ../gthumb/gth-browser.c:3746 ../gthumb/gth-browser.c:3764 msgid "View the list of visited locations" msgstr "Lihat daftar lokasi yang telah dikunjungi" -#: ../gthumb/gth-browser.c:3690 -#, fuzzy +#: ../gthumb/gth-browser.c:3782 msgid "View the list of upper locations" msgstr "Lihat daftar lokasi pengunggah" -#: ../gthumb/gth-browser.c:5796 +#: ../gthumb/gth-browser.c:6087 #, c-format msgid "File type not supported" msgstr "Jenis berkas tidak didukung" -#: ../gthumb/gth-browser.c:5840 +#: ../gthumb/gth-browser.c:6130 #, c-format msgid "No suitable module found" msgstr "Tak ditemukan modul yang cocok" -#: ../gthumb/gth-extensions.c:228 +#: ../gthumb/gth-extensions.c:203 #, c-format msgid "Could not open the module `%s`: %s" msgstr "Tidak dapat membuka modul '%s': %s" -#: ../gthumb/gth-extensions.c:831 +#: ../gthumb/gth-extensions.c:754 #, c-format msgid "The extension '%1$s' is required by the extension '%2$s'" msgstr "Ekstensi '%1$s' diperlukan oleh ekstensi '%2$s'" -#: ../gthumb/gth-file-source-vfs.c:116 +#: ../gthumb/gth-file-chooser-dialog.c:144 +msgid "All Supported Files" +msgstr "Semua Berkas Yang Didukung" + +#: ../gthumb/gth-file-source-vfs.c:121 msgid "Home Folder" msgstr "Folder Rumah" -#: ../gthumb/gth-file-source-vfs.c:121 +#: ../gthumb/gth-file-source-vfs.c:126 msgid "File System" msgstr "Sistem Berkas" -#: ../gthumb/gth-file-source-vfs.c:730 -msgid "The files cannot be moved to the Trash. Do you want to delete them permanently?" -msgstr "Berkas tak bisa dipindah ke Tong Sampah. Apakah Anda ingin menghapusnya secara permanen?" +#: ../gthumb/gth-file-source-vfs.c:739 +msgid "" +"The files cannot be moved to the Trash. Do you want to delete them " +"permanently?" +msgstr "" +"Berkas tak bisa dipindah ke Tong Sampah. Apakah Anda ingin menghapusnya " +"secara permanen?" -#: ../gthumb/gth-file-source-vfs.c:741 +#: ../gthumb/gth-file-source-vfs.c:750 msgid "Could not move the files to the Trash" msgstr "Tak bisa memindah berkas ke Tong Sampah" -#: ../gthumb/gth-file-source-vfs.c:785 +#: ../gthumb/gth-file-source-vfs.c:797 #, c-format msgid "Are you sure you want to move \"%s\" to trash?" msgstr "Anda yakin ingin memindah \"%s\" ke tong sampah?" -#: ../gthumb/gth-file-source-vfs.c:788 +#: ../gthumb/gth-file-source-vfs.c:801 #, c-format msgid "Are you sure you want to move to trash the %'d selected file?" msgid_plural "Are you sure you want to move to trash the %'d selected files?" msgstr[0] "Anda yakin ingin memindah %'d gambar yang dipilih ke tong sampah?" -#: ../gthumb/gth-file-source-vfs.c:829 +#: ../gthumb/gth-file-source-vfs.c:844 #, c-format msgid "Are you sure you want to permanently delete the %'d selected file?" -msgid_plural "Are you sure you want to permanently delete the %'d selected files?" +msgid_plural "" +"Are you sure you want to permanently delete the %'d selected files?" msgstr[0] "Anda yakin ingin menghapus permanen %'d gambar yang dipilih?" -#: ../gthumb/gth-filterbar.c:405 +#: ../gthumb/gth-filterbar.c:413 msgid "Hide the filterbar" msgstr "sembunyikan bilah tapis" -#: ../gthumb/gth-filter.c:43 -#: ../gthumb/gth-filter-editor-dialog.c:208 +#: ../gthumb/gth-filter.c:43 ../gthumb/gth-filter-editor-dialog.c:178 #: ../gthumb/gth-test-simple.c:75 msgid "kB" msgstr "kB" -#: ../gthumb/gth-filter.c:44 -#: ../gthumb/gth-filter-editor-dialog.c:209 +#: ../gthumb/gth-filter.c:44 ../gthumb/gth-filter-editor-dialog.c:179 #: ../gthumb/gth-test-simple.c:76 msgid "MB" msgstr "MB" -#: ../gthumb/gth-filter.c:45 -#: ../gthumb/gth-filter-editor-dialog.c:210 +#: ../gthumb/gth-filter.c:45 ../gthumb/gth-filter-editor-dialog.c:180 #: ../gthumb/gth-test-simple.c:77 msgid "GB" msgstr "GB" #. "files" label -#: ../gthumb/gth-filter.c:279 -#: ../gthumb/gth-filter-editor-dialog.c:207 +#: ../gthumb/gth-filter.c:286 ../gthumb/gth-filter-editor-dialog.c:177 msgid "files" msgstr "berkas" -#: ../gthumb/gth-filter-editor-dialog.c:254 +#: ../gthumb/gth-filter-editor-dialog.c:224 msgid "ascending" msgstr "naik" -#: ../gthumb/gth-filter-editor-dialog.c:255 +#: ../gthumb/gth-filter-editor-dialog.c:225 msgid "descending" msgstr "turun" -#: ../gthumb/gth-filter-editor-dialog.c:545 +#: ../gthumb/gth-filter-editor-dialog.c:515 #, c-format msgid "No limit specified" msgstr "Batas tak dinyatakan" -#: ../gthumb/gth-folder-tree.c:848 +#: ../gthumb/gth-folder-tree.c:857 msgid "Loading..." msgstr "Sedang membuka..." -#: ../gthumb/gth-folder-tree.c:1119 +#: ../gthumb/gth-folder-tree.c:1100 msgid "(Open Parent)" msgstr "(Buka Induk)" -#: ../gthumb/gth-histogram-view.c:800 +#: ../gthumb/gth-histogram-view.c:825 msgid "Linear scale" msgstr "Skala linier" -#: ../gthumb/gth-histogram-view.c:812 +#: ../gthumb/gth-histogram-view.c:837 msgid "Logarithmic scale" msgstr "Skala logaritmik" -#: ../gthumb/gth-histogram-view.c:832 +#: ../gthumb/gth-histogram-view.c:857 msgid "Channel:" msgstr "Kanal:" -#: ../gthumb/gth-histogram-view.c:864 +#: ../gthumb/gth-histogram-view.c:878 msgid "Value" msgstr "Nilai" -#: ../gthumb/gth-histogram-view.c:870 +#: ../gthumb/gth-histogram-view.c:883 msgid "Red" msgstr "Merah" -#: ../gthumb/gth-histogram-view.c:876 +#: ../gthumb/gth-histogram-view.c:888 msgid "Green" msgstr "Hijau" -#: ../gthumb/gth-histogram-view.c:882 +#: ../gthumb/gth-histogram-view.c:893 msgid "Blue" msgstr "Biru" -#: ../gthumb/gth-histogram-view.c:888 +#: ../gthumb/gth-histogram-view.c:898 msgid "Alpha" msgstr "Alfa" -#: ../gthumb/gth-histogram-view.c:895 +#: ../gthumb/gth-histogram-view.c:904 msgid "RGB" msgstr "RGB" +#: ../gthumb/gth-image-list-task.c:141 +msgid "Could not rename the file" +msgstr "Tak dapat mengubah nama berkas" + +#: ../gthumb/gth-image-saver.c:39 +msgid "No options available for this file type" +msgstr "Tak tersedia opsi bagi berkas jenis ini" + +#: ../gthumb/gth-image-saver.c:181 +#, c-format +msgid "Could not find a suitable module to save the image as \"%s\"" +msgstr "" +"Tidak dapat menemukan modul yang cocok untuk menyimpan gambar sebagai \"%s\"" + #: ../gthumb/gth-load-file-data-task.c:108 msgid "Reading file information" msgstr "Membaca informasi berkas" @@ -5291,7 +5315,7 @@ msgstr "Nama" #: ../gthumb/gth-main-default-metadata.c:40 -#: ../gthumb/gth-main-default-tests.c:248 +#: ../gthumb/gth-main-default-tests.c:284 msgid "Size" msgstr "Ukuran" @@ -5331,35 +5355,31 @@ msgid "dimensions" msgstr "dimensi" -#: ../gthumb/gth-main-default-tests.c:225 +#: ../gthumb/gth-main-default-tests.c:233 +msgid "All Files" +msgstr "Semua Berkas" + +#: ../gthumb/gth-main-default-tests.c:261 msgid "Media" msgstr "Media" -#: ../gthumb/gth-main-default-tests.c:232 +#: ../gthumb/gth-main-default-tests.c:268 msgid "Text Files" msgstr "Berkas Teks" -#: ../gthumb/gth-main-default-tests.c:240 +#: ../gthumb/gth-main-default-tests.c:276 msgid "Filename" msgstr "nama File" -#: ../gthumb/gth-main-default-tests.c:272 +#: ../gthumb/gth-main-default-tests.c:308 msgid "Title (embedded)" msgstr "Judul (tertempel)" -#: ../gthumb/gth-main-default-tests.c:278 +#: ../gthumb/gth-main-default-tests.c:316 msgid "Description (embedded)" msgstr "Keterangan (tertempel)" -#: ../gthumb/gth-pixbuf-list-task.c:139 -msgid "Could not rename the file" -msgstr "Tak dapat mengubah nama berkas" - -#: ../gthumb/gth-pixbuf-saver.c:34 -msgid "No options available for this file type" -msgstr "Tak tersedia opsi bagi berkas jenis ini" - -#: ../gthumb/gth-progress-dialog.c:142 +#: ../gthumb/gth-progress-dialog.c:144 msgid "Cancel operation" msgstr "Batalkan operasi" @@ -5367,65 +5387,64 @@ msgid "Saving file information" msgstr "Menyimpan informasi berkas" -#: ../gthumb/gth-tags-entry.c:373 +#: ../gthumb/gth-tags-entry.c:388 #, c-format msgid "Create tag «%s»" msgstr "Buat tag «%s»" -#: ../gthumb/gth-tags-entry.c:719 +#: ../gthumb/gth-tags-entry.c:735 msgid "Show all the tags" msgstr "Tampilkan semua tag" -#: ../gthumb/gth-tags-file.c:234 +#: ../gthumb/gth-tags-file.c:235 msgid "Holidays" msgstr "Hari Libur" -#: ../gthumb/gth-tags-file.c:235 +#: ../gthumb/gth-tags-file.c:236 msgid "Temporary" msgstr "Sementara" -#: ../gthumb/gth-tags-file.c:236 +#: ../gthumb/gth-tags-file.c:237 msgid "Screenshots" msgstr "TangkapanLayar" -#: ../gthumb/gth-tags-file.c:237 +#: ../gthumb/gth-tags-file.c:238 msgid "Science" msgstr "Ilmu Pengetahuan" -#: ../gthumb/gth-tags-file.c:238 +#: ../gthumb/gth-tags-file.c:239 msgid "Favorite" msgstr "Favorit" -#: ../gthumb/gth-tags-file.c:239 +#: ../gthumb/gth-tags-file.c:240 msgid "Important" msgstr "Penting" -#: ../gthumb/gth-tags-file.c:240 +#: ../gthumb/gth-tags-file.c:241 msgid "GNOME" msgstr "GNOME" -#: ../gthumb/gth-tags-file.c:241 +#: ../gthumb/gth-tags-file.c:242 msgid "Games" msgstr "Gim" -#: ../gthumb/gth-tags-file.c:242 +#: ../gthumb/gth-tags-file.c:243 msgid "Party" msgstr "Pesta" -#: ../gthumb/gth-tags-file.c:243 +#: ../gthumb/gth-tags-file.c:244 msgid "Birthday" msgstr "Ulang tahun" -#: ../gthumb/gth-tags-file.c:244 +#: ../gthumb/gth-tags-file.c:245 msgid "Astronomy" msgstr "Astronomi" -#: ../gthumb/gth-tags-file.c:245 +#: ../gthumb/gth-tags-file.c:246 msgid "Family" msgstr "Keluarga" -#: ../gthumb/gth-test-category.c:46 -#: ../gthumb/gth-test-simple.c:49 +#: ../gthumb/gth-test-category.c:46 ../gthumb/gth-test-simple.c:49 #: ../gthumb/gth-test-simple.c:64 msgid "is" msgstr "adalah" @@ -5434,26 +5453,23 @@ msgid "is only" msgstr "hanya" -#: ../gthumb/gth-test-category.c:48 -#: ../gthumb/gth-test-simple.c:50 +#: ../gthumb/gth-test-category.c:48 ../gthumb/gth-test-simple.c:50 #: ../gthumb/gth-test-simple.c:65 msgid "is not" msgstr "bukan" -#: ../gthumb/gth-test-category.c:374 -#: ../gthumb/gth-test-simple.c:800 -#: ../gthumb/gth-test-simple.c:826 -#: ../gthumb/gth-test-simple.c:847 -#: ../gthumb/gth-test-simple.c:873 +#: ../gthumb/gth-test-category.c:407 ../gthumb/gth-test-simple.c:812 +#: ../gthumb/gth-test-simple.c:838 ../gthumb/gth-test-simple.c:859 +#: ../gthumb/gth-test-simple.c:885 #, c-format msgid "The test definition is incomplete" msgstr "Definisi tes tak lengkap" -#: ../gthumb/gth-test-selector.c:278 +#: ../gthumb/gth-test-selector.c:252 msgid "Add a new rule" msgstr "Tambahkan aturan baru" -#: ../gthumb/gth-test-selector.c:289 +#: ../gthumb/gth-test-selector.c:263 msgid "Remove this rule" msgstr "Hapus aturan ini" @@ -5497,11 +5513,11 @@ msgid "is after" msgstr "setelah" -#: ../gthumb/gth-time-selector.c:471 +#: ../gthumb/gth-time-selector.c:478 msgid "Today" msgstr "Hari ini" -#: ../gthumb/gth-time-selector.c:479 +#: ../gthumb/gth-time-selector.c:486 msgid "Now" msgstr "Kini" @@ -5513,58 +5529,50 @@ msgid "Close _All Windows" msgstr "Tutup Semu_a Jendela" -#: ../gthumb/gtk-utils.c:704 +#: ../gthumb/gtk-utils.c:499 msgid "Could not display help" msgstr "Tidak dapat menampilkan bantuan" -#: ../gthumb/gtk-utils.c:991 -#: ../gthumb/gtk-utils.c:1000 +#: ../gthumb/gtk-utils.c:828 ../gthumb/gtk-utils.c:835 msgid "Could not launch the application" msgstr "Tidak dapat menjalankan aplikasi" -#: ../gthumb/gtk-utils.c:1103 +#: ../gthumb/gtk-utils.c:938 msgid "_Copy Here" msgstr "_Salin ke Sini" -#: ../gthumb/gtk-utils.c:1108 +#: ../gthumb/gtk-utils.c:943 msgid "_Move Here" msgstr "_Pindahkan ke Sini" -#: ../gthumb/gtk-utils.c:1113 +#: ../gthumb/gtk-utils.c:948 msgid "_Link Here" msgstr "_Tautkan ke Sini" -#: ../gthumb/gtk-utils.c:1122 +#: ../gthumb/gtk-utils.c:957 msgid "Cancel" msgstr "Batal" -#: ../gthumb/main.c:72 +#: ../gthumb/main.c:61 msgid "Open a new window" msgstr "Buka jendela baru" -#: ../gthumb/main.c:76 +#: ../gthumb/main.c:65 msgid "Start in fullscreen mode" msgstr "Mulai dengan modus fullscreen" -#: ../gthumb/main.c:80 +#: ../gthumb/main.c:69 msgid "Automatically start a slideshow" msgstr "Otomatis mulai sebuah slideshow" -#: ../gthumb/main.c:84 +#: ../gthumb/main.c:73 msgid "Automatically import digital camera photos" msgstr "Otomatis impor foto kamera digital" -#: ../gthumb/main.c:88 +#: ../gthumb/main.c:77 msgid "Show version" msgstr "Tampilkan versi" -#. command line options -#: ../gthumb/main.c:539 +#: ../gthumb/main.c:483 msgid "- Image browser and viewer" msgstr "- Peramban dan penilik gambar" - -#: ../gthumb/pixbuf-io.c:174 -#, c-format -msgid "Could not find a suitable module to save the image as \"%s\"" -msgstr "Tidak dapat menemukan modul yang cocok untuk menyimpan gambar sebagai \"%s\"" - diff -Nru gthumb-3.0.2/po/it.po gthumb-3.2.3/po/it.po --- gthumb-3.0.2/po/it.po 2012-08-14 16:25:43.000000000 +0000 +++ gthumb-3.2.3/po/it.po 2013-04-30 16:56:13.000000000 +0000 @@ -5,21 +5,23 @@ # Francesco Marletta , 2003, 2004, 2005, 2006, 2007, 2008, 2009. # Luca Ferretti , 2009. # Milo Casagrande , 2010. -# Gianvito Cavasoli , 2011, 2012. +# Gianvito Cavasoli , 2011, 2012, 2013. # msgid "" msgstr "" "Project-Id-Version: gthumb\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gthumb&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-01-19 21:32+0000\n" -"PO-Revision-Date: 2012-01-13 21:24+0100\n" +"POT-Creation-Date: 2013-03-15 10:59+0000\n" +"PO-Revision-Date: 2013-03-16 14:40+0100\n" "Last-Translator: Gianvito Cavasoli \n" -"Language-Team: Italiano \n" +"Language-Team: Italiano \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bits\n" -"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Gtranslator 2.91.6\n" #: ../copy-n-paste/eggdesktopfile.c:165 #, c-format @@ -32,7 +34,7 @@ #: ../copy-n-paste/eggdesktopfile.c:191 #, c-format msgid "Unrecognized desktop file Version '%s'" -msgstr "File di desktop versione «%s» non riconosciuto" +msgstr "Versione «%s» nel file desktop non riconosciuta" #: ../copy-n-paste/eggdesktopfile.c:974 #, c-format @@ -91,40 +93,40 @@ msgid "Show session management options" msgstr "Mostra le opzioni di gestione sessione" -#: ../data/gthumb.desktop.in.in.h:1 -msgid "Image Viewer" -msgstr "Visualizzatore immagini" - -#: ../data/gthumb.desktop.in.in.h:2 -msgid "View and organize your images" -msgstr "Visualizza e organizza le proprie immagini" - #. manually set name and icon -#: ../data/gthumb.desktop.in.in.h:3 ../gthumb/gth-browser.c:529 -#: ../gthumb/gth-progress-dialog.c:386 ../gthumb/main.c:313 +#: ../data/gthumb.desktop.in.in.h:1 ../gthumb/gth-browser.c:578 +#: ../gthumb/gth-progress-dialog.c:390 ../gthumb/main.c:315 msgid "gThumb" msgstr "gThumb" -#: ../data/gthumb.desktop.in.in.h:4 +#: ../data/gthumb.desktop.in.in.h:2 +msgid "Image Viewer" +msgstr "Visualizzatore immagini" + +#: ../data/gthumb.desktop.in.in.h:3 msgid "gThumb Image Viewer" msgstr "Visualizzatore immagini gThumb" -#: ../data/gthumb-import.desktop.in.in.h:1 -msgid "Import the photos on your camera card" -msgstr "Importa le foto dalla scheda della fotocamera" +#: ../data/gthumb.desktop.in.in.h:4 +msgid "View and organize your images" +msgstr "Visualizza e organizza le proprie immagini" -#: ../data/gthumb-import.desktop.in.in.h:2 +#: ../data/gthumb-import.desktop.in.in.h:1 msgid "Import with gThumb" -msgstr "Import con gThumb" +msgstr "Importa con gThumb" -#: ../data/gthumb-import.desktop.in.in.h:3 +#: ../data/gthumb-import.desktop.in.in.h:2 msgid "Photo Import Tool" msgstr "Strumento di importazione foto" -#: ../data/gthumb-import.desktop.in.in.h:4 +#: ../data/gthumb-import.desktop.in.in.h:3 msgid "gThumb Photo Import Tool" msgstr "Strumento di importazione foto gThumb" +#: ../data/gthumb-import.desktop.in.in.h:4 +msgid "Import the photos on your camera card" +msgstr "Importa le foto dalla scheda della fotocamera" + #: ../data/org.gnome.gthumb.gschema.xml.in.h:1 msgid "" "Images over this size (in bytes) will not be thumbnailed. Use 0 if you want " @@ -135,28 +137,28 @@ "generate miniature per tutte le immagini." #: ../data/org.gnome.gthumb.gschema.xml.in.h:2 -msgid "Open files in the active window" -msgstr "Apre i file nella finestra attiva" - -#: ../data/org.gnome.gthumb.gschema.xml.in.h:3 msgid "Whether to resize the window to fit the size of the image" msgstr "" "Indica se ridimensionare la finestra per adattarla alla dimensione " "dell'immagine" +#: ../data/org.gnome.gthumb.gschema.xml.in.h:3 +msgid "Open files in the active window" +msgstr "Apre i file nella finestra attiva" + #: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:1 msgid "Possible values are: white, black, checked, none." msgstr "I valori possibili: white, black, checked, none." #: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:2 -msgid "Whether to always use a black background." -msgstr "Indica se usare sempre uno sfondo nero." - -#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:3 msgid "Whether to reset the scrollbars position after changing image" msgstr "" -"Indica se ripristinare la posizione delle barre di scorrimento dopo la " -"modifica dell'immagine" +"Indica se ripristinare la posizione delle barre di scorrimento dopo il " +"cambiamento dell'immagine" + +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:3 +msgid "Whether to always use a black background." +msgstr "Indica se usare sempre uno sfondo nero." #: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:1 msgid "Possible values are: jpeg, jpg." @@ -175,32 +177,32 @@ "file::mtime, exif::photo::datetimeoriginal" #: ../data/ui/extensions-preferences.ui.h:1 +msgid "_Extensions:" +msgstr "_Estensioni:" + +#: ../data/ui/extensions-preferences.ui.h:2 msgid "More extensions..." msgstr "Altre estensioni..." -#: ../data/ui/extensions-preferences.ui.h:2 +#: ../data/ui/extensions-preferences.ui.h:3 msgid "Some extensions are configurable." msgstr "Alcune estensioni sono configurabili." -#: ../data/ui/extensions-preferences.ui.h:3 -msgid "_Extensions:" -msgstr "_Estensioni:" - #: ../data/ui/filter-editor.ui.h:1 msgid "Filter _Name:" msgstr "_Nome del filtro:" -#. limit label -#: ../data/ui/filter-editor.ui.h:2 ../gthumb/gth-filter.c:268 -#: ../gthumb/gth-filter.c:340 -msgid "_Limit to" -msgstr "_Limita a" - -#: ../data/ui/filter-editor.ui.h:3 +#: ../data/ui/filter-editor.ui.h:2 #: ../extensions/search/data/ui/search-editor.ui.h:3 msgid "_Match" msgstr "Corrispon_de" +#. limit label +#: ../data/ui/filter-editor.ui.h:3 ../gthumb/gth-filter.c:269 +#: ../gthumb/gth-filter.c:337 +msgid "_Limit to" +msgstr "_Limita a" + #: ../data/ui/filter-editor.ui.h:4 msgid "selected by" msgstr "selezionato per" @@ -209,69 +211,72 @@ msgid "Mean:" msgstr "Media:" -#: ../data/ui/histogram-info.ui.h:2 +#. Short for "Standard deviation". Try to keep it under the 12 characters in the translation or it will be ellipsizied at the end. +#: ../data/ui/histogram-info.ui.h:3 +msgid "Std dev:" +msgstr "Dev. standard:" + +#: ../data/ui/histogram-info.ui.h:4 msgid "Median:" msgstr "Mediana:" +#. After the colon there is the total number of pixels +#: ../data/ui/histogram-info.ui.h:6 +msgid "Pixels:" +msgstr "Pixel:" + #. After the colon there is a percentile. -#: ../data/ui/histogram-info.ui.h:4 +#: ../data/ui/histogram-info.ui.h:8 msgctxt "Pixels" msgid "Max:" msgstr "Massimo:" #. After the colon there is the percentile of selected pixels. -#: ../data/ui/histogram-info.ui.h:6 +#: ../data/ui/histogram-info.ui.h:10 msgctxt "Pixels" msgid "Selected:" msgstr "Selezionato:" -#. After the colon there is the total number of pixels -#: ../data/ui/histogram-info.ui.h:8 -msgid "Pixels:" -msgstr "Pixel:" - -#. Short for "Standard deviation". Try to keep it under the 12 characters in the translation or it will be ellipsizied at the end. -#: ../data/ui/histogram-info.ui.h:10 -msgid "Std dev:" -msgstr "Dev. standard:" +#: ../data/ui/location.ui.h:1 +msgid "_Location:" +msgstr "_Posizione:" #: ../data/ui/overwrite-dialog.ui.h:1 -msgid "Do not overwrite _the old file" -msgstr "Non sovrascrivere il _vecchio file" +msgid "Overwrite the old file with the new one?" +msgstr "Sovrascrivere il vecchio file con il nuovo?" #: ../data/ui/overwrite-dialog.ui.h:2 +msgid "Old File:" +msgstr "Vecchio file:" + +#: ../data/ui/overwrite-dialog.ui.h:3 msgid "Filename:" msgstr "Nome del file:" -#: ../data/ui/overwrite-dialog.ui.h:3 +#: ../data/ui/overwrite-dialog.ui.h:4 +#: ../extensions/image_print/data/ui/print-layout.ui.h:23 +msgid "Size:" +msgstr "Dimensione:" + +#: ../data/ui/overwrite-dialog.ui.h:5 msgid "Modified:" msgstr "Modificato:" -#: ../data/ui/overwrite-dialog.ui.h:4 +#: ../data/ui/overwrite-dialog.ui.h:6 msgid "New File:" msgstr "Nuovo file:" -#: ../data/ui/overwrite-dialog.ui.h:5 -msgid "Old File:" -msgstr "Vecchio file:" - -#: ../data/ui/overwrite-dialog.ui.h:6 +#: ../data/ui/overwrite-dialog.ui.h:7 msgid "Over_write the old file" msgstr "Sovra_scrivere il vecchio file" -#: ../data/ui/overwrite-dialog.ui.h:7 -msgid "Overwrite _all files" -msgstr "Sovrascrivere _tutti i file" - #: ../data/ui/overwrite-dialog.ui.h:8 -msgid "Overwrite the old file with the new one?" -msgstr "Sovrascrivere il vecchio file con il nuovo?" +msgid "Do not overwrite _the old file" +msgstr "Non sovrascrivere il _vecchio file" #: ../data/ui/overwrite-dialog.ui.h:9 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:9 -#: ../extensions/image_print/data/ui/print-layout.ui.h:16 -msgid "Size:" -msgstr "Dimensione:" +msgid "Overwrite _all files" +msgstr "Sovrascrivere _tutti i file" #: ../data/ui/overwrite-dialog.ui.h:10 msgid "_Do not overwrite any file" @@ -294,117 +299,181 @@ msgstr "_Altri filtri:" #: ../data/ui/preferences.ui.h:1 -msgid "Appearance" -msgstr "Aspetto" +msgid "below the folder list" +msgstr "sotto l'elenco cartelle" #: ../data/ui/preferences.ui.h:2 -msgid "As_k confirmation before deleting files or catalogs" -msgstr "C_hiedere conferma prima di eliminare file o cataloghi" +msgid "on the right" +msgstr "sulla destra" #: ../data/ui/preferences.ui.h:3 -msgid "Ask whether to save _modified files" -msgstr "Chiedere se salvare i file modi_ficati" +msgid "gThumb Preferences" +msgstr "Preferenze di gThumb" -#: ../data/ui/preferences.ui.h:4 ../gthumb/dlg-preferences-extensions.c:71 -#: ../gthumb/gth-browser-actions-entries.h:173 -msgid "Browser" -msgstr "Navigatore" +#: ../data/ui/preferences.ui.h:4 +msgid "_Toolbar style:" +msgstr "Stile della barra degli _strumenti:" #: ../data/ui/preferences.ui.h:5 -#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 -#: ../extensions/image_print/data/ui/print-layout.ui.h:4 -msgid "Caption" -msgstr "Didascalia" +msgid "T_humbnails in viewer:" +msgstr "_Miniature nel visualizzatore:" #: ../data/ui/preferences.ui.h:6 -msgid "Choose startup folder" -msgstr "Scegli la cartella iniziale" +msgid "System settings" +msgstr "Impostazioni di sistema" #: ../data/ui/preferences.ui.h:7 -msgid "D_etermine image type from content (slower)" -msgstr "D_eterminare il tipo di immagine dal contenuto (più lento)" +msgid "Text below icons" +msgstr "Testo sotto le icone" #: ../data/ui/preferences.ui.h:8 -msgid "File _properties in browser:" -msgstr "_Proprietà del file nel navigatore:" +msgid "Text beside icons" +msgstr "Testo accanto alle icone" #: ../data/ui/preferences.ui.h:9 -#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 -#: ../extensions/edit_metadata/gth-edit-general-page.c:404 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 -#: ../gthumb/gth-main-default-metadata.c:33 -msgid "General" -msgstr "Generale" +msgid "Icons only" +msgstr "Solo icone" #: ../data/ui/preferences.ui.h:10 -msgid "Go to last _visited location" -msgstr "Andare all'ultima posizione _visitata" +msgid "Text only" +msgstr "Solo testo" #: ../data/ui/preferences.ui.h:11 -msgid "Go to this _folder:" -msgstr "Andare a questa car_tella:" +msgid "on the bottom" +msgstr "in basso" #: ../data/ui/preferences.ui.h:12 -msgid "On startup:" -msgstr "All'avvio:" +msgid "on the side" +msgstr "sul lato" #: ../data/ui/preferences.ui.h:13 -#: ../extensions/exiv2_tools/gth-edit-iptc-page.c:198 -#: ../extensions/gstreamer_tools/main.c:33 -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:2 -msgid "Other" -msgstr "Altro" +msgid "File _properties in browser:" +msgstr "_Proprietà del file nel navigatore:" #: ../data/ui/preferences.ui.h:14 -msgid "Set to C_urrent" -msgstr "Imposta a quella at_tuale" +msgid "Appearance" +msgstr "Aspetto" #: ../data/ui/preferences.ui.h:15 -msgid "T_humbnails in viewer:" -msgstr "_Miniature nel visualizzatore:" +msgid "Go to last _visited location" +msgstr "Andare all'ultima posizione _visitata" #: ../data/ui/preferences.ui.h:16 -msgid "Thumbnail _size:" -msgstr "_Dimensione miniature:" +msgid "Go to this _folder:" +msgstr "Andare a questa car_tella:" #: ../data/ui/preferences.ui.h:17 -msgid "_Reuse the active window to open files" -msgstr "_Riutilizzare la finestra attiva per aprire i file" +msgid "Choose startup folder" +msgstr "Scegli la cartella iniziale" #: ../data/ui/preferences.ui.h:18 -msgid "_Store metadata inside files if possible" -msgstr "_Memorizzare i metadati nei file se possibile" +msgid "Set to C_urrent" +msgstr "Imposta a quella at_tuale" #: ../data/ui/preferences.ui.h:19 -msgid "_Toolbar style:" -msgstr "Stile della barra degli _strumenti:" +msgid "_Reuse the active window to open files" +msgstr "_Riutilizzare la finestra attiva per aprire i file" #: ../data/ui/preferences.ui.h:20 -msgid "below the folder list" -msgstr "sotto l'elenco cartelle" +msgid "On startup:" +msgstr "All'avvio:" #: ../data/ui/preferences.ui.h:21 -msgid "gThumb Preferences" -msgstr "Preferenze di gThumb" +msgid "As_k confirmation before deleting files or catalogs" +msgstr "C_hiedere conferma prima di eliminare file o cataloghi" #: ../data/ui/preferences.ui.h:22 -msgid "on the right" -msgstr "sulla destra" +msgid "Ask whether to save _modified files" +msgstr "Chiedere se salvare i file modi_ficati" + +#: ../data/ui/preferences.ui.h:23 +msgid "_Store metadata inside files if possible" +msgstr "_Memorizzare i metadati nei file se possibile" + +#: ../data/ui/preferences.ui.h:24 +#: ../extensions/exiv2_tools/gth-edit-iptc-page.c:198 +#: ../extensions/gstreamer_tools/main.c:33 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:17 +msgid "Other" +msgstr "Altro" + +#: ../data/ui/preferences.ui.h:25 +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 +#: ../extensions/edit_metadata/gth-edit-general-page.c:481 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 +#: ../gthumb/gth-main-default-metadata.c:33 +msgid "General" +msgstr "Generale" + +#: ../data/ui/preferences.ui.h:26 +#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 +#: ../extensions/image_print/data/ui/print-layout.ui.h:18 +msgid "Caption" +msgstr "Didascalia" + +#: ../data/ui/preferences.ui.h:27 +msgid "Thumbnail _size:" +msgstr "_Dimensione miniature:" + +#: ../data/ui/preferences.ui.h:28 +msgid "48" +msgstr "48" + +#: ../data/ui/preferences.ui.h:29 +msgid "64" +msgstr "64" + +#: ../data/ui/preferences.ui.h:30 +msgid "85" +msgstr "85" + +#: ../data/ui/preferences.ui.h:31 +msgid "95" +msgstr "95" + +#: ../data/ui/preferences.ui.h:32 +msgid "112" +msgstr "112" + +#: ../data/ui/preferences.ui.h:33 +msgid "128" +msgstr "128" + +#: ../data/ui/preferences.ui.h:34 +msgid "164" +msgstr "164" + +#: ../data/ui/preferences.ui.h:35 +msgid "200" +msgstr "200" + +#: ../data/ui/preferences.ui.h:36 +msgid "256" +msgstr "256" + +#: ../data/ui/preferences.ui.h:37 +msgid "D_etermine image type from content (slower)" +msgstr "D_eterminare il tipo di immagine dal contenuto (più lento)" + +#: ../data/ui/preferences.ui.h:38 ../gthumb/dlg-preferences-extensions.c:71 +#: ../gthumb/gth-browser-actions-entries.h:179 +msgid "Browser" +msgstr "Navigatore" #: ../data/ui/sort-order.ui.h:1 msgid "Sort By" msgstr "Ordina per" #: ../data/ui/sort-order.ui.h:2 -msgid "_Inverse order" -msgstr "Ordine _inverso" - -#: ../data/ui/sort-order.ui.h:3 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:4 msgid "_Sort by:" msgstr "_Ordina per:" +#: ../data/ui/sort-order.ui.h:3 +msgid "_Inverse order" +msgstr "Ordine _inverso" + #: ../extensions/23hq/23hq.extension.in.in.h:1 msgid "23" msgstr "23" @@ -422,14 +491,14 @@ msgstr "Carica le foto su 23" #: ../extensions/bookmarks/bookmarks.extension.in.in.h:1 -msgid "Add bookmarks support." -msgstr "Aggiunge il supporto per i segnalibri." - -#: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:1 msgid "Bookmarks" msgstr "Segnalibri" +#: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 +msgid "Add bookmarks support." +msgstr "Aggiunge il supporto per i segnalibri." + #: ../extensions/bookmarks/bookmarks.extension.in.in.h:3 #: ../extensions/burn_disc/burn_disc.extension.in.in.h:3 #: ../extensions/catalogs/catalogs.extension.in.in.h:3 @@ -449,12 +518,12 @@ #: ../extensions/image_viewer/image_viewer.extension.in.in.h:3 #: ../extensions/list_tools/list_tools.extension.in.in.h:3 #: ../extensions/photo_importer/photo_importer.extension.in.in.h:3 -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:3 #: ../extensions/raw_files/raw_files.extension.in.in.h:3 #: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:3 #: ../extensions/rename_series/rename_series.extension.in.in.h:3 #: ../extensions/resize_images/resize_images.extension.in.in.h:3 #: ../extensions/search/search.extension.in.in.h:3 +#: ../extensions/selections/selections.extension.in.in.h:3 #: ../extensions/slideshow/slideshow.extension.in.in.h:3 #: ../extensions/webalbums/webalbums.extension.in.in.h:3 msgid "gthumb development team" @@ -489,13 +558,13 @@ msgstr "Se_gnalibri:" #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:3 -msgid "_Location" -msgstr "_Posizione" - -#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:4 msgid "_Name" msgstr "_Nome" +#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:4 +msgid "_Location" +msgstr "_Posizione" + #: ../extensions/bookmarks/dlg-bookmarks.c:70 msgid "Could not remove the bookmark" msgstr "Impossibile rimuovere il segnalibro" @@ -529,33 +598,145 @@ msgstr "Attuale cartella e sue s_ottocartelle" #: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:3 -msgid "Source" -msgstr "Sorgente" - -#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:4 msgid "_Selected files" msgstr "File _selezionati" +#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:4 +msgid "Source" +msgstr "Sorgente" + #: ../extensions/burn_disc/gth-burn-task.c:238 #: ../extensions/burn_disc/gth-burn-task.c:259 #: ../extensions/burn_disc/gth-burn-task.c:397 msgid "Write to Disc" msgstr "Scrivi sul disco" -#: ../extensions/cairo_io/cairo-io-jpeg.c:62 +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:62 #, c-format msgid "Error interpreting JPEG image file: %s" msgstr "Errore di interpretazione del file immagine JPEG: %s" -#: ../extensions/cairo_io/cairo-io-jpeg.c:482 +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:483 #, c-format msgid "Unknown JPEG color space (%d)" msgstr "Spazio di colore JPEG sconosciuto (%d)" +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:1 +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:1 +msgid "_Default extension:" +msgstr "Estensione pre_definita:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:2 +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:1 +msgid "_Quality:" +msgstr "_Qualità:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:3 +msgid "_Smoothing:" +msgstr "_Levigazione:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:4 +msgid "Opti_mize" +msgstr "Otti_mizzare" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:5 +msgid "_Progressive" +msgstr "_Progressiva" + +#: ../extensions/cairo_io/data/ui/png-options.ui.h:1 +msgid "Compression _level:" +msgstr "_Livello di compressione:" + +#: ../extensions/cairo_io/data/ui/save-options-preferences.ui.h:1 +msgid "Default options:" +msgstr "Opzioni predefinite:" + +#: ../extensions/cairo_io/data/ui/tga-options.ui.h:1 +msgid "_RLE compression" +msgstr "Compressione _RLE" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:2 +msgid "Compression" +msgstr "Compressione" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:3 +msgid "_No compression" +msgstr "_Nessuna compressione" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:4 +msgid "No_rmal (Deflate)" +msgstr "No_rmale (deflate)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:5 +msgid "_Loss compression (JPEG)" +msgstr "Compressione con _perdita (JPEG)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:6 +msgid "Resolution" +msgstr "Risoluzione" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:7 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 +msgid "_Horizontal:" +msgstr "_Orizzontale:" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:8 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 +msgid "_Vertical:" +msgstr "_Verticale:" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:9 +msgid "dpi" +msgstr "dpi" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:2 +msgid "_Method:" +msgstr "_Metodo:" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:3 +msgid "_Lossless" +msgstr "_Senza perdita" + +#: ../extensions/cairo_io/gth-image-saver-jpeg.c:516 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:140 +msgid "JPEG" +msgstr "JPEG" + +#: ../extensions/cairo_io/gth-image-saver-png.c:353 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:110 +msgid "PNG" +msgstr "PNG" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:257 +#: ../extensions/cairo_io/gth-image-saver-tiff.c:435 +#: ../gthumb/gth-buffer-data.c:84 +msgid "Insufficient memory" +msgstr "Memoria insufficiente" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:344 +msgid "TGA" +msgstr "TGA" + +#: ../extensions/cairo_io/gth-image-saver-tiff.c:559 +msgid "TIFF" +msgstr "TIFF" + +#: ../extensions/cairo_io/gth-image-saver-webp.c:382 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:165 +msgid "WebP" +msgstr "WebP" + +#: ../extensions/cairo_io/preferences.c:134 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 +msgid "Saving" +msgstr "Salvataggio" + #: ../extensions/catalogs/actions.c:92 ../extensions/catalogs/actions.c:213 #: ../extensions/catalogs/dlg-add-to-catalog.c:274 #: ../extensions/catalogs/dlg-add-to-catalog.c:394 -#: ../extensions/file_manager/actions.c:65 +#: ../extensions/file_manager/actions.c:68 #: ../extensions/list_tools/gth-script-editor-dialog.c:290 #: ../gthumb/gth-filter-editor-dialog.c:461 #, c-format @@ -565,7 +746,7 @@ #: ../extensions/catalogs/actions.c:99 ../extensions/catalogs/actions.c:220 #: ../extensions/catalogs/dlg-add-to-catalog.c:281 #: ../extensions/catalogs/dlg-add-to-catalog.c:401 -#: ../extensions/file_manager/actions.c:72 +#: ../extensions/file_manager/actions.c:75 #, c-format msgid "Invalid name. The following characters are not allowed: %s" msgstr "Nome non valido. I seguenti caratteri non sono consentiti: %s" @@ -573,8 +754,8 @@ #: ../extensions/catalogs/actions.c:155 ../extensions/catalogs/actions.c:267 #: ../extensions/catalogs/dlg-add-to-catalog.c:338 #: ../extensions/catalogs/dlg-add-to-catalog.c:448 -#: ../extensions/catalogs/gth-file-source-catalogs.c:503 -#: ../extensions/file_manager/actions.c:103 +#: ../extensions/catalogs/gth-file-source-catalogs.c:508 +#: ../extensions/file_manager/actions.c:106 msgid "Name already used" msgstr "Nome già in uso" @@ -591,7 +772,7 @@ #: ../extensions/catalogs/actions.c:181 ../extensions/catalogs/actions.c:293 #: ../extensions/catalogs/dlg-add-to-catalog.c:362 #: ../extensions/catalogs/dlg-add-to-catalog.c:474 -#: ../extensions/file_manager/actions.c:133 +#: ../extensions/file_manager/actions.c:136 msgid "C_reate" msgstr "C_rea" @@ -612,22 +793,23 @@ #: ../extensions/catalogs/actions.c:363 #, c-format msgid "Are you sure you want to remove \"%s\"?" -msgstr "Si è sicuri di rimuovere «%s»?" +msgstr "Si è sicuri di voler rimuovere «%s»?" #: ../extensions/catalogs/callbacks.c:102 msgid "_Add to Catalog" msgstr "_Aggiungi al catalogo" #: ../extensions/catalogs/callbacks.c:105 +#: ../extensions/selections/callbacks.c:80 msgid "Open _Folder" msgstr "Apri car_tella" #: ../extensions/catalogs/callbacks.c:106 +#: ../extensions/selections/callbacks.c:81 msgid "Go to the folder that contains the selected file" msgstr "Va alla cartella che contiene il file selezionato" #: ../extensions/catalogs/callbacks.c:110 -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:85 msgid "Other..." msgstr "Altro..." @@ -663,36 +845,36 @@ msgid "Rena_me" msgstr "Rino_mina" -#: ../extensions/catalogs/callbacks.c:279 -#: ../extensions/catalogs/callbacks.c:282 +#: ../extensions/catalogs/callbacks.c:281 +#: ../extensions/catalogs/callbacks.c:284 msgid "Command Line" msgstr "Riga di comando" -#: ../extensions/catalogs/callbacks.c:497 -#: ../extensions/catalogs/callbacks.c:502 +#: ../extensions/catalogs/callbacks.c:496 +#: ../extensions/catalogs/callbacks.c:501 #: ../extensions/photo_importer/dlg-photo-importer.c:364 #: ../extensions/photo_importer/dlg-photo-importer.c:404 -#: ../gthumb/gth-file-list.c:43 ../gthumb/gth-folder-tree.c:883 +#: ../gthumb/gth-file-list.c:43 ../gthumb/gth-folder-tree.c:1093 msgid "(Empty)" msgstr "(Vuoto)" -#: ../extensions/catalogs/callbacks.c:697 +#: ../extensions/catalogs/callbacks.c:700 msgid "Catalog Properties" msgstr "Proprietà del catalogo" -#: ../extensions/catalogs/callbacks.c:711 +#: ../extensions/catalogs/callbacks.c:714 msgid "Organize" msgstr "Organizza" -#: ../extensions/catalogs/callbacks.c:712 +#: ../extensions/catalogs/callbacks.c:715 msgid "Automatically organize files by date" msgstr "Organizza automaticamente i file per data" #: ../extensions/catalogs/catalogs.extension.in.in.h:1 #: ../extensions/catalogs/gth-catalog.c:611 -#: ../extensions/catalogs/gth-catalog.c:660 +#: ../extensions/catalogs/gth-catalog.c:662 +#: ../extensions/catalogs/gth-catalog.c:1016 #: ../extensions/catalogs/gth-catalog.c:1017 -#: ../extensions/catalogs/gth-catalog.c:1018 msgid "Catalogs" msgstr "Cataloghi" @@ -709,114 +891,114 @@ msgstr "C_ataloghi:" #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:3 -msgid "New _Library" -msgstr "Nuova _raccolta" - -#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:4 msgid "_New Catalog" msgstr "_Nuovo catalogo" +#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:4 +msgid "New _Library" +msgstr "Nuova _raccolta" + #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:5 -#: ../extensions/file_manager/actions.c:929 -#: ../extensions/webalbums/gth-web-exporter.c:1842 +#: ../extensions/file_manager/actions.c:945 +#: ../extensions/webalbums/gth-web-exporter.c:1840 msgid "_View the destination" msgstr "_Visualizzare la destinazione" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:1 -msgid "Catalog" -msgstr "Catalogo" - -#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 -#: ../gthumb/gth-file-properties.c:212 +#: ../gthumb/gth-file-properties.c:209 msgid "Properties" msgstr "Proprietà" +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:1 +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:1 +msgid "_Name:" +msgstr "_Nome" + #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:4 -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:3 +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:2 msgid "_Date:" msgstr "_Data:" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:5 -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 -#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 -msgid "_Name:" -msgstr "_Nome" +msgid "Catalog" +msgstr "Catalogo" #: ../extensions/catalogs/data/ui/organize-files-task.ui.h:1 -msgid "Catalog _Preview:" -msgstr "Ante_prima del catalogo" - -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:2 -msgid "Organization:" -msgstr "Organizzazione:" - -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 -#: ../extensions/catalogs/data/ui/organize-files.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 msgid "Organize Files" msgstr "Organizza file" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:2 msgid "Organizing files" msgstr "Organizzazione dei file" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 +msgid "Organization:" +msgstr "Organizzazione:" + +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:4 msgid "Select All" msgstr "Seleziona tutto" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 msgid "Select None" msgstr "Nessuna selezione" +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 +msgid "Catalog _Preview:" +msgstr "Ante_prima del catalogo:" + #: ../extensions/catalogs/data/ui/organize-files.ui.h:1 -#: ../extensions/edit_metadata/gth-edit-general-page.c:480 -#: ../gthumb/gth-main-default-tests.c:264 +#: ../extensions/edit_metadata/gth-edit-general-page.c:558 +#: ../gthumb/gth-main-default-tests.c:300 msgid "Date photo was taken" msgstr "Data di scatto della foto" #: ../extensions/catalogs/data/ui/organize-files.ui.h:2 -#: ../gthumb/gth-main-default-tests.c:256 +#: ../gthumb/gth-main-default-tests.c:292 msgid "File modified date" msgstr "Data di modifica del file" #: ../extensions/catalogs/data/ui/organize-files.ui.h:3 -msgid "Ignore catalogs with a single file" -msgstr "Ignorare i cataloghi con un solo file" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:5 -msgid "Put single files in the catalog:" -msgstr "Mettere i file singoli nel catalogo:" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 -msgid "Singles" -msgstr "Singoli" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:7 -#: ../extensions/comments/main.c:280 +#: ../extensions/comments/main.c:182 msgid "Tag" msgstr "Etichetta" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:8 -#: ../gthumb/gth-main-default-tests.c:284 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:4 +msgid "tag" +msgstr "etichetta" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:5 +#: ../gthumb/gth-main-default-tests.c:324 msgid "Tag (embedded)" msgstr "Etichetta (incorporata)" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:9 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:7 msgid "_Group files by:" msgstr "Rag_gruppare i file per:" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:10 -#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:8 +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 #: ../extensions/search/data/ui/search-editor.ui.h:2 msgid "_Include sub-folders" msgstr "Includere le _sottocartelle" +#: ../extensions/catalogs/data/ui/organize-files.ui.h:9 +msgid "Ignore catalogs with a single file" +msgstr "Ignorare i cataloghi con un solo file" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:10 +msgid "Put single files in the catalog:" +msgstr "Mettere i file singoli nel catalogo:" + #: ../extensions/catalogs/data/ui/organize-files.ui.h:11 -msgid "tag" -msgstr "etichetta" +msgid "Singles" +msgstr "Singoli" #: ../extensions/catalogs/dlg-add-to-catalog.c:105 #: ../extensions/catalogs/dlg-add-to-catalog.c:136 @@ -841,52 +1023,52 @@ msgstr "" "I file saranno organizzati in cataloghi. Nessun file sul disco sarà spostato." -#: ../extensions/catalogs/gth-catalog.c:1115 ../extensions/comments/main.c:43 +#: ../extensions/catalogs/gth-catalog.c:1114 ../extensions/comments/main.c:45 #: ../extensions/edit_metadata/callbacks.c:106 #: ../gthumb/gth-main-default-metadata.c:53 msgid "Tags" msgstr "Etichette" -#: ../extensions/catalogs/gth-file-source-catalogs.c:948 +#: ../extensions/catalogs/gth-file-source-catalogs.c:953 #, c-format msgid "The catalog '%s' already exists, do you want to overwrite it?" msgstr "Il catalogo «%s» esiste già, sovrascriverlo?" -#: ../extensions/catalogs/gth-file-source-catalogs.c:950 +#: ../extensions/catalogs/gth-file-source-catalogs.c:955 #, c-format msgid "The library '%s' already exists, do you want to overwrite it?" msgstr "La raccolta «%s» esiste già, sovrascriverla?" -#: ../extensions/catalogs/gth-file-source-catalogs.c:958 +#: ../extensions/catalogs/gth-file-source-catalogs.c:963 msgid "Over_write" msgstr "Sovra_scrivi" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1076 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1081 msgid "Cannot move the files" msgstr "Impossibile spostare i file" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1078 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1083 msgid "Cannot copy the files" msgstr "Impossibile copiare i file" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1083 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1088 msgid "Invalid destination." msgstr "Destinazione non valida." -#: ../extensions/catalogs/gth-file-source-catalogs.c:1130 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1135 #, c-format msgid "Copying files to '%s'" msgstr "Copia dei file in «%s»" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1383 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1322 msgid "Could not remove the files from the catalog" msgstr "Non è possibile rimuovere i file dal catalogo" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1441 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:681 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:690 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:719 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:1224 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1380 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:746 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:755 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:785 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:1320 #: ../extensions/search/gth-search.c:265 msgid "Invalid file format" msgstr "Formato di file non valido" @@ -921,70 +1103,76 @@ msgstr "-" #: ../extensions/change_date/data/ui/change-date.ui.h:3 -msgid "A_djust by" -msgstr "_Regola di" - -#: ../extensions/change_date/data/ui/change-date.ui.h:4 msgid "Change Date" msgstr "Cambia data" -#: ../extensions/change_date/data/ui/change-date.ui.h:5 +#: ../extensions/change_date/data/ui/change-date.ui.h:4 msgid "Change the following values:" msgstr "Cambia i seguenti valori:" -#: ../extensions/change_date/data/ui/change-date.ui.h:6 -msgid "Change to:" -msgstr "Cambia in:" +#: ../extensions/change_date/data/ui/change-date.ui.h:5 +msgid "_Last modified date" +msgstr "Data dell'u_ltima modifica" -#: ../extensions/change_date/data/ui/change-date.ui.h:7 +#: ../extensions/change_date/data/ui/change-date.ui.h:6 msgid "Co_mment date" msgstr "Data co_mmento" +#: ../extensions/change_date/data/ui/change-date.ui.h:7 +msgid "Change to:" +msgstr "Cambia in:" + #: ../extensions/change_date/data/ui/change-date.ui.h:8 -msgid "Date p_hoto was taken" -msgstr "Data di scatto della _foto" +msgid "The _following date:" +msgstr "La data _seguente:" #: ../extensions/change_date/data/ui/change-date.ui.h:9 -msgid "Exif DateTimeOriginal tag" -msgstr "Etichetta Exif DateTimeOriginal" - -#: ../extensions/change_date/data/ui/change-date.ui.h:10 msgid "File _modified date" msgstr "Data di _modifica del file" -#: ../extensions/change_date/data/ui/change-date.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:10 msgid "File c_reation date" msgstr "Data di c_reazione del file" +#: ../extensions/change_date/data/ui/change-date.ui.h:11 +msgid "Date p_hoto was taken" +msgstr "Data di scatto della _foto" + #: ../extensions/change_date/data/ui/change-date.ui.h:12 -msgid "The _following date:" -msgstr "La data _seguente:" +msgid "A_djust by" +msgstr "_Regola di" #: ../extensions/change_date/data/ui/change-date.ui.h:13 -msgid "_Last modified date" -msgstr "Data dell'u_ltima modifica" - -#: ../extensions/change_date/data/ui/change-date.ui.h:14 msgid "hours" msgstr "ore" -#: ../extensions/change_date/data/ui/change-date.ui.h:15 +#: ../extensions/change_date/data/ui/change-date.ui.h:14 msgid "minutes" msgstr "minuti" -#: ../extensions/change_date/data/ui/change-date.ui.h:16 -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:15 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:6 msgid "seconds" msgstr "secondi" -#: ../extensions/comments/comments.extension.in.in.h:1 -msgid "Add comments and tags to any file type." -msgstr "Aggiunge commenti ed etichette a qualsiasi tipo di file." +#: ../extensions/comments/callbacks.c:46 +msgid "Import Embedded Metadata" +msgstr "Importa metadati incorporati" -#: ../extensions/comments/comments.extension.in.in.h:2 +#: ../extensions/comments/callbacks.c:47 +msgid "Import the metadata stored inside files into the gThumb comment system" +msgstr "" +"Importa i metadati memorizzati nei file nel sistema di commenti " +"dell'applicazione" + +#: ../extensions/comments/comments.extension.in.in.h:1 msgid "Comments and tags" msgstr "Commenti ed etichette" +#: ../extensions/comments/comments.extension.in.in.h:2 +msgid "Add comments and tags to any file type." +msgstr "Aggiunge commenti ed etichette a qualsiasi tipo di file." + #: ../extensions/comments/data/ui/comments-preferences.ui.h:1 #: ../extensions/importer/gth-import-preferences-dialog.c:318 msgid "Preferences" @@ -994,51 +1182,51 @@ msgid "_Synchronize with the embedded metadata" msgstr "_Sincronizzare con i metadati incorporati" -#: ../extensions/comments/main.c:33 +#: ../extensions/comments/main.c:35 #: ../extensions/edit_metadata/callbacks.c:100 msgid "Comment" msgstr "Commento" -#: ../extensions/comments/main.c:39 ../gthumb/gth-main-default-metadata.c:46 +#: ../extensions/comments/main.c:41 ../gthumb/gth-main-default-metadata.c:46 msgid "Title" msgstr "Titolo" -#: ../extensions/comments/main.c:40 ../extensions/comments/main.c:264 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 +#: ../extensions/comments/main.c:42 ../extensions/comments/main.c:166 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 #: ../extensions/image_print/data/ui/print-layout.ui.h:8 -#: ../extensions/importer/data/ui/import-preferences.ui.h:1 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:16 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:13 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 +#: ../extensions/importer/data/ui/import-preferences.ui.h:6 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 #: ../gthumb/gth-main-default-metadata.c:52 msgid "Description" msgstr "Descrizione" -#: ../extensions/comments/main.c:41 ../extensions/comments/main.c:272 +#: ../extensions/comments/main.c:43 ../extensions/comments/main.c:174 #: ../gthumb/gth-main-default-metadata.c:50 msgid "Place" msgstr "Luogo" -#: ../extensions/comments/main.c:42 ../gthumb/gth-main-default-metadata.c:51 +#: ../extensions/comments/main.c:44 ../gthumb/gth-main-default-metadata.c:51 msgid "Date" msgstr "Data" -#: ../extensions/comments/main.c:44 ../gthumb/gth-main-default-metadata.c:54 +#: ../extensions/comments/main.c:46 ../gthumb/gth-main-default-metadata.c:54 msgid "Rating" msgstr "Giudizio" #: ../extensions/contact_sheet/callbacks.c:59 msgid "Contact _Sheet" -msgstr "_Biglietto da visita" +msgstr "_Provino" #: ../extensions/contact_sheet/callbacks.c:61 msgid "Contact _Sheet..." -msgstr "_Biglietto da visita..." +msgstr "_Provino..." #: ../extensions/contact_sheet/callbacks.c:62 msgid "Create a contact sheet" -msgstr "Crea un biglietto da visita" +msgstr "Crea un provino" #: ../extensions/contact_sheet/callbacks.c:65 msgid "Image _Wall..." @@ -1046,289 +1234,273 @@ #: ../extensions/contact_sheet/callbacks.c:66 msgid "Create an image-wall" -msgstr "Crea una parete da esposizione" +msgstr "Crea una parete di immagini" #: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:1 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:8 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:1 msgid "Contact Sheet" -msgstr "Biglietto da visita" +msgstr "Provino" #: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:2 msgid "Create an index image displaying the thumbnails of the selected files." -msgstr "" -"Crea un'immagine indice per mostrare le miniature dei file selezionati." +msgstr "Crea un provino per mostrare le miniature dei file selezionati." #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:1 -msgid "Background" -msgstr "Sfondo" +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:446 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 +#: ../extensions/file_tools/gth-file-tool-rotate.c:397 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:14 +#: ../extensions/slideshow/main.c:277 +msgid "None" +msgstr "Nessuna" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:2 -msgid "C_olor:" -msgstr "C_olore:" +msgid "Simple" +msgstr "Semplice" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:3 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 -msgid "Caption:" -msgstr "Didascalia:" +msgid "Simple with shadow" +msgstr "Semplice con ombra" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:4 -msgid "Frame" -msgstr "Fotogramma" +msgid "Shadow only" +msgstr "Solo ombra" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:5 -msgid "Inward Shadow" -msgstr "Ombra interna" +msgid "Slide" +msgstr "Diapositiva" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:6 -#: ../extensions/file_tools/gth-file-tool-crop.c:424 -#: ../extensions/file_tools/gth-file-tool-crop.c:454 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 -#: ../extensions/file_tools/gth-file-tool-rotate.c:415 -#: ../extensions/slideshow/main.c:277 -msgid "None" -msgstr "Nessuna" +msgid "Inward Shadow" +msgstr "Ombra interna" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:7 msgid "Outward Shadow" msgstr "Ombra esterna" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 -msgid "Select a color" -msgstr "Seleziona un colore" - #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:9 -msgid "Select a font" -msgstr "Seleziona un carattere" +msgid "Background" +msgstr "Sfondo" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:10 -msgid "Shadow only" -msgstr "Solo ombra" +msgid "_Solid color" +msgstr "Tinta _unita" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:11 -msgid "Simple" -msgstr "Semplice" - -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 -msgid "Simple with shadow" -msgstr "Semplice con ombra" - -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 -msgid "Slide" -msgstr "Diapositiva" +msgid "_Gradient" +msgstr "_Gradiente" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:14 -#: ../extensions/rename_series/dlg-rename-series.c:57 -msgid "Text" -msgstr "Testo" +msgid "Select a color" +msgstr "Seleziona un colore" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:15 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 -#: ../extensions/image_print/data/ui/print-layout.ui.h:26 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 -msgid "_Footer:" -msgstr "Piè _di pagina:" +msgid "Frame" +msgstr "Fotogramma" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:16 -msgid "_Gradient" -msgstr "_Gradiente" +msgid "_Style:" +msgstr "_Stile:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:17 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 -#: ../extensions/image_print/data/ui/print-layout.ui.h:27 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 -msgid "_Header:" -msgstr "Int_estazione:" +msgid "C_olor:" +msgstr "C_olore:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:18 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 -msgid "_Horizontal:" -msgstr "_Orizzontale:" +#: ../extensions/rename_series/dlg-rename-series.c:57 +msgid "Text" +msgstr "Testo" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 +#: ../extensions/image_print/data/ui/print-layout.ui.h:3 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 +msgid "_Header:" +msgstr "Int_estazione:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:20 -msgid "_Solid color" -msgstr "Tinta _unita" +msgid "Select a font" +msgstr "Seleziona un carattere" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:21 -msgid "_Style:" -msgstr "_Stile:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 +#: ../extensions/image_print/data/ui/print-layout.ui.h:4 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 +msgid "_Footer:" +msgstr "Piè _di pagina:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:22 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 -msgid "_Vertical:" -msgstr "_Verticale:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 +msgid "Caption:" +msgstr "Didascalia:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:2 +#: ../extensions/image_print/data/ui/print-layout.ui.h:5 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:6 +msgid "The current page number" +msgstr "Il numero di pagina attuale" -#. translate only the text in the curly brackets #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:3 -#: ../extensions/image_print/data/ui/print-layout.ui.h:3 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 -#, no-c-format -msgid "%D{ format }" -msgstr "%D{ formato }" +#: ../extensions/image_print/data/ui/print-layout.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 +msgid "The total number of pages" +msgstr "Il numero totale delle pagine" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:4 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 -msgid "All images on a single page" -msgstr "Tutte le immagini in una singola pagina" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:6 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 -#: ../extensions/convert_format/data/ui/convert-format.ui.h:1 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:10 -msgid "Choose destination folder" -msgstr "Scegli la cartella di destinazione" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 +#: ../extensions/image_print/data/ui/print-layout.ui.h:7 +#: ../extensions/importer/data/ui/import-preferences.ui.h:5 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:8 +msgid "Special code" +msgstr "Codice speciale" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:7 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:3 -#: ../extensions/image_print/data/ui/print-layout.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:11 -msgid "Columns:" -msgstr "Colonne:" +#. translate only the text in the curly brackets +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:8 +#: ../extensions/image_print/data/ui/print-layout.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 +#, no-c-format +msgid "%D{ format }" +msgstr "%D{ formato }" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:9 -msgid "Create _HTML image map" -msgstr "Creare mappa _HTML dell'immagine" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 -msgid "Create a new theme" -msgstr "Crea un nuovo tema" +#: ../extensions/image_print/data/ui/print-layout.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 +msgid "The current date" +msgstr "La data attuale" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 -msgid "Delete the selected theme" -msgstr "Elimina il tema selezionato" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:6 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 +msgid "_Destination:" +msgstr "_Destinazione:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:13 -msgid "Edit the selected theme" -msgstr "Modifica il tema selezionato" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:3 +#: ../extensions/convert_format/data/ui/convert-format.ui.h:4 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 +msgid "Choose destination folder" +msgstr "Scegli la cartella di destinazione" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:14 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 msgid "File_name:" msgstr "_Nome del file:" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:16 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 -msgid "Images per page:" -msgstr "Immagini per pagina:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:8 +msgid "New enumerator digit" +msgstr "Nuova cifra per la numerazione" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 -#: ../extensions/image_print/data/ui/print-layout.ui.h:11 -msgid "Layout" -msgstr "Disposizione" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:16 +msgid "Create _HTML image map" +msgstr "Creare mappa _HTML dell'immagine" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:15 -msgid "New enumerator digit" -msgstr "Nuova cifra per la numerazione" +msgid "Create a new theme" +msgstr "Crea un nuovo tema" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:19 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:10 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 -msgid "Re_verse order" -msgstr "Ordine in_verso" +msgid "Edit the selected theme" +msgstr "Modifica il tema selezionato" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:20 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:11 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 -msgid "S_ort:" -msgstr "_Ordina:" +msgid "Delete the selected theme" +msgstr "Elimina il tema selezionato" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:21 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 -#: ../extensions/pixbuf_savers/preferences.c:134 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 -msgid "Saving" -msgstr "Salvataggio" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:13 -#: ../extensions/image_print/data/ui/print-layout.ui.h:17 -#: ../extensions/importer/data/ui/import-preferences.ui.h:2 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:20 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:18 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 -msgid "Special code" -msgstr "Codice speciale" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 +msgid "Theme" +msgstr "Tema" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:23 -msgid "Sq_uared" -msgstr "Q_uadrato" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:16 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 +msgid "Columns:" +msgstr "Colonne:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:24 -#: ../extensions/image_print/data/ui/print-layout.ui.h:18 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 -msgid "The current date" -msgstr "La data attuale" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:25 -#: ../extensions/image_print/data/ui/print-layout.ui.h:19 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 -msgid "The current page number" -msgstr "Il numero di pagina attuale" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:10 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 +msgid "Images per page:" +msgstr "Immagini per pagina:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:25 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 +msgid "All images on a single page" +msgstr "Tutte le immagini in una singola pagina" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:26 -#: ../extensions/image_print/data/ui/print-layout.ui.h:22 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 -msgid "The total number of pages" -msgstr "Il numero totale delle pagine" +msgid "_All pages with the same size" +msgstr "_Tutte le pagine con la stessa dimensione" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:27 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 -msgid "Theme" -msgstr "Tema" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:15 +msgid "Layout" +msgstr "Disposizione" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:28 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:14 -msgid "Thumbnails" -msgstr "Miniature" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:13 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 +msgid "S_ort:" +msgstr "_Ordina:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:29 -msgid "_All pages with the same size" -msgstr "_Tutte le pagine con la stessa dimensione" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:14 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 +msgid "Re_verse order" +msgstr "Ordine in_verso" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:30 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:15 -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:9 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 -msgid "_Destination:" -msgstr "_Destinazione:" +msgid "_Size:" +msgstr "Dimen_sione:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 +msgid "Sq_uared" +msgstr "Q_uadrato" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:33 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:16 -msgid "_Size:" -msgstr "Dimen_sione:" +msgid "Thumbnails" +msgstr "Miniature" -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 msgid "Image Wall" -msgstr "Parete da esposizione" +msgstr "Parete di immagini" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:486 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:498 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:512 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:481 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:492 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:506 msgid "Could not save the theme" msgstr "Impossibile salvare il tema" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:657 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:651 msgid "Could not delete the theme" msgstr "Impossibile eliminare il tema" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:248 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:247 msgid "Creating images" msgstr "Creazione delle immagini" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:897 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:896 msgid "Generating thumbnails" msgstr "Generazione delle miniature" @@ -1368,34 +1540,34 @@ msgid "Save images in a different format" msgstr "Salva le immagini in un formato diverso" -#: ../extensions/convert_format/data/ui/convert-format.ui.h:2 +#: ../extensions/convert_format/data/ui/convert-format.ui.h:1 msgid "Convert Format" msgstr "Converti formato" +#: ../extensions/convert_format/data/ui/convert-format.ui.h:2 +msgid "New format" +msgstr "Nuovo formato" + #: ../extensions/convert_format/data/ui/convert-format.ui.h:3 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:4 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 msgid "Destination" msgstr "Destinazione" -#: ../extensions/convert_format/data/ui/convert-format.ui.h:4 -msgid "New format" -msgstr "Nuovo formato" - #: ../extensions/convert_format/data/ui/convert-format.ui.h:5 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 msgid "_Use the original image folder" msgstr "_Usare la cartella originaria dell'immagine" -#: ../extensions/convert_format/dlg-convert-format.c:93 +#: ../extensions/convert_format/dlg-convert-format.c:95 msgid "Converting images" msgstr "Conversione delle immagini" -#: ../extensions/desktop_background/actions.c:162 +#: ../extensions/desktop_background/actions.c:194 msgid "Could not show the desktop background properties" msgstr "Impossibile mostrare le proprietà dello sfondo del desktop" -#: ../extensions/desktop_background/actions.c:228 -#: ../extensions/desktop_background/actions.c:246 +#: ../extensions/desktop_background/actions.c:259 +#: ../extensions/desktop_background/actions.c:277 msgid "Could not set the desktop background" msgstr "Impossibile impostare lo sfondo del desktop" @@ -1443,20 +1615,20 @@ msgstr "Elimina il commento e i metadati incorporati nei file selezionati" #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:1 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:1 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 msgid "D_escription:" msgstr "D_escrizione:" -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:2 +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:3 +msgid "_Place:" +msgstr "_Luogo:" + +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 #: ../extensions/edit_metadata/data/ui/tag-chooser.ui.h:1 msgid "T_ags:" msgstr "_Etichette:" -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 -msgid "_Place:" -msgstr "_Luogo:" - #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:5 msgid "_Rating:" msgstr "_Giudizio:" @@ -1475,13 +1647,13 @@ msgstr "Impossibile leggere le informazioni del file" #: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:1 -msgid "Allow to edit files metadata." -msgstr "Consente di modificare i metadati del file." - -#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 msgid "Edit metadata" msgstr "Modifica i metadati" +#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 +msgid "Allow to edit files metadata." +msgstr "Consente di modificare i metadati del file." + #. Translators: the %s symbol in the string is a file name #: ../extensions/edit_metadata/gth-edit-comment-dialog.c:63 #, c-format @@ -1489,8 +1661,9 @@ msgstr "Metadati di %s" #: ../extensions/edit_metadata/gth-edit-comment-dialog.c:66 -#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:97 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:335 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:83 +#: ../extensions/facebook/dlg-import-from-facebook.c:319 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:324 #, c-format msgid "%d file" msgid_plural "%d files" @@ -1498,7 +1671,7 @@ msgstr[1] "%d file" #: ../extensions/edit_metadata/gth-edit-comment-dialog.c:144 -#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:263 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:197 msgid "Sa_ve and Close" msgstr "Sal_va e chiudi" @@ -1506,51 +1679,51 @@ msgid "Save only cha_nged fields" msgstr "Salvare solo i campi _modificati" -#: ../extensions/edit_metadata/gth-edit-general-page.c:477 +#: ../extensions/edit_metadata/gth-edit-general-page.c:555 msgid "No date" msgstr "Nessuna data" -#: ../extensions/edit_metadata/gth-edit-general-page.c:478 +#: ../extensions/edit_metadata/gth-edit-general-page.c:556 msgid "The following date" msgstr "La data seguente" -#: ../extensions/edit_metadata/gth-edit-general-page.c:479 +#: ../extensions/edit_metadata/gth-edit-general-page.c:557 #: ../extensions/importer/gth-import-preferences-dialog.c:331 msgid "Current date" msgstr "Data attuale" -#: ../extensions/edit_metadata/gth-edit-general-page.c:481 +#: ../extensions/edit_metadata/gth-edit-general-page.c:559 msgid "Last modified date" msgstr "Data dell'ultima modifica" -#: ../extensions/edit_metadata/gth-edit-general-page.c:482 +#: ../extensions/edit_metadata/gth-edit-general-page.c:560 msgid "File creation date" msgstr "Data di creazione del file" -#: ../extensions/edit_metadata/gth-edit-general-page.c:483 +#: ../extensions/edit_metadata/gth-edit-general-page.c:561 msgid "Do not modify" msgstr "Non modificare" #. Translators: the %s symbol in the string is a file name -#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:94 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:80 #, c-format msgid "%s Tags" -msgstr "Etichette %s" +msgstr "Etichette di %s" -#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:255 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:189 msgid "Assign Tags" msgstr "Assegna le etichette" -#: ../extensions/edit_metadata/gth-tag-task.c:115 -#: ../extensions/edit_metadata/gth-tag-task.c:132 +#: ../extensions/edit_metadata/gth-tag-task.c:119 +#: ../extensions/edit_metadata/gth-tag-task.c:136 msgid "Assigning tags to the selected files" msgstr "Assegna le etichette ai file selezionati" -#: ../extensions/edit_metadata/gth-tag-task.c:115 +#: ../extensions/edit_metadata/gth-tag-task.c:119 msgid "Writing files" msgstr "Scrittura dei file" -#: ../extensions/edit_metadata/gth-tag-task.c:132 +#: ../extensions/edit_metadata/gth-tag-task.c:136 msgid "Reading files" msgstr "Lettura dei file" @@ -1563,53 +1736,53 @@ msgstr "Esempio di estensione." #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:1 -msgid "Byline _Title:" -msgstr "_Titolo dell'autore:" - -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 msgid "C_opyright:" msgstr "C_opyright:" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:3 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 msgid "Co_untry:" msgstr "_Paese:" +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:3 +msgid "_Code:" +msgstr "_Codice:" + #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:4 msgid "Cr_edit:" msgstr "Ringraziam_enti:" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 -msgid "State/Province:" -msgstr "Stato/Provincia:" - #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:6 -msgid "_Byline:" -msgstr "_Firma:" +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 +msgid "_Source:" +msgstr "_Fonte:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:7 -msgid "_City:" -msgstr "_Città:" +msgid "_Urgency:" +msgstr "_Urgenza:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:8 -msgid "_Code:" -msgstr "_Codice:" +msgid "_Object Name:" +msgstr "Nome dell'_oggetto:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:9 +msgid "Byline _Title:" +msgstr "_Titolo dell'autore:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:10 -msgid "_Language:" -msgstr "_Lingua:" +msgid "_Byline:" +msgstr "_Firma:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:11 -msgid "_Object Name:" -msgstr "Nome dell'_oggetto:" +msgid "_City:" +msgstr "_Città:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:12 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 -msgid "_Source:" -msgstr "_Fonte:" +msgid "_Language:" +msgstr "_Lingua:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:13 -msgid "_Urgency:" -msgstr "_Urgenza:" +msgid "State/Province:" +msgstr "Stato/Provincia:" #: ../extensions/exiv2_tools/exiv2_tools.extension.in.in.h:1 msgid "EXIF, IPTC, XMP support" @@ -1664,7 +1837,7 @@ msgid "XMP Attached" msgstr "Allegato XMP" -#: ../extensions/exiv2_tools/main.c:256 +#: ../extensions/exiv2_tools/main.c:272 msgid "date photo was taken" msgstr "data di scatto della foto" @@ -1672,138 +1845,106 @@ msgid "Share" msgstr "Condivisione" -#: ../extensions/facebook/callbacks.c:54 +#: ../extensions/facebook/callbacks.c:59 ../extensions/facebook/callbacks.c:64 msgid "Face_book..." msgstr "Face_book..." -#: ../extensions/facebook/callbacks.c:55 +#: ../extensions/facebook/callbacks.c:60 +msgid "Download photos from Facebook" +msgstr "Scarica le foto da Facebook" + +#: ../extensions/facebook/callbacks.c:65 msgid "Upload photos to Facebook" msgstr "Carica le foto su Facebook" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:1 -msgid "1024 x 1024" -msgstr "1024 × 1024" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 +msgid "Export to Flickr" +msgstr "Esporta su Flickr" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:2 -msgid "1280 x 1280" -msgstr "1280 × 1280" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 +msgid "_Upload" +msgstr "_Carica" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:3 -msgid "1600 x 1600" -msgstr "1600 × 1600" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 +msgid "_Account:" +msgstr "_Account:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:4 -msgid "2048 x 2048" -msgstr "2048 × 2048" +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:3 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 +msgid "Edit accounts" +msgstr "Modifica gli account" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 -msgid "720 x 720" -msgstr "720 × 720" - -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 msgid "A_lbum:" msgstr "A_lbum:" -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 msgid "Add a new album" msgstr "Aggiunge un nuovo album" +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 +msgid "Resize the images if larger than this size" +msgstr "Ridimensiona le immagini se più grandi di queste dimensioni" + #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:8 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 -msgid "Edit accounts" -msgstr "Modifica gli account" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 +msgid "_Resize if larger than:" +msgstr "_Ridimensionare se più grande di:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:9 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 -msgid "Export to Flickr" -msgstr "Esporta su Flickr" +msgid "720 x 720" +msgstr "720 × 720" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:10 -msgid "Resize the images if larger than this size" -msgstr "Ridimensiona le immagini se più grandi di queste dimensioni" +msgid "1024 x 1024" +msgstr "1024 × 1024" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:11 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 -msgid "_Account:" -msgstr "_Account:" +msgid "1280 x 1280" +msgstr "1280 × 1280" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:12 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 -msgid "_Resize to:" -msgstr "_Ridimensiona a:" +msgid "1600 x 1600" +msgstr "1600 × 1600" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:13 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 -msgid "_Upload" -msgstr "_Carica" - -#: ../extensions/facebook/data/ui/facebook-account-chooser.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-account-chooser.ui.h:1 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 -#: ../extensions/picasaweb/data/ui/picasa-web-account-chooser.ui.h:1 -msgid "A_ccount:" -msgstr "A_ccount:" - -#: ../extensions/facebook/data/ui/facebook-account-manager.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-account-manager.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-account-manager.ui.h:1 -#: ../extensions/picasaweb/data/ui/picasa-web-account-manager.ui.h:1 -msgid "A_ccounts:" -msgstr "A_ccount:" - -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 -msgid "Private" -msgstr "Privato" - -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 -msgid "Private photos, visible to friends" -msgstr "Foto private, visibili agli amici" +msgid "2048 x 2048" +msgstr "2048 × 2048" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 msgid "Public photos" msgstr "Foto pubbliche" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:5 -msgid "_Location:" -msgstr "_Posizione:" +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 +msgid "Private photos, visible to friends" +msgstr "Foto private, visibili agli amici" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 #: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:5 -msgid "_Visibility:" -msgstr "_Visibilità:" - -#: ../extensions/facebook/data/ui/facebook-ask-authorization.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-ask-authorization.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-ask-authorization.ui.h:1 -msgid "_Authorize..." -msgstr "_Autorizza..." - -#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-complete-authorization.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-complete-authorization.ui.h:1 -msgid "C_ontinue" -msgstr "C_ontinua" +msgid "Private" +msgstr "Privato" -#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 -#: ../extensions/facebook/facebook-authentication.c:472 -#: ../extensions/flicker_utils/flickr-authentication.c:408 -#: ../extensions/oauth/oauth-authentication.c:423 -msgid "Once you're done, click the 'Continue' button below." -msgstr "Una volta terminato, fare clic sul bottone «Continua» in basso." +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:5 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 +msgid "_Visibility:" +msgstr "_Visibilità:" #: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:1 @@ -1816,171 +1957,127 @@ #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:2 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:2 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:2 -#: ../extensions/webalbums/gth-web-exporter.c:1841 +#: ../extensions/webalbums/gth-web-exporter.c:1839 msgid "_Open in the Browser" -msgstr "_Apri nel navigatore" +msgstr "_Apri nel browser" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 +msgid "Import from Picasa Web Album" +msgstr "Importa dall'album web di Picasa" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:2 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 +msgid "_Import" +msgstr "_Importa" -#: ../extensions/facebook/dlg-export-to-facebook.c:130 -#: ../extensions/facebook/dlg-export-to-facebook.c:335 -#: ../extensions/facebook/facebook-authentication.c:192 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:4 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 +#: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 +msgid "A_ccount:" +msgstr "A_ccount:" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:5 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 +msgid "_Album:" +msgstr "_Album:" + +#: ../extensions/facebook/dlg-export-to-facebook.c:123 +#: ../extensions/facebook/dlg-export-to-facebook.c:326 +#: ../extensions/facebook/dlg-import-from-facebook.c:226 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:138 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:399 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:237 -#: ../extensions/flicker_utils/flickr-authentication.c:191 -#: ../extensions/oauth/oauth-authentication.c:187 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:414 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:231 +#: ../extensions/oauth/web-service.c:380 #: ../extensions/photobucket/dlg-export-to-photobucket.c:131 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:376 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:139 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:424 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:380 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:375 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:124 msgid "Could not connect to the server" msgstr "Impossibile connettersi al server" -#: ../extensions/facebook/dlg-export-to-facebook.c:182 +#: ../extensions/facebook/dlg-export-to-facebook.c:175 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:246 #: ../extensions/photobucket/dlg-export-to-photobucket.c:182 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:192 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:176 msgid "Could not upload the files" msgstr "Impossibile caricare i file" -#: ../extensions/facebook/dlg-export-to-facebook.c:412 +#: ../extensions/facebook/dlg-export-to-facebook.c:397 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:188 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:223 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:462 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:717 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:457 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:309 msgid "Could not create the album" msgstr "Impossibile creare l'album" -#: ../extensions/facebook/dlg-export-to-facebook.c:481 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:534 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:783 +#: ../extensions/facebook/dlg-export-to-facebook.c:465 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:528 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:375 msgid "New Album" msgstr "Nuovo album" -#: ../extensions/facebook/dlg-export-to-facebook.c:561 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:557 -#: ../extensions/image_print/gth-image-print-job.c:1789 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:614 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1002 +#: ../extensions/facebook/dlg-export-to-facebook.c:557 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:583 +#: ../extensions/image_print/gth-image-print-job.c:1739 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:607 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:597 msgid "No valid file selected." msgstr "Nessun file valido selezionato." -#: ../extensions/facebook/dlg-export-to-facebook.c:562 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:558 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:615 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1003 +#: ../extensions/facebook/dlg-export-to-facebook.c:558 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:584 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:608 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:598 msgid "Could not export the files" msgstr "Impossibile esportare i file" -#: ../extensions/facebook/dlg-export-to-facebook.c:570 -#: ../extensions/find_duplicates/gth-find-duplicates.c:255 -#: ../extensions/find_duplicates/gth-find-duplicates.c:347 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:566 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:623 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1010 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:803 -#: ../gthumb/gth-browser.c:995 +#: ../extensions/facebook/dlg-export-to-facebook.c:566 +#: ../extensions/find_duplicates/gth-find-duplicates.c:277 +#: ../extensions/find_duplicates/gth-find-duplicates.c:470 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:592 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:616 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:605 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:254 +#: ../gthumb/gth-browser.c:1116 #, c-format msgid "%d file (%s)" msgid_plural "%d files (%s)" msgstr[0] "%d file (%s)" msgstr[1] "%d file (%s)" -#: ../extensions/facebook/dlg-export-to-facebook.c:591 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:589 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:642 +#: ../extensions/facebook/dlg-export-to-facebook.c:587 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:615 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:635 #, c-format msgid "Export to %s" msgstr "Esporta su %s" -#: ../extensions/facebook/facebook-account-chooser-dialog.c:200 -#: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:200 -#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 -msgid "New authentication..." -msgstr "Nuova autenticazione..." - -#: ../extensions/facebook/facebook-authentication.c:194 -#: ../extensions/flicker_utils/flickr-authentication.c:193 -#: ../extensions/oauth/oauth-authentication.c:189 -msgid "Choose _Account..." -msgstr "Scegli _account..." - -#: ../extensions/facebook/facebook-authentication.c:471 -#: ../extensions/flicker_utils/flickr-authentication.c:407 -#: ../extensions/oauth/oauth-authentication.c:422 -#, c-format -msgid "" -"Return to this window when you have finished the authorization process on %s" -msgstr "" -"Ritornare a questa finestra quando è terminato il processo di autorizzazione " -"su %s" +#: ../extensions/facebook/dlg-import-from-facebook.c:344 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:349 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:279 +msgid "Could not get the photo list" +msgstr "Impossibile recuperare l'elenco delle foto" -#: ../extensions/facebook/facebook-authentication.c:556 -#: ../extensions/flicker_utils/flickr-authentication.c:487 -#: ../extensions/oauth/oauth-authentication.c:502 -#, c-format -msgid "gthumb requires your authorization to upload the photos to %s" -msgstr "L'applicazione richiede l'autorizzazione per caricare le foto su %s" +#: ../extensions/facebook/dlg-import-from-facebook.c:378 +#: ../extensions/facebook/dlg-import-from-facebook.c:533 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:386 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:551 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:313 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:586 +msgid "No album selected" +msgstr "Nessun album selezionato" -#: ../extensions/facebook/facebook-authentication.c:557 -#: ../extensions/flicker_utils/flickr-authentication.c:488 -#: ../extensions/oauth/oauth-authentication.c:503 +#: ../extensions/facebook/dlg-import-from-facebook.c:551 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:569 #, c-format -msgid "" -"Click 'Authorize' to open your web browser and authorize gthumb to upload " -"photos to %s. When you're finished, return to this window to complete the " -"authorization." -msgstr "" -"Fare clic su «Autorizza» per aprire il browser web e autorizzare " -"l'applicazione a caricare le foto su %s. Quando terminato, ritornare a " -"questa finestra per completare l'autorizzazione." - -#: ../extensions/facebook/facebook-authentication.c:652 -#: ../extensions/flicker_utils/flickr-authentication.c:588 -#: ../extensions/oauth/oauth-authentication.c:605 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:820 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:684 -msgid "Choose Account" -msgstr "Scegli l'account" - -#: ../extensions/facebook/facebook-authentication.c:761 -#: ../extensions/flicker_utils/flickr-authentication.c:697 -#: ../extensions/oauth/oauth-authentication.c:714 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:881 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:745 -msgid "Edit Accounts" -msgstr "Modifica gli account" - -#: ../extensions/facebook/facebook-connection.c:275 -#: ../extensions/facebook/facebook-connection.c:435 -#: ../extensions/facebook/facebook-service.c:162 -#: ../extensions/facebook/facebook-service.c:265 -#: ../extensions/facebook/facebook-service.c:468 -#: ../extensions/flicker_utils/flickr-connection.c:266 -#: ../extensions/flicker_utils/flickr-connection.c:413 -#: ../extensions/flicker_utils/flickr-service.c:195 -#: ../extensions/flicker_utils/flickr-service.c:398 -#: ../extensions/photobucket/photobucket-consumer.c:74 -#: ../extensions/photobucket/photobucket-consumer.c:79 -#: ../extensions/photobucket/photobucket-consumer.c:115 -#: ../extensions/photobucket/photobucket-consumer.c:170 -msgid "Unknown error" -msgstr "Errore sconosciuto" - -#: ../extensions/facebook/facebook-connection.c:310 -#: ../extensions/facebook/facebook-connection.c:461 -#: ../extensions/facebook/facebook-service.c:188 -#: ../extensions/facebook/facebook-service.c:290 -#: ../extensions/flicker_utils/flickr-connection.c:292 -#: ../extensions/flicker_utils/flickr-connection.c:439 -#: ../extensions/flicker_utils/flickr-service.c:219 -#: ../extensions/oauth/oauth-connection.c:356 -#: ../extensions/oauth/oauth-connection.c:431 -#: ../extensions/oauth/oauth-connection.c:535 -#: ../extensions/picasaweb/google-connection.c:344 -msgid "Connecting to the server" -msgstr "Connessione al server" +msgid "Import from %s" +msgstr "Importa da %s" +#: ../extensions/facebook/dlg-import-from-facebook.c:551 #: ../extensions/facebook/facebook.extension.in.in.h:1 msgid "Facebook" msgstr "Facebook" @@ -1989,78 +2086,69 @@ msgid "Upload images to Facebook" msgstr "Carica le immagini su Facebook" -#: ../extensions/facebook/facebook-service.c:188 -#: ../extensions/facebook/facebook-service.c:290 -#: ../extensions/flicker_utils/flickr-service.c:219 -#: ../extensions/oauth/oauth-connection.c:356 -#: ../extensions/oauth/oauth-connection.c:431 -#: ../extensions/oauth/oauth-connection.c:535 -msgid "Getting account information" -msgstr "Ricupero informazioni sull'account" - -#: ../extensions/facebook/facebook-service.c:396 -#: ../extensions/flicker_utils/flickr-service.c:323 -#: ../extensions/photobucket/photobucket-service.c:207 -#: ../extensions/picasaweb/picasa-web-service.c:209 +#: ../extensions/facebook/facebook-service.c:462 +#: ../extensions/flicker_utils/flickr-service.c:863 +#: ../extensions/photobucket/photobucket-service.c:310 +#: ../extensions/picasaweb/picasa-web-service.c:711 msgid "Getting the album list" -msgstr "Ricupero dell'elenco degli album" +msgstr "Recupero dell'elenco degli album" -#: ../extensions/facebook/facebook-service.c:525 -#: ../extensions/flicker_utils/flickr-service.c:426 -#: ../extensions/flicker_utils/flickr-service.c:546 -#: ../extensions/flicker_utils/flickr-service.c:584 -#: ../extensions/photobucket/photobucket-service.c:316 -#: ../extensions/picasaweb/picasa-web-service.c:300 +#: ../extensions/facebook/facebook-service.c:584 +#: ../extensions/flicker_utils/flickr-service.c:965 +#: ../extensions/flicker_utils/flickr-service.c:1087 +#: ../extensions/flicker_utils/flickr-service.c:1126 +#: ../extensions/photobucket/photobucket-service.c:423 +#: ../extensions/picasaweb/picasa-web-service.c:805 msgid "Creating the new album" msgstr "Creazione del nuovo album" -#: ../extensions/facebook/facebook-service.c:584 -#: ../extensions/flicker_utils/flickr-service.c:634 -#: ../extensions/photobucket/photobucket-service.c:373 -#: ../extensions/picasaweb/picasa-web-service.c:357 +#: ../extensions/facebook/facebook-service.c:645 +#: ../extensions/flicker_utils/flickr-service.c:1176 +#: ../extensions/photobucket/photobucket-service.c:485 +#: ../extensions/picasaweb/picasa-web-service.c:860 #, c-format msgid "Could not upload '%s': %s" msgstr "Impossibile caricare «%s»: %s" #. Translators: %s is a filename -#: ../extensions/facebook/facebook-service.c:670 -#: ../extensions/flicker_utils/flickr-service.c:745 -#: ../extensions/photobucket/photobucket-service.c:430 -#: ../extensions/picasaweb/picasa-web-service.c:412 +#: ../extensions/facebook/facebook-service.c:710 +#: ../extensions/flicker_utils/flickr-service.c:1287 +#: ../extensions/photobucket/photobucket-service.c:542 +#: ../extensions/picasaweb/picasa-web-service.c:917 #, c-format msgid "Uploading '%s'" msgstr "Caricamento di «%s»" -#: ../extensions/facebook/facebook-service.c:886 -#: ../extensions/flicker_utils/flickr-service.c:914 -#: ../extensions/photobucket/photobucket-service.c:599 -#: ../extensions/picasaweb/picasa-web-service.c:605 +#: ../extensions/facebook/facebook-service.c:923 +#: ../extensions/flicker_utils/flickr-service.c:1482 +#: ../extensions/photobucket/photobucket-service.c:714 +#: ../extensions/picasaweb/picasa-web-service.c:1138 msgid "Uploading the files to the server" msgstr "Caricamento dei file sul server" -#: ../extensions/facebook/facebook-service.c:1003 -#: ../extensions/flicker_utils/flickr-service.c:1077 -#: ../extensions/picasaweb/picasa-web-service.c:718 +#: ../extensions/facebook/facebook-service.c:1022 +#: ../extensions/flicker_utils/flickr-service.c:1651 +#: ../extensions/picasaweb/picasa-web-service.c:1257 msgid "Getting the photo list" -msgstr "Ricupero dell'elenco delle foto" +msgstr "Recupero dell'elenco delle foto" -#: ../extensions/file_manager/actions.c:130 +#: ../extensions/file_manager/actions.c:133 msgid "New folder" msgstr "Nuova cartella" -#: ../extensions/file_manager/actions.c:131 +#: ../extensions/file_manager/actions.c:134 msgid "Enter the folder name:" msgstr "Inserire il nome della cartella:" -#: ../extensions/file_manager/actions.c:397 +#: ../extensions/file_manager/actions.c:400 #: ../extensions/file_manager/callbacks.c:380 -#: ../extensions/file_manager/callbacks.c:842 +#: ../extensions/file_manager/callbacks.c:838 msgid "Could not move the files" msgstr "Impossibile spostare i file" -#: ../extensions/file_manager/actions.c:398 +#: ../extensions/file_manager/actions.c:401 #: ../extensions/file_manager/callbacks.c:381 -#: ../extensions/file_manager/callbacks.c:843 +#: ../extensions/file_manager/callbacks.c:839 msgid "" "Files cannot be moved to the current location, as alternative you can choose " "to copy them." @@ -2068,11 +2156,11 @@ "I file non possono essere spostati nella posizione attuale, in alternativa " "si può scegliere di copiarli." -#: ../extensions/file_manager/actions.c:555 +#: ../extensions/file_manager/actions.c:563 msgid "Could not open the location" msgstr "Impossibile aprire la posizione" -#: ../extensions/file_manager/actions.c:688 +#: ../extensions/file_manager/actions.c:696 msgid "" "The folder is not empty, do you want to delete the folder and its content " "permanently?" @@ -2080,45 +2168,45 @@ "La cartella non è vuota, eliminare la cartella e il suo contenuto " "definitivamente?" -#: ../extensions/file_manager/actions.c:704 +#: ../extensions/file_manager/actions.c:712 msgid "Could not delete the folder" msgstr "Impossibile eliminare la cartella" -#: ../extensions/file_manager/actions.c:765 +#: ../extensions/file_manager/actions.c:773 msgid "" "The folder cannot be moved to the Trash. Do you want to delete it " "permanently?" msgstr "" "La cartella non può essere spostata nel cestino. Eliminarla definitivamente?" -#: ../extensions/file_manager/actions.c:772 +#: ../extensions/file_manager/actions.c:780 msgid "Could not move the folder to the Trash" msgstr "Impossibile spostare la cartella nel cestino" -#: ../extensions/file_manager/actions.c:808 -#: ../gthumb/gth-file-source-vfs.c:837 +#: ../extensions/file_manager/actions.c:816 +#: ../gthumb/gth-file-source-vfs.c:841 #, c-format msgid "Are you sure you want to permanently delete \"%s\"?" msgstr "Eliminare definitivamente «%s»?" -#: ../extensions/file_manager/actions.c:818 -#: ../gthumb/gth-file-source-vfs.c:850 +#: ../extensions/file_manager/actions.c:826 +#: ../gthumb/gth-file-source-vfs.c:854 msgid "If you delete a file, it will be permanently lost." msgstr "Se si elimina un file, sarà perso definitivamente." -#: ../extensions/file_manager/actions.c:910 +#: ../extensions/file_manager/actions.c:920 msgid "Move To" msgstr "Sposta in" -#: ../extensions/file_manager/actions.c:910 +#: ../extensions/file_manager/actions.c:920 msgid "Copy To" msgstr "Copia in" -#: ../extensions/file_manager/actions.c:914 +#: ../extensions/file_manager/actions.c:924 msgid "Move" msgstr "Sposta" -#: ../extensions/file_manager/actions.c:914 +#: ../extensions/file_manager/actions.c:924 msgid "Copy" msgstr "Copia" @@ -2142,7 +2230,7 @@ #: ../extensions/file_manager/callbacks.c:183 #: ../extensions/file_manager/callbacks.c:219 -#: ../gthumb/gth-file-source-vfs.c:809 +#: ../gthumb/gth-file-source-vfs.c:813 msgid "Mo_ve to Trash" msgstr "S_posta nel cestino" @@ -2153,6 +2241,7 @@ #: ../extensions/file_manager/callbacks.c:187 #: ../extensions/file_manager/callbacks.c:223 #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:5 +#: ../gthumb/gth-tags-entry.c:871 msgid "_Delete" msgstr "E_limina" @@ -2162,7 +2251,7 @@ #: ../extensions/file_manager/callbacks.c:191 #: ../extensions/file_manager/callbacks.c:203 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:2 msgid "_Rename" msgstr "_Rinomina" @@ -2172,7 +2261,7 @@ #: ../extensions/file_manager/callbacks.c:195 msgid "Open with the _File Manager" -msgstr "Apri con il _file manager" +msgstr "Apri con il gestore di _file" #: ../extensions/file_manager/callbacks.c:215 msgid "_Paste Into Folder" @@ -2204,15 +2293,16 @@ msgid "Move the selected files to another folder" msgstr "Sposta i file selezionati in un'altra cartella" -#: ../extensions/file_manager/callbacks.c:1003 -#: ../extensions/find_duplicates/gth-find-duplicates.c:581 -#: ../gthumb/gth-browser.c:4925 ../gthumb/gth-browser.c:4959 +#: ../extensions/file_manager/callbacks.c:999 +#: ../extensions/find_duplicates/gth-find-duplicates.c:766 +#: ../gthumb/gth-browser.c:5234 ../gthumb/gth-browser.c:5268 +#: ../gthumb/gth-progress-dialog.c:406 msgid "Could not perform the operation" msgstr "Impossibile eseguire l'operazione" #: ../extensions/file_manager/file_manager.extension.in.in.h:1 msgid "File manager" -msgstr "Gestore file" +msgstr "Gestore di file" #: ../extensions/file_manager/file_manager.extension.in.in.h:2 msgid "File manager operations." @@ -2223,167 +2313,207 @@ msgstr "Eliminazione dei file" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:1 -msgid "B_rightness:" -msgstr "_Luminosità:" +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:5 +msgid "_Preview" +msgstr "Ante_prima" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:2 -msgid "Color Levels" -msgstr "Livelli di colore" +msgid "B_rightness:" +msgstr "_Luminosità:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:3 msgid "Con_trast:" msgstr "Con_trasto:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:4 -msgid "Cyan-_Red:" -msgstr "Ciano-_rosso:" +msgid "_Saturation:" +msgstr "_Saturazione:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:5 msgid "G_amma:" msgstr "G_amma:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:6 -msgid "_Magenta-Green:" -msgstr "_Magenta-verde:" +msgid "Cyan-_Red:" +msgstr "Ciano-_rosso:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:7 -msgid "_Preview" -msgstr "Ante_prima" +msgid "_Magenta-Green:" +msgstr "_Magenta-verde:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:8 -#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:5 -msgid "_Reset" -msgstr "_Ripristina" +msgid "_Yellow-Blue:" +msgstr "_Giallo-blu:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:9 -msgid "_Saturation:" -msgstr "_Saturazione:" +msgid "Color Levels" +msgstr "Livelli di colore" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:10 -msgid "_Yellow-Blue:" -msgstr "_Giallo-blu:" +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:5 +msgid "_Reset" +msgstr "_Ripristina" #: ../extensions/file_tools/data/ui/crop-options.ui.h:1 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 -msgid "Aspect ratio" -msgstr "Proporzioni" +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +msgid "Selection" +msgstr "Selezione" #: ../extensions/file_tools/data/ui/crop-options.ui.h:2 -msgid "C_rop" -msgstr "_Ritaglia" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 +msgid "_Width:" +msgstr "Larg_hezza:" #: ../extensions/file_tools/data/ui/crop-options.ui.h:3 -msgid "Center" -msgstr "Centra" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 +msgid "Heigh_t:" +msgstr "Al_tezza:" #: ../extensions/file_tools/data/ui/crop-options.ui.h:4 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 -msgid "I_nvert aspect ratio" -msgstr "I_nvertire le proporzioni" +msgid "_Position:" +msgstr "_Posizione:" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:5 +msgid "Maximize" +msgstr "Massimizza" -#. after the colon there is a control to select the size in pixels #: ../extensions/file_tools/data/ui/crop-options.ui.h:6 -msgid "M_ultiple of:" -msgstr "M_ultiplo di:" +msgid "Center" +msgstr "Centra" #: ../extensions/file_tools/data/ui/crop-options.ui.h:7 -msgid "Maximize" -msgstr "Massimizza" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:5 +msgid "Aspect ratio" +msgstr "Proporzioni" #: ../extensions/file_tools/data/ui/crop-options.ui.h:8 -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 -msgid "Selection" -msgstr "Selezione" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 +msgid "I_nvert aspect ratio" +msgstr "I_nvertire le proporzioni" +#. after the colon there is a control to select the size in pixels #: ../extensions/file_tools/data/ui/crop-options.ui.h:10 -msgid "_Grid:" -msgstr "_Griglia:" - -#: ../extensions/file_tools/data/ui/crop-options.ui.h:11 -msgid "_Position:" -msgstr "_Posizione:" +msgid "M_ultiple of:" +msgstr "M_ultiplo di:" #. abbreviation of pixel -#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:12 msgid "px" msgstr "px" -#. this is used to separate the dimensions, for example: 120 × 250 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 +#: ../gthumb/gth-file-chooser-dialog.c:252 +msgid "Options" +msgstr "Opzioni" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:14 +msgid "_Grid:" +msgstr "_Griglia:" + #: ../extensions/file_tools/data/ui/crop-options.ui.h:15 -msgid "×" -msgstr "×" +msgid "C_rop" +msgstr "_Ritaglia" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:2 -#, no-c-format -msgid "%" -msgstr "%" +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:1 +msgid "Method" +msgstr "Metodo" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:2 +msgid "_Brightness" +msgstr "_Luminosità" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:3 +msgid "_Saturation" +msgstr "_Saturazione" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:4 +msgid "_Average" +msgstr "_Medio" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 #: ../gthumb/gth-main-default-metadata.c:47 msgid "Dimensions" msgstr "Dimensioni" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:5 -msgid "Heigh_t:" -msgstr "Al_tezza:" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +msgid "Set the image size to this value" +msgstr "Imposta le dimensioni dell'immagine a questo valore" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:8 msgid "High _quality" msgstr "Alta _qualità" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:8 -msgid "New dimensions:" -msgstr "Nuove dimensioni:" - #: ../extensions/file_tools/data/ui/resize-options.ui.h:9 -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 -msgid "Options" -msgstr "Opzioni" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 msgid "Original dimensions:" msgstr "Dimensioni originali:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 msgid "Scale factor:" msgstr "Fattore di scala:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 -msgid "Set the image size to this value" -msgstr "Imposta le dimensioni dell'immagine a questo valore" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:13 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:11 -msgid "_Width:" -msgstr "Larg_hezza:" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 +msgid "New dimensions:" +msgstr "Nuove dimensioni:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:14 -#: ../extensions/image_print/data/ui/print-layout.ui.h:31 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:29 msgid "pixels" msgstr "pixel" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:14 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:12 +#, no-c-format +msgid "%" +msgstr "%" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:1 -msgid "Align" -msgstr "Allinea" +msgid "Angle" +msgstr "Angolo" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 -msgid "Alignment" -msgstr "Allineamento" +msgid "Align" +msgstr "Allinea" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 -msgid "Angle" -msgstr "Angolo" +msgid "Image size" +msgstr "Dimensioni immagine" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 -msgid "Bounding box" -msgstr "Riquadro delimitato" +msgid "Point 1:" +msgstr "Punto 1:" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 -msgid "Crop borders" -msgstr "Ritaglio bordi" +msgid "Point 2:" +msgstr "Punto 2:" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 +msgid "Keep aspect ratio" +msgstr "Mantenere le proporzioni" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 +msgid "Grid:" +msgstr "Griglia:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 +msgid "_Background:" +msgstr "_Sfondo:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 +msgid "Pick a background color" +msgstr "Scegli un colore di sfondo" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 +msgid "_Transparent" +msgstr "_Trasparenza" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:12 +msgid "Reset" +msgstr "Ripristina" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:13 msgid "" "Draw a line on the image \n" "to set the alignment." @@ -2391,224 +2521,202 @@ "Tracciare una linea sull'immagine \n" "per impostare l'allineamento." -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 -msgid "Grid:" -msgstr "Griglia:" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 -msgid "Image size" -msgstr "Dimesioni immagine" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 -msgid "Keep aspect ratio" -msgstr "Mantenere le proporzioni" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:12 -msgid "Original size" -msgstr "Dimensioni originali" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:13 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:15 msgid "Parallel" msgstr "Parallelo" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:14 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:16 msgid "Perpendicular" msgstr "Perpendicolare" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:15 -msgid "Pick a background color" -msgstr "Scegli un colore di sfondo" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:16 -msgid "Point 1:" -msgstr "Punto 1:" - #: ../extensions/file_tools/data/ui/rotate-options.ui.h:17 -msgid "Point 2:" -msgstr "Punto 2:" +msgid "Alignment" +msgstr "Allineamento" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:18 -msgid "Reset" -msgstr "Ripristina" +msgid "Original size" +msgstr "Dimensioni originali" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:19 -msgid "_Background:" -msgstr "_Sfondo:" +msgid "Bounding box" +msgstr "Riquadro delimitato" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:20 -msgid "_Transparent" -msgstr "_Trasparenza" +msgid "Crop borders" +msgstr "Ritaglio bordi" #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:1 -msgid "Amount:" -msgstr "Ammontare:" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 +msgid "_Preview:" +msgstr "Ante_prima:" #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:2 -msgid "Radius:" -msgstr "Raggio:" - -#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:3 msgid "Threshold:" msgstr "Soglia:" +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:3 +msgid "Radius:" +msgstr "Raggio:" + #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:4 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 -msgid "_Preview:" -msgstr "Ante_prima:" +msgid "Amount:" +msgstr "Ammontare:" #: ../extensions/file_tools/file_tools.extension.in.in.h:1 +msgid "Image tools" +msgstr "Strumenti per le immagini" + +#: ../extensions/file_tools/file_tools.extension.in.in.h:2 msgid "Basic tools to modify images." msgstr "Strumenti di base per modificare le immagini." -#: ../extensions/file_tools/file_tools.extension.in.in.h:2 -msgid "Image tools" -msgstr "Strumenti per le immagini" +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:372 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:272 +#: ../extensions/file_tools/gth-file-tool-grayscale.c:248 +#: ../extensions/file_tools/gth-file-tool-negative.c:68 +msgid "Applying changes" +msgstr "Applicazione delle modifiche" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 msgid "Adjust Colors..." msgstr "Aggiusta i colori..." -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 msgid "Adjust Colors" msgstr "Aggiusta i colori" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:531 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:619 msgid "Change brightness, contrast, saturation and gamma level of the image" msgstr "" -"Cambio di luminosità, contrasto, saturazione e livello gamma dell'immagine" +"Cambia la luminosità, contrasto, saturazione e livello gamma dell'immagine" -#: ../extensions/file_tools/gth-file-tool-crop.c:424 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:304 +msgid "Adjust Contrast" +msgstr "Aggiusta contrasto" + +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:305 +msgid "Automatic contrast adjustment" +msgstr "Aggiusta automaticamente il contrasto" + +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 msgid "Square" msgstr "Quadrato" -#: ../extensions/file_tools/gth-file-tool-crop.c:425 -#: ../extensions/file_tools/gth-file-tool-resize.c:499 +#: ../extensions/file_tools/gth-file-tool-crop.c:417 +#: ../extensions/file_tools/gth-file-tool-resize.c:590 #, c-format msgid "%d x %d (Image)" msgstr "%d × %d (Immagine)" -#: ../extensions/file_tools/gth-file-tool-crop.c:428 -#: ../extensions/file_tools/gth-file-tool-resize.c:503 +#: ../extensions/file_tools/gth-file-tool-crop.c:420 +#: ../extensions/file_tools/gth-file-tool-resize.c:594 #, c-format msgid "%d x %d (Screen)" msgstr "%d × %d (Schermo)" -#: ../extensions/file_tools/gth-file-tool-crop.c:432 -#: ../extensions/file_tools/gth-file-tool-resize.c:508 +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-resize.c:599 msgid "5:4" msgstr "5:4" -#: ../extensions/file_tools/gth-file-tool-crop.c:433 -#: ../extensions/file_tools/gth-file-tool-resize.c:509 +#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-resize.c:600 msgid "4:3 (DVD, Book)" msgstr "4:3 (DVD, Libro)" -#: ../extensions/file_tools/gth-file-tool-crop.c:434 -#: ../extensions/file_tools/gth-file-tool-resize.c:510 +#: ../extensions/file_tools/gth-file-tool-crop.c:426 +#: ../extensions/file_tools/gth-file-tool-resize.c:601 msgid "7:5" msgstr "7:5" -#: ../extensions/file_tools/gth-file-tool-crop.c:435 -#: ../extensions/file_tools/gth-file-tool-resize.c:511 +#: ../extensions/file_tools/gth-file-tool-crop.c:427 +#: ../extensions/file_tools/gth-file-tool-resize.c:602 msgid "3:2 (Postcard)" msgstr "3:2 (Cartolina)" -#: ../extensions/file_tools/gth-file-tool-crop.c:436 -#: ../extensions/file_tools/gth-file-tool-resize.c:512 +#: ../extensions/file_tools/gth-file-tool-crop.c:428 +#: ../extensions/file_tools/gth-file-tool-resize.c:603 msgid "16:10" msgstr "16:10" -#: ../extensions/file_tools/gth-file-tool-crop.c:437 -#: ../extensions/file_tools/gth-file-tool-resize.c:513 +#: ../extensions/file_tools/gth-file-tool-crop.c:429 +#: ../extensions/file_tools/gth-file-tool-resize.c:604 msgid "16:9 (DVD)" msgstr "16:9 (DVD)" -#: ../extensions/file_tools/gth-file-tool-crop.c:438 -#: ../extensions/file_tools/gth-file-tool-resize.c:514 +#: ../extensions/file_tools/gth-file-tool-crop.c:430 +#: ../extensions/file_tools/gth-file-tool-resize.c:605 msgid "1.85:1" msgstr "1.85:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:439 -#: ../extensions/file_tools/gth-file-tool-resize.c:515 +#: ../extensions/file_tools/gth-file-tool-crop.c:431 +#: ../extensions/file_tools/gth-file-tool-resize.c:606 msgid "2.39:1" msgstr "2.39:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:440 -#: ../extensions/file_tools/gth-file-tool-resize.c:516 -#: ../extensions/image_print/data/ui/print-layout.ui.h:7 -#: ../extensions/rename_series/gth-template-selector.c:232 +#: ../extensions/file_tools/gth-file-tool-crop.c:432 +#: ../extensions/file_tools/gth-file-tool-resize.c:607 +#: ../extensions/image_print/data/ui/print-layout.ui.h:2 +#: ../extensions/rename_series/gth-template-selector.c:234 msgid "Custom" msgstr "Personalizzate" -#: ../extensions/file_tools/gth-file-tool-crop.c:455 -#: ../extensions/file_tools/gth-file-tool-rotate.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:447 +#: ../extensions/file_tools/gth-file-tool-rotate.c:398 msgid "Rule of Thirds" msgstr "Regola dei terzi" -#: ../extensions/file_tools/gth-file-tool-crop.c:456 -#: ../extensions/file_tools/gth-file-tool-rotate.c:417 +#: ../extensions/file_tools/gth-file-tool-crop.c:448 +#: ../extensions/file_tools/gth-file-tool-rotate.c:399 msgid "Golden Sections" msgstr "Rapporto aureo" -#: ../extensions/file_tools/gth-file-tool-crop.c:457 -#: ../extensions/file_tools/gth-file-tool-rotate.c:418 +#: ../extensions/file_tools/gth-file-tool-crop.c:449 +#: ../extensions/file_tools/gth-file-tool-rotate.c:400 msgid "Center Lines" msgstr "Linee centrali" -#: ../extensions/file_tools/gth-file-tool-crop.c:458 -#: ../extensions/file_tools/gth-file-tool-rotate.c:419 +#: ../extensions/file_tools/gth-file-tool-crop.c:450 +#: ../extensions/file_tools/gth-file-tool-rotate.c:401 msgid "Uniform" msgstr "Uniforme" -#: ../extensions/file_tools/gth-file-tool-crop.c:614 +#: ../extensions/file_tools/gth-file-tool-crop.c:608 msgid "Crop..." msgstr "Ritaglia..." -#: ../extensions/file_tools/gth-file-tool-crop.c:614 +#: ../extensions/file_tools/gth-file-tool-crop.c:608 msgid "Crop" msgstr "Ritaglia" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:68 -#: ../extensions/file_tools/gth-file-tool-negative.c:68 -msgid "Applying changes" -msgstr "Applicazione delle modifiche" - -#: ../extensions/file_tools/gth-file-tool-desaturate.c:203 -msgid "Desaturate" -msgstr "Desatura" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:119 -msgid "White balance correction" -msgstr "Correzione del bilanciamento del bianco" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:342 -msgid "Enhance Colors" -msgstr "Migliora i colori" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:343 -msgid "Automatic white balance correction" -msgstr "Correzione automatica del bilanciamento del bianco" - -#: ../extensions/file_tools/gth-file-tool-equalize.c:86 +#: ../extensions/file_tools/gth-file-tool-equalize.c:45 msgid "Equalizing image histogram" msgstr "Equalizzazione dell'istogramma dell'immagine" -#: ../extensions/file_tools/gth-file-tool-equalize.c:275 +#: ../extensions/file_tools/gth-file-tool-equalize.c:230 msgid "Equalize" msgstr "Equalizza" -#: ../extensions/file_tools/gth-file-tool-equalize.c:276 +#: ../extensions/file_tools/gth-file-tool-equalize.c:231 msgid "Equalize image histogram" msgstr "Equalizza l'istogramma dell'immagine" #: ../extensions/file_tools/gth-file-tool-flip.c:87 msgid "Flip" -msgstr "Capovolgi" +msgstr "Gira" #: ../extensions/file_tools/gth-file-tool-flip.c:88 msgid "Flip the image vertically" -msgstr "Capovolge verticalmente l'immagine" +msgstr "Gira verticalmente l'immagine" + +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale..." +msgstr "Scala di grigi..." + +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale" +msgstr "Scala di grigi" #: ../extensions/file_tools/gth-file-tool-mirror.c:87 msgid "Mirror" @@ -2626,23 +2734,28 @@ msgid "Redo" msgstr "Ripeti" -#: ../extensions/file_tools/gth-file-tool-resize.c:680 +#: ../extensions/file_tools/gth-file-tool-resize.c:214 +#: ../extensions/resize_images/dlg-resize-images.c:180 +msgid "Resizing images" +msgstr "Ridimensionamento immagini" + +#: ../extensions/file_tools/gth-file-tool-resize.c:808 msgid "Resize..." msgstr "Ridimensiona..." -#: ../extensions/file_tools/gth-file-tool-resize.c:680 +#: ../extensions/file_tools/gth-file-tool-resize.c:808 msgid "Resize" msgstr "Ridimensiona" -#: ../extensions/file_tools/gth-file-tool-rotate.c:636 +#: ../extensions/file_tools/gth-file-tool-rotate.c:628 msgid "Rotate..." msgstr "Ruota..." -#: ../extensions/file_tools/gth-file-tool-rotate.c:636 +#: ../extensions/file_tools/gth-file-tool-rotate.c:628 msgid "Rotate" msgstr "Ruota" -#: ../extensions/file_tools/gth-file-tool-rotate.c:637 +#: ../extensions/file_tools/gth-file-tool-rotate.c:629 msgid "Freely rotate the image" msgstr "Ruota liberamente l'immagine" @@ -2672,15 +2785,15 @@ msgid "Save" msgstr "Salva" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:100 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:101 msgid "Sharpening image" msgstr "Nitidezza dell'immagine" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 msgid "Enhance Focus..." msgstr "Migliora messa a fuoco..." -#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 msgid "Enhance Focus" msgstr "Migliora la messa a fuoco" @@ -2694,45 +2807,45 @@ #: ../extensions/find_duplicates/callbacks.c:49 msgid "Find duplicated files in the current location" -msgstr "Trova i file duplicati nell'attuale cartella" +msgstr "Trova i file duplicati nell'attuale posizione" #: ../extensions/find_duplicates/data/ui/find-duplicates-choose-folders.ui.h:1 msgid "_Folders:" msgstr "_Cartelle:" #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:1 +msgid "Search for Duplicates" +msgstr "Cerca duplicati" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 msgid "Duplicates:" msgstr "Duplicati:" -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 msgid "Files:" msgstr "File:" -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 -msgid "No duplicates found." -msgstr "Nessun duplicato trovato." - #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:4 -msgid "Search for Duplicates" -msgstr "Cerca duplicati" - -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 #: ../gthumb/gth-browser-actions-entries.h:33 msgid "_View" msgstr "_Visualizza" +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 +msgid "No duplicates found." +msgstr "Nessun duplicato trovato." + #: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:1 #: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:1 msgid "Find Duplicates" msgstr "Trova duplicati" #: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:2 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:19 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 #: ../extensions/search/data/ui/search-editor.ui.h:1 msgid "Start _at:" msgstr "Iniziare _da:" -#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 msgid "_Filter:" msgstr "_Filtro:" @@ -2740,43 +2853,43 @@ msgid "Find duplicated files." msgstr "Trova i file duplicati." -#: ../extensions/find_duplicates/gth-find-duplicates.c:53 +#: ../extensions/find_duplicates/gth-find-duplicates.c:65 msgid "leave the newest duplicates" msgstr "lascia i duplicati più nuovi" -#: ../extensions/find_duplicates/gth-find-duplicates.c:54 +#: ../extensions/find_duplicates/gth-find-duplicates.c:66 msgid "leave the oldest duplicates" msgstr "lascia i duplicati più vecchi" -#: ../extensions/find_duplicates/gth-find-duplicates.c:55 +#: ../extensions/find_duplicates/gth-find-duplicates.c:67 msgid "by folder..." msgstr "per cartella..." -#: ../extensions/find_duplicates/gth-find-duplicates.c:56 +#: ../extensions/find_duplicates/gth-find-duplicates.c:68 msgid "all files" msgstr "tutti i file" -#: ../extensions/find_duplicates/gth-find-duplicates.c:57 +#: ../extensions/find_duplicates/gth-find-duplicates.c:69 msgid "no file" msgstr "nessun file" -#: ../extensions/find_duplicates/gth-find-duplicates.c:397 -#: ../extensions/find_duplicates/gth-find-duplicates.c:492 +#: ../extensions/find_duplicates/gth-find-duplicates.c:560 +#: ../extensions/find_duplicates/gth-find-duplicates.c:668 #, c-format msgid "%d duplicate" msgid_plural "%d duplicates" msgstr[0] "%d duplicato" msgstr[1] "%d duplicati" -#: ../extensions/find_duplicates/gth-find-duplicates.c:536 +#: ../extensions/find_duplicates/gth-find-duplicates.c:712 msgid "Search completed" msgstr "Ricerca completata" -#: ../extensions/find_duplicates/gth-find-duplicates.c:548 +#: ../extensions/find_duplicates/gth-find-duplicates.c:725 msgid "Searching for duplicates" msgstr "Ricerca dei duplicati in corso" -#: ../extensions/find_duplicates/gth-find-duplicates.c:551 +#: ../extensions/find_duplicates/gth-find-duplicates.c:728 #: ../gthumb/gth-load-file-data-task.c:106 #: ../gthumb/gth-save-file-data-task.c:100 #, c-format @@ -2785,15 +2898,15 @@ msgstr[0] "%d file rimanente" msgstr[1] "%d file rimanenti" -#: ../extensions/find_duplicates/gth-find-duplicates.c:634 +#: ../extensions/find_duplicates/gth-find-duplicates.c:830 msgid "Getting the file list" -msgstr "Ricupero elenco dei file" +msgstr "Recupero elenco dei file" -#: ../extensions/find_duplicates/gth-find-duplicates.c:740 +#: ../extensions/find_duplicates/gth-find-duplicates.c:1016 msgid "Duplicates" msgstr "Duplicati" -#: ../extensions/find_duplicates/gth-find-duplicates.c:997 +#: ../extensions/find_duplicates/gth-find-duplicates.c:1306 msgid "Select" msgstr "Seleziona" @@ -2817,126 +2930,152 @@ msgid "Upload images to Flickr" msgstr "Carica le immagini su Flickr" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 msgid "Free space:" msgstr "Spazio libero:" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 -msgid "Hi_de from public searches" -msgstr "Nascon_di dalle ricerche pubbliche" - -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 -msgid "Moderate content" -msgstr "Contenuto moderato" - #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:5 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 msgid "Ph_otoset:" msgstr "Raccolta di f_oto:" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:6 -msgid "Private photos" -msgstr "Foto private" +msgid "_Privacy:" +msgstr "_Privacy:" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:7 -msgid "Private photos, visible to family" -msgstr "Foto private, visibili alla famiglia" +msgid "Hi_de from public searches" +msgstr "Nascon_di dalle ricerche pubbliche" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:8 +msgid "_Safety:" +msgstr "_Sicurezza:" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 msgid "Private photos, visible to family and friends" msgstr "Foto private, visibili alla famiglia e agli amici" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 -msgid "Restricted content" -msgstr "Contenuto riservato" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 +msgid "Private photos, visible to family" +msgstr "Foto private, visibili alla famiglia" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 +msgid "Private photos" +msgstr "Foto private" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 msgid "Safe content" msgstr "Contenuto sicuro" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 -msgid "_Privacy:" -msgstr "_Privacy:" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 +msgid "Moderate content" +msgstr "Contenuto moderato" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 -msgid "_Safety:" -msgstr "_Sicurezza:" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:17 +msgid "Restricted content" +msgstr "Contenuto riservato" -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 -msgid "_Import" -msgstr "_Importa" +#: ../extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui.h:1 +msgid "C_ontinue" +msgstr "C_ontinua" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:360 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:830 -msgid "Could not get the photo list" -msgstr "Impossibile recuperare l'elenco delle foto" +#: ../extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui.h:2 +msgid "_Authorize..." +msgstr "_Autorizza..." -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:397 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:561 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:864 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1026 -msgid "No album selected" -msgstr "Nessun album selezionato" +#: ../extensions/flicker_utils/flickr-consumer.c:124 +#: ../extensions/flicker_utils/flickr-service.c:237 +#: ../extensions/flicker_utils/flickr-service.c:348 +#: ../extensions/flicker_utils/flickr-service.c:672 +#: ../extensions/flicker_utils/flickr-service.c:937 +#: ../extensions/oauth/oauth-service.c:154 +#: ../extensions/photobucket/photobucket-consumer.c:74 +#: ../extensions/photobucket/photobucket-consumer.c:82 +#: ../extensions/photobucket/photobucket-consumer.c:149 +#: ../extensions/photobucket/photobucket-service.c:132 +msgid "Unknown error" +msgstr "Errore sconosciuto" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:579 +#: ../extensions/flicker_utils/flickr-service.c:502 #, c-format -msgid "Import from %s" -msgstr "Importa da %s" +msgid "" +"Return to this window when you have finished the authorization process on %s" +msgstr "" +"Ritornare a questa finestra quando è terminato il processo di autorizzazione " +"su %s" + +#: ../extensions/flicker_utils/flickr-service.c:503 +msgid "Once you're done, click the 'Continue' button below." +msgstr "Una volta terminato, fare clic sul pulsante «Continua» in basso." + +#: ../extensions/flicker_utils/flickr-service.c:571 +#, c-format +msgid "gThumb requires your authorization to upload the photos to %s" +msgstr "L'applicazione richiede l'autorizzazione per caricare le foto su %s" + +#: ../extensions/flicker_utils/flickr-service.c:572 +#, c-format +msgid "" +"Click 'Authorize' to open your web browser and authorize gthumb to upload " +"photos to %s. When you're finished, return to this window to complete the " +"authorization." +msgstr "" +"Fare clic su «Autorizza» per aprire il browser web e autorizzare " +"l'applicazione a caricare le foto su %s. Quando terminato, ritornare a " +"questa finestra per completare l'autorizzazione." #: ../extensions/gstreamer_tools/actions.c:66 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1080 -#: ../gthumb/gth-browser.c:1998 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1072 +#: ../gthumb/gth-browser.c:2175 msgid "Could not save the file" msgstr "Impossibile salvare il file" -#: ../extensions/gstreamer_tools/actions.c:126 +#: ../extensions/gstreamer_tools/actions.c:130 msgid "Could not take a screenshot" msgstr "Impossibile catturare una schermata" -#: ../extensions/gstreamer_tools/actions.c:132 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1248 +#: ../extensions/gstreamer_tools/actions.c:136 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1245 msgid "Save Image" msgstr "Salva l'immagine" -#: ../extensions/gstreamer_tools/actions.c:152 +#: ../extensions/gstreamer_tools/actions.c:156 msgctxt "Filename" msgid "Screenshot" msgstr "Schermata" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:1 -msgid "--:--" -msgstr "--:--" +msgid "Slower" +msgstr "Più lento" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 -msgid "Change volume level" -msgstr "Cambia il volume" +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:699 +msgid "Play" +msgstr "Riproduci" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:3 msgid "Faster" msgstr "Più veloce" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:686 -msgid "Play" -msgstr "Riproduci" +msgid "Time:" +msgstr "Tempo:" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 -msgid "Slower" -msgstr "Più lento" +msgid "--:--" +msgstr "--:--" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 -msgid "Time:" -msgstr "Tempo:" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 msgid "Toggle volume" msgstr "Attiva o disattiva il volume" -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 +msgid "Change volume level" +msgstr "Cambia il volume" + +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 #: ../extensions/photo_importer/actions.c:67 #: ../extensions/photo_importer/dlg-photo-importer.c:620 msgid "Choose a folder" @@ -2958,21 +3097,21 @@ msgid "Take a screenshot" msgstr "Cattura una schermata" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:663 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 msgid "Playing video" msgstr "Riproduzione video" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:689 msgid "Pause" msgstr "Pausa" #: ../extensions/gstreamer_tools/main.c:31 -#: ../gthumb/gth-main-default-tests.c:211 +#: ../gthumb/gth-main-default-tests.c:247 msgid "Video" msgstr "Video" #: ../extensions/gstreamer_tools/main.c:32 -#: ../gthumb/gth-main-default-tests.c:218 +#: ../gthumb/gth-main-default-tests.c:254 msgid "Audio" msgstr "Audio" @@ -2981,7 +3120,7 @@ msgstr "Artista" #: ../extensions/gstreamer_tools/main.c:40 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 msgid "Album" msgstr "Album" @@ -3003,13 +3142,13 @@ msgstr "Fotogrammi al secondo" #: ../extensions/gstreamer_tools/main.c:46 -#: ../extensions/image_print/data/ui/print-layout.ui.h:25 +#: ../extensions/image_print/data/ui/print-layout.ui.h:24 #: ../extensions/image_viewer/gth-image-viewer-page.c:209 msgid "Width" msgstr "Larghezza" #: ../extensions/gstreamer_tools/main.c:47 -#: ../extensions/image_print/data/ui/print-layout.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:25 msgid "Height" msgstr "Altezza" @@ -3021,20 +3160,19 @@ msgid "Sample rate" msgstr "Frequenza di campionatura" -#: ../extensions/gstreamer_utils/gstreamer-utils.c:363 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:362 msgid "Stereo" msgstr "Stereo" -#: ../extensions/gstreamer_utils/gstreamer-utils.c:363 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:362 msgid "Mono" msgstr "Mono" #. Translators: this is an image size, such as 1024 × 768 -#: ../extensions/gstreamer_utils/gstreamer-utils.c:396 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1303 -#: ../extensions/image_viewer/gth-metadata-provider-image.c:190 -#: ../extensions/webalbums/dlg-web-exporter.c:442 -#: ../extensions/webalbums/gth-web-exporter.c:2446 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:395 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1300 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:243 +#: ../extensions/webalbums/gth-web-exporter.c:2446 ../gthumb/gtk-utils.c:1037 #, c-format msgid "%d × %d" msgstr "%d × %d" @@ -3043,98 +3181,99 @@ msgid "Could not print the selected files" msgstr "Impossibile stampare i file selezionati" -#: ../extensions/image_print/callbacks.c:54 +#: ../extensions/image_print/callbacks.c:65 msgid "Print the selected images" msgstr "Stampa le immagini selezionate" -#: ../extensions/image_print/data/ui/print-layout.ui.h:5 +#: ../extensions/image_print/data/ui/print-layout.ui.h:1 msgid "Centered" msgstr "Centrato" -#: ../extensions/image_print/data/ui/print-layout.ui.h:10 -msgid "Image" -msgstr "Immagine" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:12 -msgid "Left" -msgstr "Sinistra" - #: ../extensions/image_print/data/ui/print-layout.ui.h:13 -msgid "Position:" -msgstr "Posizione:" +msgid "The total number of files" +msgstr "Il numero totale dei file" #: ../extensions/image_print/data/ui/print-layout.ui.h:14 -msgid "Preview" -msgstr "Anteprima" +#: ../extensions/importer/data/ui/import-preferences.ui.h:4 +msgid "The event description" +msgstr "La descrizione dell'evento" -#: ../extensions/image_print/data/ui/print-layout.ui.h:15 -msgid "Rotation:" -msgstr "Rotazione:" +#: ../extensions/image_print/data/ui/print-layout.ui.h:17 +msgid "_Rows:" +msgstr "_Righe:" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:19 +msgid "Image" +msgstr "Immagine" #: ../extensions/image_print/data/ui/print-layout.ui.h:20 -#: ../extensions/importer/data/ui/import-preferences.ui.h:4 -msgid "The event description" -msgstr "La descrizione dell'evento" +msgid "Position:" +msgstr "Posizione:" #: ../extensions/image_print/data/ui/print-layout.ui.h:21 -msgid "The total number of files" -msgstr "Il numero totale dei file" +msgid "Left" +msgstr "Sinistra" -#: ../extensions/image_print/data/ui/print-layout.ui.h:23 +#: ../extensions/image_print/data/ui/print-layout.ui.h:22 msgid "Top" msgstr "In alto" -#: ../extensions/image_print/data/ui/print-layout.ui.h:24 +#: ../extensions/image_print/data/ui/print-layout.ui.h:26 +msgid "Rotation:" +msgstr "Rotazione:" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:27 msgid "Unit:" msgstr "Unità:" #: ../extensions/image_print/data/ui/print-layout.ui.h:28 -msgid "_Rows:" -msgstr "_Righe:" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:29 -msgid "inches" -msgstr "pollici" +msgid "Preview" +msgstr "Anteprima" #: ../extensions/image_print/data/ui/print-layout.ui.h:30 msgid "millimeters" msgstr "millimetri" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 -msgid "Fonts" -msgstr "Tipi di carattere" +#: ../extensions/image_print/data/ui/print-layout.ui.h:31 +msgid "inches" +msgstr "pollici" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:4 msgid "Select Caption Font" msgstr "Seleziona carattere didascalia" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:4 -msgid "Select Footer Font" -msgstr "Seleziona carattere piè di pagina" - #: ../extensions/image_print/data/ui/print-preferences.ui.h:5 msgid "Select Header Font" msgstr "Seleziona carattere intestazione" -#: ../extensions/image_print/gth-image-print-job.c:971 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 +msgid "Select Footer Font" +msgstr "Seleziona carattere piè di pagina" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 +msgid "Fonts" +msgstr "Tipi di carattere" + +#: ../extensions/image_print/gth-image-print-job.c:914 #: ../extensions/webalbums/data/albumthemes/text.h:31 #, c-format msgid "Page %d of %d" msgstr "Pagina %d di %d" -#: ../extensions/image_print/gth-image-print-job.c:1734 -#: ../extensions/image_print/gth-image-print-job.c:1861 -#: ../extensions/image_print/gth-image-print-job.c:1898 +#: ../extensions/image_print/gth-image-print-job.c:1680 +#: ../extensions/image_print/gth-image-print-job.c:1845 +#: ../extensions/image_print/gth-image-print-job.c:1888 msgid "Could not print" msgstr "Impossibile stampare" -#: ../extensions/image_print/gth-image-print-job.c:1796 -#: ../gthumb/gth-main-default-tests.c:204 +#: ../extensions/image_print/gth-image-print-job.c:1746 +#: ../gthumb/gth-main-default-tests.c:240 msgid "Images" msgstr "Immagini" -#: ../extensions/image_print/gth-image-print-job.c:1863 -#: ../gthumb/gth-image-loader.c:204 ../gthumb/gth-image-loader.c:277 +#: ../extensions/image_print/gth-image-print-job.c:1847 +#: ../gthumb/gth-image-loader.c:197 ../gthumb/gth-image-loader.c:304 +#: ../gthumb/gth-image-utils.c:131 ../gthumb/gth-image-utils.c:137 msgid "No suitable loader available for this file type" msgstr "Nessun caricatore idoneo per questo tipo di file" @@ -3145,18 +3284,18 @@ msgstr "Caricamento di «%s»" #: ../extensions/image_print/gth-load-image-info-task.c:166 -#: ../extensions/webalbums/gth-web-exporter.c:2685 +#: ../extensions/webalbums/gth-web-exporter.c:2719 msgid "Loading images" msgstr "Caricamento immagini" #: ../extensions/image_print/image_print.extension.in.in.h:1 -msgid "Allow to print images choosing the page layout." -msgstr "Permette di stampare le immagini scegliendo l'impaginazione." - -#: ../extensions/image_print/image_print.extension.in.in.h:2 msgid "Image print" msgstr "Stampa immagine" +#: ../extensions/image_print/image_print.extension.in.in.h:2 +msgid "Allow to print images choosing the page layout." +msgstr "Permette di stampare le immagini scegliendo l'impaginazione." + #: ../extensions/image_print/preferences.c:79 msgid "Print" msgstr "Stampa" @@ -3179,15 +3318,15 @@ #: ../extensions/image_rotation/callbacks.c:67 msgid "Reset the EXIF Orientation" -msgstr "Ripristina l'orientamento EXIF" +msgstr "Reimposta l'orientamento EXIF" #: ../extensions/image_rotation/callbacks.c:68 msgid "Reset the embedded orientation without rotating the images" -msgstr "Ripristina l'orientamento incorporato senza ruotare le immagini" +msgstr "Reimposta l'orientamento incorporato senza ruotare le immagini" #: ../extensions/image_rotation/gth-reset-orientation-task.c:111 #: ../extensions/image_rotation/gth-transform-task.c:141 -#: ../extensions/webalbums/gth-web-exporter.c:2339 +#: ../extensions/webalbums/gth-web-exporter.c:2338 #: ../extensions/webalbums/gth-web-exporter.c:2423 msgid "Saving images" msgstr "Salvataggio immagini" @@ -3240,21 +3379,65 @@ msgstr "_Accetta distorsione" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:1 -msgid "After loading an image:" -msgstr "Dopo aver caricato un'immagine:" +msgid "Set to actual size" +msgstr "Impostare alla dimensione reale" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:2 +msgid "Keep previous zoom" +msgstr "Mantenere ingrandimento precedente" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:3 -msgid "Reset scrollbar positions" -msgstr "Ripristinare la posizione delle barre di scorrimento" +msgid "Fit to window" +msgstr "Adattare alla finestra" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 -msgid "Transparency _type:" -msgstr "_Tipo di trasparenza:" +msgid "Fit to window if larger" +msgstr "Adattare alla finestra se più grande" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:5 +msgid "Fit to width" +msgstr "Adattare alla larghezza" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:6 +msgid "Fit to width if larger" +msgstr "Adattare alla larghezza se più grande" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:7 +msgid "Reset scrollbar positions" +msgstr "Ripristinare la posizione delle barre di scorrimento" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:8 +msgid "After loading an image:" +msgstr "Dopo aver caricato un'immagine:" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:9 msgid "_Zoom quality:" msgstr "Qualità dell'_ingrandimento:" +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:10 +msgid "Transparency _type:" +msgstr "_Tipo di trasparenza:" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:11 +msgid "High" +msgstr "Alto" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:12 +msgid "Low" +msgstr "Basso" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:13 +msgid "White" +msgstr "Bianco" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:15 +msgid "Black" +msgstr "Nero" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:16 +msgid "Checked" +msgstr "Scacchiera" + #: ../extensions/image_viewer/gth-image-histogram.c:84 msgid "Histogram" msgstr "Istogramma" @@ -3314,52 +3497,52 @@ msgstr "Ingrandisce adattando alla larghezza" #: ../extensions/image_viewer/image_viewer.extension.in.in.h:1 -msgid "Basic image viewing." -msgstr "Visualizzazione di base delle immagini." - -#: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 msgid "Image viewer" msgstr "Visualizzatore immagini" +#: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 +msgid "Basic image viewing." +msgstr "Visualizzazione di base delle immagini." + #: ../extensions/image_viewer/preferences.c:125 msgid "Viewer" msgstr "Visualizzatore" -#: ../extensions/importer/data/ui/import-preferences.ui.h:3 -msgid "The day of the month" -msgstr "Il giorno del mese" +#: ../extensions/importer/data/ui/import-preferences.ui.h:1 +msgid "_Destination" +msgstr "_Destinazione" -#: ../extensions/importer/data/ui/import-preferences.ui.h:5 -msgid "The hour" -msgstr "L'ora" +#: ../extensions/importer/data/ui/import-preferences.ui.h:2 +msgid "_Automatic subfolder" +msgstr "Sottocartella _automatica" -#: ../extensions/importer/data/ui/import-preferences.ui.h:6 -msgid "The minutes" -msgstr "I minuti" +#: ../extensions/importer/data/ui/import-preferences.ui.h:3 +msgid "as _single subfolder" +msgstr "come _singola sottocartella" #: ../extensions/importer/data/ui/import-preferences.ui.h:7 -msgid "The month" -msgstr "Il mese" +msgid "The year" +msgstr "L'anno" #: ../extensions/importer/data/ui/import-preferences.ui.h:8 -msgid "The seconds" -msgstr "I secondi" +msgid "The month" +msgstr "Il mese" #: ../extensions/importer/data/ui/import-preferences.ui.h:9 -msgid "The year" -msgstr "L'anno" +msgid "The day of the month" +msgstr "Il giorno del mese" #: ../extensions/importer/data/ui/import-preferences.ui.h:10 -msgid "_Automatic subfolder" -msgstr "Sottocartella _automatica" +msgid "The hour" +msgstr "L'ora" #: ../extensions/importer/data/ui/import-preferences.ui.h:11 -msgid "_Destination" -msgstr "_Destinazione" +msgid "The minutes" +msgstr "I minuti" #: ../extensions/importer/data/ui/import-preferences.ui.h:12 -msgid "as _single subfolder" -msgstr "come _singola sottocartella" +msgid "The seconds" +msgstr "I secondi" #: ../extensions/importer/gth-import-destination-button.c:183 msgid "Invalid Destination" @@ -3393,39 +3576,39 @@ msgid "custom format" msgstr "formato personalizzato" -#: ../extensions/importer/gth-import-task.c:442 -#: ../extensions/importer/gth-import-task.c:477 -#: ../extensions/importer/gth-import-task.c:648 +#: ../extensions/importer/gth-import-task.c:426 +#: ../extensions/importer/gth-import-task.c:461 +#: ../extensions/importer/gth-import-task.c:671 msgid "Importing files" msgstr "Importazione file" -#: ../extensions/importer/gth-import-task.c:598 +#: ../extensions/importer/gth-import-task.c:620 msgid "No file imported" msgstr "Nessun file importato" -#: ../extensions/importer/gth-import-task.c:599 +#: ../extensions/importer/gth-import-task.c:621 msgid "The selected files are already present in the destination." msgstr "I file selezionati sono già presenti nella destinazione." -#: ../extensions/importer/gth-import-task.c:622 -#: ../gthumb/gth-file-source-vfs.c:690 +#: ../extensions/importer/gth-import-task.c:644 +#: ../gthumb/gth-file-source-vfs.c:694 msgid "Could not delete the files" msgstr "Impossibile eliminare i file" -#: ../extensions/importer/gth-import-task.c:623 +#: ../extensions/importer/gth-import-task.c:645 msgid "Delete operation not supported." -msgstr "Operazione di eliminazione non supportata" +msgstr "Operazione di eliminazione non supportata." -#: ../extensions/importer/gth-import-task.c:709 +#: ../extensions/importer/gth-import-task.c:732 msgid "Last imported" msgstr "Ultimo importato" -#: ../extensions/importer/gth-import-task.c:815 +#: ../extensions/importer/gth-import-task.c:838 msgid "No file specified." msgstr "Nessun file specificato." #. Translators: For example: Not enough free space in '/home/user/Images'.\n1.3 GB of space is required but only 300 MB is available. -#: ../extensions/importer/gth-import-task.c:852 +#: ../extensions/importer/gth-import-task.c:875 #, c-format msgid "" "Not enough free space in '%s'.\n" @@ -3434,15 +3617,15 @@ "Non c'è abbastanza spazio libero in «%s».\n" "Sono richiesti %s di spazio ma sono disponibili solo %s." -#: ../extensions/list_tools/callbacks.c:75 ../gthumb/gth-filterbar.c:303 +#: ../extensions/list_tools/callbacks.c:76 ../gthumb/gth-filterbar.c:311 msgid "Personalize..." msgstr "Personalizza..." -#: ../extensions/list_tools/callbacks.c:319 +#: ../extensions/list_tools/callbacks.c:320 msgid "Tools" msgstr "Strumenti" -#: ../extensions/list_tools/callbacks.c:320 +#: ../extensions/list_tools/callbacks.c:321 msgid "Batch tools for multiple files" msgstr "Strumenti in batch per file multipli" @@ -3451,97 +3634,97 @@ msgstr "_Salta" #: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:1 -msgid "Co_mmands:" -msgstr "Co_mandi:" - -#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:2 msgid "Commands" msgstr "Comandi" +#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:2 +msgid "Co_mmands:" +msgstr "Co_mandi:" + #: ../extensions/list_tools/data/ui/script-editor.ui.h:2 -#, no-c-format -msgid "%E" -msgstr "%E" +msgid "_Wait for the command to finish" +msgstr "_Attendere che il comando termini" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:3 +msgid "E_xecute command once for every file" +msgstr "Ese_guire il comando una volta per ogni file" #: ../extensions/list_tools/data/ui/script-editor.ui.h:4 -#, no-c-format -msgid "%N" -msgstr "%N" +msgid "_Terminal command (shell script)" +msgstr "Comando da _terminale (script per la shell)" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:5 +msgid "Sh_ortcut:" +msgstr "Sc_orciatoia:" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:6 +msgid "The file uri" +msgstr "L'URI del file" -#. Translate only 'message' and 'default_value'. #: ../extensions/list_tools/data/ui/script-editor.ui.h:7 -#, no-c-format -msgid "%ask{ message }{ default value }" -msgstr "%ask{ messaggio }{ valore predefinito }" +msgid "The file path" +msgstr "Il percorso del file" -#. Translate only 'attribute name' -#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 -#, no-c-format -msgid "%attr{ attribute name }" -msgstr "%attr{ nome dell'attributo }" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:8 +msgid "The file basename" +msgstr "Il nome base del file senza percorso" -#. Translate only 'text'. -#: ../extensions/list_tools/data/ui/script-editor.ui.h:13 -#, no-c-format -msgid "%quote{ text }" -msgstr "%quote{ testo }" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:9 +msgid "The parent folder path" +msgstr "Il percorso della cartella genitore" +#. Translate only 'message' and 'default_value'. #: ../extensions/list_tools/data/ui/script-editor.ui.h:14 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 -msgid "A file attribute" -msgstr "Un attributo di file" +#, no-c-format +msgid "%ask{ message }{ default value }" +msgstr "%ask{ messaggio }{ valore predefinito }" #: ../extensions/list_tools/data/ui/script-editor.ui.h:15 msgid "Ask an input value" msgstr "Chiede un valore da inserire" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:17 -msgid "E_xecute command once for every file" -msgstr "Ese_guire il comando una volta per ogni file" - +#. Translate only 'attribute name' #: ../extensions/list_tools/data/ui/script-editor.ui.h:18 -msgid "Quote the text " -msgstr "Cita il testo " +#, no-c-format +msgid "%attr{ attribute name }" +msgstr "%attr{ nome dell'attributo }" #: ../extensions/list_tools/data/ui/script-editor.ui.h:19 -msgid "Sh_ortcut:" -msgstr "Sc_orciatoia:" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 +msgid "A file attribute" +msgstr "Un attributo di file" #: ../extensions/list_tools/data/ui/script-editor.ui.h:21 -msgid "The file basename" -msgstr "Il nome del file senza percorso" +#, no-c-format +msgid "%N" +msgstr "%N" #: ../extensions/list_tools/data/ui/script-editor.ui.h:22 msgid "The file basename without extension" -msgstr "Il nome del file senza percorso e estensione" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:23 -msgid "The file extension" -msgstr "L'estensione del file" +msgstr "Il nome base del file senza percorso ed estensione" #: ../extensions/list_tools/data/ui/script-editor.ui.h:24 -msgid "The file path" -msgstr "Il percorso del file" +#, no-c-format +msgid "%E" +msgstr "%E" #: ../extensions/list_tools/data/ui/script-editor.ui.h:25 -msgid "The file uri" -msgstr "L'URI del file" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:26 -msgid "The parent folder path" -msgstr "Il percorso della cartella genitore" +msgid "The file extension" +msgstr "L'estensione del file" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:27 -msgid "_Command:" -msgstr "_Comando:" +#. Translate only 'text'. +#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 +#, no-c-format +msgid "%quote{ text }" +msgstr "%quote{ testo }" #: ../extensions/list_tools/data/ui/script-editor.ui.h:29 -msgid "_Terminal command (shell script)" -msgstr "Comando da _terminale (script per la shell)" +msgid "Quote the text " +msgstr "Cita il testo " #: ../extensions/list_tools/data/ui/script-editor.ui.h:30 -msgid "_Wait for the command to finish" -msgstr "_Attendere che il comando termini" +msgid "_Command:" +msgstr "_Comando:" #: ../extensions/list_tools/dlg-personalize-scripts.c:257 msgid "Script" @@ -3577,9 +3760,9 @@ msgstr "Inserire un valore:" #: ../extensions/list_tools/gth-script.c:745 -#: ../extensions/webalbums/gth-web-exporter.c:560 -#: ../extensions/webalbums/gth-web-exporter.c:572 -#: ../extensions/webalbums/gth-web-exporter.c:580 +#: ../extensions/webalbums/gth-web-exporter.c:558 +#: ../extensions/webalbums/gth-web-exporter.c:570 +#: ../extensions/webalbums/gth-web-exporter.c:578 msgid "Malformed command" msgstr "Comando malformato" @@ -3608,7 +3791,7 @@ #: ../extensions/list_tools/list_tools.extension.in.in.h:2 msgid "Scripting and batch manipulation of files." -msgstr "Script e batch per la manipolazione di file." +msgstr "Script e manipolazione batch di file." #: ../extensions/map_view/gth-map-view.c:130 msgctxt "Cardinal point" @@ -3636,15 +3819,56 @@ msgstr "Mappa" #. No GPS label -#: ../extensions/map_view/gth-map-view.c:273 +#: ../extensions/map_view/gth-map-view.c:276 msgid "The geographical position information is not available for this image." msgstr "" "Non sono disponibili le informazioni della posizione geografica per questa " "immagine." -#: ../extensions/map_view/map_view.extension.in.in.h:2 -msgid "View the photo position on the map" -msgstr "Visualizza la posizione della foto sulla mappa" +#: ../extensions/map_view/map_view.extension.in.in.h:2 +msgid "View the photo position on the map" +msgstr "Visualizza la posizione della foto sulla mappa" + +#: ../extensions/oauth/data/ui/oauth-account-manager.ui.h:1 +msgid "A_ccounts:" +msgstr "A_ccount:" + +#: ../extensions/oauth/data/ui/oauth-ask-authorization.ui.h:1 +#: ../gthumb/gth-folder-tree.c:1067 +msgid "Loading..." +msgstr "Caricamento..." + +#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 +msgid "New authentication..." +msgstr "Nuova autenticazione..." + +#: ../extensions/oauth/oauth-ask-authorization-dialog.c:191 +msgid "Authorization Required" +msgstr "Richiesta autorizzazione" + +#: ../extensions/oauth/web-service.c:382 +msgid "Choose _Account..." +msgstr "Scegli _account..." + +#: ../extensions/oauth/web-service.c:660 +msgid "Choose Account" +msgstr "Scegli l'account" + +#: ../extensions/oauth/web-service.c:777 +msgid "Edit Accounts" +msgstr "Modifica gli account" + +#: ../extensions/oauth/web-service.c:795 ../extensions/oauth/web-service.c:812 +msgid "Connecting to the server" +msgstr "Connessione al server" + +#: ../extensions/oauth/web-service.c:796 +msgid "Asking authorization" +msgstr "Autorizzazione richiesta" + +#: ../extensions/oauth/web-service.c:813 +msgid "Getting account information" +msgstr "Recupero informazioni sull'account" #: ../extensions/photobucket/callbacks.c:54 msgid "Photobucket..." @@ -3654,68 +3878,68 @@ msgid "Upload photos to Photobucket" msgstr "Carica le foto su Photobucket" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 -msgid "1 megabyte file size" -msgstr "un megabyte di dimensione" - -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 -msgid "15ʺ screen ( 800 x 600 )" -msgstr "Schermo da 15ʺ ( 800 × 600 )" - -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 -msgid "17ʺ screen ( 1024 x 768 )" -msgstr "Schermo da 17ʺ ( 1024 × 768 )" - #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 -msgid "Large ( 640 x 480 )" -msgstr "Grande ( 640 × 480 )" +msgid "_Scramble filenames" +msgstr "Rendere ca_suali i nomi dei file" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 -msgid "Medium ( 320 x 240 )" -msgstr "Media ( 320 × 240 )" +msgid "Tiny ( 100 x 75 )" +msgstr "Miniatura ( 100 × 75 )" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 msgid "Small ( 160 x 120 )" msgstr "Piccola ( 160 × 120 )" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 -msgid "Tiny ( 100 x 75 )" -msgstr "Miniatura ( 100 × 75 )" +msgid "Medium ( 320 x 240 )" +msgstr "Media ( 320 × 240 )" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 +msgid "Large ( 640 x 480 )" +msgstr "Grande ( 640 × 480 )" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 +msgid "15ʺ screen ( 800 x 600 )" +msgstr "Schermo da 15ʺ ( 800 × 600 )" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 -msgid "_Scramble filenames" -msgstr "Rendere ca_suali i nomi dei file" +msgid "17ʺ screen ( 1024 x 768 )" +msgstr "Schermo da 17ʺ ( 1024 × 768 )" -#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 +msgid "1 megabyte file size" +msgstr "1 megabyte di dimensione file" + +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 msgid "_Container:" msgstr "_Contenitore:" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:290 msgid "Tiny ( 100 × 75 )" msgstr "Miniatura ( 100 × 75 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 msgid "Small ( 160 × 120 )" msgstr "Piccola ( 160 × 120 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 msgid "Medium ( 320 × 240 )" msgstr "Media ( 320 × 240 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 msgid "Large ( 640 × 480 )" msgstr "Grande ( 640 × 480 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 msgid "15ʺ screen ( 800 × 600 )" msgstr "Schermo da 15ʺ ( 800 × 600 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 msgid "17ʺ screen ( 1024 × 768 )" msgstr "Schermo da 17ʺ ( 1024 × 768 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:304 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:303 msgid "2 megabyte file size" msgstr "2 megabyte di dimensione file" @@ -3748,33 +3972,33 @@ msgstr "Importa foto e altri file da una cartella" #: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:1 -msgid "After importing from a device:" -msgstr "Dopo l'importazione da un dispositivo:" - -#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 msgid "_Rotate the images physically" msgstr "_Ruotare fisicamente le immagini" +#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 +msgid "After importing from a device:" +msgstr "Dopo l'importazione da un dispositivo:" + #. view label -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 -#: ../gthumb/gth-filterbar.c:413 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 +#: ../gthumb/gth-filterbar.c:421 msgid "S_how:" msgstr "M_ostrare:" -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 -msgid "_Delete the imported files from the source" -msgstr "_Eliminare i file importati dalla sorgente" - #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:4 +msgid "_Tags:" +msgstr "E_tichette:" + +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 msgid "_Event:" msgstr "_Evento:" #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:7 -msgid "_Tags:" -msgstr "E_tichette:" +msgid "_Delete the imported files from the source" +msgstr "_Eliminare i file importati dalla sorgente" #: ../extensions/photo_importer/dlg-photo-importer.c:227 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:174 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:149 msgid "Could not import the files" msgstr "Impossibile importare i file" @@ -3789,7 +4013,7 @@ msgstr "Impossibile caricare la cartella" #: ../extensions/photo_importer/dlg-photo-importer.c:369 -#: ../gthumb/gth-browser.c:1911 +#: ../gthumb/gth-browser.c:2089 msgid "Getting folder listing..." msgstr "Recupero elenco delle cartelle..." @@ -3826,61 +4050,23 @@ msgid "Upload photos to Picasa Web Album" msgstr "Carica le foto sull'album web di Picasa" -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 msgid "Export to Picasa Web Albums" msgstr "Esporta su album web di Picasa" -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 msgid "_Albums:" msgstr "_Album:" -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 -msgid "Import from Picasa Web Album" -msgstr "Importa dall'album web di Picasa" - -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 -msgid "_Album:" -msgstr "_Album:" - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:1 -msgid "" -"Type the characters you see in the picture below. Letters are not case-" -"sensitive." -msgstr "" -"Digitare i caratteri che si vedono nell'immagine sottostante. Non sono " -"distinte lettere maiuscole o minuscole." - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 -msgid "_E-Mail:" -msgstr "_E-Mail:" - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:3 -msgid "_Password:" -msgstr "Pass_word:" - -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 msgid "Public" msgstr "Pubblico" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:354 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:310 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:458 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:469 msgid "Could not get the album list" msgstr "Impossibile recuperare l'elenco degli album" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:438 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:394 -msgid "Picasa Web Album" -msgstr "Album web Picasa" - -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:525 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:481 -msgid "Account" -msgstr "Account" - -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:104 -msgid "Could not load the file" -msgstr "Impossibile caricare il file" - #: ../extensions/picasaweb/picasaweb.extension.in.in.h:1 msgid "Picasa Web Albums" msgstr "Album web Picasa" @@ -3889,100 +4075,14 @@ msgid "Upload images to Picasa Web Albums" msgstr "Carica le immagini sull'album web di Picasa" -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:1 -msgid "Opti_mize" -msgstr "Otti_mizzare" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:2 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 -msgid "_Default extension:" -msgstr "Estensione pre_definita:" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 -msgid "_Progressive" -msgstr "_Progressiva" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 -msgid "_Quality:" -msgstr "_Qualità:" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:5 -msgid "_Smoothing:" -msgstr "_Smussatura:" - -#: ../extensions/pixbuf_savers/data/ui/png-options.ui.h:1 -msgid "Compression _level:" -msgstr "_Livello di compressione:" - -#: ../extensions/pixbuf_savers/data/ui/save-options-preferences.ui.h:1 -msgid "Default options:" -msgstr "Opzioni predefinite:" - -#: ../extensions/pixbuf_savers/data/ui/tga-options.ui.h:1 -msgid "_RLE compression" -msgstr "Compressione _RLE" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:1 -msgid "Compression" -msgstr "Compressione" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:2 -msgid "No_rmal (Deflate)" -msgstr "No_rmale (deflate)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:3 -msgid "Resolution" -msgstr "Risoluzione" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 -msgid "_Loss compression (JPEG)" -msgstr "Compressione con _perdita (JPEG)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 -msgid "_No compression" -msgstr "_Nessuna compressione" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:9 -msgid "dpi" -msgstr "dpi" - -#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:519 -msgid "JPEG" -msgstr "JPEG" - -#: ../extensions/pixbuf_savers/gth-png-saver.c:140 -msgid "PNG" -msgstr "PNG" - -#: ../extensions/pixbuf_savers/gth-tga-saver.c:286 -#: ../gthumb/gth-buffer-data.c:84 -msgid "Insufficient memory" -msgstr "Memoria insufficiente" - -#: ../extensions/pixbuf_savers/gth-tga-saver.c:373 -msgid "TGA" -msgstr "TGA" - -#: ../extensions/pixbuf_savers/gth-tiff-saver.c:537 -msgid "TIFF" -msgstr "TIFF" - -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:1 -msgid "Save images" -msgstr "Salva le immagini" - -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:2 -msgid "Save images in common file formats such as JPEG, PNG and TIFF" -msgstr "Salva le immagini in comuni formati di file come JPEG, PNG e TIFF" - #: ../extensions/raw_files/raw_files.extension.in.in.h:1 -msgid "Allow to load raw format images." -msgstr "Consente il caricamento di immagini in formato RAW." - -#: ../extensions/raw_files/raw_files.extension.in.in.h:2 msgid "Raw format support" msgstr "Supporto per il formato RAW" +#: ../extensions/raw_files/raw_files.extension.in.in.h:2 +msgid "Allow to load raw format images." +msgstr "Consente il caricamento di immagini in formato RAW." + #: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 msgid "_X:" msgstr "_X:" @@ -4012,75 +4112,75 @@ msgstr "Strumento per la rimozione dell'effetto occhi rossi da una foto." #: ../extensions/rename_series/data/ui/code-selector.ui.h:1 -msgid "add" -msgstr "aggiungi" - -#: ../extensions/rename_series/data/ui/code-selector.ui.h:2 msgid "digits" -msgstr "digita" +msgstr "cifre" -#: ../extensions/rename_series/data/ui/code-selector.ui.h:3 +#: ../extensions/rename_series/data/ui/code-selector.ui.h:2 msgid "format:" msgstr "formato:" -#: ../extensions/rename_series/data/ui/code-selector.ui.h:4 +#: ../extensions/rename_series/data/ui/code-selector.ui.h:3 msgid "remove" msgstr "rimuovi" -#. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 -#, no-c-format -msgid "%A{ identifier }" -msgstr "%A{ identificatore }" +#: ../extensions/rename_series/data/ui/code-selector.ui.h:4 +msgid "add" +msgstr "aggiungi" -#. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 -#, no-c-format -msgid "%M{ format }" -msgstr "%M{ formato }" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:1 +msgid "Rename" +msgstr "Rinomina" #. Translators: this is the text case (upper or lower case). -#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 msgid "Cas_e:" -msgstr "_Maiuscolo/minuscolo:" +msgstr "_Maiuscolo/Minuscolo:" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:14 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:7 msgid "Edit template" msgstr "Modifica il modello" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 -msgid "Re_verse Order" -msgstr "Ordine in_verso" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 +msgid "The original filename" +msgstr "Il nome di file originale" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 -msgid "Rename" -msgstr "Rinomina" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 +msgid "The original extension" +msgstr "L'estensione originale" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 -msgid "The digitalization date" -msgstr "La data di digitalizzazione" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:13 +msgid "The original enumerator" +msgstr "La numerazione originale" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:21 +#. translate only the text in the curly brackets +#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 +#, no-c-format +msgid "%M{ format }" +msgstr "%M{ formato }" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 msgid "The modification date" msgstr "La data di modifica" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:22 -msgid "The original enumerator" -msgstr "La numerazione originale" - -#: ../extensions/rename_series/data/ui/rename-series.ui.h:23 -msgid "The original extension" -msgstr "L'estensione originale" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:21 +msgid "The digitalization date" +msgstr "La data di digitalizzazione" +#. translate only the text in the curly brackets #: ../extensions/rename_series/data/ui/rename-series.ui.h:24 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 -msgid "The original filename" -msgstr "Il nome di file originale" +#, no-c-format +msgid "%A{ identifier }" +msgstr "%A{ identificatore }" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 msgid "_Template:" msgstr "_Modello:" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +msgid "Re_verse Order" +msgstr "Ordine in_verso" + #: ../extensions/rename_series/dlg-rename-series.c:58 msgid "Enumerator" msgstr "Numerazione" @@ -4109,36 +4209,36 @@ msgid "File attribute" msgstr "Attributo file" -#: ../extensions/rename_series/dlg-rename-series.c:552 -#: ../extensions/rename_series/dlg-rename-series.c:683 +#: ../extensions/rename_series/dlg-rename-series.c:558 +#: ../extensions/rename_series/dlg-rename-series.c:689 msgid "Could not rename the files" msgstr "Impossibile rinominare i file" -#: ../extensions/rename_series/dlg-rename-series.c:780 +#: ../extensions/rename_series/dlg-rename-series.c:786 msgid "Could not save the template" msgstr "Impossibile salvare il modello" -#: ../extensions/rename_series/dlg-rename-series.c:798 +#: ../extensions/rename_series/dlg-rename-series.c:804 msgid "Edit Template" msgstr "Modifica modello" -#: ../extensions/rename_series/dlg-rename-series.c:856 +#: ../extensions/rename_series/dlg-rename-series.c:862 msgid "Old Name" msgstr "Nome vecchio" -#: ../extensions/rename_series/dlg-rename-series.c:867 +#: ../extensions/rename_series/dlg-rename-series.c:873 msgid "New Name" msgstr "Nome nuovo" -#: ../extensions/rename_series/dlg-rename-series.c:944 +#: ../extensions/rename_series/dlg-rename-series.c:950 msgid "Keep original case" msgstr "Mantieni maiuscole/minuscole originali" -#: ../extensions/rename_series/dlg-rename-series.c:945 +#: ../extensions/rename_series/dlg-rename-series.c:951 msgid "Convert to lower-case" msgstr "Converti in minuscolo" -#: ../extensions/rename_series/dlg-rename-series.c:946 +#: ../extensions/rename_series/dlg-rename-series.c:952 msgid "Convert to upper-case" msgstr "Converti in maiuscolo" @@ -4162,36 +4262,32 @@ msgid "Resize the selected images" msgstr "Ridimensiona le immagini selezionate" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:5 -#: ../gthumb/gth-main-default-metadata.c:49 -msgid "Format" -msgstr "Formato" +#: ../extensions/resize_images/data/ui/resize-images.ui.h:1 +msgid "Resize Images" +msgstr "Ridimensiona immagini" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:2 msgid "New dimensions" msgstr "Nuove dimensioni" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 -msgid "Resize Images" -msgstr "Ridimensiona immagini" - -#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:4 msgid "_Height:" msgstr "Alte_zza:" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:5 msgid "_Preserve original aspect ratios" msgstr "_Preservare le proporzioni originali" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:12 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 +#: ../gthumb/gth-main-default-metadata.c:49 +msgid "Format" +msgstr "Formato" + +#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 msgid "pixel" msgstr "pixel" -#: ../extensions/resize_images/dlg-resize-images.c:168 -msgid "Resizing images" -msgstr "Ridimensionamento immagini" - -#: ../extensions/resize_images/dlg-resize-images.c:412 +#: ../extensions/resize_images/dlg-resize-images.c:423 msgid "Keep the original format" msgstr "Mantieni il formato originale" @@ -4226,16 +4322,16 @@ #. Translators: This is not a verb, it's a name as in "the search properties". #: ../extensions/search/callbacks.c:174 -#: ../extensions/search/search.extension.in.in.h:2 +#: ../extensions/search/search.extension.in.in.h:1 msgid "Search" -msgstr "Cerca" +msgstr "Ricerca" -#: ../extensions/search/gth-search-editor.c:111 +#: ../extensions/search/gth-search-editor.c:112 #: ../gthumb/gth-filter-editor-dialog.c:165 msgid "all the following rules" msgstr "tutte le regole seguenti" -#: ../extensions/search/gth-search-editor.c:112 +#: ../extensions/search/gth-search-editor.c:113 #: ../gthumb/gth-filter-editor-dialog.c:166 msgid "any of the following rules" msgstr "una qualsiasi delle regole seguenti" @@ -4253,71 +4349,108 @@ msgid "Cancel the operation" msgstr "Annulla l'operazione" -#: ../extensions/search/search.extension.in.in.h:1 +#: ../extensions/search/search.extension.in.in.h:2 msgid "File search tool." msgstr "Strumento di ricerca file." +#: ../extensions/selections/callbacks.c:77 +msgid "Add to _Selection" +msgstr "Aggiungi alla _selezione" + +#: ../extensions/selections/callbacks.c:86 +msgid "Selection 1" +msgstr "Selezione 1" + +#: ../extensions/selections/callbacks.c:91 +msgid "Selection 2" +msgstr "Selezione 2" + +#: ../extensions/selections/callbacks.c:96 +msgid "Selection 3" +msgstr "Selezione 3" + +#: ../extensions/selections/callbacks.c:285 +#, c-format +msgid "" +"Use Alt-%d to add files to this selection, Ctrl-%d to view this selection." +msgstr "" +"Usare Alt-%d per aggiungere file alla selezione, Ctrl-%d per visualizzarla." + +#: ../extensions/selections/gth-selections-manager.c:239 +#, c-format +msgid "Selection %d" +msgstr "Selezione %d" + +#: ../extensions/selections/gth-selections-manager.c:242 +#: ../extensions/selections/selections.extension.in.in.h:1 +msgid "Selections" +msgstr "Selezioni" + +#: ../extensions/selections/selections.extension.in.in.h:2 +msgid "Advanced file selection." +msgstr "Selezione avanzata dei file." + #: ../extensions/slideshow/callbacks.c:56 msgid "_Slideshow" -msgstr "_Diapositiva" +msgstr "_Diapositive" #: ../extensions/slideshow/callbacks.c:57 msgid "View as a slideshow" -msgstr "Visualizza come una diapositiva" +msgstr "Visualizza come delle diapositive" #: ../extensions/slideshow/callbacks.c:410 -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 #: ../extensions/slideshow/preferences.c:162 #: ../extensions/slideshow/slideshow.extension.in.in.h:1 msgid "Slideshow" -msgstr "Diapositiva" +msgstr "Diapositive" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:1 -msgid "Add files to the playlist" -msgstr "Aggiunge dei file alla scaletta" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 -msgid "Playlist" -msgstr "Scaletta" +msgid "_Personalize" +msgstr "_Personalizzare" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:3 -msgid "R_andom order" -msgstr "Ordine c_asuale" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:4 -msgid "Remove the selected files" -msgstr "Rimuove i file selezionati" +msgid "_Transition effect:" +msgstr "Effetto di _transizione:" #. This is the first part of the phrase "change automatically, every x seconds", where x is an input control that let the user choose a value. -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 msgid "_Change automatically, every" msgstr "_Cambiare automaticamente ogni" +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 +msgid "_Restart when finished" +msgstr "_Ricominciare quando è terminata" + #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:8 -msgid "_Personalize" -msgstr "_Personalizzare" +msgid "R_andom order" +msgstr "Ordine c_asuale" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:9 -msgid "_Restart when finished" -msgstr "_Ricominciare quando è terminata" +msgid "Playlist" +msgstr "Scaletta" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:10 -msgid "_Transition effect:" -msgstr "Effetto di _transizione:" +msgid "Add files to the playlist" +msgstr "Aggiunge dei file alla scaletta" + +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:11 +msgid "Remove the selected files" +msgstr "Rimuove i file selezionati" -#: ../extensions/slideshow/gth-slideshow.c:229 +#: ../extensions/slideshow/gth-slideshow.c:231 msgid "Playing slideshow" -msgstr "Riproduzione diapositiva" +msgstr "Riproduzione diapositive" -#: ../extensions/slideshow/gth-slideshow-preferences.c:183 +#: ../extensions/slideshow/gth-slideshow-preferences.c:184 msgid "Choose the files to play" msgstr "Scegli i file da riprodurre" -#: ../extensions/slideshow/gth-slideshow-preferences.c:192 +#: ../extensions/slideshow/gth-slideshow-preferences.c:193 msgid "Audio files" msgstr "File audio" -#: ../extensions/slideshow/gth-slideshow-preferences.c:258 +#: ../extensions/slideshow/gth-slideshow-preferences.c:259 msgid "Random" msgstr "Casuale" @@ -4343,7 +4476,7 @@ #: ../extensions/slideshow/main.c:313 msgid "Flip page" -msgstr "Pagina capovolta" +msgstr "Gira pagina" #: ../extensions/slideshow/main.c:319 msgid "Cube from right" @@ -4355,7 +4488,7 @@ #: ../extensions/slideshow/slideshow.extension.in.in.h:2 msgid "View images as a slideshow." -msgstr "Visualizza le immagini come una diapositiva." +msgstr "Visualizza le immagini come delle diapositive." #: ../extensions/webalbums/callbacks.c:71 msgid "_Web Album..." @@ -4413,111 +4546,114 @@ msgid "View the previous page" msgstr "Visualizza la precedente pagina" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:5 -#, no-c-format -msgid "%P" -msgstr "%P" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:1 +msgid "All images on a single image" +msgstr "Tutte le immagini in una singola immagine" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:2 msgid "Adapts to the window width" msgstr "Adatta alla larghezza della finestra" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:8 -msgid "All images on a single image" -msgstr "Tutte le immagini in una singola immagine" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 +msgid "Web Album" +msgstr "Album web" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 -msgid "Image Attributes" -msgstr "Attributi dell'immagine" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:5 +#, no-c-format +msgid "%P" +msgstr "%P" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 -msgid "Image Page" -msgstr "Pagina dell'immagine" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 +msgid "_Copy originals to destination" +msgstr "_Copiare gli originali nella destinazione" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 +msgid "_Adapt to the window width " +msgstr "_Adattare alla larghezza della finestra" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 msgid "Index Page" msgstr "Pagina indice" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 -msgid "Show the description, if available" -msgstr "Mostrare la descrizione se disponibile" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 -msgid "Show the following attributes:" -msgstr "Mostrare i seguenti attributi:" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 +msgid "Thumbnail Caption" +msgstr "Didascalia della miniatura" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 msgid "The current image number" msgstr "Il numero dell'immagine attuale" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 -msgid "The file comment" -msgstr "Il commento del file" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 msgid "The total number of images" msgstr "Il numero totale delle immagini" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 -msgid "Thumbnail Caption" -msgstr "Didascalia della miniatura" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 +msgid "The file comment" +msgstr "Il commento del file" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 -msgid "Web Album" -msgstr "Album web" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 +msgid "Image Page" +msgstr "Pagina dell'immagine" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 -msgid "_Adapt to the window width " -msgstr "_Adattare alla larghezza della finestra" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 +msgid "Show the description, if available" +msgstr "Mostrare la descrizione se disponibile" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 -msgid "_Copy originals to destination" -msgstr "_Copiare gli originali nella destinazione" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 +msgid "Show the following attributes:" +msgstr "Mostrare i seguenti attributi:" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:39 -msgid "_Resize if larger than:" -msgstr "_Ridimensionare se più grande di:" +msgid "Image Attributes" +msgstr "Attributi dell'immagine" -#: ../extensions/webalbums/gth-web-exporter.c:1802 +#: ../extensions/webalbums/gth-web-exporter.c:1800 msgid "Could not show the destination" msgstr "Impossibile mostrare la destinazione" -#: ../extensions/webalbums/gth-web-exporter.c:1838 +#: ../extensions/webalbums/gth-web-exporter.c:1836 msgid "The album has been created successfully." msgstr "L'album è stato creato con successo." -#: ../extensions/webalbums/gth-web-exporter.c:2106 -#: ../extensions/webalbums/gth-web-exporter.c:2133 +#: ../extensions/webalbums/gth-web-exporter.c:2104 +#: ../extensions/webalbums/gth-web-exporter.c:2132 msgid "Saving thumbnails" msgstr "Salvataggio miniature" -#: ../extensions/webalbums/gth-web-exporter.c:2161 +#: ../extensions/webalbums/gth-web-exporter.c:2160 msgid "Saving HTML pages: Images" -msgstr "Salvataggio pagine HTML: Immagini" +msgstr "Salvataggio pagine HTML: immagini" -#: ../extensions/webalbums/gth-web-exporter.c:2219 +#: ../extensions/webalbums/gth-web-exporter.c:2218 msgid "Saving HTML pages: Indexes" -msgstr "Salvataggio pagine HTML: Indici" +msgstr "Salvataggio pagine HTML: indici" -#: ../extensions/webalbums/gth-web-exporter.c:2502 +#: ../extensions/webalbums/gth-web-exporter.c:2503 msgid "Copying original images" msgstr "Copia immagini originali" -#: ../extensions/webalbums/gth-web-exporter.c:2929 +#: ../extensions/webalbums/gth-web-exporter.c:2963 msgid "Could not find the style folder" msgstr "Impossibile trovare la cartella dello stile" -#: ../extensions/webalbums/gth-web-exporter.c:2967 +#: ../extensions/webalbums/gth-web-exporter.c:3001 msgid "Could not create a temporary folder" msgstr "Impossibile creare una cartella temporanea" #: ../extensions/webalbums/webalbums.extension.in.in.h:1 +msgid "Web Albums" +msgstr "Album web" + +#: ../extensions/webalbums/webalbums.extension.in.in.h:2 msgid "Create static web albums." msgstr "Crea degli album web statici." -#: ../extensions/webalbums/webalbums.extension.in.in.h:2 -msgid "Web Albums" -msgstr "Album web" +#: ../gthumb/dlg-location.c:200 ../gthumb/gth-browser.c:1396 +#: ../gthumb/gth-browser.c:1969 ../gthumb/gth-browser.c:6214 +#: ../gthumb/gth-browser.c:6233 ../gthumb/gth-browser.c:6257 +#, c-format +msgid "Could not load the position \"%s\"" +msgstr "Impossibile caricare la posizione «%s»" #: ../gthumb/dlg-personalize-filters.c:237 msgid "Filter" @@ -4525,7 +4661,7 @@ #: ../gthumb/dlg-personalize-filters.c:315 msgid "Could not save the filter" -msgstr "Impossibile salvare i filtri" +msgstr "Impossibile salvare il filtro" #: ../gthumb/dlg-personalize-filters.c:358 msgid "New Filter" @@ -4535,7 +4671,7 @@ msgid "Edit Filter" msgstr "Modifica filtro" -#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:269 +#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:277 msgid "All" msgstr "Tutte" @@ -4601,71 +4737,31 @@ msgid "_Restart" msgstr "_Riavvia" -#: ../gthumb/eggfileformatchooser.c:236 -#, c-format -msgid "File _Format: %s" -msgstr "_Formato del file: %s" - -#: ../gthumb/eggfileformatchooser.c:397 ../gthumb/gth-main-default-tests.c:197 -msgid "All Files" -msgstr "Tutti i file" - -#: ../gthumb/eggfileformatchooser.c:398 -msgid "All Supported Files" -msgstr "Tutti i file supportati" - -#: ../gthumb/eggfileformatchooser.c:407 -msgid "By Extension" -msgstr "Per estensione" - -#: ../gthumb/eggfileformatchooser.c:422 -msgid "File Format" -msgstr "Formato del file" - -#: ../gthumb/eggfileformatchooser.c:440 -msgid "Extension(s)" -msgstr "Estensioni" - -#: ../gthumb/eggfileformatchooser.c:681 -#, c-format -msgid "" -"The program was not able to find out the file format you want to use for `%" -"s'. Please make sure to use a known extension for that file or manually " -"choose a file format from the list below." -msgstr "" -"Il programma non è stato in grado di trovare il formato di file che si vuole " -"usare per «%s». Assicurarsi di usare un'estensione conosciuta per questo file " -"oppure scegliere manualmente un formato di file dall'elenco sottostante." - -#: ../gthumb/eggfileformatchooser.c:688 -msgid "File format not recognized" -msgstr "Formato di file non riconosciuto" - #. For translators: This is a progress size indicator, for example: 230.4 MB of 512.8 MB -#: ../gthumb/gio-utils.c:1355 +#: ../gthumb/gio-utils.c:1351 #, c-format msgid "%s of %s" msgstr "%s di %s" -#: ../gthumb/gio-utils.c:1390 +#: ../gthumb/gio-utils.c:1386 #, c-format msgid "Moving \"%s\" to \"%s\"" msgstr "Spostamento di «%s» in «%s»" -#: ../gthumb/gio-utils.c:1392 +#: ../gthumb/gio-utils.c:1388 #, c-format msgid "Copying \"%s\" to \"%s\"" msgstr "Copia di «%s» in «%s»" -#: ../gthumb/gio-utils.c:1733 +#: ../gthumb/gio-utils.c:1750 msgid "Moving files" msgstr "Spostamento file" -#: ../gthumb/gio-utils.c:1733 +#: ../gthumb/gio-utils.c:1750 msgid "Copying files" msgstr "Copia file" -#: ../gthumb/gio-utils.c:1734 +#: ../gthumb/gio-utils.c:1751 msgid "Getting file information" msgstr "Recupero informazioni file" @@ -4675,7 +4771,7 @@ #. * the separator that your locale uses or use "%Id" instead #. * of "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2844 +#: ../gthumb/glib-utils.c:3068 #, c-format msgctxt "long time format" msgid "%d:%02d:%02d" @@ -4687,13 +4783,13 @@ #. * separator that your locale uses or use "%Id" instead of #. * "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2853 +#: ../gthumb/glib-utils.c:3077 #, c-format msgctxt "short time format" msgid "%d:%02d" msgstr "%d.%02d" -#: ../gthumb/gth-browser-actions-callbacks.c:391 +#: ../gthumb/gth-browser-actions-callbacks.c:414 msgid "" "gthumb is free software; you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -4705,7 +4801,7 @@ "Foundation; sia la versione 2 della licenza, o (a scelta) una qualsiasi " "versione successiva." -#: ../gthumb/gth-browser-actions-callbacks.c:395 +#: ../gthumb/gth-browser-actions-callbacks.c:418 msgid "" "gthumb is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -4714,22 +4810,22 @@ msgstr "" "gthumb è distribuito nella speranza che possa essere utile, ma SENZA ALCUNA " "GARANZIA; senza neppure la garanzia implicita di COMMERCIABILITÁ o IDONEITÀ " -"PER UN PARTICOLARE SCOPO. Vedere la GNU General Public License per maggiori " +"PER UN PARTICOLARE SCOPO. Vedere la GNU General Public License per maggiori " "dettagli." -#: ../gthumb/gth-browser-actions-callbacks.c:399 +#: ../gthumb/gth-browser-actions-callbacks.c:422 msgid "" "You should have received a copy of the GNU General Public License along with " "gthumb. If not, see http://www.gnu.org/licenses/." msgstr "" "Si dovrebbe aver ricevuto una copia della GNU General Public License insieme " -"a gthumb. In caso contrario, consultare http://www.gnu.org/licenses/." +"a gthumb. In caso contrario, consultare http://www.gnu.org/licenses/." -#: ../gthumb/gth-browser-actions-callbacks.c:418 +#: ../gthumb/gth-browser-actions-callbacks.c:441 msgid "An image viewer and browser for GNOME." msgstr "Un visualizzatore e navigatore di immagini per GNOME." -#: ../gthumb/gth-browser-actions-callbacks.c:421 +#: ../gthumb/gth-browser-actions-callbacks.c:444 msgid "translator_credits" msgstr "" "Paolo Bacchilega \n" @@ -4763,7 +4859,7 @@ #: ../gthumb/gth-browser-actions-entries.h:38 msgid "E_xport To" -msgstr "E_sporta a" +msgstr "E_sporta in" #: ../gthumb/gth-browser-actions-entries.h:41 msgid "New _Window" @@ -4791,7 +4887,7 @@ #: ../gthumb/gth-browser-actions-entries.h:101 msgid "_Filter..." -msgstr "_Filtro..." +msgstr "_Filtra..." #: ../gthumb/gth-browser-actions-entries.h:108 msgid "Stop loading the current location" @@ -4817,193 +4913,196 @@ msgid "Leave Fullscreen" msgstr "Finestra normale" -#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3575 +#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3841 msgid "Go to the previous visited location" msgstr "Va alla precedente posizione visitata" -#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3593 +#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3859 msgid "Go to the next visited location" msgstr "Va alla successiva posizione visitata" -#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3611 +#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3877 msgid "Go up one level" msgstr "Sale di un livello" -#: ../gthumb/gth-browser-actions-entries.h:167 ../gthumb/gth-browser.c:672 +#: ../gthumb/gth-browser-actions-entries.h:161 +msgid "_Location..." +msgstr "_Posizione..." + +#: ../gthumb/gth-browser-actions-entries.h:162 +msgid "Specify a location to open" +msgstr "Specifica una posizione da aprire" + +#: ../gthumb/gth-browser-actions-entries.h:173 ../gthumb/gth-browser.c:721 msgid "_Delete History" msgstr "_Elimina cronologia" -#: ../gthumb/gth-browser-actions-entries.h:168 +#: ../gthumb/gth-browser-actions-entries.h:174 msgid "Delete the list of visited locations" msgstr "Elimina l'elenco delle posizioni visitate" -#: ../gthumb/gth-browser-actions-entries.h:174 +#: ../gthumb/gth-browser-actions-entries.h:180 msgid "View the folders" msgstr "Visualizza le cartelle" -#: ../gthumb/gth-browser-actions-entries.h:180 +#: ../gthumb/gth-browser-actions-entries.h:186 msgid "Show information about gthumb" msgstr "Mostra le informazioni sull'applicazione" -#: ../gthumb/gth-browser-actions-entries.h:185 +#: ../gthumb/gth-browser-actions-entries.h:191 msgid "Contents" msgstr "Sommario" -#: ../gthumb/gth-browser-actions-entries.h:186 +#: ../gthumb/gth-browser-actions-entries.h:192 msgid "Display the gthumb Manual" msgstr "Visualizza il manuale dell'applicazione" -#: ../gthumb/gth-browser-actions-entries.h:191 +#: ../gthumb/gth-browser-actions-entries.h:197 msgid "_Keyboard Shortcuts" msgstr "Scorciatoie da _tastiera" -#: ../gthumb/gth-browser-actions-entries.h:200 +#: ../gthumb/gth-browser-actions-entries.h:203 +#: ../gthumb/gth-browser-actions-entries.h:257 +msgid "Edit" +msgstr "Modifica" + +#: ../gthumb/gth-browser-actions-entries.h:204 +#: ../gthumb/gth-browser-actions-entries.h:258 +msgid "Edit file" +msgstr "Modifica il file" + +#: ../gthumb/gth-browser-actions-entries.h:212 msgid "_Toolbar" msgstr "Barra degli _strumenti" -#: ../gthumb/gth-browser-actions-entries.h:201 +#: ../gthumb/gth-browser-actions-entries.h:213 msgid "View or hide the toolbar of this window" msgstr "Visualizza o nasconde la barra degli strumenti di questa finestra" -#: ../gthumb/gth-browser-actions-entries.h:205 +#: ../gthumb/gth-browser-actions-entries.h:217 msgid "_Statusbar" msgstr "Barra di s_tato" -#: ../gthumb/gth-browser-actions-entries.h:206 +#: ../gthumb/gth-browser-actions-entries.h:218 msgid "View or hide the statusbar of this window" msgstr "Visualizza o nasconde la barra di stato di questa finestra" -#: ../gthumb/gth-browser-actions-entries.h:210 +#: ../gthumb/gth-browser-actions-entries.h:222 msgid "_Filterbar" msgstr "Barra dei f_iltri" -#: ../gthumb/gth-browser-actions-entries.h:211 +#: ../gthumb/gth-browser-actions-entries.h:223 msgid "View or hide the filterbar of this window" msgstr "Visualizza o nasconde la barra dei filtri di questa finestra" -#: ../gthumb/gth-browser-actions-entries.h:215 +#: ../gthumb/gth-browser-actions-entries.h:227 msgid "_Sidebar" msgstr "Barra _laterale" -#: ../gthumb/gth-browser-actions-entries.h:216 +#: ../gthumb/gth-browser-actions-entries.h:228 msgid "View or hide the sidebar of this window" msgstr "Visualizza o nasconde la barra laterale di questa finestra" -#: ../gthumb/gth-browser-actions-entries.h:220 +#: ../gthumb/gth-browser-actions-entries.h:232 msgid "_Thumbnail Pane" msgstr "Pannello delle _miniature" -#: ../gthumb/gth-browser-actions-entries.h:221 +#: ../gthumb/gth-browser-actions-entries.h:233 msgid "View or hide the thumbnail pane in viewer mode" msgstr "" "Visualizza o nasconde il pannello delle miniature nella modalità " "visualizzatore" -#: ../gthumb/gth-browser-actions-entries.h:225 +#: ../gthumb/gth-browser-actions-entries.h:237 msgid "_Thumbnails" msgstr "_Miniature" -#: ../gthumb/gth-browser-actions-entries.h:226 +#: ../gthumb/gth-browser-actions-entries.h:238 msgid "View thumbnails" msgstr "Visualizza le miniature" -#: ../gthumb/gth-browser-actions-entries.h:230 +#: ../gthumb/gth-browser-actions-entries.h:242 msgid "_Hidden Files" msgstr "File _nascosti" -#: ../gthumb/gth-browser-actions-entries.h:231 +#: ../gthumb/gth-browser-actions-entries.h:243 msgid "Show hidden files and folders" msgstr "Mostra i file e le cartelle nascoste" -#: ../gthumb/gth-browser-actions-entries.h:236 -#: ../gthumb/gth-browser-actions-entries.h:241 +#: ../gthumb/gth-browser-actions-entries.h:248 +#: ../gthumb/gth-browser-actions-entries.h:253 msgid "View file properties" msgstr "Visualizza le proprietà dei file" -#: ../gthumb/gth-browser-actions-entries.h:245 -msgid "Edit" -msgstr "Modifica" - -#: ../gthumb/gth-browser-actions-entries.h:246 -msgid "Edit file" -msgstr "Modifica il file" - -#: ../gthumb/gth-browser-actions-entries.h:250 +#: ../gthumb/gth-browser-actions-entries.h:262 msgid "_Fit Window to Image" -msgstr "A_dattare la finestra all'Immagine" +msgstr "A_dattare la finestra all'immagine" -#: ../gthumb/gth-browser-actions-entries.h:251 +#: ../gthumb/gth-browser-actions-entries.h:263 msgid "Resize the window to the size of the image" msgstr "Ridimensiona la finestra alla dimensione dell'immagine" -#: ../gthumb/gth-browser.c:369 +#: ../gthumb/gth-browser.c:418 #, c-format msgid "Open %s" msgstr "Apri %s" -#: ../gthumb/gth-browser.c:509 +#: ../gthumb/gth-browser.c:558 msgid "[modified]" msgstr "[modificata]" -#: ../gthumb/gth-browser.c:996 +#: ../gthumb/gth-browser.c:1117 #, c-format msgid "%d file selected (%s)" msgid_plural "%d files selected (%s)" msgstr[0] "%d file selezionato (%s)" msgstr[1] "%d file selezionati (%s)" -#: ../gthumb/gth-browser.c:1031 +#: ../gthumb/gth-browser.c:1152 #, c-format msgid "%s of free space" msgstr "%s di spazio libero" -#: ../gthumb/gth-browser.c:1240 ../gthumb/gth-browser.c:1799 -#: ../gthumb/gth-browser.c:5883 ../gthumb/gth-browser.c:5902 -#: ../gthumb/gth-browser.c:5927 -#, c-format -msgid "Could not load the position \"%s\"" -msgstr "Impossibile caricare la posizione «%s»" - -#: ../gthumb/gth-browser.c:1895 ../gthumb/gth-browser.c:1922 +#: ../gthumb/gth-browser.c:2073 ../gthumb/gth-browser.c:2100 #, c-format msgid "No suitable module found for %s" msgstr "Nessun modulo idoneo trovato per %s" -#: ../gthumb/gth-browser.c:2042 +#: ../gthumb/gth-browser.c:2219 #, c-format msgid "Save changes to file '%s'?" msgstr "Salvare le modifiche al file «%s»?" -#: ../gthumb/gth-browser.c:2047 +#: ../gthumb/gth-browser.c:2224 msgid "If you don't save, changes to the file will be permanently lost." msgstr "Se non si salva, le modifiche al file saranno perse definitivamente." -#: ../gthumb/gth-browser.c:2048 +#: ../gthumb/gth-browser.c:2225 msgid "Do _Not Save" msgstr "_Non salvare" -#: ../gthumb/gth-browser.c:2818 ../gthumb/gth-source-tree.c:182 +#: ../gthumb/gth-browser.c:3020 ../gthumb/gth-source-tree.c:182 msgid "Could not change name" msgstr "Impossibile cambiare il nome" -#: ../gthumb/gth-browser.c:3247 ../gthumb/gth-main-default-metadata.c:41 +#: ../gthumb/gth-browser.c:3451 ../gthumb/gth-main-default-metadata.c:41 msgid "Modified" msgstr "Modificato" -#: ../gthumb/gth-browser.c:3576 ../gthumb/gth-browser.c:3594 +#: ../gthumb/gth-browser.c:3842 ../gthumb/gth-browser.c:3860 msgid "View the list of visited locations" msgstr "Visualizza l'elenco delle posizioni visitate" -#: ../gthumb/gth-browser.c:3612 +#: ../gthumb/gth-browser.c:3878 msgid "View the list of upper locations" msgstr "Visualizza l'elenco delle posizioni superiori" -#: ../gthumb/gth-browser.c:5884 +#: ../gthumb/gth-browser.c:6215 #, c-format msgid "File type not supported" msgstr "Tipo di file non supportato" -#: ../gthumb/gth-browser.c:5928 +#: ../gthumb/gth-browser.c:6258 #, c-format msgid "No suitable module found" msgstr "Nessun modulo idoneo trovato" @@ -5013,43 +5112,47 @@ msgid "Could not open the module `%s`: %s" msgstr "Impossibile aprire il modulo «%s»: %s" -#: ../gthumb/gth-extensions.c:733 +#: ../gthumb/gth-extensions.c:754 #, c-format msgid "The extension '%1$s' is required by the extension '%2$s'" msgstr "L'estensione «%1$s» è richiesta dall'estensione «%2$s»" -#: ../gthumb/gth-file-source-vfs.c:117 +#: ../gthumb/gth-file-chooser-dialog.c:144 +msgid "All Supported Files" +msgstr "Tutti i file supportati" + +#: ../gthumb/gth-file-source-vfs.c:121 msgid "Home Folder" msgstr "Cartella home" -#: ../gthumb/gth-file-source-vfs.c:122 +#: ../gthumb/gth-file-source-vfs.c:126 msgid "File System" msgstr "File system" -#: ../gthumb/gth-file-source-vfs.c:735 +#: ../gthumb/gth-file-source-vfs.c:739 msgid "" "The files cannot be moved to the Trash. Do you want to delete them " "permanently?" msgstr "" "I file non possono essere spostati nel cestino. Eliminarli definitivamente?" -#: ../gthumb/gth-file-source-vfs.c:746 +#: ../gthumb/gth-file-source-vfs.c:750 msgid "Could not move the files to the Trash" msgstr "Impossibile spostare i file nel cestino" -#: ../gthumb/gth-file-source-vfs.c:793 +#: ../gthumb/gth-file-source-vfs.c:797 #, c-format msgid "Are you sure you want to move \"%s\" to trash?" msgstr "Spostare «%s» nel cestino?" -#: ../gthumb/gth-file-source-vfs.c:797 +#: ../gthumb/gth-file-source-vfs.c:801 #, c-format msgid "Are you sure you want to move to trash the %'d selected file?" msgid_plural "Are you sure you want to move to trash the %'d selected files?" msgstr[0] "Spostare nel cestino %'d file selezionato?" msgstr[1] "Spostare nel cestino %'d file selezionati?" -#: ../gthumb/gth-file-source-vfs.c:840 +#: ../gthumb/gth-file-source-vfs.c:844 #, c-format msgid "Are you sure you want to permanently delete the %'d selected file?" msgid_plural "" @@ -5057,7 +5160,7 @@ msgstr[0] "Eliminare definitivamente %'d file selezionato?" msgstr[1] "Eliminare definitivamente %'d file selezionati?" -#: ../gthumb/gth-filterbar.c:405 +#: ../gthumb/gth-filterbar.c:413 msgid "Hide the filterbar" msgstr "Nasconde la barra dei filtri" @@ -5077,7 +5180,7 @@ msgstr "GB" #. "files" label -#: ../gthumb/gth-filter.c:289 ../gthumb/gth-filter-editor-dialog.c:177 +#: ../gthumb/gth-filter.c:286 ../gthumb/gth-filter-editor-dialog.c:177 msgid "files" msgstr "file" @@ -5094,50 +5197,59 @@ msgid "No limit specified" msgstr "Nessun limite specificato" -#: ../gthumb/gth-folder-tree.c:857 -msgid "Loading..." -msgstr "Caricamento..." - -#: ../gthumb/gth-folder-tree.c:1100 +#: ../gthumb/gth-folder-tree.c:1369 msgid "(Open Parent)" msgstr "(Apri genitore)" -#: ../gthumb/gth-histogram-view.c:826 +#: ../gthumb/gth-histogram-view.c:825 msgid "Linear scale" msgstr "Scala lineare" -#: ../gthumb/gth-histogram-view.c:838 +#: ../gthumb/gth-histogram-view.c:837 msgid "Logarithmic scale" msgstr "Scala logaritmica" -#: ../gthumb/gth-histogram-view.c:858 +#: ../gthumb/gth-histogram-view.c:857 msgid "Channel:" msgstr "Canali:" -#: ../gthumb/gth-histogram-view.c:890 +#: ../gthumb/gth-histogram-view.c:878 msgid "Value" msgstr "Valore" -#: ../gthumb/gth-histogram-view.c:896 +#: ../gthumb/gth-histogram-view.c:883 msgid "Red" msgstr "Rosso" -#: ../gthumb/gth-histogram-view.c:902 +#: ../gthumb/gth-histogram-view.c:888 msgid "Green" msgstr "Verde" -#: ../gthumb/gth-histogram-view.c:908 +#: ../gthumb/gth-histogram-view.c:893 msgid "Blue" msgstr "Blu" -#: ../gthumb/gth-histogram-view.c:914 +#: ../gthumb/gth-histogram-view.c:898 msgid "Alpha" msgstr "Alfa" -#: ../gthumb/gth-histogram-view.c:921 +#: ../gthumb/gth-histogram-view.c:904 msgid "RGB" msgstr "RGB" +#: ../gthumb/gth-image-list-task.c:141 +msgid "Could not rename the file" +msgstr "Impossibile rinominare il file" + +#: ../gthumb/gth-image-saver.c:39 +msgid "No options available for this file type" +msgstr "Nessuna opzione disponibile per questo tipo di file" + +#: ../gthumb/gth-image-saver.c:185 +#, c-format +msgid "Could not find a suitable module to save the image as \"%s\"" +msgstr "Impossibile trovare un modulo idoneo per salvare l'immagine come «%s»" + #: ../gthumb/gth-load-file-data-task.c:108 msgid "Reading file information" msgstr "Lettura informazioni del file" @@ -5151,7 +5263,7 @@ msgstr "Nome" #: ../gthumb/gth-main-default-metadata.c:40 -#: ../gthumb/gth-main-default-tests.c:248 +#: ../gthumb/gth-main-default-tests.c:284 msgid "Size" msgstr "Dimensione" @@ -5191,35 +5303,31 @@ msgid "dimensions" msgstr "dimensioni" -#: ../gthumb/gth-main-default-tests.c:225 +#: ../gthumb/gth-main-default-tests.c:233 +msgid "All Files" +msgstr "Tutti i file" + +#: ../gthumb/gth-main-default-tests.c:261 msgid "Media" msgstr "Multimediale" -#: ../gthumb/gth-main-default-tests.c:232 +#: ../gthumb/gth-main-default-tests.c:268 msgid "Text Files" msgstr "File di testo" -#: ../gthumb/gth-main-default-tests.c:240 +#: ../gthumb/gth-main-default-tests.c:276 msgid "Filename" msgstr "Nome del file" -#: ../gthumb/gth-main-default-tests.c:272 +#: ../gthumb/gth-main-default-tests.c:308 msgid "Title (embedded)" msgstr "Titolo (incorporato)" -#: ../gthumb/gth-main-default-tests.c:278 +#: ../gthumb/gth-main-default-tests.c:316 msgid "Description (embedded)" msgstr "Descrizione (incorporata)" -#: ../gthumb/gth-pixbuf-list-task.c:139 -msgid "Could not rename the file" -msgstr "Impossibile rinominare il file" - -#: ../gthumb/gth-pixbuf-saver.c:34 -msgid "No options available for this file type" -msgstr "Nessuna opzione disponibile per questo tipo di file" - -#: ../gthumb/gth-progress-dialog.c:142 +#: ../gthumb/gth-progress-dialog.c:146 msgid "Cancel operation" msgstr "Annulla operazione" @@ -5227,60 +5335,66 @@ msgid "Saving file information" msgstr "Salvataggio informazioni del file" -#: ../gthumb/gth-tags-entry.c:388 +#. Translators: %s is a filename +#: ../gthumb/gth-save-image-task.c:160 +#, c-format +msgid "Saving '%s'" +msgstr "Salvataggio di «%s»" + +#: ../gthumb/gth-tags-entry.c:390 #, c-format msgid "Create tag «%s»" msgstr "Crea etichetta «%s»" -#: ../gthumb/gth-tags-entry.c:743 +#: ../gthumb/gth-tags-entry.c:814 msgid "Show all the tags" msgstr "Mostra tutte le etichette" -#: ../gthumb/gth-tags-file.c:234 +#: ../gthumb/gth-tags-file.c:235 msgid "Holidays" msgstr "Vacanze" -#: ../gthumb/gth-tags-file.c:235 +#: ../gthumb/gth-tags-file.c:236 msgid "Temporary" msgstr "Temporaneo" -#: ../gthumb/gth-tags-file.c:236 +#: ../gthumb/gth-tags-file.c:237 msgid "Screenshots" msgstr "Schermate" -#: ../gthumb/gth-tags-file.c:237 +#: ../gthumb/gth-tags-file.c:238 msgid "Science" msgstr "Scienza" -#: ../gthumb/gth-tags-file.c:238 +#: ../gthumb/gth-tags-file.c:239 msgid "Favorite" msgstr "Preferito" -#: ../gthumb/gth-tags-file.c:239 +#: ../gthumb/gth-tags-file.c:240 msgid "Important" msgstr "Importante" -#: ../gthumb/gth-tags-file.c:240 +#: ../gthumb/gth-tags-file.c:241 msgid "GNOME" msgstr "GNOME" -#: ../gthumb/gth-tags-file.c:241 +#: ../gthumb/gth-tags-file.c:242 msgid "Games" msgstr "Giochi" -#: ../gthumb/gth-tags-file.c:242 +#: ../gthumb/gth-tags-file.c:243 msgid "Party" msgstr "Festa" -#: ../gthumb/gth-tags-file.c:243 +#: ../gthumb/gth-tags-file.c:244 msgid "Birthday" msgstr "Compleanno" -#: ../gthumb/gth-tags-file.c:244 +#: ../gthumb/gth-tags-file.c:245 msgid "Astronomy" msgstr "Astronomia" -#: ../gthumb/gth-tags-file.c:245 +#: ../gthumb/gth-tags-file.c:246 msgid "Family" msgstr "Famiglia" @@ -5298,18 +5412,18 @@ msgid "is not" msgstr "non è" -#: ../gthumb/gth-test-category.c:386 ../gthumb/gth-test-simple.c:812 +#: ../gthumb/gth-test-category.c:407 ../gthumb/gth-test-simple.c:812 #: ../gthumb/gth-test-simple.c:838 ../gthumb/gth-test-simple.c:859 #: ../gthumb/gth-test-simple.c:885 #, c-format msgid "The test definition is incomplete" msgstr "La definizione del test non è completa" -#: ../gthumb/gth-test-selector.c:251 +#: ../gthumb/gth-test-selector.c:252 msgid "Add a new rule" msgstr "Aggiunge una nuova regola" -#: ../gthumb/gth-test-selector.c:262 +#: ../gthumb/gth-test-selector.c:263 msgid "Remove this rule" msgstr "Rimuove questa regola" @@ -5331,7 +5445,7 @@ #: ../gthumb/gth-test-simple.c:52 msgid "matches" -msgstr "rispetta" +msgstr "corrisponde" #: ../gthumb/gth-test-simple.c:56 msgid "is lower than" @@ -5353,11 +5467,11 @@ msgid "is after" msgstr "è dopo" -#: ../gthumb/gth-time-selector.c:474 +#: ../gthumb/gth-time-selector.c:478 msgid "Today" msgstr "Oggi" -#: ../gthumb/gth-time-selector.c:482 +#: ../gthumb/gth-time-selector.c:486 msgid "Now" msgstr "Ora" @@ -5369,55 +5483,50 @@ msgid "Close _All Windows" msgstr "Chiudi _tutte le finestre" -#: ../gthumb/gtk-utils.c:551 +#: ../gthumb/gtk-utils.c:490 msgid "Could not display help" msgstr "Impossibile mostrare il sommario" -#: ../gthumb/gtk-utils.c:868 ../gthumb/gtk-utils.c:875 +#: ../gthumb/gtk-utils.c:810 ../gthumb/gtk-utils.c:817 msgid "Could not launch the application" msgstr "Impossibile lanciare l'applicazione" -#: ../gthumb/gtk-utils.c:978 +#: ../gthumb/gtk-utils.c:920 msgid "_Copy Here" msgstr "_Copia qui" -#: ../gthumb/gtk-utils.c:983 +#: ../gthumb/gtk-utils.c:925 msgid "_Move Here" msgstr "_Sposta qui" -#: ../gthumb/gtk-utils.c:988 +#: ../gthumb/gtk-utils.c:930 msgid "_Link Here" msgstr "C_ollega qui" -#: ../gthumb/gtk-utils.c:997 +#: ../gthumb/gtk-utils.c:939 msgid "Cancel" msgstr "Annulla" -#: ../gthumb/main.c:59 +#: ../gthumb/main.c:61 msgid "Open a new window" msgstr "Apre una nuova finestra" -#: ../gthumb/main.c:63 +#: ../gthumb/main.c:65 msgid "Start in fullscreen mode" msgstr "Avvia in modalità a schermo intero" -#: ../gthumb/main.c:67 +#: ../gthumb/main.c:69 msgid "Automatically start a slideshow" -msgstr "Avvia automaticamente una diapositiva" +msgstr "Avvia automaticamente una proiezione di diapositive" -#: ../gthumb/main.c:71 +#: ../gthumb/main.c:73 msgid "Automatically import digital camera photos" msgstr "Importa automaticamente le foto dalla fotocamera digitale" -#: ../gthumb/main.c:75 +#: ../gthumb/main.c:77 msgid "Show version" msgstr "Mostra la versione" -#: ../gthumb/main.c:344 +#: ../gthumb/main.c:483 msgid "- Image browser and viewer" msgstr "- Navigatore e visualizzatore di immagini" - -#: ../gthumb/pixbuf-io.c:174 -#, c-format -msgid "Could not find a suitable module to save the image as \"%s\"" -msgstr "Impossibile trovare un modulo idoneo per salvare l'immagine come «%s»" diff -Nru gthumb-3.0.2/po/lt.po gthumb-3.2.3/po/lt.po --- gthumb-3.0.2/po/lt.po 2012-08-14 16:25:43.000000000 +0000 +++ gthumb-3.2.3/po/lt.po 2013-04-30 17:06:23.000000000 +0000 @@ -3,22 +3,24 @@ # This file is distributed under the same license as the gthumb package. # Žygimantas Beručka , 2004-2007, 2010. # Gintautas Miliauskas , 2008. -# Aurimas Černius , 2010. -# Aurimas Černius , 2010. +# Aurimas Černius , 2010, 2013. +# msgid "" msgstr "" "Project-Id-Version: lt\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gthumb&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-03-25 17:42+0000\n" -"PO-Revision-Date: 2012-04-05 21:31+0300\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=gthumb&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-02-16 21:21+0000\n" +"PO-Revision-Date: 2013-03-02 16:55+0200\n" "Last-Translator: Aurimas Černius \n" "Language-Team: Lietuvių \n" +"Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: lt\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Virtaal 0.6.1\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" +"%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Gtranslator 2.91.6\n" #: ../copy-n-paste/eggdesktopfile.c:165 #, c-format @@ -89,10 +91,8 @@ msgstr "Rodyti sesijos valdymo parinktis" #. manually set name and icon -#: ../data/gthumb.desktop.in.in.h:1 -#: ../gthumb/gth-browser.c:529 -#: ../gthumb/gth-progress-dialog.c:388 -#: ../gthumb/main.c:313 +#: ../data/gthumb.desktop.in.in.h:1 ../gthumb/gth-browser.c:578 +#: ../gthumb/gth-progress-dialog.c:390 ../gthumb/main.c:315 msgid "gThumb" msgstr "gThumb" @@ -125,15 +125,18 @@ msgstr "Importuoti fotografijas iš skaitmeninio fotoaparato" #: ../data/org.gnome.gthumb.gschema.xml.in.h:1 -msgid "Images over this size (in bytes) will not be thumbnailed. Use 0 if you want to generate thumbnails for all images." -msgstr "Paveikslėlių, viršijančių šį dydį (baitais), miniatiūros nebus rodomos. Naudokite 0, jeigu norite matyti visų paveikslėlių miniatiūras." +msgid "" +"Images over this size (in bytes) will not be thumbnailed. Use 0 if you want " +"to generate thumbnails for all images." +msgstr "" +"Paveikslėlių, viršijančių šį dydį (baitais), miniatiūros nebus rodomos. " +"Naudokite 0, jeigu norite matyti visų paveikslėlių miniatiūras." #: ../data/org.gnome.gthumb.gschema.xml.in.h:2 msgid "Whether to resize the window to fit the size of the image" msgstr "Ar keisti lango dydį pagal paveikslėlio dydį" #: ../data/org.gnome.gthumb.gschema.xml.in.h:3 -#| msgid "Open another window" msgid "Open files in the active window" msgstr "Atverti failus aktyviame lange" @@ -142,7 +145,6 @@ msgstr "Galimos reikšmės yra: white, black, checked, none." #: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:2 -#| msgid "Whether to reset the scrollbar positions after changing image" msgid "Whether to reset the scrollbars position after changing image" msgstr "Ar pakeitus paveikslėlį atstatyti slinkties juostų pozicijas" @@ -151,21 +153,22 @@ msgstr "Ar visada naudoti juodą foną." #: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:1 -#| msgid "Possible values are: png, jpeg." msgid "Possible values are: jpeg, jpg." msgstr "Galimos vertės yra: jpeg, jpg." #: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:2 -#| msgid "Possible values are: high, low." msgid "Possible values are: tiff, tif." msgstr "Galimos reikšmės yra: tiff, tif." #: ../data/org.gnome.gthumb.rename-series.gschema.xml.in.h:1 -msgid "Possible values include: general::unsorted, file::name, file::size, file::mtime, exif::photo::datetimeoriginal" -msgstr "Galimos reikšmės: general::unsorted, file::name, file::size, file::mtime, exif::photo::datetimeoriginal" +msgid "" +"Possible values include: general::unsorted, file::name, file::size, file::" +"mtime, exif::photo::datetimeoriginal" +msgstr "" +"Galimos reikšmės: general::unsorted, file::name, file::size, file::mtime, " +"exif::photo::datetimeoriginal" #: ../data/ui/extensions-preferences.ui.h:1 -#| msgid "Extensions" msgid "_Extensions:" msgstr "_Plėtiniai:" @@ -187,9 +190,8 @@ msgstr "_Ieškoti" #. limit label -#: ../data/ui/filter-editor.ui.h:3 -#: ../gthumb/gth-filter.c:270 -#: ../gthumb/gth-filter.c:342 +#: ../data/ui/filter-editor.ui.h:3 ../gthumb/gth-filter.c:269 +#: ../gthumb/gth-filter.c:337 msgid "_Limit to" msgstr "_Riboti iki" @@ -198,7 +200,6 @@ msgstr "pažymėtas" #: ../data/ui/histogram-info.ui.h:1 -#| msgid "Media" msgid "Mean:" msgstr "Vidurkis:" @@ -208,13 +209,11 @@ msgstr "Std. nuokr." #: ../data/ui/histogram-info.ui.h:4 -#| msgid "Media" msgid "Median:" msgstr "Mediana:" #. After the colon there is the total number of pixels #: ../data/ui/histogram-info.ui.h:6 -#| msgid "Pi_xels" msgid "Pixels:" msgstr "Pikseliai:" @@ -226,13 +225,11 @@ #. After the colon there is the percentile of selected pixels. #: ../data/ui/histogram-info.ui.h:10 -#| msgid "selected by" msgctxt "Pixels" msgid "Selected:" msgstr "Pažymėta:" #: ../data/ui/location.ui.h:1 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 msgid "_Location:" msgstr "_Vieta:" @@ -249,7 +246,6 @@ msgstr "Failo pavadinimas:" #: ../data/ui/overwrite-dialog.ui.h:4 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 #: ../extensions/image_print/data/ui/print-layout.ui.h:23 msgid "Size:" msgstr "Dydis:" @@ -295,17 +291,14 @@ msgstr "_Kiti filtrai:" #: ../data/ui/preferences.ui.h:1 -#| msgid "View the folders" msgid "below the folder list" msgstr "žemiau aplankų sąrašo" #: ../data/ui/preferences.ui.h:2 -#| msgid "on the side" msgid "on the right" msgstr "dešinėje" #: ../data/ui/preferences.ui.h:3 -#| msgid "gthumb Preferences" msgid "gThumb Preferences" msgstr "gThumb nustatymai" @@ -370,7 +363,6 @@ msgstr "Nustatyti į _dabartinį" #: ../data/ui/preferences.ui.h:19 -#| msgid "Resize the window to the size of the image" msgid "_Reuse the active window to open files" msgstr "Paka_rtotinai naudoti aktyvų langą failams atverti" @@ -400,7 +392,7 @@ #: ../data/ui/preferences.ui.h:25 #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 -#: ../extensions/edit_metadata/gth-edit-general-page.c:473 +#: ../extensions/edit_metadata/gth-edit-general-page.c:481 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 #: ../gthumb/gth-main-default-metadata.c:33 msgid "General" @@ -456,8 +448,7 @@ msgid "D_etermine image type from content (slower)" msgstr "Nustat_yti paveikslėlio tipą pagal turinį (lėčiau)" -#: ../data/ui/preferences.ui.h:38 -#: ../gthumb/dlg-preferences-extensions.c:71 +#: ../data/ui/preferences.ui.h:38 ../gthumb/dlg-preferences-extensions.c:71 #: ../gthumb/gth-browser-actions-entries.h:179 msgid "Browser" msgstr "Naršyklė" @@ -476,22 +467,18 @@ msgstr "At_virkštinė tvarka" #: ../extensions/23hq/23hq.extension.in.in.h:1 -#| msgid "2" msgid "23" msgstr "23" #: ../extensions/23hq/23hq.extension.in.in.h:2 -#| msgid "Upload images to Facebook" msgid "Upload images to 23hq.com" msgstr "Įkelti paveikslėlius į 23hq.com" #: ../extensions/23hq/callbacks.c:68 -#| msgid "..." msgid "_23..." msgstr "_23..." #: ../extensions/23hq/callbacks.c:69 -#| msgid "Upload photos to Flickr" msgid "Upload photos to 23" msgstr "Įkelti fotografijas į 23" @@ -523,7 +510,6 @@ #: ../extensions/image_viewer/image_viewer.extension.in.in.h:3 #: ../extensions/list_tools/list_tools.extension.in.in.h:3 #: ../extensions/photo_importer/photo_importer.extension.in.in.h:3 -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:3 #: ../extensions/raw_files/raw_files.extension.in.in.h:3 #: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:3 #: ../extensions/rename_series/rename_series.extension.in.in.h:3 @@ -617,18 +603,129 @@ msgid "Write to Disc" msgstr "Rašyti į diską" -#: ../extensions/cairo_io/cairo-io-jpeg.c:62 +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:62 #, c-format msgid "Error interpreting JPEG image file: %s" msgstr "Klaida interpretuojant JPEG paveikslėlio failą: %s" -#: ../extensions/cairo_io/cairo-io-jpeg.c:482 +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:483 #, c-format msgid "Unknown JPEG color space (%d)" msgstr "Nežinoma JPEG spalvų sritis (%d)" -#: ../extensions/catalogs/actions.c:92 -#: ../extensions/catalogs/actions.c:213 +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:1 +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:1 +msgid "_Default extension:" +msgstr "_Numatytasis plėtinys:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:2 +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:1 +msgid "_Quality:" +msgstr "_Kokybė:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:3 +msgid "_Smoothing:" +msgstr "_Glotninimas:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:4 +msgid "Opti_mize" +msgstr "Opti_mizuoti" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:5 +msgid "_Progressive" +msgstr "_Progresyvus" + +#: ../extensions/cairo_io/data/ui/png-options.ui.h:1 +msgid "Compression _level:" +msgstr "Glaudinimo _lygis:" + +#: ../extensions/cairo_io/data/ui/save-options-preferences.ui.h:1 +msgid "Default options:" +msgstr "Numatytosios parinktys:" + +#: ../extensions/cairo_io/data/ui/tga-options.ui.h:1 +msgid "_RLE compression" +msgstr "_RLE glaudinimas" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:2 +msgid "Compression" +msgstr "Glaudinimas" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:3 +msgid "_No compression" +msgstr "_Jokio glaudinimo" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:4 +msgid "No_rmal (Deflate)" +msgstr "No_rmalus (Deflate)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:5 +msgid "_Loss compression (JPEG)" +msgstr "_Nuostolingas glaudinimas (JPEG)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:6 +msgid "Resolution" +msgstr "Raiška" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:7 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 +msgid "_Horizontal:" +msgstr "_Horizontalus:" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:8 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 +msgid "_Vertical:" +msgstr "_Vertikalus:" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:9 +msgid "dpi" +msgstr "dpi" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:2 +msgid "_Method:" +msgstr "_Metodas:" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:3 +msgid "_Lossless" +msgstr "_Be praradimų" + +#: ../extensions/cairo_io/gth-image-saver-jpeg.c:516 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:140 +msgid "JPEG" +msgstr "JPEG" + +#: ../extensions/cairo_io/gth-image-saver-png.c:353 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:110 +msgid "PNG" +msgstr "PNG" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:257 +#: ../extensions/cairo_io/gth-image-saver-tiff.c:435 +#: ../gthumb/gth-buffer-data.c:84 +msgid "Insufficient memory" +msgstr "Nepakanka atminties" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:344 +msgid "TGA" +msgstr "TGA" + +#: ../extensions/cairo_io/gth-image-saver-tiff.c:559 +msgid "TIFF" +msgstr "TIFF" + +#: ../extensions/cairo_io/gth-image-saver-webp.c:382 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:165 +msgid "WebP" +msgstr "WebP" + +#: ../extensions/cairo_io/preferences.c:134 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 +msgid "Saving" +msgstr "Įrašoma" + +#: ../extensions/catalogs/actions.c:92 ../extensions/catalogs/actions.c:213 #: ../extensions/catalogs/dlg-add-to-catalog.c:274 #: ../extensions/catalogs/dlg-add-to-catalog.c:394 #: ../extensions/file_manager/actions.c:68 @@ -638,8 +735,7 @@ msgid "No name specified" msgstr "Nenurodytas pavadinimas" -#: ../extensions/catalogs/actions.c:99 -#: ../extensions/catalogs/actions.c:220 +#: ../extensions/catalogs/actions.c:99 ../extensions/catalogs/actions.c:220 #: ../extensions/catalogs/dlg-add-to-catalog.c:281 #: ../extensions/catalogs/dlg-add-to-catalog.c:401 #: ../extensions/file_manager/actions.c:75 @@ -647,8 +743,7 @@ msgid "Invalid name. The following characters are not allowed: %s" msgstr "Netinkamas pavadinimas. Šie simboliai yra neleistini: %s" -#: ../extensions/catalogs/actions.c:155 -#: ../extensions/catalogs/actions.c:267 +#: ../extensions/catalogs/actions.c:155 ../extensions/catalogs/actions.c:267 #: ../extensions/catalogs/dlg-add-to-catalog.c:338 #: ../extensions/catalogs/dlg-add-to-catalog.c:448 #: ../extensions/catalogs/gth-file-source-catalogs.c:508 @@ -658,18 +753,15 @@ #: ../extensions/catalogs/actions.c:178 #: ../extensions/catalogs/dlg-add-to-catalog.c:359 -#| msgid "_New Catalog" msgid "New catalog" msgstr "Naujas katalogas" #: ../extensions/catalogs/actions.c:179 #: ../extensions/catalogs/dlg-add-to-catalog.c:360 -#| msgid "Enter the catalog name: " msgid "Enter the catalog name:" msgstr "Įveskite katalogo pavadinimą:" -#: ../extensions/catalogs/actions.c:181 -#: ../extensions/catalogs/actions.c:293 +#: ../extensions/catalogs/actions.c:181 ../extensions/catalogs/actions.c:293 #: ../extensions/catalogs/dlg-add-to-catalog.c:362 #: ../extensions/catalogs/dlg-add-to-catalog.c:474 #: ../extensions/file_manager/actions.c:136 @@ -678,13 +770,11 @@ #: ../extensions/catalogs/actions.c:290 #: ../extensions/catalogs/dlg-add-to-catalog.c:471 -#| msgid "New Library" msgid "New library" msgstr "Nauja biblioteka" #: ../extensions/catalogs/actions.c:291 #: ../extensions/catalogs/dlg-add-to-catalog.c:472 -#| msgid "Enter the library name: " msgid "Enter the library name:" msgstr "Įveskite bibliotekos pavadinimą:" @@ -702,15 +792,16 @@ msgstr "Į_dėti į katalogą" #: ../extensions/catalogs/callbacks.c:105 +#: ../extensions/selections/callbacks.c:80 msgid "Open _Folder" msgstr "Atverti _aplanką" #: ../extensions/catalogs/callbacks.c:106 +#: ../extensions/selections/callbacks.c:81 msgid "Go to the folder that contains the selected file" msgstr "Atverti aplanką, kuriame yra pasirinktas failas" #: ../extensions/catalogs/callbacks.c:110 -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:85 msgid "Other..." msgstr "Kitas..." @@ -746,37 +837,36 @@ msgid "Rena_me" msgstr "_Pervadinti" -#: ../extensions/catalogs/callbacks.c:279 -#: ../extensions/catalogs/callbacks.c:282 +#: ../extensions/catalogs/callbacks.c:281 +#: ../extensions/catalogs/callbacks.c:284 msgid "Command Line" msgstr "Komandų eilutė" -#: ../extensions/catalogs/callbacks.c:497 -#: ../extensions/catalogs/callbacks.c:502 +#: ../extensions/catalogs/callbacks.c:496 +#: ../extensions/catalogs/callbacks.c:501 #: ../extensions/photo_importer/dlg-photo-importer.c:364 #: ../extensions/photo_importer/dlg-photo-importer.c:404 -#: ../gthumb/gth-file-list.c:43 -#: ../gthumb/gth-folder-tree.c:883 +#: ../gthumb/gth-file-list.c:43 ../gthumb/gth-folder-tree.c:1093 msgid "(Empty)" msgstr "(tuščia)" -#: ../extensions/catalogs/callbacks.c:697 +#: ../extensions/catalogs/callbacks.c:700 msgid "Catalog Properties" msgstr "Katalogo savybės" -#: ../extensions/catalogs/callbacks.c:711 +#: ../extensions/catalogs/callbacks.c:714 msgid "Organize" msgstr "Sutvarkyti" -#: ../extensions/catalogs/callbacks.c:712 +#: ../extensions/catalogs/callbacks.c:715 msgid "Automatically organize files by date" msgstr "Automatiškai sutvarkyti failus pagal datą" #: ../extensions/catalogs/catalogs.extension.in.in.h:1 #: ../extensions/catalogs/gth-catalog.c:611 #: ../extensions/catalogs/gth-catalog.c:662 -#: ../extensions/catalogs/gth-catalog.c:1024 -#: ../extensions/catalogs/gth-catalog.c:1025 +#: ../extensions/catalogs/gth-catalog.c:1016 +#: ../extensions/catalogs/gth-catalog.c:1017 msgid "Catalogs" msgstr "Katalogai" @@ -802,12 +892,12 @@ #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:5 #: ../extensions/file_manager/actions.c:945 -#: ../extensions/webalbums/gth-web-exporter.c:1842 +#: ../extensions/webalbums/gth-web-exporter.c:1840 msgid "_View the destination" msgstr "Žiū_rėti paskirties aplanką" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:1 -#: ../gthumb/gth-file-properties.c:212 +#: ../gthumb/gth-file-properties.c:209 msgid "Properties" msgstr "Savybės" @@ -856,7 +946,7 @@ msgstr "Katalogo _peržiūra:" #: ../extensions/catalogs/data/ui/organize-files.ui.h:1 -#: ../extensions/edit_metadata/gth-edit-general-page.c:550 +#: ../extensions/edit_metadata/gth-edit-general-page.c:558 #: ../gthumb/gth-main-default-tests.c:300 msgid "Date photo was taken" msgstr "Fotografavimo data" @@ -867,7 +957,7 @@ msgstr "Failo pakeitimo data" #: ../extensions/catalogs/data/ui/organize-files.ui.h:3 -#: ../extensions/comments/main.c:159 +#: ../extensions/comments/main.c:182 msgid "Tag" msgstr "Žyma" @@ -924,8 +1014,7 @@ msgid "Files will be organized in catalogs. No file will be moved on disk." msgstr "Failai bus suskirstyti katalogais. Jokie failai nebus perkelti diske." -#: ../extensions/catalogs/gth-catalog.c:1122 -#: ../extensions/comments/main.c:44 +#: ../extensions/catalogs/gth-catalog.c:1114 ../extensions/comments/main.c:45 #: ../extensions/edit_metadata/callbacks.c:106 #: ../gthumb/gth-main-default-metadata.c:53 msgid "Tags" @@ -933,35 +1022,27 @@ #: ../extensions/catalogs/gth-file-source-catalogs.c:953 #, c-format -#| msgid "" -#| "An image named \"%s\" is already present. Do you want to overwrite it?" msgid "The catalog '%s' already exists, do you want to overwrite it?" msgstr "Katalogas pavadinimu „%s“ jau yra. Ar norite jį perrašyti?" #: ../extensions/catalogs/gth-file-source-catalogs.c:955 #, c-format -#| msgid "" -#| "An image named \"%s\" is already present. Do you want to overwrite it?" msgid "The library '%s' already exists, do you want to overwrite it?" msgstr "Biblioteka pavadinimu „%s“ jau yra. Ar norite ją perrašyti?" #: ../extensions/catalogs/gth-file-source-catalogs.c:963 -#| msgid "Overwrite" msgid "Over_write" msgstr "Per_rašyti" #: ../extensions/catalogs/gth-file-source-catalogs.c:1081 -#| msgid "Could not move the files" msgid "Cannot move the files" msgstr "Nepavyko perkelti failų" #: ../extensions/catalogs/gth-file-source-catalogs.c:1083 -#| msgid "Could not move the files" msgid "Cannot copy the files" msgstr "Nepavyko perkopijuoti failų" #: ../extensions/catalogs/gth-file-source-catalogs.c:1088 -#| msgid "Invalid Destination" msgid "Invalid destination." msgstr "Netinkamas tikslas." @@ -970,15 +1051,15 @@ msgid "Copying files to '%s'" msgstr "Kopijuojami failai į „%s“" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1388 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1322 msgid "Could not remove the files from the catalog" msgstr "Nepavyko pašalinti failų iš katalogo" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1446 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:685 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:694 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:723 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:1228 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1380 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:746 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:755 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:785 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:1320 #: ../extensions/search/gth-search.c:265 msgid "Invalid file format" msgstr "Netinkamas failo formatas" @@ -1005,71 +1086,66 @@ msgstr "Pakeisti failo datą" #: ../extensions/change_date/data/ui/change-date.ui.h:1 +msgid "+" +msgstr "+" + +#: ../extensions/change_date/data/ui/change-date.ui.h:2 +msgid "-" +msgstr "-" + +#: ../extensions/change_date/data/ui/change-date.ui.h:3 msgid "Change Date" msgstr "Pakeisti datą" -#: ../extensions/change_date/data/ui/change-date.ui.h:2 +#: ../extensions/change_date/data/ui/change-date.ui.h:4 msgid "Change the following values:" msgstr "Pakeisti šias reikšmes:" -#: ../extensions/change_date/data/ui/change-date.ui.h:3 +#: ../extensions/change_date/data/ui/change-date.ui.h:5 msgid "_Last modified date" msgstr "_Paskutiniojo pakeitimo data" -#: ../extensions/change_date/data/ui/change-date.ui.h:4 +#: ../extensions/change_date/data/ui/change-date.ui.h:6 msgid "Co_mment date" msgstr "Ko_mentaro data" -#: ../extensions/change_date/data/ui/change-date.ui.h:5 -msgid "Exif DateTimeOriginal tag" -msgstr "Exif DateTimeOriginal žyma" - -#: ../extensions/change_date/data/ui/change-date.ui.h:6 +#: ../extensions/change_date/data/ui/change-date.ui.h:7 msgid "Change to:" msgstr "Pakeisti į:" -#: ../extensions/change_date/data/ui/change-date.ui.h:7 +#: ../extensions/change_date/data/ui/change-date.ui.h:8 msgid "The _following date:" msgstr "Š_i data:" -#: ../extensions/change_date/data/ui/change-date.ui.h:8 +#: ../extensions/change_date/data/ui/change-date.ui.h:9 msgid "File _modified date" msgstr "Paskutiniojo _pakeitimo data" -#: ../extensions/change_date/data/ui/change-date.ui.h:9 +#: ../extensions/change_date/data/ui/change-date.ui.h:10 msgid "File c_reation date" msgstr "Failo sukū_rimo data" -#: ../extensions/change_date/data/ui/change-date.ui.h:10 +#: ../extensions/change_date/data/ui/change-date.ui.h:11 msgid "Date p_hoto was taken" msgstr "_Fotografavimo data" -#: ../extensions/change_date/data/ui/change-date.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:12 msgid "A_djust by" msgstr "_Pakoreguoti" -#: ../extensions/change_date/data/ui/change-date.ui.h:12 +#: ../extensions/change_date/data/ui/change-date.ui.h:13 msgid "hours" msgstr "valandos" -#: ../extensions/change_date/data/ui/change-date.ui.h:13 -#| msgid "The minutes" +#: ../extensions/change_date/data/ui/change-date.ui.h:14 msgid "minutes" msgstr "minutės" -#: ../extensions/change_date/data/ui/change-date.ui.h:14 +#: ../extensions/change_date/data/ui/change-date.ui.h:15 #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:6 msgid "seconds" msgstr "sekundės" -#: ../extensions/change_date/data/ui/change-date.ui.h:15 -msgid "+" -msgstr "+" - -#: ../extensions/change_date/data/ui/change-date.ui.h:16 -msgid "-" -msgstr "-" - #: ../extensions/comments/callbacks.c:46 msgid "Import Embedded Metadata" msgstr "Importuoti integruotus metaduomenis" @@ -1095,18 +1171,16 @@ msgid "_Synchronize with the embedded metadata" msgstr "_Sinchronizuoti su įtaisytais metaduomenimis" -#: ../extensions/comments/main.c:34 +#: ../extensions/comments/main.c:35 #: ../extensions/edit_metadata/callbacks.c:100 msgid "Comment" msgstr "Komentaras" -#: ../extensions/comments/main.c:40 -#: ../gthumb/gth-main-default-metadata.c:46 +#: ../extensions/comments/main.c:41 ../gthumb/gth-main-default-metadata.c:46 msgid "Title" msgstr "Pavadinimas" -#: ../extensions/comments/main.c:41 -#: ../extensions/comments/main.c:143 +#: ../extensions/comments/main.c:42 ../extensions/comments/main.c:166 #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 #: ../extensions/image_print/data/ui/print-layout.ui.h:8 @@ -1118,19 +1192,16 @@ msgid "Description" msgstr "Aprašymas" -#: ../extensions/comments/main.c:42 -#: ../extensions/comments/main.c:151 +#: ../extensions/comments/main.c:43 ../extensions/comments/main.c:174 #: ../gthumb/gth-main-default-metadata.c:50 msgid "Place" msgstr "Vieta" -#: ../extensions/comments/main.c:43 -#: ../gthumb/gth-main-default-metadata.c:51 +#: ../extensions/comments/main.c:44 ../gthumb/gth-main-default-metadata.c:51 msgid "Date" msgstr "Data" -#: ../extensions/comments/main.c:45 -#: ../gthumb/gth-main-default-metadata.c:54 +#: ../extensions/comments/main.c:46 ../gthumb/gth-main-default-metadata.c:54 msgid "Rating" msgstr "Įvertinimas" @@ -1143,17 +1214,14 @@ msgstr "Kontaktų _lapas..." #: ../extensions/contact_sheet/callbacks.c:62 -#| msgid "Create a new category" msgid "Create a contact sheet" msgstr "Sukurti kontaktų lapą" #: ../extensions/contact_sheet/callbacks.c:65 -#| msgid "I_mage Caption..." msgid "Image _Wall..." msgstr "Paveikslėlių _siena..." #: ../extensions/contact_sheet/callbacks.c:66 -#| msgid "Create Index Image" msgid "Create an image-wall" msgstr "Sukurti paveikslėlių sieną" @@ -1163,22 +1231,20 @@ msgstr "Kontaktų lapas" #: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:2 -#| msgid "Edit the comment and other information of the selected files" msgid "Create an index image displaying the thumbnails of the selected files." msgstr "Sukurti indekso paveikslėlį, rodantį pasirinktų failų miniatiūras." #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:1 -#: ../extensions/file_tools/gth-file-tool-crop.c:424 -#: ../extensions/file_tools/gth-file-tool-crop.c:454 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 -#: ../extensions/file_tools/gth-file-tool-rotate.c:415 +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:446 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 +#: ../extensions/file_tools/gth-file-tool-rotate.c:397 #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:14 #: ../extensions/slideshow/main.c:277 msgid "None" msgstr "Nėra" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:2 -#| msgid "Singles" msgid "Simple" msgstr "Paprastas" @@ -1191,7 +1257,6 @@ msgstr "Tik šešėlis" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:5 -#| msgid "Slideshow" msgid "Slide" msgstr "Skaidrė" @@ -1204,7 +1269,6 @@ msgstr "Išorinis šešėlis" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:9 -#| msgid "Desktop background" msgid "Background" msgstr "Fonas" @@ -1216,38 +1280,24 @@ msgid "_Gradient" msgstr "_Perėjimas" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 -msgid "_Horizontal:" -msgstr "_Horizontalus:" - -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 -msgid "_Vertical:" -msgstr "_Vertikalus:" - #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:14 msgid "Select a color" msgstr "Pasirinkite spalvą" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:15 -#| msgid "Framerate" msgid "Frame" msgstr "Rėmelis" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:16 -#| msgid "St_yle" msgid "_Style:" msgstr "_Stilius:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:17 -#| msgid "Colo_r:" msgid "C_olor:" msgstr "S_palva:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:18 #: ../extensions/rename_series/dlg-rename-series.c:57 -#| msgid "Next" msgid "Text" msgstr "Tekstas" @@ -1260,7 +1310,6 @@ msgstr "A_ntraštė:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:20 -#| msgid "Select None" msgid "Select a font" msgstr "Pasirinkite šriftą" @@ -1275,7 +1324,6 @@ #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:22 #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 #: ../extensions/image_print/data/ui/print-preferences.ui.h:1 -#| msgid "Caption" msgid "Caption:" msgstr "Antraštė:" @@ -1319,6 +1367,7 @@ #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:6 #: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 #: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 @@ -1337,7 +1386,6 @@ #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:14 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 -#| msgid "Filename:" msgid "File_name:" msgstr "Failo pavadi_nimas:" @@ -1351,25 +1399,15 @@ msgid "Create _HTML image map" msgstr "Sukurti _HTML paveikslėlių žemėlapį" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 -#: ../extensions/pixbuf_savers/preferences.c:134 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 -msgid "Saving" -msgstr "Įrašoma" - #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 -#| msgid "Create a new category" msgid "Create a new theme" msgstr "Sukurti naują temą" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:19 -#| msgid "Print the selected images" msgid "Edit the selected theme" msgstr "Keisti pasirinktą temą" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:20 -#| msgid "Delete the selected files" msgid "Delete the selected theme" msgstr "Ištrinti pasirinktą temą" @@ -1421,45 +1459,37 @@ #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:30 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:15 -#| msgid "_Size :" msgid "_Size:" msgstr "_Dydis:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 -#| msgid "Square" msgid "Sq_uared" msgstr "_Kvadratinis" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:33 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:16 -#| msgid "_Thumbnails" msgid "Thumbnails" msgstr "Miniatiūros" #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 -#| msgid "Image Page" msgid "Image Wall" msgstr "Paveikslėlių siena" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:486 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:498 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:512 -#| msgid "Could not save the filter" +#: ../extensions/contact_sheet/dlg-contact-sheet.c:481 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:492 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:506 msgid "Could not save the theme" msgstr "Nepavyko įrašyti temos" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:657 -#| msgid "Could not delete the files" +#: ../extensions/contact_sheet/dlg-contact-sheet.c:651 msgid "Could not delete the theme" msgstr "Nepavyko ištrinti temos" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:248 -#| msgid "Creating image: %s.%s" +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:247 msgid "Creating images" msgstr "Kuriami paveikslėliai" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:897 -#| msgid "Saving thumbnails" +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:896 msgid "Generating thumbnails" msgstr "Generuojamos miniatiūros" @@ -1468,12 +1498,10 @@ msgstr "Antraštė" #: ../extensions/contact_sheet/gth-contact-sheet-theme.c:33 -#| msgid "_Footer:" msgid "Footer" msgstr "Poraštė" #: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:193 -#| msgid "Properties" msgid "Theme Properties" msgstr "Temos savybės" @@ -1482,7 +1510,6 @@ msgstr "Kopijuoti _iš" #: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:316 -#| msgid "New Name" msgid "New theme" msgstr "Nauja tema" @@ -1517,20 +1544,19 @@ #: ../extensions/convert_format/data/ui/convert-format.ui.h:5 #: ../extensions/resize_images/data/ui/resize-images.ui.h:8 -#| msgid "Restore the original desktop wallpaper" msgid "_Use the original image folder" msgstr "Na_udoti originalų paveikslėlio aplanką" -#: ../extensions/convert_format/dlg-convert-format.c:93 +#: ../extensions/convert_format/dlg-convert-format.c:95 msgid "Converting images" msgstr "Konvertuojami paveikslėliai" -#: ../extensions/desktop_background/actions.c:162 +#: ../extensions/desktop_background/actions.c:158 msgid "Could not show the desktop background properties" msgstr "Nepavyko parodyti darbastalio fono savybių" -#: ../extensions/desktop_background/actions.c:228 -#: ../extensions/desktop_background/actions.c:246 +#: ../extensions/desktop_background/actions.c:224 +#: ../extensions/desktop_background/actions.c:242 msgid "Could not set the desktop background" msgstr "Nepavyko nustatyti darbastalio fono" @@ -1548,14 +1574,12 @@ msgstr "Darbastalio fonas" #: ../extensions/edit_metadata/actions.c:66 -#| msgid "Are you sure you want to permanently delete the %'d selected file?" -#| msgid_plural "" -#| "Are you sure you want to permanently delete the %'d selected files?" -msgid "Are you sure you want to permanently delete the metadata of the selected files?" +msgid "" +"Are you sure you want to permanently delete the metadata of the selected " +"files?" msgstr "Ar tikrai norite negrįžtamai ištrinti pasirinktų failų metaduomenis?" #: ../extensions/edit_metadata/actions.c:73 -#| msgid "If you delete a file, it will be permanently lost." msgid "If you delete the metadata, it will be permanently lost." msgstr "Jei ištrinsite metaduomenis, jie bus negrįžtamai prarasti." @@ -1568,17 +1592,14 @@ msgstr "Taisyti pasirinktų failų komentarą ir kitą informaciją" #: ../extensions/edit_metadata/callbacks.c:107 -#| msgid "Delete the selected files" msgid "Set the tags of the selected files" msgstr "Nustatyti pasirinktų failų žymas" #: ../extensions/edit_metadata/callbacks.c:112 -#| msgid "Metadata" msgid "Delete Metadata" msgstr "Ištrinti metaduomenis" #: ../extensions/edit_metadata/callbacks.c:113 -#| msgid "Edit the comment and other information of the selected files" msgid "Delete the comment and the embedded metadata of the selected files" msgstr "Ištrinti pasirinktų failų komentarus ir integruotus metaduomenis" @@ -1630,7 +1651,8 @@ #: ../extensions/edit_metadata/gth-edit-comment-dialog.c:66 #: ../extensions/edit_metadata/gth-edit-tags-dialog.c:83 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:335 +#: ../extensions/facebook/dlg-import-from-facebook.c:319 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:324 #, c-format msgid "%d file" msgid_plural "%d files" @@ -1639,8 +1661,7 @@ msgstr[2] "%d failų" #: ../extensions/edit_metadata/gth-edit-comment-dialog.c:144 -#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:192 -#| msgid "Da_te and Time" +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:197 msgid "Sa_ve and Close" msgstr "Įrašyti ir už_verti" @@ -1648,52 +1669,51 @@ msgid "Save only cha_nged fields" msgstr "Įrašyti tik pa_keistus laukelius" -#: ../extensions/edit_metadata/gth-edit-general-page.c:547 +#: ../extensions/edit_metadata/gth-edit-general-page.c:555 msgid "No date" msgstr "Nėra datos" -#: ../extensions/edit_metadata/gth-edit-general-page.c:548 +#: ../extensions/edit_metadata/gth-edit-general-page.c:556 msgid "The following date" msgstr "Ši data" -#: ../extensions/edit_metadata/gth-edit-general-page.c:549 +#: ../extensions/edit_metadata/gth-edit-general-page.c:557 #: ../extensions/importer/gth-import-preferences-dialog.c:331 msgid "Current date" msgstr "Dabartinė data" -#: ../extensions/edit_metadata/gth-edit-general-page.c:551 +#: ../extensions/edit_metadata/gth-edit-general-page.c:559 msgid "Last modified date" msgstr "Paskutiniojo pakeitimo data" -#: ../extensions/edit_metadata/gth-edit-general-page.c:552 +#: ../extensions/edit_metadata/gth-edit-general-page.c:560 msgid "File creation date" msgstr "Failo sukūrimo data" -#: ../extensions/edit_metadata/gth-edit-general-page.c:553 +#: ../extensions/edit_metadata/gth-edit-general-page.c:561 msgid "Do not modify" msgstr "Nekeisti" #. Translators: the %s symbol in the string is a file name #: ../extensions/edit_metadata/gth-edit-tags-dialog.c:80 #, c-format -#| msgid "Tags" msgid "%s Tags" msgstr "%s Žymos" -#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:184 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:189 msgid "Assign Tags" msgstr "Priskirti žymas" -#: ../extensions/edit_metadata/gth-tag-task.c:115 -#: ../extensions/edit_metadata/gth-tag-task.c:132 +#: ../extensions/edit_metadata/gth-tag-task.c:119 +#: ../extensions/edit_metadata/gth-tag-task.c:136 msgid "Assigning tags to the selected files" msgstr "Priskirti žymas pasirinktiems failams" -#: ../extensions/edit_metadata/gth-tag-task.c:115 +#: ../extensions/edit_metadata/gth-tag-task.c:119 msgid "Writing files" msgstr "Įrašomi failai" -#: ../extensions/edit_metadata/gth-tag-task.c:132 +#: ../extensions/edit_metadata/gth-tag-task.c:136 msgid "Reading files" msgstr "Skaitomi failai" @@ -1806,7 +1826,7 @@ msgid "XMP Attached" msgstr "XPM prisegtas" -#: ../extensions/exiv2_tools/main.c:256 +#: ../extensions/exiv2_tools/main.c:272 msgid "date photo was taken" msgstr "fotografavimo data" @@ -1814,62 +1834,69 @@ msgid "Share" msgstr "Dalytis" -#: ../extensions/facebook/callbacks.c:54 +#: ../extensions/facebook/callbacks.c:59 ../extensions/facebook/callbacks.c:64 msgid "Face_book..." msgstr "Face_book..." -#: ../extensions/facebook/callbacks.c:55 +#: ../extensions/facebook/callbacks.c:60 +#| msgid "Download photos from Flickr" +msgid "Download photos from Facebook" +msgstr "Parsisiųsti fotografijas iš Facebook" + +#: ../extensions/facebook/callbacks.c:65 msgid "Upload photos to Facebook" msgstr "Įkelti fotografijas į Facebook" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:1 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 msgid "Export to Flickr" msgstr "Eksportuoti į Flickr" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:2 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 #: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 msgid "_Upload" msgstr "S_iųsti" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:3 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 msgid "_Account:" msgstr "_Paskyra:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:4 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:3 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 #: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 #: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 msgid "Edit accounts" msgstr "Keisti paskyras" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 msgid "A_lbum:" msgstr "A_lbumas:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 msgid "Add a new album" msgstr "Pridėti naują albumą" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 -#| msgid "_Resize if larger than:" msgid "Resize the images if larger than this size" msgstr "Keisti dydį, jei didesnis nei" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:8 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 -msgid "_Resize to:" -msgstr "_Keisti dydį į:" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 +msgid "_Resize if larger than:" +msgstr "Keisti d_ydį, jei didesnis nei:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:9 -#| msgid "200 x 200" msgid "720 x 720" msgstr "720 x 720" @@ -1882,39 +1909,20 @@ msgstr "1280 x 1280" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:12 -#| msgid "800 x 600" msgid "1600 x 1600" msgstr "1600 x 1600" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:13 -#| msgid "48 x 48" msgid "2048 x 2048" msgstr "2048 x 2048" -#: ../extensions/facebook/data/ui/facebook-account-chooser.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-account-chooser.ui.h:1 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 -#: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 -#: ../extensions/picasaweb/data/ui/picasa-web-account-chooser.ui.h:1 -msgid "A_ccount:" -msgstr "P_askyra:" - -#: ../extensions/facebook/data/ui/facebook-account-manager.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-account-manager.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-account-manager.ui.h:1 -#: ../extensions/picasaweb/data/ui/picasa-web-account-manager.ui.h:1 -msgid "A_ccounts:" -msgstr "P_askyros:" - #: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 msgid "Public photos" msgstr "Viešos fotografijos" #: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 msgid "Private photos, visible to friends" msgstr "Privačios fotografijos, matomos draugams" @@ -1928,25 +1936,6 @@ msgid "_Visibility:" msgstr "_Matomumas:" -#: ../extensions/facebook/data/ui/facebook-ask-authorization.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-ask-authorization.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-ask-authorization.ui.h:1 -msgid "_Authorize..." -msgstr "_Nustatyti tapatybę..." - -#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:1 -#: ../extensions/facebook/facebook-authentication.c:472 -#: ../extensions/flicker_utils/flickr-authentication.c:408 -#: ../extensions/oauth/oauth-authentication.c:423 -msgid "Once you're done, click the 'Continue' button below." -msgstr "Kai baigsite, spustelėkite žemiau esantį mygtuką „Tęsti“." - -#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 -#: ../extensions/flicker_utils/data/ui/flicker-complete-authorization.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-complete-authorization.ui.h:1 -msgid "C_ontinue" -msgstr "_Tęsti" - #: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:1 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:1 @@ -1958,70 +1947,92 @@ #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:2 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:2 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:2 -#: ../extensions/webalbums/gth-web-exporter.c:1841 +#: ../extensions/webalbums/gth-web-exporter.c:1839 msgid "_Open in the Browser" msgstr "_Atverti naršyklėje" -#: ../extensions/facebook/dlg-export-to-facebook.c:130 -#: ../extensions/facebook/dlg-export-to-facebook.c:335 -#: ../extensions/facebook/facebook-authentication.c:192 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 +msgid "Import from Picasa Web Album" +msgstr "Importuoti iš Picasa žiniatinklio albumo" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:2 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 +msgid "_Import" +msgstr "_Importuoti" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:4 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 +#: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 +msgid "A_ccount:" +msgstr "P_askyra:" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:5 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 +msgid "_Album:" +msgstr "_Albumas:" + +#: ../extensions/facebook/dlg-export-to-facebook.c:123 +#: ../extensions/facebook/dlg-export-to-facebook.c:326 +#: ../extensions/facebook/dlg-import-from-facebook.c:226 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:138 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:399 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:237 -#: ../extensions/flicker_utils/flickr-authentication.c:191 -#: ../extensions/oauth/oauth-authentication.c:187 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:414 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:231 +#: ../extensions/oauth/web-service.c:380 #: ../extensions/photobucket/dlg-export-to-photobucket.c:131 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:376 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:139 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:424 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:380 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:375 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:124 msgid "Could not connect to the server" msgstr "Nepavyko prisijungti prie serverio" -#: ../extensions/facebook/dlg-export-to-facebook.c:182 +#: ../extensions/facebook/dlg-export-to-facebook.c:175 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:246 #: ../extensions/photobucket/dlg-export-to-photobucket.c:182 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:192 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:176 msgid "Could not upload the files" msgstr "Nepavyko nusiųsti failų" -#: ../extensions/facebook/dlg-export-to-facebook.c:412 +#: ../extensions/facebook/dlg-export-to-facebook.c:397 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:188 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:223 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:462 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:717 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:457 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:309 msgid "Could not create the album" msgstr "Nepavyko sukurti albumo" -#: ../extensions/facebook/dlg-export-to-facebook.c:481 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:534 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:783 +#: ../extensions/facebook/dlg-export-to-facebook.c:465 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:528 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:375 msgid "New Album" msgstr "Naujas albumas" -#: ../extensions/facebook/dlg-export-to-facebook.c:561 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:557 -#: ../extensions/image_print/gth-image-print-job.c:1789 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:614 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1002 +#: ../extensions/facebook/dlg-export-to-facebook.c:557 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:583 +#: ../extensions/image_print/gth-image-print-job.c:1739 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:607 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:597 msgid "No valid file selected." msgstr "Nepasirinkta tinkamų failų." -#: ../extensions/facebook/dlg-export-to-facebook.c:562 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:558 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:615 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1003 +#: ../extensions/facebook/dlg-export-to-facebook.c:558 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:584 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:608 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:598 msgid "Could not export the files" msgstr "Nepavyko eksportuoti failų" -#: ../extensions/facebook/dlg-export-to-facebook.c:570 -#: ../extensions/find_duplicates/gth-find-duplicates.c:255 -#: ../extensions/find_duplicates/gth-find-duplicates.c:347 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:566 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:623 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1010 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:803 -#: ../gthumb/gth-browser.c:1005 +#: ../extensions/facebook/dlg-export-to-facebook.c:566 +#: ../extensions/find_duplicates/gth-find-duplicates.c:277 +#: ../extensions/find_duplicates/gth-find-duplicates.c:470 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:592 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:616 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:605 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:254 +#: ../gthumb/gth-browser.c:1116 #, c-format msgid "%d file (%s)" msgid_plural "%d files (%s)" @@ -2029,92 +2040,35 @@ msgstr[1] "%d failai (%s)" msgstr[2] "%d failų (%s)" -#: ../extensions/facebook/dlg-export-to-facebook.c:591 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:589 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:642 +#: ../extensions/facebook/dlg-export-to-facebook.c:587 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:615 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:635 #, c-format msgid "Export to %s" msgstr "Eksportuoti į %s" -#: ../extensions/facebook/facebook-account-chooser-dialog.c:200 -#: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:200 -#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 -msgid "New authentication..." -msgstr "Iš naujo nustatyti tapatybę..." +#: ../extensions/facebook/dlg-import-from-facebook.c:344 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:349 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:279 +msgid "Could not get the photo list" +msgstr "Nepavyko gauti fotografijų sąrašo" -#: ../extensions/facebook/facebook-authentication.c:194 -#: ../extensions/flicker_utils/flickr-authentication.c:193 -#: ../extensions/oauth/oauth-authentication.c:189 -msgid "Choose _Account..." -msgstr "Pasirinkite _paskyrą..." +#: ../extensions/facebook/dlg-import-from-facebook.c:378 +#: ../extensions/facebook/dlg-import-from-facebook.c:533 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:386 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:551 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:313 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:586 +msgid "No album selected" +msgstr "Nepasirinkta jokių albumų" -#: ../extensions/facebook/facebook-authentication.c:471 -#: ../extensions/flicker_utils/flickr-authentication.c:407 -#: ../extensions/oauth/oauth-authentication.c:422 +#: ../extensions/facebook/dlg-import-from-facebook.c:551 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:569 #, c-format -msgid "Return to this window when you have finished the authorization process on %s" -msgstr "Grįžkite į šį langą, kai nustatysite tapatybę %s" - -#: ../extensions/facebook/facebook-authentication.c:556 -#: ../extensions/flicker_utils/flickr-authentication.c:487 -#: ../extensions/oauth/oauth-authentication.c:502 -#, c-format -msgid "gthumb requires your authorization to upload the photos to %s" -msgstr "gThumb reikalauja nustatyti jūsų tapatybę fotografijoms siųsti į %s" - -#: ../extensions/facebook/facebook-authentication.c:557 -#: ../extensions/flicker_utils/flickr-authentication.c:488 -#: ../extensions/oauth/oauth-authentication.c:503 -#, c-format -msgid "Click 'Authorize' to open your web browser and authorize gthumb to upload photos to %s. When you're finished, return to this window to complete the authorization." -msgstr "Spustelėkite „Nustatyti tapatybę“, kad atvertumėte žiniatinklio naršyklę ir nustatytumėte tapatybę norėdami įkelti fotografijas į %s. Kai baigsite, grįžkite į šį langą tapatybės nustatymo procedūrai baigti." - -#: ../extensions/facebook/facebook-authentication.c:652 -#: ../extensions/flicker_utils/flickr-authentication.c:588 -#: ../extensions/oauth/oauth-authentication.c:605 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:820 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:684 -msgid "Choose Account" -msgstr "Pasirinkite paskyrą" - -#: ../extensions/facebook/facebook-authentication.c:761 -#: ../extensions/flicker_utils/flickr-authentication.c:697 -#: ../extensions/oauth/oauth-authentication.c:714 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:881 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:745 -msgid "Edit Accounts" -msgstr "Keisti paskyras" - -#: ../extensions/facebook/facebook-connection.c:275 -#: ../extensions/facebook/facebook-connection.c:435 -#: ../extensions/facebook/facebook-service.c:162 -#: ../extensions/facebook/facebook-service.c:265 -#: ../extensions/facebook/facebook-service.c:468 -#: ../extensions/flicker_utils/flickr-connection.c:266 -#: ../extensions/flicker_utils/flickr-connection.c:413 -#: ../extensions/flicker_utils/flickr-service.c:195 -#: ../extensions/flicker_utils/flickr-service.c:398 -#: ../extensions/photobucket/photobucket-consumer.c:74 -#: ../extensions/photobucket/photobucket-consumer.c:79 -#: ../extensions/photobucket/photobucket-consumer.c:115 -#: ../extensions/photobucket/photobucket-consumer.c:170 -msgid "Unknown error" -msgstr "Nežinoma klaida" - -#: ../extensions/facebook/facebook-connection.c:310 -#: ../extensions/facebook/facebook-connection.c:461 -#: ../extensions/facebook/facebook-service.c:188 -#: ../extensions/facebook/facebook-service.c:290 -#: ../extensions/flicker_utils/flickr-connection.c:292 -#: ../extensions/flicker_utils/flickr-connection.c:439 -#: ../extensions/flicker_utils/flickr-service.c:219 -#: ../extensions/oauth/oauth-connection.c:356 -#: ../extensions/oauth/oauth-connection.c:431 -#: ../extensions/oauth/oauth-connection.c:535 -#: ../extensions/picasaweb/google-connection.c:344 -msgid "Connecting to the server" -msgstr "Jungiamasi prie serverio" +msgid "Import from %s" +msgstr "Importuoti iš %s" +#: ../extensions/facebook/dlg-import-from-facebook.c:551 #: ../extensions/facebook/facebook.extension.in.in.h:1 msgid "Facebook" msgstr "Facebook" @@ -2123,98 +2077,97 @@ msgid "Upload images to Facebook" msgstr "Įkelti paveikslėlius į Facebook" -#: ../extensions/facebook/facebook-service.c:188 -#: ../extensions/facebook/facebook-service.c:290 -#: ../extensions/flicker_utils/flickr-service.c:219 -#: ../extensions/oauth/oauth-connection.c:356 -#: ../extensions/oauth/oauth-connection.c:431 -#: ../extensions/oauth/oauth-connection.c:535 -msgid "Getting account information" -msgstr "Gaunama paskyros informacija" - -#: ../extensions/facebook/facebook-service.c:396 -#: ../extensions/flicker_utils/flickr-service.c:323 -#: ../extensions/photobucket/photobucket-service.c:207 -#: ../extensions/picasaweb/picasa-web-service.c:209 +#: ../extensions/facebook/facebook-service.c:462 +#: ../extensions/flicker_utils/flickr-service.c:863 +#: ../extensions/photobucket/photobucket-service.c:310 +#: ../extensions/picasaweb/picasa-web-service.c:711 msgid "Getting the album list" msgstr "Gaunamas albumų sąrašas" -#: ../extensions/facebook/facebook-service.c:525 -#: ../extensions/flicker_utils/flickr-service.c:426 -#: ../extensions/flicker_utils/flickr-service.c:546 -#: ../extensions/flicker_utils/flickr-service.c:584 -#: ../extensions/photobucket/photobucket-service.c:316 -#: ../extensions/picasaweb/picasa-web-service.c:300 +#: ../extensions/facebook/facebook-service.c:584 +#: ../extensions/flicker_utils/flickr-service.c:965 +#: ../extensions/flicker_utils/flickr-service.c:1087 +#: ../extensions/flicker_utils/flickr-service.c:1126 +#: ../extensions/photobucket/photobucket-service.c:423 +#: ../extensions/picasaweb/picasa-web-service.c:805 msgid "Creating the new album" msgstr "Kuriamas naujas albumas" -#: ../extensions/facebook/facebook-service.c:584 -#: ../extensions/flicker_utils/flickr-service.c:634 -#: ../extensions/photobucket/photobucket-service.c:373 -#: ../extensions/picasaweb/picasa-web-service.c:357 +#: ../extensions/facebook/facebook-service.c:645 +#: ../extensions/flicker_utils/flickr-service.c:1176 +#: ../extensions/photobucket/photobucket-service.c:485 +#: ../extensions/picasaweb/picasa-web-service.c:860 #, c-format msgid "Could not upload '%s': %s" msgstr "Nepavyko įkelti „%s“: %s" #. Translators: %s is a filename -#: ../extensions/facebook/facebook-service.c:670 -#: ../extensions/flicker_utils/flickr-service.c:745 -#: ../extensions/photobucket/photobucket-service.c:430 -#: ../extensions/picasaweb/picasa-web-service.c:412 +#: ../extensions/facebook/facebook-service.c:710 +#: ../extensions/flicker_utils/flickr-service.c:1287 +#: ../extensions/photobucket/photobucket-service.c:542 +#: ../extensions/picasaweb/picasa-web-service.c:917 #, c-format msgid "Uploading '%s'" msgstr "Įkeliama „%s“" -#: ../extensions/facebook/facebook-service.c:886 -#: ../extensions/flicker_utils/flickr-service.c:914 -#: ../extensions/photobucket/photobucket-service.c:599 -#: ../extensions/picasaweb/picasa-web-service.c:605 +#: ../extensions/facebook/facebook-service.c:923 +#: ../extensions/flicker_utils/flickr-service.c:1482 +#: ../extensions/photobucket/photobucket-service.c:714 +#: ../extensions/picasaweb/picasa-web-service.c:1138 msgid "Uploading the files to the server" msgstr "Failai siunčiami serveriui" -#: ../extensions/facebook/facebook-service.c:1003 -#: ../extensions/flicker_utils/flickr-service.c:1077 -#: ../extensions/picasaweb/picasa-web-service.c:718 +#: ../extensions/facebook/facebook-service.c:1022 +#: ../extensions/flicker_utils/flickr-service.c:1651 +#: ../extensions/picasaweb/picasa-web-service.c:1257 msgid "Getting the photo list" msgstr "Gaunamas fotografijų sąrašas" #: ../extensions/file_manager/actions.c:133 -#| msgid "_New Folder..." msgid "New folder" msgstr "Naujas aplankas" #: ../extensions/file_manager/actions.c:134 -#| msgid "Enter the folder name: " msgid "Enter the folder name:" msgstr "Įveskite aplanko pavadinimą:" #: ../extensions/file_manager/actions.c:400 #: ../extensions/file_manager/callbacks.c:380 -#: ../extensions/file_manager/callbacks.c:842 +#: ../extensions/file_manager/callbacks.c:838 msgid "Could not move the files" msgstr "Nepavyko perkelti failų" #: ../extensions/file_manager/actions.c:401 #: ../extensions/file_manager/callbacks.c:381 -#: ../extensions/file_manager/callbacks.c:843 -msgid "Files cannot be moved to the current location, as alternative you can choose to copy them." -msgstr "Failų negalima perkelti į dabartinę vietą, tačiau galite juos nukopijuoti." +#: ../extensions/file_manager/callbacks.c:839 +msgid "" +"Files cannot be moved to the current location, as alternative you can choose " +"to copy them." +msgstr "" +"Failų negalima perkelti į dabartinę vietą, tačiau galite juos nukopijuoti." #: ../extensions/file_manager/actions.c:563 msgid "Could not open the location" msgstr "Nepavyko atverti vietos" #: ../extensions/file_manager/actions.c:696 -msgid "The folder is not empty, do you want to delete the folder and its content permanently?" -msgstr "Aplankas ne tuščias, ar norite negrįžtamai ištrinti aplanką ir jo turinį?" +msgid "" +"The folder is not empty, do you want to delete the folder and its content " +"permanently?" +msgstr "" +"Aplankas ne tuščias, ar norite negrįžtamai ištrinti aplanką ir jo turinį?" #: ../extensions/file_manager/actions.c:712 msgid "Could not delete the folder" msgstr "Nepavyko ištrinti aplanko" #: ../extensions/file_manager/actions.c:773 -msgid "The folder cannot be moved to the Trash. Do you want to delete it permanently?" -msgstr "Paveikslėlių negalima perkelti į šiukšlinę. Ar norite juos ištrinti negrįžtamai?" +msgid "" +"The folder cannot be moved to the Trash. Do you want to delete it " +"permanently?" +msgstr "" +"Paveikslėlių negalima perkelti į šiukšlinę. Ar norite juos ištrinti " +"negrįžtamai?" #: ../extensions/file_manager/actions.c:780 msgid "Could not move the folder to the Trash" @@ -2232,7 +2185,6 @@ msgstr "Jei ištrinsite failą, jis bus negrįžtamai prarastas." #: ../extensions/file_manager/actions.c:920 -#| msgid "_Move" msgid "Move To" msgstr "Perkelti į" @@ -2241,12 +2193,10 @@ msgstr "Kopijuoti į" #: ../extensions/file_manager/actions.c:924 -#| msgid "_Move" msgid "Move" msgstr "Perkelti" #: ../extensions/file_manager/actions.c:924 -#| msgid "Crop" msgid "Copy" msgstr "Kopijuoti" @@ -2281,6 +2231,7 @@ #: ../extensions/file_manager/callbacks.c:187 #: ../extensions/file_manager/callbacks.c:223 #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:5 +#: ../gthumb/gth-tags-entry.c:871 msgid "_Delete" msgstr "Iš_trinti" @@ -2308,40 +2259,34 @@ #: ../extensions/file_manager/callbacks.c:227 #: ../extensions/file_manager/callbacks.c:236 -#| msgid "Crop..." msgid "Copy to..." msgstr "Kopijuoti į..." #: ../extensions/file_manager/callbacks.c:228 -#| msgid "Move the selected folder to the Trash" msgid "Copy the selected folder to another folder" msgstr "Kopijuoti pasirinktą aplanką į kitą" #: ../extensions/file_manager/callbacks.c:231 #: ../extensions/file_manager/callbacks.c:240 -#| msgid "_Move..." msgid "Move to..." msgstr "Perke_lti į..." #: ../extensions/file_manager/callbacks.c:232 -#| msgid "Move the selected folder to the Trash" msgid "Move the selected folder to another folder" msgstr "Perkelti pasirinktą aplanką į kitą" #: ../extensions/file_manager/callbacks.c:237 -#| msgid "Move the selected files to the Trash" msgid "Copy the selected files to another folder" msgstr "Perkopijuoti pasirinktus failus į kitą aplanką" #: ../extensions/file_manager/callbacks.c:241 -#| msgid "Move the selected files to the Trash" msgid "Move the selected files to another folder" msgstr "Perkelti pasirinktus failus į kitą aplanką" -#: ../extensions/file_manager/callbacks.c:1003 -#: ../extensions/find_duplicates/gth-find-duplicates.c:581 -#: ../gthumb/gth-browser.c:4939 -#: ../gthumb/gth-browser.c:4973 +#: ../extensions/file_manager/callbacks.c:999 +#: ../extensions/find_duplicates/gth-find-duplicates.c:766 +#: ../gthumb/gth-browser.c:5234 ../gthumb/gth-browser.c:5268 +#: ../gthumb/gth-progress-dialog.c:406 msgid "Could not perform the operation" msgstr "Nepavyko įvykdyti operacijos" @@ -2358,7 +2303,7 @@ msgstr "Trinami failai" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:1 -#| msgid "_Preview:" +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:5 msgid "_Preview" msgstr "_Peržiūra" @@ -2400,83 +2345,96 @@ msgstr "A_tstatyti" #: ../extensions/file_tools/data/ui/crop-options.ui.h:1 -msgid "_Position:" -msgstr "_Pozicija:" +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +msgid "Selection" +msgstr "Pažymėta sritis" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 +msgid "_Width:" +msgstr "Pl_otis:" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:3 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 +msgid "Heigh_t:" +msgstr "_Aukštis:" -#. this is used to separate the dimensions, for example: 120 × 250 #: ../extensions/file_tools/data/ui/crop-options.ui.h:4 -msgid "×" -msgstr "×" +msgid "_Position:" +msgstr "_Pozicija:" #: ../extensions/file_tools/data/ui/crop-options.ui.h:5 -msgid "_Grid:" -msgstr "_Tinklelis:" - -#: ../extensions/file_tools/data/ui/crop-options.ui.h:6 msgid "Maximize" msgstr "Išdidinti" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 -#| msgid "Centered" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:6 msgid "Center" msgstr "Centruotas" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 -msgid "Selection" -msgstr "Pažymėta sritis" - -#: ../extensions/file_tools/data/ui/crop-options.ui.h:9 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 #: ../extensions/file_tools/data/ui/resize-options.ui.h:5 +msgid "Aspect ratio" +msgstr "Proporcija" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 msgid "I_nvert aspect ratio" msgstr "I_nvertuoti proporciją" #. after the colon there is a control to select the size in pixels -#: ../extensions/file_tools/data/ui/crop-options.ui.h:11 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:10 msgid "M_ultiple of:" msgstr "_Kartotinis:" #. abbreviation of pixel -#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:12 msgid "px" msgstr "piks" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 +#: ../gthumb/gth-file-chooser-dialog.c:252 +msgid "Options" +msgstr "Parinktys" + #: ../extensions/file_tools/data/ui/crop-options.ui.h:14 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 -msgid "Aspect ratio" -msgstr "Proporcija" +msgid "_Grid:" +msgstr "_Tinklelis:" #: ../extensions/file_tools/data/ui/crop-options.ui.h:15 msgid "C_rop" msgstr "Ap_kirpti" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 -msgid "_Width:" -msgstr "Pl_otis:" +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:1 +msgid "Method" +msgstr "Metodas" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:2 +msgid "_Brightness" +msgstr "_Šviesumas" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:3 +msgid "_Saturation" +msgstr "_Grynis" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:4 +msgid "_Average" +msgstr "_Vidutinis" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 -msgid "Heigh_t:" -msgstr "_Aukštis:" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 -#| msgid "Set the image as desktop background" -msgid "Set the image size to this value" -msgstr "Nustatyti paveikslėlio dydį į šią vertę" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 #: ../gthumb/gth-main-default-metadata.c:47 msgid "Dimensions" msgstr "Matmenys" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 -msgid "High _quality" -msgstr "Aukšta _kokybė" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +msgid "Set the image size to this value" +msgstr "Nustatyti paveikslėlio dydį į šią vertę" #: ../extensions/file_tools/data/ui/resize-options.ui.h:8 -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 -msgid "Options" -msgstr "Parinktys" +msgid "High _quality" +msgstr "Aukšta _kokybė" #: ../extensions/file_tools/data/ui/resize-options.ui.h:9 msgid "Original dimensions:" @@ -2502,53 +2460,46 @@ msgstr "%" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:1 -msgid "Align" -msgstr "Lygiuoti" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 -#| msgid "Singles" msgid "Angle" msgstr "Kampas" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 +msgid "Align" +msgstr "Lygiuoti" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 +msgid "Image size" +msgstr "Paveikslėlio dydis" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 msgid "Point 1:" msgstr "Taškas 1:" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 msgid "Point 2:" msgstr "Taškas 2:" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 -#| msgid "_Keep aspect ratio" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 msgid "Keep aspect ratio" msgstr "Išlaikyti proporcijas" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 -#| msgid "_Image size:" -msgid "Image size" -msgstr "Paveikslėlio dydis" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 -#| msgid "_Grid:" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 msgid "Grid:" msgstr "Tinklelis:" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 +msgid "_Background:" +msgstr "_Fonas" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 msgid "Pick a background color" msgstr "Pasirinkite fono spalvą" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 -#| msgid "Transparency _type:" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 msgid "_Transparent" msgstr "_Permatomas" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 -#| msgid "Desktop background" -msgid "_Background:" -msgstr "_Fonas" - #: ../extensions/file_tools/data/ui/rotate-options.ui.h:12 -#| msgid "_Reset" msgid "Reset" msgstr "Atstatyti" @@ -2573,7 +2524,6 @@ msgstr "Lygiuotė" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:18 -#| msgid "Organize" msgid "Original size" msgstr "Originalus dydis" @@ -2599,7 +2549,6 @@ msgstr "Spindulys:" #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:4 -#| msgid "_Account:" msgid "Amount:" msgstr "Kiekis:" @@ -2611,141 +2560,134 @@ msgid "Basic tools to modify images." msgstr "Baziniai įrankiai paveikslėliams redaguoti." -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:372 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:272 +#: ../extensions/file_tools/gth-file-tool-grayscale.c:248 +#: ../extensions/file_tools/gth-file-tool-negative.c:68 +msgid "Applying changes" +msgstr "Pritaikomi pakeitimai" + +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 msgid "Adjust Colors..." msgstr "Koreguoti spalvas..." -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 msgid "Adjust Colors" msgstr "Koreguoti spalvas" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:531 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:619 msgid "Change brightness, contrast, saturation and gamma level of the image" msgstr "Keisti paveikslėlio skaistį, kontrastą, grynį ir gamą lygį" -#: ../extensions/file_tools/gth-file-tool-crop.c:424 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:304 +msgid "Adjust Contrast" +msgstr "Koreguoti kontrastą" + +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:305 +msgid "Automatic contrast adjustment" +msgstr "Automatinis kontrasto koregavimas" + +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 msgid "Square" msgstr "Kvadratas" -#: ../extensions/file_tools/gth-file-tool-crop.c:425 -#: ../extensions/file_tools/gth-file-tool-resize.c:499 +#: ../extensions/file_tools/gth-file-tool-crop.c:417 +#: ../extensions/file_tools/gth-file-tool-resize.c:590 #, c-format msgid "%d x %d (Image)" msgstr "%d x %d (paveikslėlis)" -#: ../extensions/file_tools/gth-file-tool-crop.c:428 -#: ../extensions/file_tools/gth-file-tool-resize.c:503 +#: ../extensions/file_tools/gth-file-tool-crop.c:420 +#: ../extensions/file_tools/gth-file-tool-resize.c:594 #, c-format msgid "%d x %d (Screen)" msgstr "%d x %d (ekranas)" -#: ../extensions/file_tools/gth-file-tool-crop.c:432 -#: ../extensions/file_tools/gth-file-tool-resize.c:508 +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-resize.c:599 msgid "5:4" msgstr "5:4" -#: ../extensions/file_tools/gth-file-tool-crop.c:433 -#: ../extensions/file_tools/gth-file-tool-resize.c:509 +#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-resize.c:600 msgid "4:3 (DVD, Book)" msgstr "4:3 (DVD, knyga)" -#: ../extensions/file_tools/gth-file-tool-crop.c:434 -#: ../extensions/file_tools/gth-file-tool-resize.c:510 +#: ../extensions/file_tools/gth-file-tool-crop.c:426 +#: ../extensions/file_tools/gth-file-tool-resize.c:601 msgid "7:5" msgstr "7:5" -#: ../extensions/file_tools/gth-file-tool-crop.c:435 -#: ../extensions/file_tools/gth-file-tool-resize.c:511 +#: ../extensions/file_tools/gth-file-tool-crop.c:427 +#: ../extensions/file_tools/gth-file-tool-resize.c:602 msgid "3:2 (Postcard)" msgstr "3:2 (atvirukas)" -#: ../extensions/file_tools/gth-file-tool-crop.c:436 -#: ../extensions/file_tools/gth-file-tool-resize.c:512 +#: ../extensions/file_tools/gth-file-tool-crop.c:428 +#: ../extensions/file_tools/gth-file-tool-resize.c:603 msgid "16:10" msgstr "16:10" -#: ../extensions/file_tools/gth-file-tool-crop.c:437 -#: ../extensions/file_tools/gth-file-tool-resize.c:513 +#: ../extensions/file_tools/gth-file-tool-crop.c:429 +#: ../extensions/file_tools/gth-file-tool-resize.c:604 msgid "16:9 (DVD)" msgstr "16:9 (DVD)" -#: ../extensions/file_tools/gth-file-tool-crop.c:438 -#: ../extensions/file_tools/gth-file-tool-resize.c:514 +#: ../extensions/file_tools/gth-file-tool-crop.c:430 +#: ../extensions/file_tools/gth-file-tool-resize.c:605 msgid "1.85:1" msgstr "1.85:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:439 -#: ../extensions/file_tools/gth-file-tool-resize.c:515 +#: ../extensions/file_tools/gth-file-tool-crop.c:431 +#: ../extensions/file_tools/gth-file-tool-resize.c:606 msgid "2.39:1" msgstr "2.39:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:440 -#: ../extensions/file_tools/gth-file-tool-resize.c:516 +#: ../extensions/file_tools/gth-file-tool-crop.c:432 +#: ../extensions/file_tools/gth-file-tool-resize.c:607 #: ../extensions/image_print/data/ui/print-layout.ui.h:2 #: ../extensions/rename_series/gth-template-selector.c:234 msgid "Custom" msgstr "Pasirinktinis" -#: ../extensions/file_tools/gth-file-tool-crop.c:455 -#: ../extensions/file_tools/gth-file-tool-rotate.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:447 +#: ../extensions/file_tools/gth-file-tool-rotate.c:398 msgid "Rule of Thirds" msgstr "Trečdalių taisyklė" -#: ../extensions/file_tools/gth-file-tool-crop.c:456 -#: ../extensions/file_tools/gth-file-tool-rotate.c:417 +#: ../extensions/file_tools/gth-file-tool-crop.c:448 +#: ../extensions/file_tools/gth-file-tool-rotate.c:399 msgid "Golden Sections" msgstr "Aukso pjūviai" -#: ../extensions/file_tools/gth-file-tool-crop.c:457 -#: ../extensions/file_tools/gth-file-tool-rotate.c:418 -#| msgid "Centered" +#: ../extensions/file_tools/gth-file-tool-crop.c:449 +#: ../extensions/file_tools/gth-file-tool-rotate.c:400 msgid "Center Lines" msgstr "Centruotos linijos" -#: ../extensions/file_tools/gth-file-tool-crop.c:458 -#: ../extensions/file_tools/gth-file-tool-rotate.c:419 +#: ../extensions/file_tools/gth-file-tool-crop.c:450 +#: ../extensions/file_tools/gth-file-tool-rotate.c:401 msgid "Uniform" msgstr "Vienodas" -#: ../extensions/file_tools/gth-file-tool-crop.c:614 +#: ../extensions/file_tools/gth-file-tool-crop.c:608 msgid "Crop..." msgstr "Apkirpti..." -#: ../extensions/file_tools/gth-file-tool-crop.c:614 +#: ../extensions/file_tools/gth-file-tool-crop.c:608 msgid "Crop" msgstr "Apkirpti" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:68 -#: ../extensions/file_tools/gth-file-tool-negative.c:68 -msgid "Applying changes" -msgstr "Pritaikomi pakeitimai" - -#: ../extensions/file_tools/gth-file-tool-desaturate.c:203 -msgid "Desaturate" -msgstr "Nusodrinti" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:119 -msgid "White balance correction" -msgstr "Baltos spalvos balanso korekcija" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:342 -msgid "Enhance Colors" -msgstr "Pagerinti spalvas" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:343 -msgid "Automatic white balance correction" -msgstr "Automatinė baltos spalvos balanso korekcija" - -#: ../extensions/file_tools/gth-file-tool-equalize.c:86 +#: ../extensions/file_tools/gth-file-tool-equalize.c:45 msgid "Equalizing image histogram" msgstr "Išlyginama paveikslėlio histograma" -#: ../extensions/file_tools/gth-file-tool-equalize.c:275 +#: ../extensions/file_tools/gth-file-tool-equalize.c:230 msgid "Equalize" msgstr "Išlyginti" -#: ../extensions/file_tools/gth-file-tool-equalize.c:276 +#: ../extensions/file_tools/gth-file-tool-equalize.c:231 msgid "Equalize image histogram" msgstr "Išlyginti paveikslėlio histogramą" @@ -2754,16 +2696,22 @@ msgstr "Apversti" #: ../extensions/file_tools/gth-file-tool-flip.c:88 -#| msgid "_Rotate the images physically" msgid "Flip the image vertically" msgstr "apversti paveikslėlį vertikaliai" +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale..." +msgstr "Pilka skalė..." + +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale" +msgstr "Pilka skalė" + #: ../extensions/file_tools/gth-file-tool-mirror.c:87 msgid "Mirror" msgstr "Atspindėti" #: ../extensions/file_tools/gth-file-tool-mirror.c:88 -#| msgid "Mirror image horizontally (left-right)" msgid "Mirror the image horizontally" msgstr "Apsukti paveikslėlį horizontaliai" @@ -2775,26 +2723,28 @@ msgid "Redo" msgstr "Pakartoti" -#: ../extensions/file_tools/gth-file-tool-resize.c:680 +#: ../extensions/file_tools/gth-file-tool-resize.c:214 +#: ../extensions/resize_images/dlg-resize-images.c:180 +msgid "Resizing images" +msgstr "Keičiamas paveikslėlių dydis" + +#: ../extensions/file_tools/gth-file-tool-resize.c:808 msgid "Resize..." msgstr "Keisti dydį..." -#: ../extensions/file_tools/gth-file-tool-resize.c:680 +#: ../extensions/file_tools/gth-file-tool-resize.c:808 msgid "Resize" msgstr "Keisti dydį" -#: ../extensions/file_tools/gth-file-tool-rotate.c:636 -#| msgid "_Rename..." +#: ../extensions/file_tools/gth-file-tool-rotate.c:628 msgid "Rotate..." msgstr "Pasukti..." -#: ../extensions/file_tools/gth-file-tool-rotate.c:636 -#| msgid "Rotate Left" +#: ../extensions/file_tools/gth-file-tool-rotate.c:628 msgid "Rotate" msgstr "Pasukti" -#: ../extensions/file_tools/gth-file-tool-rotate.c:637 -#| msgid "Click to view the image" +#: ../extensions/file_tools/gth-file-tool-rotate.c:629 msgid "Freely rotate the image" msgstr "Laisvai pasukti paveikslėlį" @@ -2804,7 +2754,6 @@ msgstr "Pasukti į kairę" #: ../extensions/file_tools/gth-file-tool-rotate-left.c:88 -#| msgid "Rotate image 90 degrees counter-clockwise" msgid "Rotate the image by 90 degrees counterclockwise" msgstr "Pasukti paveikslėlį 90 laipsnių prieš laikrodžio rodyklę" @@ -2814,7 +2763,6 @@ msgstr "Pasukti į dešinę" #: ../extensions/file_tools/gth-file-tool-rotate-right.c:88 -#| msgid "Rotate image 90 degrees clockwise" msgid "Rotate the image by 90 degrees clockwise" msgstr "Pasukti paveikslėlį 90 laipsnių pagal laikrodžio rodyklę" @@ -2826,18 +2774,15 @@ msgid "Save" msgstr "Įrašyti" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:100 -#| msgid "Saving images" +#: ../extensions/file_tools/gth-file-tool-sharpen.c:101 msgid "Sharpening image" msgstr "Paveikslėlio sodrinimas" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 -#| msgid "Enhance Colors" +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 msgid "Enhance Focus..." msgstr "Pagerinti fokusavimą..." -#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 -#| msgid "Enhance Colors" +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 msgid "Enhance Focus" msgstr "Pagerinti fokusavimą" @@ -2846,17 +2791,14 @@ msgstr "Atšaukti" #: ../extensions/find_duplicates/callbacks.c:48 -#| msgid "Found duplicates:" msgid "Find _Duplicates..." msgstr "Rasti dublikatus..." #: ../extensions/find_duplicates/callbacks.c:49 -#| msgid "Stop loading the current location" msgid "Find duplicated files in the current location" msgstr "Rasti dublikatus esamoje vietoje" #: ../extensions/find_duplicates/data/ui/find-duplicates-choose-folders.ui.h:1 -#| msgid "_Folders" msgid "_Folders:" msgstr "_Aplankai:" @@ -2865,12 +2807,10 @@ msgstr "Ieškoti dublikatų" #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 -#| msgid "Duplicates" msgid "Duplicates:" msgstr "Dublikatai:" #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 -#| msgid "Files" msgid "Files:" msgstr "Failai:" @@ -2880,13 +2820,11 @@ msgstr "_Rodymas" #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 -#| msgid "Found duplicates:" msgid "No duplicates found." msgstr "Dublikatai nerasta." #: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:1 #: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:1 -#| msgid "Found duplicates:" msgid "Find Duplicates" msgstr "Rasti dublikatus" @@ -2897,62 +2835,51 @@ msgstr "_Pradėti nuo:" #: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 -#| msgid "Filter" msgid "_Filter:" msgstr "_Filtras:" #: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:2 -#| msgid "Found duplicates:" msgid "Find duplicated files." msgstr "Rasti failų dublikatus." -#: ../extensions/find_duplicates/gth-find-duplicates.c:53 -#| msgid "_Save the new file as:" +#: ../extensions/find_duplicates/gth-find-duplicates.c:65 msgid "leave the newest duplicates" msgstr "palikti naujausius dublikatus" -#: ../extensions/find_duplicates/gth-find-duplicates.c:54 -#| msgid "Change the files date" +#: ../extensions/find_duplicates/gth-find-duplicates.c:66 msgid "leave the oldest duplicates" msgstr "palikti seniausius dublikatus" -#: ../extensions/find_duplicates/gth-find-duplicates.c:55 -#| msgid "_New Folder..." +#: ../extensions/find_duplicates/gth-find-duplicates.c:67 msgid "by folder..." msgstr "pagal aplanką..." -#: ../extensions/find_duplicates/gth-find-duplicates.c:56 -#| msgid "All Files" +#: ../extensions/find_duplicates/gth-find-duplicates.c:68 msgid "all files" msgstr "visi failai" -#: ../extensions/find_duplicates/gth-find-duplicates.c:57 -#| msgid "%d file" -#| msgid_plural "%d files" +#: ../extensions/find_duplicates/gth-find-duplicates.c:69 msgid "no file" msgstr "nėra failų" -#: ../extensions/find_duplicates/gth-find-duplicates.c:397 -#: ../extensions/find_duplicates/gth-find-duplicates.c:492 +#: ../extensions/find_duplicates/gth-find-duplicates.c:560 +#: ../extensions/find_duplicates/gth-find-duplicates.c:668 #, c-format -#| msgid "Found duplicates:" msgid "%d duplicate" msgid_plural "%d duplicates" msgstr[0] "%d dublikatas" msgstr[1] "%d dublikatai" msgstr[2] "%d dublikatų" -#: ../extensions/find_duplicates/gth-find-duplicates.c:536 -#| msgid "Search for Duplicates" +#: ../extensions/find_duplicates/gth-find-duplicates.c:712 msgid "Search completed" msgstr "Paieška baigta" -#: ../extensions/find_duplicates/gth-find-duplicates.c:548 -#| msgid "Search for Duplicates" +#: ../extensions/find_duplicates/gth-find-duplicates.c:725 msgid "Searching for duplicates" msgstr "Ieškoti dublikatų" -#: ../extensions/find_duplicates/gth-find-duplicates.c:551 +#: ../extensions/find_duplicates/gth-find-duplicates.c:728 #: ../gthumb/gth-load-file-data-task.c:106 #: ../gthumb/gth-save-file-data-task.c:100 #, c-format @@ -2962,22 +2889,19 @@ msgstr[1] "liko %d failai" msgstr[2] "liko %d failų" -#: ../extensions/find_duplicates/gth-find-duplicates.c:634 -#| msgid "Getting the album list" +#: ../extensions/find_duplicates/gth-find-duplicates.c:830 msgid "Getting the file list" msgstr "Gaunamas failų sąrašas" -#: ../extensions/find_duplicates/gth-find-duplicates.c:740 +#: ../extensions/find_duplicates/gth-find-duplicates.c:1016 msgid "Duplicates" msgstr "Dublikatai" -#: ../extensions/find_duplicates/gth-find-duplicates.c:997 -#| msgid "Selection" +#: ../extensions/find_duplicates/gth-find-duplicates.c:1306 msgid "Select" msgstr "Pažymėti" -#: ../extensions/flicker/callbacks.c:59 -#: ../extensions/flicker/callbacks.c:64 +#: ../extensions/flicker/callbacks.c:59 ../extensions/flicker/callbacks.c:64 msgid "_Flickr..." msgstr "Į _Flickr..." @@ -2998,7 +2922,7 @@ msgstr "Išsiųsti pasirinktus paveikslėlius į Flickr" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 #: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 msgid "Free space:" msgstr "Laisva vieta:" @@ -3020,69 +2944,94 @@ msgid "_Safety:" msgstr "_Saugumas:" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 msgid "Private photos, visible to family and friends" msgstr "Privačios fotografijos, matomos šeimai ir draugams" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 msgid "Private photos, visible to family" msgstr "Privačios fotografijos, matomos šeimai" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 msgid "Private photos" msgstr "Privačios fotografijos" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 msgid "Safe content" msgstr "Saugus turinys" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 msgid "Moderate content" msgstr "Nuosaikus turinys" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:17 msgid "Restricted content" msgstr "Ribojamas turinys" -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 -msgid "_Import" -msgstr "_Importuoti" +#: ../extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui.h:1 +msgid "C_ontinue" +msgstr "_Tęsti" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:360 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:830 -msgid "Could not get the photo list" -msgstr "Nepavyko gauti fotografijų sąrašo" +#: ../extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui.h:2 +msgid "_Authorize..." +msgstr "_Nustatyti tapatybę..." -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:397 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:561 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:864 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1026 -msgid "No album selected" -msgstr "Nepasirinkta jokių albumų" +#: ../extensions/flicker_utils/flickr-consumer.c:124 +#: ../extensions/flicker_utils/flickr-service.c:237 +#: ../extensions/flicker_utils/flickr-service.c:348 +#: ../extensions/flicker_utils/flickr-service.c:672 +#: ../extensions/flicker_utils/flickr-service.c:937 +#: ../extensions/oauth/oauth-service.c:154 +#: ../extensions/photobucket/photobucket-consumer.c:74 +#: ../extensions/photobucket/photobucket-consumer.c:82 +#: ../extensions/photobucket/photobucket-consumer.c:149 +#: ../extensions/photobucket/photobucket-service.c:132 +msgid "Unknown error" +msgstr "Nežinoma klaida" + +#: ../extensions/flicker_utils/flickr-service.c:502 +#, c-format +msgid "" +"Return to this window when you have finished the authorization process on %s" +msgstr "Grįžkite į šį langą, kai nustatysite tapatybę %s" + +#: ../extensions/flicker_utils/flickr-service.c:503 +msgid "Once you're done, click the 'Continue' button below." +msgstr "Kai baigsite, spustelėkite žemiau esantį mygtuką „Tęsti“." + +#: ../extensions/flicker_utils/flickr-service.c:571 +#, c-format +#| msgid "gthumb requires your authorization to upload the photos to %s" +msgid "gThumb requires your authorization to upload the photos to %s" +msgstr "gThumb reikalauja nustatyti jūsų tapatybę fotografijų siuntimui į %s" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:579 +#: ../extensions/flicker_utils/flickr-service.c:572 #, c-format -msgid "Import from %s" -msgstr "Importuoti iš %s" +msgid "" +"Click 'Authorize' to open your web browser and authorize gthumb to upload " +"photos to %s. When you're finished, return to this window to complete the " +"authorization." +msgstr "" +"Spustelėkite „Nustatyti tapatybę“, kad atvertumėte žiniatinklio naršyklę ir " +"nustatytumėte tapatybę norėdami įkelti fotografijas į %s. Kai baigsite, " +"grįžkite į šį langą tapatybės nustatymo procedūrai baigti." #: ../extensions/gstreamer_tools/actions.c:66 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1080 -#: ../gthumb/gth-browser.c:2008 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1072 +#: ../gthumb/gth-browser.c:2175 msgid "Could not save the file" msgstr "Nepavyko įrašyti failo" -#: ../extensions/gstreamer_tools/actions.c:126 +#: ../extensions/gstreamer_tools/actions.c:130 msgid "Could not take a screenshot" msgstr "Nepavyko nufotografuoti ekrano" -#: ../extensions/gstreamer_tools/actions.c:132 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1248 +#: ../extensions/gstreamer_tools/actions.c:136 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1245 msgid "Save Image" msgstr "Įrašyti paveikslėlį" -#: ../extensions/gstreamer_tools/actions.c:152 +#: ../extensions/gstreamer_tools/actions.c:156 msgctxt "Filename" msgid "Screenshot" msgstr "Ekrano nuotrauka" @@ -3092,7 +3041,7 @@ msgstr "Lėčiau" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:686 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:699 msgid "Play" msgstr "Groti" @@ -3138,12 +3087,11 @@ msgid "Take a screenshot" msgstr "Daryti ekrano nuotrauką" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:663 -#| msgid "Play audio and video files." +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 msgid "Playing video" msgstr "Grojamas vaizdo įrašas" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:689 msgid "Pause" msgstr "Pauzė" @@ -3202,20 +3150,19 @@ msgid "Sample rate" msgstr "Imties dažnis" -#: ../extensions/gstreamer_utils/gstreamer-utils.c:363 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:362 msgid "Stereo" msgstr "Stereo" -#: ../extensions/gstreamer_utils/gstreamer-utils.c:363 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:362 msgid "Mono" msgstr "Mono" #. Translators: this is an image size, such as 1024 × 768 -#: ../extensions/gstreamer_utils/gstreamer-utils.c:396 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1303 -#: ../extensions/image_viewer/gth-metadata-provider-image.c:190 -#: ../extensions/webalbums/dlg-web-exporter.c:442 -#: ../extensions/webalbums/gth-web-exporter.c:2446 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:395 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1300 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:209 +#: ../extensions/webalbums/gth-web-exporter.c:2446 ../gthumb/gtk-utils.c:1037 #, c-format msgid "%d × %d" msgstr "%d × %d" @@ -3224,7 +3171,7 @@ msgid "Could not print the selected files" msgstr "Nepavyko atspausdinti pasirinktų failų" -#: ../extensions/image_print/callbacks.c:54 +#: ../extensions/image_print/callbacks.c:65 msgid "Print the selected images" msgstr "Spausdinti pasirinktus paveikslėlius" @@ -3233,7 +3180,6 @@ msgstr "Centruotas" #: ../extensions/image_print/data/ui/print-layout.ui.h:13 -#| msgid "The total number of images" msgid "The total number of files" msgstr "Iš viso failų" @@ -3287,40 +3233,37 @@ msgstr "Pasirinkti antraštės šriftą" #: ../extensions/image_print/data/ui/print-preferences.ui.h:5 -#| msgid "Select Caption Font" msgid "Select Header Font" msgstr "Pasirinkti antraštės šriftą" #: ../extensions/image_print/data/ui/print-preferences.ui.h:6 -#| msgid "Select Caption Font" msgid "Select Footer Font" msgstr "Pasirinkti poraštės šriftą" #: ../extensions/image_print/data/ui/print-preferences.ui.h:7 -#| msgid "_Font:" msgid "Fonts" msgstr "Šriftai" -#: ../extensions/image_print/gth-image-print-job.c:971 +#: ../extensions/image_print/gth-image-print-job.c:914 #: ../extensions/webalbums/data/albumthemes/text.h:31 #, c-format msgid "Page %d of %d" msgstr "%d puslapis iš %d" -#: ../extensions/image_print/gth-image-print-job.c:1734 -#: ../extensions/image_print/gth-image-print-job.c:1861 -#: ../extensions/image_print/gth-image-print-job.c:1898 +#: ../extensions/image_print/gth-image-print-job.c:1680 +#: ../extensions/image_print/gth-image-print-job.c:1845 +#: ../extensions/image_print/gth-image-print-job.c:1888 msgid "Could not print" msgstr "Nepavyko išspausdinti" -#: ../extensions/image_print/gth-image-print-job.c:1796 +#: ../extensions/image_print/gth-image-print-job.c:1746 #: ../gthumb/gth-main-default-tests.c:240 msgid "Images" msgstr "Paveikslėliai" -#: ../extensions/image_print/gth-image-print-job.c:1863 -#: ../gthumb/gth-image-loader.c:204 -#: ../gthumb/gth-image-loader.c:278 +#: ../extensions/image_print/gth-image-print-job.c:1847 +#: ../gthumb/gth-image-loader.c:197 ../gthumb/gth-image-loader.c:304 +#: ../gthumb/gth-image-utils.c:131 ../gthumb/gth-image-utils.c:137 msgid "No suitable loader available for this file type" msgstr "Šio tipo failams nėra tinkamos įkėlimo priemonės" @@ -3331,7 +3274,7 @@ msgstr "Įkeliama „%s“" #: ../extensions/image_print/gth-load-image-info-task.c:166 -#: ../extensions/webalbums/gth-web-exporter.c:2685 +#: ../extensions/webalbums/gth-web-exporter.c:2719 msgid "Loading images" msgstr "Įkeliami paveikslėliai" @@ -3344,7 +3287,6 @@ msgstr "Leisti spausdinti paveikslėlius pasirenkant puslapio išdėstymą." #: ../extensions/image_print/preferences.c:79 -#| msgid "Print..." msgid "Print" msgstr "Spausdinti" @@ -3374,7 +3316,7 @@ #: ../extensions/image_rotation/gth-reset-orientation-task.c:111 #: ../extensions/image_rotation/gth-transform-task.c:141 -#: ../extensions/webalbums/gth-web-exporter.c:2339 +#: ../extensions/webalbums/gth-web-exporter.c:2338 #: ../extensions/webalbums/gth-web-exporter.c:2423 msgid "Saving images" msgstr "Įrašomi paveikslėliai" @@ -3394,17 +3336,27 @@ #: ../extensions/image_rotation/rotation-utils.c:122 msgid "" -"This transformation may introduce small image distortions along one or more edges, because the image dimensions are not multiples of 8.\n" +"This transformation may introduce small image distortions along one or more " +"edges, because the image dimensions are not multiples of 8.\n" "\n" -"The distortion is reversible, however. If the resulting image is unacceptable, simply apply the reverse transformation to return to the original image.\n" +"The distortion is reversible, however. If the resulting image is " +"unacceptable, simply apply the reverse transformation to return to the " +"original image.\n" "\n" -"You can also choose to discard (or trim) any untransformable edge pixels. For practical use, this mode gives the best looking results, but the transformation is not strictly lossless anymore." +"You can also choose to discard (or trim) any untransformable edge pixels. " +"For practical use, this mode gives the best looking results, but the " +"transformation is not strictly lossless anymore." msgstr "" -"Dėl šios transformacijos gali atsirasti nedidelių paveikslėlių iškraipymų viename ar daugiau kraštų, kadangi paveikslėlio matmenys nesidalija iš 8.\n" +"Dėl šios transformacijos gali atsirasti nedidelių paveikslėlių iškraipymų " +"viename ar daugiau kraštų, kadangi paveikslėlio matmenys nesidalija iš 8.\n" "\n" -"Tačiau šie iškraipymai yra atstatomi. Jeigu gautasis paveikslėlis nepriimtinas, paprasčiausiai pritaikykite atvirkštinę transformaciją ir gausite pradinį paveikslėlį.\n" +"Tačiau šie iškraipymai yra atstatomi. Jeigu gautasis paveikslėlis " +"nepriimtinas, paprasčiausiai pritaikykite atvirkštinę transformaciją ir " +"gausite pradinį paveikslėlį.\n" "\n" -"Galite taip pat panaikinti (ar padailinti) netransformuojamus kraštinius taškelius. Praktiškai naudojant šią transformaciją gaunamas geriausiai atrodantis paveikslėlis, tačiau ši transformacija neatšaukiama." +"Galite taip pat panaikinti (ar padailinti) netransformuojamus kraštinius " +"taškelius. Praktiškai naudojant šią transformaciją gaunamas geriausiai " +"atrodantis paveikslėlis, tačiau ši transformacija neatšaukiama." #: ../extensions/image_rotation/rotation-utils.c:128 msgid "_Trim" @@ -3475,27 +3427,22 @@ msgstr "Languotas" #: ../extensions/image_viewer/gth-image-histogram.c:84 -#| msgid "_Histogram" msgid "Histogram" msgstr "Histograma" #: ../extensions/image_viewer/gth-image-viewer-page.c:179 -#| msgid "Crop image" msgid "Copy Image" msgstr "Kopijuoti paveikslėlį" #: ../extensions/image_viewer/gth-image-viewer-page.c:180 -#| msgid "Copy this image to another location" msgid "Copy the image to the clipboard" msgstr "Kopijuoti paveikslėlį į iškarpinę" #: ../extensions/image_viewer/gth-image-viewer-page.c:184 -#| msgid "Save Image" msgid "Paste Image" msgstr "Įdėti paveikslėlį" #: ../extensions/image_viewer/gth-image-viewer-page.c:185 -#| msgid "Delete selected images from the camera" msgid "Paste the image from the clipboard" msgstr "Įdėti paveikslėlį iš iškarpinės" @@ -3615,40 +3562,39 @@ msgid "custom format" msgstr "pasirinktinis formatas" -#: ../extensions/importer/gth-import-task.c:442 -#: ../extensions/importer/gth-import-task.c:477 -#: ../extensions/importer/gth-import-task.c:648 +#: ../extensions/importer/gth-import-task.c:426 +#: ../extensions/importer/gth-import-task.c:461 +#: ../extensions/importer/gth-import-task.c:671 msgid "Importing files" msgstr "Importuojami failai" -#: ../extensions/importer/gth-import-task.c:598 +#: ../extensions/importer/gth-import-task.c:620 msgid "No file imported" msgstr "Neimportuota jokių failų" -#: ../extensions/importer/gth-import-task.c:599 +#: ../extensions/importer/gth-import-task.c:621 msgid "The selected files are already present in the destination." msgstr "Pasirinkti failai jau yra paskirties vietoje." -#: ../extensions/importer/gth-import-task.c:622 +#: ../extensions/importer/gth-import-task.c:644 #: ../gthumb/gth-file-source-vfs.c:694 msgid "Could not delete the files" msgstr "Nepavyko ištrinti failų" -#: ../extensions/importer/gth-import-task.c:623 +#: ../extensions/importer/gth-import-task.c:645 msgid "Delete operation not supported." msgstr "Ištrynimo operacija nepalaikoma." -#: ../extensions/importer/gth-import-task.c:709 +#: ../extensions/importer/gth-import-task.c:732 msgid "Last imported" msgstr "Paskutinį kartą importuota" -#: ../extensions/importer/gth-import-task.c:815 -#| msgid "No name specified" +#: ../extensions/importer/gth-import-task.c:838 msgid "No file specified." msgstr "Nenurodytas failas." #. Translators: For example: Not enough free space in '/home/user/Images'.\n1.3 GB of space is required but only 300 MB is available. -#: ../extensions/importer/gth-import-task.c:852 +#: ../extensions/importer/gth-import-task.c:875 #, c-format msgid "" "Not enough free space in '%s'.\n" @@ -3657,8 +3603,7 @@ "„%s“ trūksta vietos.\n" "Reikia %s vietos, bet yra tik %s." -#: ../extensions/list_tools/callbacks.c:76 -#: ../gthumb/gth-filterbar.c:304 +#: ../extensions/list_tools/callbacks.c:76 ../gthumb/gth-filterbar.c:311 msgid "Personalize..." msgstr "Suasmeninti..." @@ -3793,9 +3738,6 @@ msgstr "Keisti komandą" #: ../extensions/list_tools/dlg-personalize-scripts.c:461 -#| msgid "Are you sure you want to permanently delete the %'d selected file?" -#| msgid_plural "" -#| "Are you sure you want to permanently delete the %'d selected files?" msgid "Are you sure you want to delete the selected command?" msgstr "Ar tikrai norite negrįžtamai ištrinti pasirinktą komandą?" @@ -3804,9 +3746,9 @@ msgstr "Įveskite reikšmę:" #: ../extensions/list_tools/gth-script.c:745 -#: ../extensions/webalbums/gth-web-exporter.c:560 -#: ../extensions/webalbums/gth-web-exporter.c:572 -#: ../extensions/webalbums/gth-web-exporter.c:580 +#: ../extensions/webalbums/gth-web-exporter.c:558 +#: ../extensions/webalbums/gth-web-exporter.c:570 +#: ../extensions/webalbums/gth-web-exporter.c:578 msgid "Malformed command" msgstr "Netinkamai suformuota komanda" @@ -3843,7 +3785,6 @@ msgstr "P" #: ../extensions/map_view/gth-map-view.c:130 -#| msgid "%N" msgctxt "Cardinal point" msgid "N" msgstr "Š" @@ -3854,7 +3795,6 @@ msgstr "V" #: ../extensions/map_view/gth-map-view.c:132 -#| msgid "%E" msgctxt "Cardinal point" msgid "E" msgstr "R" @@ -3873,6 +3813,47 @@ msgid "View the photo position on the map" msgstr "Rodyti nuotraukos vietą žemėlapyje" +#: ../extensions/oauth/data/ui/oauth-account-manager.ui.h:1 +msgid "A_ccounts:" +msgstr "P_askyros:" + +#: ../extensions/oauth/data/ui/oauth-ask-authorization.ui.h:1 +#: ../gthumb/gth-folder-tree.c:1067 +msgid "Loading..." +msgstr "Įkeliama..." + +#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 +msgid "New authentication..." +msgstr "Iš naujo nustatyti tapatybę..." + +#: ../extensions/oauth/oauth-ask-authorization-dialog.c:191 +msgid "Authorization Required" +msgstr "Reikia patvirtinti tapatybę" + +#: ../extensions/oauth/web-service.c:382 +msgid "Choose _Account..." +msgstr "Pasirinkite _paskyrą..." + +#: ../extensions/oauth/web-service.c:660 +msgid "Choose Account" +msgstr "Pasirinkite paskyrą" + +#: ../extensions/oauth/web-service.c:777 +msgid "Edit Accounts" +msgstr "Keisti paskyras" + +#: ../extensions/oauth/web-service.c:795 ../extensions/oauth/web-service.c:812 +msgid "Connecting to the server" +msgstr "Jungiamasi prie serverio" + +#: ../extensions/oauth/web-service.c:796 +msgid "Asking authorization" +msgstr "Prašomas leidimo" + +#: ../extensions/oauth/web-service.c:813 +msgid "Getting account information" +msgstr "Gaunama paskyros informacija" + #: ../extensions/photobucket/callbacks.c:54 msgid "Photobucket..." msgstr "Photobucket..." @@ -3881,68 +3862,68 @@ msgid "Upload photos to Photobucket" msgstr "Įkelti fotografijas į Photobucket" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +msgid "_Scramble filenames" +msgstr "_Sumaišyti failų pavadinimus" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 msgid "Tiny ( 100 x 75 )" msgstr "Smulkus ( 100 x 75 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 msgid "Small ( 160 x 120 )" msgstr "Mažas ( 160 x 120 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 msgid "Medium ( 320 x 240 )" msgstr "Vidutinis ( 320 x 240 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 msgid "Large ( 640 x 480 )" msgstr "Didelis ( 640 x 480 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 msgid "15ʺ screen ( 800 x 600 )" msgstr "15 colių ekranas ( 800 x 600 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 msgid "17ʺ screen ( 1024 x 768 )" msgstr "17 colių ekranas ( 1024 x 768 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 msgid "1 megabyte file size" msgstr "1 megabaito dydžio failas" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 -msgid "_Scramble filenames" -msgstr "_Sumaišyti failų pavadinimus" - #: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 msgid "_Container:" msgstr "_Konteineris:" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:290 msgid "Tiny ( 100 × 75 )" msgstr "Mažytis ( 100 x 75 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 msgid "Small ( 160 × 120 )" msgstr "Mažas ( 160 x 120 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 msgid "Medium ( 320 × 240 )" msgstr "Vidutinis ( 320 x 240 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 msgid "Large ( 640 × 480 )" msgstr "Didelis ( 640 x 480 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 msgid "15ʺ screen ( 800 × 600 )" msgstr "15 colių ekranas ( 800 x 600 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 msgid "17ʺ screen ( 1024 × 768 )" msgstr "17 colių ekranas ( 1024 x 768 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:304 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:303 msgid "2 megabyte file size" msgstr "2 megabaitų dydžio failas" @@ -3955,7 +3936,6 @@ msgstr "Išsiųsti paveikslėlius į PhotoBucket" #: ../extensions/photo_importer/actions.c:71 -#| msgid "_Import" msgid "Import" msgstr "Importuoti" @@ -3968,12 +3948,10 @@ msgstr "Importuoti fotografijas ir kitus failus iš išimamos laikmenos" #: ../extensions/photo_importer/callbacks.c:56 -#| msgid "_New Folder..." msgid "F_older..." msgstr "_Aplankas..." #: ../extensions/photo_importer/callbacks.c:57 -#| msgid "Import photos and other files from a removable device" msgid "Import photos and other files from a folder" msgstr "Importuoti fotografijas ir kitus failus iš aplanko" @@ -3987,7 +3965,7 @@ #. view label #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 -#: ../gthumb/gth-filterbar.c:414 +#: ../gthumb/gth-filterbar.c:421 msgid "S_how:" msgstr "_Rodyti:" @@ -4004,8 +3982,7 @@ msgstr "_Ištrinti importuotus failus iš šaltinio" #: ../extensions/photo_importer/dlg-photo-importer.c:227 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:174 -#| msgid "Could not export the files" +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:149 msgid "Could not import the files" msgstr "Nepavyko importuoti failų" @@ -4020,7 +3997,7 @@ msgstr "Nepavyko įkelti aplanko" #: ../extensions/photo_importer/dlg-photo-importer.c:369 -#: ../gthumb/gth-browser.c:1921 +#: ../gthumb/gth-browser.c:2089 msgid "Getting folder listing..." msgstr "Gaunamas aplankų sąrašas..." @@ -4033,7 +4010,6 @@ msgstr "Importuoti iš išimamos laikmenos" #: ../extensions/photo_importer/dlg-photo-importer.c:618 -#| msgid "Import from %s" msgid "Import from Folder" msgstr "Importuoti iš aplanko" @@ -4066,49 +4042,15 @@ msgid "_Albums:" msgstr "_Albumai:" -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 -msgid "Import from Picasa Web Album" -msgstr "Importuoti iš Picasa žiniatinklio albumo" - -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 -msgid "_Album:" -msgstr "_Albumas:" - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:1 -msgid "_E-Mail:" -msgstr "_El. paštas:" - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 -msgid "Type the characters you see in the picture below. Letters are not case-sensitive." -msgstr "Įveskite simbolius, kuriuos matote žemiau esančiame paveikslėlyje. Raidžių registras neturi reikšmės." - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:3 -msgid "_Password:" -msgstr "_Slaptažodis:" - #: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 msgid "Public" msgstr "Vieša" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:354 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:310 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:458 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:469 msgid "Could not get the album list" msgstr "Nepavyko gauti albumų sąrašo" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:438 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:394 -msgid "Picasa Web Album" -msgstr "Picasa žiniatinklio albumas" - -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:525 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:481 -msgid "Account" -msgstr "Paskyra" - -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:104 -msgid "Could not load the file" -msgstr "Nepavyko įkelti failo" - #: ../extensions/picasaweb/picasaweb.extension.in.in.h:1 msgid "Picasa Web Albums" msgstr "Picasa internetiniai albumai" @@ -4117,93 +4059,6 @@ msgid "Upload images to Picasa Web Albums" msgstr "Nusiųsti paveikslėlius į Picasa internetinius albumus" -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:1 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:1 -#| msgid "Default options:" -msgid "_Default extension:" -msgstr "_Numatytasis plėtinys:" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:2 -msgid "_Quality:" -msgstr "_Kokybė:" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 -msgid "_Smoothing:" -msgstr "_Glotninimas:" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 -msgid "Opti_mize" -msgstr "Opti_mizuoti" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:5 -msgid "_Progressive" -msgstr "_Progresyvus" - -#: ../extensions/pixbuf_savers/data/ui/png-options.ui.h:1 -msgid "Compression _level:" -msgstr "Glaudinimo _lygis:" - -#: ../extensions/pixbuf_savers/data/ui/save-options-preferences.ui.h:1 -msgid "Default options:" -msgstr "Numatytosios parinktys:" - -#: ../extensions/pixbuf_savers/data/ui/tga-options.ui.h:1 -msgid "_RLE compression" -msgstr "_RLE glaudinimas" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:2 -msgid "_No compression" -msgstr "_Jokio glaudinimo" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:3 -msgid "No_rmal (Deflate)" -msgstr "No_rmalus (Deflate)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 -msgid "_Loss compression (JPEG)" -msgstr "_Nuostolingas glaudinimas (JPEG)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 -msgid "Compression" -msgstr "Glaudinimas" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 -msgid "dpi" -msgstr "dpi" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:9 -msgid "Resolution" -msgstr "Raiška" - -#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:519 -msgid "JPEG" -msgstr "JPEG" - -#: ../extensions/pixbuf_savers/gth-png-saver.c:140 -msgid "PNG" -msgstr "PNG" - -#: ../extensions/pixbuf_savers/gth-tga-saver.c:286 -#: ../gthumb/gth-buffer-data.c:84 -msgid "Insufficient memory" -msgstr "Nepakanka atminties" - -#: ../extensions/pixbuf_savers/gth-tga-saver.c:373 -msgid "TGA" -msgstr "TGA" - -#: ../extensions/pixbuf_savers/gth-tiff-saver.c:537 -msgid "TIFF" -msgstr "TIFF" - -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:1 -msgid "Save images" -msgstr "Įrašyti paveikslėlius" - -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:2 -msgid "Save images in common file formats such as JPEG, PNG and TIFF" -msgstr "Įrašyti paveikslėlius įprastiniais formatais, tokiais kaip JPEG, PNG ir TIFF" - #: ../extensions/raw_files/raw_files.extension.in.in.h:1 msgid "Raw format support" msgstr "Raw formato palaikymas" @@ -4212,11 +4067,11 @@ msgid "Allow to load raw format images." msgstr "Leisti įkelti raw formato paveikslėlius." -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 msgid "_X:" msgstr "_X:" -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 msgid "_Y:" msgstr "_Y:" @@ -4241,17 +4096,14 @@ msgstr "Priemonė raudonų akių efektui pašalinti iš fotografijos." #: ../extensions/rename_series/data/ui/code-selector.ui.h:1 -#| msgid "Edit" msgid "digits" msgstr "skaitmenys" #: ../extensions/rename_series/data/ui/code-selector.ui.h:2 -#| msgid "Format" msgid "format:" msgstr "formatas:" #: ../extensions/rename_series/data/ui/code-selector.ui.h:3 -#| msgid "Rem_ove" msgid "remove" msgstr "pašalinti" @@ -4269,7 +4121,6 @@ msgstr "_Registras:" #: ../extensions/rename_series/data/ui/rename-series.ui.h:7 -#| msgid "Edit Filter" msgid "Edit template" msgstr "Keisti šabloną" @@ -4315,72 +4166,63 @@ msgstr "At_virkštinė tvarka" #: ../extensions/rename_series/dlg-rename-series.c:58 -#| msgid "New enumerator digit" msgid "Enumerator" msgstr "Išvardintojas" #: ../extensions/rename_series/dlg-rename-series.c:59 -#| msgid "The original filename" msgid "Original filename" msgstr "Originalus failo pavadinimas" #: ../extensions/rename_series/dlg-rename-series.c:60 -#| msgid "The original extension" msgid "Original extension" msgstr "Originalus plėtinys" #: ../extensions/rename_series/dlg-rename-series.c:61 -#| msgid "The original enumerator" msgid "Original enumerator" msgstr "Originalus išvardintojas" #: ../extensions/rename_series/dlg-rename-series.c:62 -#| msgid "The modification date" msgid "Modification date" msgstr "Pakeitimo data" #: ../extensions/rename_series/dlg-rename-series.c:63 -#| msgid "The digitalization date" msgid "Digitalization date" msgstr "Suskaitmeninimo data" #: ../extensions/rename_series/dlg-rename-series.c:64 -#| msgid "A file attribute" msgid "File attribute" msgstr "Failo atributas" -#: ../extensions/rename_series/dlg-rename-series.c:552 -#: ../extensions/rename_series/dlg-rename-series.c:683 +#: ../extensions/rename_series/dlg-rename-series.c:558 +#: ../extensions/rename_series/dlg-rename-series.c:689 msgid "Could not rename the files" msgstr "Nepavyko pervadinti failų" -#: ../extensions/rename_series/dlg-rename-series.c:780 -#| msgid "Could not save the filter" +#: ../extensions/rename_series/dlg-rename-series.c:786 msgid "Could not save the template" msgstr "Nepavyko įrašyti šablono" -#: ../extensions/rename_series/dlg-rename-series.c:798 -#| msgid "_Template:" +#: ../extensions/rename_series/dlg-rename-series.c:804 msgid "Edit Template" msgstr "Keisti šabloną" -#: ../extensions/rename_series/dlg-rename-series.c:856 +#: ../extensions/rename_series/dlg-rename-series.c:862 msgid "Old Name" msgstr "Senasis pavadinimas" -#: ../extensions/rename_series/dlg-rename-series.c:867 +#: ../extensions/rename_series/dlg-rename-series.c:873 msgid "New Name" msgstr "Naujasis pavadinimas" -#: ../extensions/rename_series/dlg-rename-series.c:944 +#: ../extensions/rename_series/dlg-rename-series.c:950 msgid "Keep original case" msgstr "Palikti originalų registrą" -#: ../extensions/rename_series/dlg-rename-series.c:945 +#: ../extensions/rename_series/dlg-rename-series.c:951 msgid "Convert to lower-case" msgstr "Konvertuoti į mažąsias raides" -#: ../extensions/rename_series/dlg-rename-series.c:946 +#: ../extensions/rename_series/dlg-rename-series.c:952 msgid "Convert to upper-case" msgstr "Konvertuoti į didžiąsias raides" @@ -4429,12 +4271,7 @@ msgid "pixel" msgstr "pikseliai" -#: ../extensions/resize_images/dlg-resize-images.c:168 -msgid "Resizing images" -msgstr "Keičiamas paveikslėlių dydis" - -#: ../extensions/resize_images/dlg-resize-images.c:412 -#| msgid "Keep original case" +#: ../extensions/resize_images/dlg-resize-images.c:423 msgid "Keep the original format" msgstr "Palikti originalų formatą" @@ -4446,8 +4283,7 @@ msgid "Resize series of images." msgstr "Keisti paveikslėlių sekų dydį." -#: ../extensions/search/actions.c:49 -#: ../extensions/search/actions.c:117 +#: ../extensions/search/actions.c:49 ../extensions/search/actions.c:117 #: ../extensions/search/actions.c:123 msgid "Could not perform the search" msgstr "Nepavyko atlikti paieškos" @@ -4486,7 +4322,6 @@ #: ../extensions/search/gth-search-task.c:181 #, c-format -#| msgid "Files found untill now: %" msgid "Files found until now: %s" msgstr "Iki šiol rasti failai: %s" @@ -4502,45 +4337,40 @@ msgid "File search tool." msgstr "Failų paieškos įrankis." -#: ../extensions/selections/callbacks.c:62 -#| msgid "Selection" +#: ../extensions/selections/callbacks.c:77 msgid "Add to _Selection" msgstr "Pridėti prie _pažymėjimo" -#: ../extensions/selections/callbacks.c:65 -#| msgid "Selection" +#: ../extensions/selections/callbacks.c:86 msgid "Selection 1" msgstr "Sritis 1" -#: ../extensions/selections/callbacks.c:70 -#| msgid "Selection" +#: ../extensions/selections/callbacks.c:91 msgid "Selection 2" msgstr "Sritis 2" -#: ../extensions/selections/callbacks.c:75 -#| msgid "Selection" +#: ../extensions/selections/callbacks.c:96 msgid "Selection 3" msgstr "Sritis 3" -#: ../extensions/selections/callbacks.c:180 +#: ../extensions/selections/callbacks.c:285 #, c-format -msgid "Use Alt-%d to add files to this selection, Ctrl-%d to view this selection." -msgstr "Naudokite Alt-%d failams pridėti prie pažymėjimo, Vald-%d žymėjimui rodyti." +msgid "" +"Use Alt-%d to add files to this selection, Ctrl-%d to view this selection." +msgstr "" +"Naudokite Alt-%d failams pridėti prie pažymėjimo, Vald-%d žymėjimui rodyti." -#: ../extensions/selections/gth-selections-manager.c:250 +#: ../extensions/selections/gth-selections-manager.c:239 #, c-format -#| msgid "Selection" msgid "Selection %d" msgstr "Sritis %d" -#: ../extensions/selections/gth-selections-manager.c:253 +#: ../extensions/selections/gth-selections-manager.c:242 #: ../extensions/selections/selections.extension.in.in.h:1 -#| msgid "Selection" msgid "Selections" msgstr "Sritys" #: ../extensions/selections/selections.extension.in.in.h:2 -#| msgid "No valid file selected." msgid "Advanced file selection." msgstr "Sudėtingesnis failų žymėjimas." @@ -4592,8 +4422,7 @@ msgid "Remove the selected files" msgstr "Pašalinti pasirinktus failus" -#: ../extensions/slideshow/gth-slideshow.c:229 -#| msgid "Slideshow" +#: ../extensions/slideshow/gth-slideshow.c:231 msgid "Playing slideshow" msgstr "Rodymos skaidrės" @@ -4722,10 +4551,6 @@ msgid "_Copy originals to destination" msgstr "_Kopijuoti originalus į naują vietą" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 -msgid "_Resize if larger than:" -msgstr "Keisti d_ydį, jei didesnis nei:" - #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 msgid "_Adapt to the window width " msgstr "_Pritaikyti prie lango pločio" @@ -4747,7 +4572,6 @@ msgstr "Iš viso paveikslėlių" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 -#| msgid "The file path" msgid "The file comment" msgstr "Failo komentaras" @@ -4767,36 +4591,36 @@ msgid "Image Attributes" msgstr "Paveikslėlio atributai" -#: ../extensions/webalbums/gth-web-exporter.c:1802 +#: ../extensions/webalbums/gth-web-exporter.c:1800 msgid "Could not show the destination" msgstr "Nepavyko parodyti tikslo" -#: ../extensions/webalbums/gth-web-exporter.c:1838 +#: ../extensions/webalbums/gth-web-exporter.c:1836 msgid "The album has been created successfully." msgstr "Albumas sėkmingai sukurtas." -#: ../extensions/webalbums/gth-web-exporter.c:2106 -#: ../extensions/webalbums/gth-web-exporter.c:2133 +#: ../extensions/webalbums/gth-web-exporter.c:2104 +#: ../extensions/webalbums/gth-web-exporter.c:2132 msgid "Saving thumbnails" msgstr "Įrašomos miniatiūros" -#: ../extensions/webalbums/gth-web-exporter.c:2161 +#: ../extensions/webalbums/gth-web-exporter.c:2160 msgid "Saving HTML pages: Images" msgstr "Įrašomi HTML puslapiai: paveikslėliai" -#: ../extensions/webalbums/gth-web-exporter.c:2219 +#: ../extensions/webalbums/gth-web-exporter.c:2218 msgid "Saving HTML pages: Indexes" msgstr "Įrašomi HTML puslapiai: rodyklės" -#: ../extensions/webalbums/gth-web-exporter.c:2502 +#: ../extensions/webalbums/gth-web-exporter.c:2503 msgid "Copying original images" msgstr "Kopijuojami originalūs paveikslėliai" -#: ../extensions/webalbums/gth-web-exporter.c:2929 +#: ../extensions/webalbums/gth-web-exporter.c:2963 msgid "Could not find the style folder" msgstr "Nepavyko rasti stilių aplanko" -#: ../extensions/webalbums/gth-web-exporter.c:2967 +#: ../extensions/webalbums/gth-web-exporter.c:3001 msgid "Could not create a temporary folder" msgstr "Nepavyko sukurti laikino aplanko" @@ -4808,12 +4632,9 @@ msgid "Create static web albums." msgstr "Kurti statinius žiniatinklio albumus." -#: ../gthumb/dlg-location.c:200 -#: ../gthumb/gth-browser.c:1250 -#: ../gthumb/gth-browser.c:1809 -#: ../gthumb/gth-browser.c:5899 -#: ../gthumb/gth-browser.c:5918 -#: ../gthumb/gth-browser.c:5942 +#: ../gthumb/dlg-location.c:200 ../gthumb/gth-browser.c:1396 +#: ../gthumb/gth-browser.c:1969 ../gthumb/gth-browser.c:6214 +#: ../gthumb/gth-browser.c:6233 ../gthumb/gth-browser.c:6257 #, c-format msgid "Could not load the position \"%s\"" msgstr "Nepavyko įkelti pozicijos „%s“" @@ -4834,8 +4655,7 @@ msgid "Edit Filter" msgstr "Keisti filtrą" -#: ../gthumb/dlg-preferences-extensions.c:67 -#: ../gthumb/gth-filterbar.c:270 +#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:277 msgid "All" msgstr "Visi" @@ -4900,41 +4720,6 @@ msgid "_Restart" msgstr "Paleisti iš _naujo" -#: ../gthumb/eggfileformatchooser.c:236 -#, c-format -msgid "File _Format: %s" -msgstr "Failo _formatas: %s" - -#: ../gthumb/eggfileformatchooser.c:397 -#: ../gthumb/gth-main-default-tests.c:233 -msgid "All Files" -msgstr "Visi failai" - -#: ../gthumb/eggfileformatchooser.c:398 -msgid "All Supported Files" -msgstr "Visi palaikomi failai" - -#: ../gthumb/eggfileformatchooser.c:407 -msgid "By Extension" -msgstr "Pagal plėtinį" - -#: ../gthumb/eggfileformatchooser.c:422 -msgid "File Format" -msgstr "Failo formatas" - -#: ../gthumb/eggfileformatchooser.c:440 -msgid "Extension(s)" -msgstr "Plėtinys (-iai)" - -#: ../gthumb/eggfileformatchooser.c:681 -#, c-format -msgid "The program was not able to find out the file format you want to use for `%s'. Please make sure to use a known extension for that file or manually choose a file format from the list below." -msgstr "Programai nepavyko nustatyti, kokį failo formatą jūs norite naudoti failui „%s“. Naudokite tam failui žinomą plėtinį arba pasirinkite formatą žemiau esančiame sąraše." - -#: ../gthumb/eggfileformatchooser.c:688 -msgid "File format not recognized" -msgstr "Failo formatas neatpažintas" - #. For translators: This is a progress size indicator, for example: 230.4 MB of 512.8 MB #: ../gthumb/gio-utils.c:1351 #, c-format @@ -4969,7 +4754,7 @@ #. * the separator that your locale uses or use "%Id" instead #. * of "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2848 +#: ../gthumb/glib-utils.c:3068 #, c-format msgctxt "long time format" msgid "%d:%02d:%02d" @@ -4981,33 +4766,51 @@ #. * separator that your locale uses or use "%Id" instead of #. * "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2857 +#: ../gthumb/glib-utils.c:3077 #, c-format msgctxt "short time format" msgid "%d:%02d" msgstr "%d:%02d" -#: ../gthumb/gth-browser-actions-callbacks.c:400 -msgid "gthumb is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version." -msgstr "gthumb yra laisva programinė įranga; jūs galite ją platinti ir/arba keisti pagal GNU Bendros Viešosios Licencijos, kaip jas pateikia Free Software Foundation, sąlygas; licencijos versija 2 arba (jūsų pasirinkta) bet kuri vėlesnė versija." - -#: ../gthumb/gth-browser-actions-callbacks.c:404 -msgid "gthumb is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details." -msgstr "gthumb yra platinama tikintis, kad ji bus naudinga, bet BE JOKIŲ GARANTIJŲ; netgi be numanomų PREKYBINIŲ arba TINKAMUMO KONKREČIAM TIKSLUI garantijų. Daugiau rasite perskaitę GNU Bendrą Viešąją Licenciją." - -#: ../gthumb/gth-browser-actions-callbacks.c:408 -msgid "You should have received a copy of the GNU General Public License along with gthumb. If not, see http://www.gnu.org/licenses/." -msgstr "Jūs turėjote gauti GNU Bendros Viešosios Licencijos kopiją kartu su gthumb. Jei negavote, žiūrėkite http://www.gnu.org/licenses/." +#: ../gthumb/gth-browser-actions-callbacks.c:414 +msgid "" +"gthumb is free software; you can redistribute it and/or modify it under the " +"terms of the GNU General Public License as published by the Free Software " +"Foundation; either version 2 of the License, or (at your option) any later " +"version." +msgstr "" +"gthumb yra laisva programinė įranga; jūs galite ją platinti ir/arba keisti " +"pagal GNU Bendros Viešosios Licencijos, kaip jas pateikia Free Software " +"Foundation, sąlygas; licencijos versija 2 arba (jūsų pasirinkta) bet kuri " +"vėlesnė versija." + +#: ../gthumb/gth-browser-actions-callbacks.c:418 +msgid "" +"gthumb is distributed in the hope that it will be useful, but WITHOUT ANY " +"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " +"details." +msgstr "" +"gthumb yra platinama tikintis, kad ji bus naudinga, bet BE JOKIŲ GARANTIJŲ; " +"netgi be numanomų PREKYBINIŲ arba TINKAMUMO KONKREČIAM TIKSLUI garantijų. " +"Daugiau rasite perskaitę GNU Bendrą Viešąją Licenciją." + +#: ../gthumb/gth-browser-actions-callbacks.c:422 +msgid "" +"You should have received a copy of the GNU General Public License along with " +"gthumb. If not, see http://www.gnu.org/licenses/." +msgstr "" +"Jūs turėjote gauti GNU Bendros Viešosios Licencijos kopiją kartu su gthumb. " +"Jei negavote, žiūrėkite http://www.gnu.org/licenses/." -#: ../gthumb/gth-browser-actions-callbacks.c:427 +#: ../gthumb/gth-browser-actions-callbacks.c:441 msgid "An image viewer and browser for GNOME." msgstr "Paveikslėlių peržiūros ir naršymo programa, skirta GNOME." -#: ../gthumb/gth-browser-actions-callbacks.c:430 +#: ../gthumb/gth-browser-actions-callbacks.c:444 msgid "translator_credits" msgstr "" -"Žygimantas Beručka \\n" -"\n" +"Žygimantas Beručka \\n\n" "Aurimas Černius " #: ../gthumb/gth-browser-actions-entries.h:31 @@ -5090,33 +4893,27 @@ msgid "Leave Fullscreen" msgstr "Išjungti viso ekrano veikseną" -#: ../gthumb/gth-browser-actions-entries.h:144 -#: ../gthumb/gth-browser.c:3586 +#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3841 msgid "Go to the previous visited location" msgstr "Eiti į ankstesnę aplankytą vietą" -#: ../gthumb/gth-browser-actions-entries.h:150 -#: ../gthumb/gth-browser.c:3604 +#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3859 msgid "Go to the next visited location" msgstr "Eiti į kitą aplankytą vietą" -#: ../gthumb/gth-browser-actions-entries.h:156 -#: ../gthumb/gth-browser.c:3622 +#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3877 msgid "Go up one level" msgstr "Eiti vienu lygiu aukštyn" #: ../gthumb/gth-browser-actions-entries.h:161 -#| msgid "_Location" msgid "_Location..." msgstr "_Vieta..." #: ../gthumb/gth-browser-actions-entries.h:162 -#| msgid "Specify a location to visit" msgid "Specify a location to open" msgstr "Nurodykite norimą atverti vietą" -#: ../gthumb/gth-browser-actions-entries.h:173 -#: ../gthumb/gth-browser.c:672 +#: ../gthumb/gth-browser-actions-entries.h:173 ../gthumb/gth-browser.c:721 msgid "_Delete History" msgstr "_Ištrinti retrospektyvą" @@ -5144,151 +4941,147 @@ msgid "_Keyboard Shortcuts" msgstr "_Klavišų susiejimai" -#: ../gthumb/gth-browser-actions-entries.h:206 +#: ../gthumb/gth-browser-actions-entries.h:203 +#: ../gthumb/gth-browser-actions-entries.h:257 +msgid "Edit" +msgstr "Taisyti" + +#: ../gthumb/gth-browser-actions-entries.h:204 +#: ../gthumb/gth-browser-actions-entries.h:258 +msgid "Edit file" +msgstr "Taisyti failą" + +#: ../gthumb/gth-browser-actions-entries.h:212 msgid "_Toolbar" msgstr "Į_rankių juosta" -#: ../gthumb/gth-browser-actions-entries.h:207 +#: ../gthumb/gth-browser-actions-entries.h:213 msgid "View or hide the toolbar of this window" msgstr "Rodyti ar slėpti šio lango įrankių juostą" -#: ../gthumb/gth-browser-actions-entries.h:211 +#: ../gthumb/gth-browser-actions-entries.h:217 msgid "_Statusbar" msgstr "_Būsenos juosta" -#: ../gthumb/gth-browser-actions-entries.h:212 +#: ../gthumb/gth-browser-actions-entries.h:218 msgid "View or hide the statusbar of this window" msgstr "Rodyti ar slėpti šio lango būsenos juostą" -#: ../gthumb/gth-browser-actions-entries.h:216 +#: ../gthumb/gth-browser-actions-entries.h:222 msgid "_Filterbar" msgstr "_Filtravimo juosta" -#: ../gthumb/gth-browser-actions-entries.h:217 +#: ../gthumb/gth-browser-actions-entries.h:223 msgid "View or hide the filterbar of this window" msgstr "Rodyti ar slėpti šio lango filtravimo juostą" -#: ../gthumb/gth-browser-actions-entries.h:221 +#: ../gthumb/gth-browser-actions-entries.h:227 msgid "_Sidebar" msgstr "_Šoninė juosta" -#: ../gthumb/gth-browser-actions-entries.h:222 +#: ../gthumb/gth-browser-actions-entries.h:228 msgid "View or hide the sidebar of this window" msgstr "Rodyti ar slėpti šio lango šoninę juostą" -#: ../gthumb/gth-browser-actions-entries.h:226 +#: ../gthumb/gth-browser-actions-entries.h:232 msgid "_Thumbnail Pane" msgstr "_Miniatiūrų polangis" -#: ../gthumb/gth-browser-actions-entries.h:227 +#: ../gthumb/gth-browser-actions-entries.h:233 msgid "View or hide the thumbnail pane in viewer mode" msgstr "Rodyti ar slėpti miniatiūrų polangį rodymo veiksenoje" -#: ../gthumb/gth-browser-actions-entries.h:231 +#: ../gthumb/gth-browser-actions-entries.h:237 msgid "_Thumbnails" msgstr "_Miniatiūros" -#: ../gthumb/gth-browser-actions-entries.h:232 +#: ../gthumb/gth-browser-actions-entries.h:238 msgid "View thumbnails" msgstr "Rodyti miniatiūras" -#: ../gthumb/gth-browser-actions-entries.h:236 +#: ../gthumb/gth-browser-actions-entries.h:242 msgid "_Hidden Files" msgstr "_Paslėpti failai" -#: ../gthumb/gth-browser-actions-entries.h:237 +#: ../gthumb/gth-browser-actions-entries.h:243 msgid "Show hidden files and folders" msgstr "Rodyti paslėptus failus ir aplankus" -#: ../gthumb/gth-browser-actions-entries.h:242 -#: ../gthumb/gth-browser-actions-entries.h:247 +#: ../gthumb/gth-browser-actions-entries.h:248 +#: ../gthumb/gth-browser-actions-entries.h:253 msgid "View file properties" msgstr "Rodyti failo savybes" -#: ../gthumb/gth-browser-actions-entries.h:251 -msgid "Edit" -msgstr "Taisyti" - -#: ../gthumb/gth-browser-actions-entries.h:252 -msgid "Edit file" -msgstr "Taisyti failą" - -#: ../gthumb/gth-browser-actions-entries.h:256 +#: ../gthumb/gth-browser-actions-entries.h:262 msgid "_Fit Window to Image" msgstr "_Pritaikyti langą prie paveikslėlio" -#: ../gthumb/gth-browser-actions-entries.h:257 +#: ../gthumb/gth-browser-actions-entries.h:263 msgid "Resize the window to the size of the image" msgstr "Keisti lango dydį pagal paveikslėlio dydį" -#: ../gthumb/gth-browser.c:369 +#: ../gthumb/gth-browser.c:418 #, c-format msgid "Open %s" msgstr "Atverti %s" -#: ../gthumb/gth-browser.c:509 +#: ../gthumb/gth-browser.c:558 msgid "[modified]" msgstr "[pakeistas]" -#: ../gthumb/gth-browser.c:1006 +#: ../gthumb/gth-browser.c:1117 #, c-format -#| msgid "%d selected (%s)" msgid "%d file selected (%s)" msgid_plural "%d files selected (%s)" msgstr[0] "Pasirinktas %d failas (%s)" msgstr[1] "Pasirinkti %d failai (%s)" msgstr[2] "Pasirinkta %d failų (%s)" -#: ../gthumb/gth-browser.c:1041 +#: ../gthumb/gth-browser.c:1152 #, c-format -#| msgid "Free space:" msgid "%s of free space" msgstr "Laisva vietos %s" -#: ../gthumb/gth-browser.c:1905 -#: ../gthumb/gth-browser.c:1932 +#: ../gthumb/gth-browser.c:2073 ../gthumb/gth-browser.c:2100 #, c-format msgid "No suitable module found for %s" msgstr "Nerastas tinkamas modulis %s" -#: ../gthumb/gth-browser.c:2052 +#: ../gthumb/gth-browser.c:2219 #, c-format msgid "Save changes to file '%s'?" msgstr "Įrašyti pakeitimus į failą „%s“?" -#: ../gthumb/gth-browser.c:2057 +#: ../gthumb/gth-browser.c:2224 msgid "If you don't save, changes to the file will be permanently lost." msgstr "Jei neįrašysite, pakeitimai bus negrįžtamai prarasti." -#: ../gthumb/gth-browser.c:2058 +#: ../gthumb/gth-browser.c:2225 msgid "Do _Not Save" msgstr "_Neįrašyti" -#: ../gthumb/gth-browser.c:2828 -#: ../gthumb/gth-source-tree.c:182 +#: ../gthumb/gth-browser.c:3020 ../gthumb/gth-source-tree.c:182 msgid "Could not change name" msgstr "Nepavyko pakeisti pavadinimo" -#: ../gthumb/gth-browser.c:3257 -#: ../gthumb/gth-main-default-metadata.c:41 +#: ../gthumb/gth-browser.c:3451 ../gthumb/gth-main-default-metadata.c:41 msgid "Modified" msgstr "Pakeistas" -#: ../gthumb/gth-browser.c:3587 -#: ../gthumb/gth-browser.c:3605 +#: ../gthumb/gth-browser.c:3842 ../gthumb/gth-browser.c:3860 msgid "View the list of visited locations" msgstr "Rodyti aplankytų vietų sąrašą" -#: ../gthumb/gth-browser.c:3623 +#: ../gthumb/gth-browser.c:3878 msgid "View the list of upper locations" msgstr "Rodyti aukštesnių vietų sąrašą" -#: ../gthumb/gth-browser.c:5900 +#: ../gthumb/gth-browser.c:6215 #, c-format msgid "File type not supported" msgstr "Failo tipas nepalaikomas" -#: ../gthumb/gth-browser.c:5943 +#: ../gthumb/gth-browser.c:6258 #, c-format msgid "No suitable module found" msgstr "Nerastas tinkamas modulis" @@ -5298,12 +5091,15 @@ msgid "Could not open the module `%s`: %s" msgstr "Nepavyko atverti modulio „%s“: %s" -#: ../gthumb/gth-extensions.c:744 +#: ../gthumb/gth-extensions.c:754 #, c-format -#| msgid "The extension '%s' is required by the extension '%s'" msgid "The extension '%1$s' is required by the extension '%2$s'" msgstr "Papildiniui „%2$s“ reikia papildinio „%1$s“" +#: ../gthumb/gth-file-chooser-dialog.c:144 +msgid "All Supported Files" +msgstr "Visi palaikomi failai" + #: ../gthumb/gth-file-source-vfs.c:121 msgid "Home Folder" msgstr "Namų aplankas" @@ -5313,8 +5109,12 @@ msgstr "Failų sistema" #: ../gthumb/gth-file-source-vfs.c:739 -msgid "The files cannot be moved to the Trash. Do you want to delete them permanently?" -msgstr "Paveikslėlių negalima perkelti į šiukšlinę. Ar norite juos ištrinti negrįžtamai?" +msgid "" +"The files cannot be moved to the Trash. Do you want to delete them " +"permanently?" +msgstr "" +"Paveikslėlių negalima perkelti į šiukšlinę. Ar norite juos ištrinti " +"negrįžtamai?" #: ../gthumb/gth-file-source-vfs.c:750 msgid "Could not move the files to the Trash" @@ -5336,36 +5136,33 @@ #: ../gthumb/gth-file-source-vfs.c:844 #, c-format msgid "Are you sure you want to permanently delete the %'d selected file?" -msgid_plural "Are you sure you want to permanently delete the %'d selected files?" +msgid_plural "" +"Are you sure you want to permanently delete the %'d selected files?" msgstr[0] "Ar tikrai norite negrįžtamai ištrinti %'d pasirinktą failą?" msgstr[1] "Ar tikrai norite negrįžtamai ištrinti %'d pasirinktus failus?" msgstr[2] "Ar tikrai norite negrįžtamai ištrinti %'d pasirinktų failų?" -#: ../gthumb/gth-filterbar.c:406 +#: ../gthumb/gth-filterbar.c:413 msgid "Hide the filterbar" msgstr "Slėpti filtravimo juostą" -#: ../gthumb/gth-filter.c:43 -#: ../gthumb/gth-filter-editor-dialog.c:178 +#: ../gthumb/gth-filter.c:43 ../gthumb/gth-filter-editor-dialog.c:178 #: ../gthumb/gth-test-simple.c:75 msgid "kB" msgstr "kB" -#: ../gthumb/gth-filter.c:44 -#: ../gthumb/gth-filter-editor-dialog.c:179 +#: ../gthumb/gth-filter.c:44 ../gthumb/gth-filter-editor-dialog.c:179 #: ../gthumb/gth-test-simple.c:76 msgid "MB" msgstr "MB" -#: ../gthumb/gth-filter.c:45 -#: ../gthumb/gth-filter-editor-dialog.c:180 +#: ../gthumb/gth-filter.c:45 ../gthumb/gth-filter-editor-dialog.c:180 #: ../gthumb/gth-test-simple.c:77 msgid "GB" msgstr "GB" #. "files" label -#: ../gthumb/gth-filter.c:291 -#: ../gthumb/gth-filter-editor-dialog.c:177 +#: ../gthumb/gth-filter.c:286 ../gthumb/gth-filter-editor-dialog.c:177 msgid "files" msgstr "failai" @@ -5382,55 +5179,60 @@ msgid "No limit specified" msgstr "Be apribojimų" -#: ../gthumb/gth-folder-tree.c:857 -msgid "Loading..." -msgstr "Įkeliama..." - -#: ../gthumb/gth-folder-tree.c:1100 +#: ../gthumb/gth-folder-tree.c:1369 msgid "(Open Parent)" msgstr "(Atverti aukštesnį)" -#: ../gthumb/gth-histogram-view.c:826 +#: ../gthumb/gth-histogram-view.c:825 msgid "Linear scale" msgstr "Tiesinis didinimas" -#: ../gthumb/gth-histogram-view.c:838 +#: ../gthumb/gth-histogram-view.c:837 msgid "Logarithmic scale" msgstr "Logaritminis didinimas" -#: ../gthumb/gth-histogram-view.c:858 -#| msgid "Channels" +#: ../gthumb/gth-histogram-view.c:857 msgid "Channel:" msgstr "Kanalas:" -#: ../gthumb/gth-histogram-view.c:890 +#: ../gthumb/gth-histogram-view.c:878 msgid "Value" msgstr "Reikšmė" -#: ../gthumb/gth-histogram-view.c:896 -#| msgid "Redo" +#: ../gthumb/gth-histogram-view.c:883 msgid "Red" msgstr "Raudona" -#: ../gthumb/gth-histogram-view.c:902 +#: ../gthumb/gth-histogram-view.c:888 msgid "Green" msgstr "Žalia" -#: ../gthumb/gth-histogram-view.c:908 +#: ../gthumb/gth-histogram-view.c:893 msgid "Blue" msgstr "Mėlyna" -#: ../gthumb/gth-histogram-view.c:914 +#: ../gthumb/gth-histogram-view.c:898 msgid "Alpha" msgstr "Alfa" -#: ../gthumb/gth-histogram-view.c:921 -#| msgid "GB" +#: ../gthumb/gth-histogram-view.c:904 msgid "RGB" msgstr "RGB" +#: ../gthumb/gth-image-list-task.c:141 +msgid "Could not rename the file" +msgstr "Nepavyko pervadinti failo" + +#: ../gthumb/gth-image-saver.c:39 +msgid "No options available for this file type" +msgstr "Nėra parinkčių šiam failo tipui" + +#: ../gthumb/gth-image-saver.c:185 +#, c-format +msgid "Could not find a suitable module to save the image as \"%s\"" +msgstr "Nepavyko rasti tinkamo modulio paveikslėliui įrašyti kaip „%s“" + #: ../gthumb/gth-load-file-data-task.c:108 -#| msgid "Getting file information" msgid "Reading file information" msgstr "Skaitomi failo duomenys" @@ -5483,6 +5285,10 @@ msgid "dimensions" msgstr "matmenys" +#: ../gthumb/gth-main-default-tests.c:233 +msgid "All Files" +msgstr "Visi failai" + #: ../gthumb/gth-main-default-tests.c:261 msgid "Media" msgstr "Laikmena" @@ -5503,101 +5309,94 @@ msgid "Description (embedded)" msgstr "Aprašymas (įtaisytas)" -#: ../gthumb/gth-pixbuf-list-task.c:139 -msgid "Could not rename the file" -msgstr "Nepavyko pervadinti failo" - -#: ../gthumb/gth-pixbuf-saver.c:34 -msgid "No options available for this file type" -msgstr "Nėra parinkčių šiam failo tipui" - -#: ../gthumb/gth-progress-dialog.c:144 +#: ../gthumb/gth-progress-dialog.c:146 msgid "Cancel operation" msgstr "Atšaukti veiksmą" #: ../gthumb/gth-save-file-data-task.c:102 -#| msgid "Getting file information" msgid "Saving file information" msgstr "Įrašomi failo duomenys" -#: ../gthumb/gth-tags-entry.c:388 +#. Translators: %s is a filename +#: ../gthumb/gth-save-image-task.c:160 +#, c-format +#| msgid "Starting %s" +msgid "Saving '%s'" +msgstr "Įrašoma '%s'" + +#: ../gthumb/gth-tags-entry.c:390 #, c-format msgid "Create tag «%s»" msgstr "Sukurti žymą „%s“" -#: ../gthumb/gth-tags-entry.c:735 +#: ../gthumb/gth-tags-entry.c:814 msgid "Show all the tags" msgstr "Rodyti visas žymas" -#: ../gthumb/gth-tags-file.c:236 +#: ../gthumb/gth-tags-file.c:235 msgid "Holidays" msgstr "Šventės" -#: ../gthumb/gth-tags-file.c:237 +#: ../gthumb/gth-tags-file.c:236 msgid "Temporary" msgstr "Laikina" -#: ../gthumb/gth-tags-file.c:238 +#: ../gthumb/gth-tags-file.c:237 msgid "Screenshots" msgstr "Ekrano nuotraukos" -#: ../gthumb/gth-tags-file.c:239 +#: ../gthumb/gth-tags-file.c:238 msgid "Science" msgstr "Mokslas" -#: ../gthumb/gth-tags-file.c:240 +#: ../gthumb/gth-tags-file.c:239 msgid "Favorite" msgstr "Mėgstamiausi" -#: ../gthumb/gth-tags-file.c:241 +#: ../gthumb/gth-tags-file.c:240 msgid "Important" msgstr "Svarbu" -#: ../gthumb/gth-tags-file.c:242 +#: ../gthumb/gth-tags-file.c:241 msgid "GNOME" msgstr "GNOME" -#: ../gthumb/gth-tags-file.c:243 +#: ../gthumb/gth-tags-file.c:242 msgid "Games" msgstr "Žaidimai" -#: ../gthumb/gth-tags-file.c:244 +#: ../gthumb/gth-tags-file.c:243 msgid "Party" msgstr "Vakarėlis" -#: ../gthumb/gth-tags-file.c:245 +#: ../gthumb/gth-tags-file.c:244 msgid "Birthday" msgstr "Gimtadienis" -#: ../gthumb/gth-tags-file.c:246 +#: ../gthumb/gth-tags-file.c:245 msgid "Astronomy" msgstr "Astronomija" -#: ../gthumb/gth-tags-file.c:247 +#: ../gthumb/gth-tags-file.c:246 msgid "Family" msgstr "Šeima" -#: ../gthumb/gth-test-category.c:46 -#: ../gthumb/gth-test-simple.c:49 +#: ../gthumb/gth-test-category.c:46 ../gthumb/gth-test-simple.c:49 #: ../gthumb/gth-test-simple.c:64 msgid "is" msgstr "yra" #: ../gthumb/gth-test-category.c:47 -#| msgid "Icons only" msgid "is only" msgstr "yra tik" -#: ../gthumb/gth-test-category.c:48 -#: ../gthumb/gth-test-simple.c:50 +#: ../gthumb/gth-test-category.c:48 ../gthumb/gth-test-simple.c:50 #: ../gthumb/gth-test-simple.c:65 msgid "is not" msgstr "nėra" -#: ../gthumb/gth-test-category.c:394 -#: ../gthumb/gth-test-simple.c:812 -#: ../gthumb/gth-test-simple.c:838 -#: ../gthumb/gth-test-simple.c:859 +#: ../gthumb/gth-test-category.c:407 ../gthumb/gth-test-simple.c:812 +#: ../gthumb/gth-test-simple.c:838 ../gthumb/gth-test-simple.c:859 #: ../gthumb/gth-test-simple.c:885 #, c-format msgid "The test definition is incomplete" @@ -5651,11 +5450,11 @@ msgid "is after" msgstr "po" -#: ../gthumb/gth-time-selector.c:477 +#: ../gthumb/gth-time-selector.c:478 msgid "Today" msgstr "Šiandien" -#: ../gthumb/gth-time-selector.c:485 +#: ../gthumb/gth-time-selector.c:486 msgid "Now" msgstr "Dabar" @@ -5664,63 +5463,54 @@ msgstr "Užverti šį langą" #: ../gthumb/gth-window-actions-entries.h:36 -#| msgid "Close this window" msgid "Close _All Windows" msgstr "Užverti _visus langus" -#: ../gthumb/gtk-utils.c:551 +#: ../gthumb/gtk-utils.c:490 msgid "Could not display help" msgstr "Nepavyko parodyti žinyno" -#: ../gthumb/gtk-utils.c:868 -#: ../gthumb/gtk-utils.c:875 +#: ../gthumb/gtk-utils.c:810 ../gthumb/gtk-utils.c:817 msgid "Could not launch the application" msgstr "Nepavyko paleisti programos" -#: ../gthumb/gtk-utils.c:978 +#: ../gthumb/gtk-utils.c:920 msgid "_Copy Here" msgstr "_Kopijuoti čia" -#: ../gthumb/gtk-utils.c:983 -#| msgid "_Move" +#: ../gthumb/gtk-utils.c:925 msgid "_Move Here" msgstr "_Perkelti čia" -#: ../gthumb/gtk-utils.c:988 +#: ../gthumb/gtk-utils.c:930 msgid "_Link Here" msgstr "_Saitas į čia" -#: ../gthumb/gtk-utils.c:997 -#| msgid "Channels" +#: ../gthumb/gtk-utils.c:939 msgid "Cancel" msgstr "Atsisakyti" -#: ../gthumb/main.c:59 +#: ../gthumb/main.c:61 msgid "Open a new window" msgstr "Atverti naują langą" -#: ../gthumb/main.c:63 +#: ../gthumb/main.c:65 msgid "Start in fullscreen mode" msgstr "Paleisti viso ekrano veiksenoje" -#: ../gthumb/main.c:67 +#: ../gthumb/main.c:69 msgid "Automatically start a slideshow" msgstr "Automatiškai pradėti rodyti pateiktis" -#: ../gthumb/main.c:71 +#: ../gthumb/main.c:73 msgid "Automatically import digital camera photos" msgstr "Automatiškai importuoti skaitmeninio fotoaparato fotografijas" -#: ../gthumb/main.c:75 +#: ../gthumb/main.c:77 msgid "Show version" msgstr "Rodyti versiją" -#: ../gthumb/main.c:344 +#: ../gthumb/main.c:483 msgid "- Image browser and viewer" msgstr "– Paveikslėlių naršymo ir peržiūros programa" -#: ../gthumb/pixbuf-io.c:174 -#, c-format -msgid "Could not find a suitable module to save the image as \"%s\"" -msgstr "Nepavyko rasti tinkamo modulio paveikslėliui įrašyti kaip „%s“" - diff -Nru gthumb-3.0.2/po/lv.po gthumb-3.2.3/po/lv.po --- gthumb-3.0.2/po/lv.po 2012-08-14 16:25:43.000000000 +0000 +++ gthumb-3.2.3/po/lv.po 2013-04-30 16:56:13.000000000 +0000 @@ -9,24 +9,23 @@ msgid "" msgstr "" "Project-Id-Version: lv\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=gthumb&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-03-25 17:42+0000\n" -"PO-Revision-Date: 2012-05-17 00:02+0300\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-10-13 00:53+0300\n" +"PO-Revision-Date: 2012-10-13 01:15+0300\n" "Last-Translator: Rūdolfs Mazurs \n" "Language-Team: Latvian \n" +"Language: lv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.4\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " "2);\n" -"Language: lv\n" #: ../copy-n-paste/eggdesktopfile.c:165 #, c-format msgid "File is not a valid .desktop file" -msgstr "Fails nav derīgs .desktop fails" +msgstr "Datne nav derīga .desktop datne" #. translators: 'Version' is from a desktop file, and #. * should not be translated. '%s' would probably be a @@ -34,7 +33,7 @@ #: ../copy-n-paste/eggdesktopfile.c:191 #, c-format msgid "Unrecognized desktop file Version '%s'" -msgstr "Neatpazīta darbvirsmas faila versija '%s'" +msgstr "Neatpazīta darbvirsmas datnes versija “%s”" #: ../copy-n-paste/eggdesktopfile.c:974 #, c-format @@ -44,19 +43,19 @@ #: ../copy-n-paste/eggdesktopfile.c:1116 #, c-format msgid "Application does not accept documents on command line" -msgstr "Lietotne nepieņem norādes uz dokumentiem no komandrindas" +msgstr "Lietotne nepieņem dokumentus no komandrindas" #: ../copy-n-paste/eggdesktopfile.c:1184 #, c-format msgid "Unrecognized launch option: %d" -msgstr "Neatpazīta palaišanas opcija: %d" +msgstr "Neatpazīta palaišanas opcija — %d" #. translators: The 'Type=Link' string is found in a #. * desktop file, and should not be translated. #: ../copy-n-paste/eggdesktopfile.c:1391 #, c-format msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "Nevar padot dokumentu URI uz 'Type=Link' darbvirsmas ierakstu" +msgstr "Nevar padot dokumenta URI darbvirsmas ierakstam “Type=Link”" #: ../copy-n-paste/eggdesktopfile.c:1412 #, c-format @@ -65,19 +64,19 @@ #: ../copy-n-paste/eggsmclient.c:226 msgid "Disable connection to session manager" -msgstr "Atvienoties no sesiju pārvaldnieka" +msgstr "Deaktivēt savienojumu ar sesiju pārvaldnieku" #: ../copy-n-paste/eggsmclient.c:229 msgid "Specify file containing saved configuration" -msgstr "Norādīt failu, kas satur saglabāto konfigurāciju" +msgstr "Norādīt datni, kas satur saglabāto konfigurāciju" #: ../copy-n-paste/eggsmclient.c:229 msgid "FILE" -msgstr "FAILS" +msgstr "DATNE" #: ../copy-n-paste/eggsmclient.c:232 msgid "Specify session management ID" -msgstr "Norādīt sesijas pārvaldības ID" +msgstr "Norādiet sesiju pārvaldības ID" #: ../copy-n-paste/eggsmclient.c:232 msgid "ID" @@ -85,15 +84,15 @@ #: ../copy-n-paste/eggsmclient.c:253 msgid "Session management options:" -msgstr "Sesijas pārvaldības opcijas:" +msgstr "Sesiju pārvaldības opcijas:" #: ../copy-n-paste/eggsmclient.c:254 msgid "Show session management options" -msgstr "Rādīt sesijas pārvaldības opcijas" +msgstr "Rādīt sesiju pārvaldības opcijas" #. manually set name and icon -#: ../data/gthumb.desktop.in.in.h:1 ../gthumb/gth-browser.c:529 -#: ../gthumb/gth-progress-dialog.c:388 ../gthumb/main.c:313 +#: ../data/gthumb.desktop.in.in.h:1 ../gthumb/gth-browser.c:534 +#: ../gthumb/gth-progress-dialog.c:388 ../gthumb/main.c:315 msgid "gThumb" msgstr "gThumb" @@ -114,7 +113,6 @@ msgstr "Importēt ar gThumb" #: ../data/gthumb-import.desktop.in.in.h:2 -#| msgid "Import Photos" msgid "Photo Import Tool" msgstr "Fotogrāfiju importēšanas rīks" @@ -123,7 +121,6 @@ msgstr "gThumb fotogrāfiju importēšanas rīks" #: ../data/gthumb-import.desktop.in.in.h:4 -#| msgid "Import photos from a digital camera" msgid "Import the photos on your camera card" msgstr "Importēt fotogrāfijas no fotokameras kartes" @@ -136,14 +133,12 @@ "Izmantojiet 0, lai radītu sīktēlus visiem attēliem." #: ../data/org.gnome.gthumb.gschema.xml.in.h:2 -#| msgid "Reuse this window to view other images" msgid "Whether to resize the window to fit the size of the image" msgstr "Vai mainīt loga izmēru, lai tas pielāgotos attēla izmēram" #: ../data/org.gnome.gthumb.gschema.xml.in.h:3 -#| msgid "Open in New Window" msgid "Open files in the active window" -msgstr "Atvērt failus aktīvajā logā" +msgstr "Atvērt datnes aktīvajā logā" #: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:1 msgid "Possible values are: white, black, checked, none." @@ -158,12 +153,10 @@ msgstr "Vai vienmēr lietot melnu fonu." #: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:1 -#| msgid "Possible values are: png, jpeg." msgid "Possible values are: jpeg, jpg." msgstr "Iespējamās vērtības ir: jpg, jpeg." #: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:2 -#| msgid "Possible values are: mm, in." msgid "Possible values are: tiff, tif." msgstr "Iespējamās vērtības ir: tiff, tif." @@ -172,16 +165,14 @@ "Possible values include: general::unsorted, file::name, file::size, file::" "mtime, exif::photo::datetimeoriginal" msgstr "" -"Iespējamās vērtības iekļauj: general::unsorted, file::name, file::size, file::" -"mtime, exif::photo::datetimeoriginal" +"Iespējamās vērtības iekļauj: general::unsorted, file::name, file::size, " +"file::mtime, exif::photo::datetimeoriginal" #: ../data/ui/extensions-preferences.ui.h:1 -#| msgid "Dimensions" msgid "_Extensions:" msgstr "_Paplašinājumi:" #: ../data/ui/extensions-preferences.ui.h:2 -#| msgid "Determine by extension" msgid "More extensions..." msgstr "Vairāk paplašinājumu..." @@ -190,24 +181,21 @@ msgstr "Daži paplašinājumi ir konfigurējami." #: ../data/ui/filter-editor.ui.h:1 -#| msgid "File _name:" msgid "Filter _Name:" msgstr "Filtra _nosaukums:" #: ../data/ui/filter-editor.ui.h:2 #: ../extensions/search/data/ui/search-editor.ui.h:3 -#| msgid "_Search" msgid "_Match" msgstr "_Atbilst" #. limit label -#: ../data/ui/filter-editor.ui.h:3 ../gthumb/gth-filter.c:270 -#: ../gthumb/gth-filter.c:342 +#: ../data/ui/filter-editor.ui.h:3 ../gthumb/gth-filter.c:269 +#: ../gthumb/gth-filter.c:337 msgid "_Limit to" msgstr "Ierobežot _līdz" #: ../data/ui/filter-editor.ui.h:4 -#| msgid "1 selected (%s)" msgid "selected by" msgstr "izvēlēti pēc" @@ -226,7 +214,6 @@ #. After the colon there is the total number of pixels #: ../data/ui/histogram-info.ui.h:6 -#| msgid "Pi_xels" msgid "Pixels:" msgstr "Pikseļi:" @@ -238,81 +225,65 @@ #. After the colon there is the percentile of selected pixels. #: ../data/ui/histogram-info.ui.h:10 -#| msgid "_Select" msgctxt "Pixels" msgid "Selected:" msgstr "Izvēlēts:" #: ../data/ui/location.ui.h:1 #: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 -#| msgid "Location" msgid "_Location:" msgstr "_Atrašanās vieta:" #: ../data/ui/overwrite-dialog.ui.h:1 -#| msgid "Overwrite the old image with the new one?" msgid "Overwrite the old file with the new one?" -msgstr "Pārrakstīt veco failu ar jauno?" +msgstr "Pārrakstīt veco datni ar jauno?" #: ../data/ui/overwrite-dialog.ui.h:2 -#| msgid "Old Image:" msgid "Old File:" -msgstr "Vecais fails:" +msgstr "Vecā datne:" #: ../data/ui/overwrite-dialog.ui.h:3 -#| msgid "Filename" msgid "Filename:" -msgstr "Faila nosaukums:" +msgstr "Datnes nosaukums:" #: ../data/ui/overwrite-dialog.ui.h:4 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 #: ../extensions/image_print/data/ui/print-layout.ui.h:23 -#| msgid "Size" msgid "Size:" msgstr "Izmērs:" #: ../data/ui/overwrite-dialog.ui.h:5 -#| msgid "Modified" msgid "Modified:" msgstr "Pārveidots:" #: ../data/ui/overwrite-dialog.ui.h:6 -#| msgid "New Folder" msgid "New File:" -msgstr "Jauns fails:" +msgstr "Jauna datne:" #: ../data/ui/overwrite-dialog.ui.h:7 -#| msgid "Over_write the old image" msgid "Over_write the old file" -msgstr "Pārra_kstīt veco failu" +msgstr "Pārra_kstīt veco datni" #: ../data/ui/overwrite-dialog.ui.h:8 -#| msgid "Do not overwrite _the old image" msgid "Do not overwrite _the old file" -msgstr "Nepārrakstīt _veco failu" +msgstr "Nepārrakstīt _veco datni" #: ../data/ui/overwrite-dialog.ui.h:9 -#| msgid "Overwrite _all images" msgid "Overwrite _all files" -msgstr "Pārrakstīt vi_sus failus" +msgstr "Pārrakstīt vi_sas datnes" #: ../data/ui/overwrite-dialog.ui.h:10 -#| msgid "_Do not overwrite any image" msgid "_Do not overwrite any file" -msgstr "_Nepārrakstīt nevienu failu" +msgstr "_Nepārrakstīt nevienu datni" #: ../data/ui/overwrite-dialog.ui.h:11 -#| msgid "_Save the new image as:" msgid "_Save the new file as:" -msgstr "_Saglabāt jauno failu kā:" +msgstr "_Saglabāt jauno datni kā:" #: ../data/ui/personalize-filters.ui.h:1 -#| msgid "_Filter" msgid "Filters" msgstr "Filtri" #: ../data/ui/personalize-filters.ui.h:2 -#| msgid "_General" msgid "_General filter:" msgstr "Vispārī_gs filtrs:" @@ -321,12 +292,10 @@ msgstr "_Citi filtri:" #: ../data/ui/preferences.ui.h:1 -#| msgid "View the folders" msgid "below the folder list" msgstr "zem mapju saraksta" #: ../data/ui/preferences.ui.h:2 -#| msgid "Rotate Ri_ght" msgid "on the right" msgstr "labajā pusē" @@ -339,7 +308,6 @@ msgstr "Rīkjoslas s_tils:" #: ../data/ui/preferences.ui.h:5 -#| msgid "Th_umbnail size:" msgid "T_humbnails in viewer:" msgstr "Sī_ktēli skatītājā:" @@ -368,20 +336,18 @@ msgstr "apakšā" #: ../data/ui/preferences.ui.h:12 -#| msgid "Redo the search" msgid "on the side" msgstr "sānā" #: ../data/ui/preferences.ui.h:13 msgid "File _properties in browser:" -msgstr "Faila ī_pašības pārlūkā:" +msgstr "Datnes ī_pašības pārlūkā:" #: ../data/ui/preferences.ui.h:14 msgid "Appearance" msgstr "Izskats" #: ../data/ui/preferences.ui.h:15 -#| msgid "Go to the next visited location" msgid "Go to last _visited location" msgstr "Iet uz pēdējo apmeklēto _vietu" @@ -398,28 +364,24 @@ msgstr "Iestatīt uz _pašreizējo" #: ../data/ui/preferences.ui.h:19 -#| msgid "Reuse this window to view other images" msgid "_Reuse the active window to open files" -msgstr "Atkā_rtoti izmantot aktivitāšu logu, lai atvērtu failus" +msgstr "Atkā_rtoti izmantot aktivitāšu logu, lai atvērtu datnes" #: ../data/ui/preferences.ui.h:20 -#| msgid "On startup:" msgid "On startup:" msgstr "Palaižoties:" #: ../data/ui/preferences.ui.h:21 -#| msgid "As_k confirmation before deleting images or catalogs" msgid "As_k confirmation before deleting files or catalogs" -msgstr "Vaicāt apstiprinājumu pirms failu vai _katalogu dzēšanas" +msgstr "Vaicāt apstiprinājumu pirms datņu vai _katalogu dzēšanas" #: ../data/ui/preferences.ui.h:22 -#| msgid "Ask whether to save _modified images" msgid "Ask whether to save _modified files" -msgstr "Jautāt vai saglabāt _pārveidotos failus" +msgstr "Jautāt vai saglabāt _pārveidotās datnes" #: ../data/ui/preferences.ui.h:23 msgid "_Store metadata inside files if possible" -msgstr "Rak_stīt metadatus failos, ja iespējams" +msgstr "Rak_stīt metadatus datnēs, ja iespējams" #: ../data/ui/preferences.ui.h:24 #: ../extensions/exiv2_tools/gth-edit-iptc-page.c:198 @@ -431,7 +393,7 @@ #: ../data/ui/preferences.ui.h:25 #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 -#: ../extensions/edit_metadata/gth-edit-general-page.c:473 +#: ../extensions/edit_metadata/gth-edit-general-page.c:481 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 #: ../gthumb/gth-main-default-metadata.c:33 msgid "General" @@ -444,7 +406,6 @@ msgstr "Paraksts" #: ../data/ui/preferences.ui.h:27 -#| msgid "Th_umbnail size:" msgid "Thumbnail _size:" msgstr "_Sīktēlu izmērs:" @@ -494,23 +455,19 @@ msgstr "Pārlūks" #: ../data/ui/sort-order.ui.h:1 -#| msgid "Sort" msgid "Sort By" msgstr "Kārtot pēc" #: ../data/ui/sort-order.ui.h:2 #: ../extensions/rename_series/data/ui/rename-series.ui.h:4 -#| msgid "_Sort:" msgid "_Sort by:" msgstr "_Kārtot pēc:" #: ../data/ui/sort-order.ui.h:3 -#| msgid "Re_verse order" msgid "_Inverse order" msgstr "Apgr_ieztā secība" #: ../extensions/23hq/23hq.extension.in.in.h:1 -#| msgid "2" msgid "23" msgstr "23" @@ -519,7 +476,6 @@ msgstr "Augšupielādēt attēlus uz 23hq.com" #: ../extensions/23hq/callbacks.c:68 -#| msgid "..." msgid "_23..." msgstr "_23..." @@ -533,7 +489,6 @@ msgstr "Grāmatzīmes" #: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 -#| msgid "_Add Bookmark" msgid "Add bookmarks support." msgstr "Pievienot grāmatzīmju atbalstu." @@ -556,7 +511,6 @@ #: ../extensions/image_viewer/image_viewer.extension.in.in.h:3 #: ../extensions/list_tools/list_tools.extension.in.in.h:3 #: ../extensions/photo_importer/photo_importer.extension.in.in.h:3 -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:3 #: ../extensions/raw_files/raw_files.extension.in.in.h:3 #: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:3 #: ../extensions/rename_series/rename_series.extension.in.in.h:3 @@ -573,7 +527,6 @@ msgstr "_Grāmatzīmes" #: ../extensions/bookmarks/callbacks.c:55 -#| msgid "_Bookmarks" msgid "_System Bookmarks" msgstr "_Sistēmas grāmatzīmes" @@ -598,17 +551,14 @@ msgstr "_Grāmatzīmes:" #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:3 -#| msgid "Name" msgid "_Name" msgstr "_Nosaukums" #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:4 -#| msgid "Location" msgid "_Location" msgstr "_Vieta" #: ../extensions/bookmarks/dlg-bookmarks.c:70 -#| msgid "Could not move the image:" msgid "Could not remove the bookmark" msgstr "Nevarēja izņemt grāmatzīmi" @@ -618,7 +568,7 @@ #: ../extensions/burn_disc/burn_disc.extension.in.in.h:2 msgid "Save files to an optical disc." -msgstr "Saglabāt failus optiskajā diskā." +msgstr "Saglabāt datnes optiskajā diskā." #: ../extensions/burn_disc/callbacks.c:55 msgid "_Optical Disc..." @@ -626,15 +576,13 @@ #: ../extensions/burn_disc/callbacks.c:56 msgid "Write files to an optical disc" -msgstr "Rakstīt failus optiskajā diskā" +msgstr "Rakstīt datnes optiskajā diskā" #: ../extensions/burn_disc/data/ui/burn-disc-options.ui.h:1 -#| msgid "Name" msgid "Disc Name" msgstr "Diska nosaukums" #: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:1 -#| msgid "Current _Folder" msgid "Current _folder" msgstr "Pašreizējā _mape" @@ -643,33 +591,141 @@ msgstr "Pašreizējā mape un tās apa_kšmapes" #: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:3 -#| msgid "_Selected Images" msgid "_Selected files" -msgstr "_Izvēlētie faili" +msgstr "_Izvēlētās datnes" #: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:4 -#| msgid "Square" msgid "Source" msgstr "Avots" #: ../extensions/burn_disc/gth-burn-task.c:238 #: ../extensions/burn_disc/gth-burn-task.c:259 #: ../extensions/burn_disc/gth-burn-task.c:397 -#| msgid "Write To CD" msgid "Write to Disc" msgstr "Rakstīt diskā" -#: ../extensions/cairo_io/cairo-io-jpeg.c:62 +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:62 #, c-format -#| msgid "Converting image: %s" msgid "Error interpreting JPEG image file: %s" -msgstr "Kļūda, interpretējot JPEG attēla failu — %s" +msgstr "Kļūda, interpretējot JPEG attēla datni — %s" -#: ../extensions/cairo_io/cairo-io-jpeg.c:482 +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:483 #, c-format msgid "Unknown JPEG color space (%d)" msgstr "Nezināma JPEG krāsu telpa (%d)" +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:1 +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:1 +msgid "_Default extension:" +msgstr "_Noklusējuma paplašinājums:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:2 +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:1 +msgid "_Quality:" +msgstr "_Kvalitāte:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:3 +msgid "_Smoothing:" +msgstr "_Gludināšana:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:4 +msgid "Opti_mize" +msgstr "Opti_mizēt" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:5 +msgid "_Progressive" +msgstr "_Progresīvs" + +#: ../extensions/cairo_io/data/ui/png-options.ui.h:1 +msgid "Compression _level:" +msgstr "Saspiešanas _līmenis:" + +#: ../extensions/cairo_io/data/ui/save-options-preferences.ui.h:1 +msgid "Default options:" +msgstr "Noklusējuma opcijas:" + +#: ../extensions/cairo_io/data/ui/tga-options.ui.h:1 +msgid "_RLE compression" +msgstr "_RLE saspiešana" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:2 +msgid "Compression" +msgstr "Saspiešana" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:3 +msgid "_No compression" +msgstr "_Bez saspiešanas" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:4 +msgid "No_rmal (Deflate)" +msgstr "No_rmāls (saplacināt)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:5 +msgid "_Loss compression (JPEG)" +msgstr "_Zudumradošā saspiešana (JPEG)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:6 +msgid "Resolution" +msgstr "Izšķirtspēja" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:7 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 +msgid "_Horizontal:" +msgstr "_Horizontāli:" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:8 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 +msgid "_Vertical:" +msgstr "_Vertikāli:" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:9 +msgid "dpi" +msgstr "dpi" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:2 +msgid "_Method:" +msgstr "_Metode:" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:3 +msgid "_Lossless" +msgstr "_Bezzudumu" + +#: ../extensions/cairo_io/gth-image-saver-jpeg.c:515 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:140 +msgid "JPEG" +msgstr "JPEG" + +#: ../extensions/cairo_io/gth-image-saver-png.c:352 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:110 +msgid "PNG" +msgstr "PNG" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:257 +#: ../extensions/cairo_io/gth-image-saver-tiff.c:435 +#: ../gthumb/gth-buffer-data.c:84 +msgid "Insufficient memory" +msgstr "Nepietiek atmiņas" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:343 +msgid "TGA" +msgstr "TGA" + +#: ../extensions/cairo_io/gth-image-saver-tiff.c:558 +msgid "TIFF" +msgstr "TIFF" + +#: ../extensions/cairo_io/gth-image-saver-webp.c:381 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:165 +msgid "WebP" +msgstr "WebP" + +#: ../extensions/cairo_io/preferences.c:134 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 +msgid "Saving" +msgstr "Saglabā" + #: ../extensions/catalogs/actions.c:92 ../extensions/catalogs/actions.c:213 #: ../extensions/catalogs/dlg-add-to-catalog.c:274 #: ../extensions/catalogs/dlg-add-to-catalog.c:394 @@ -677,7 +733,6 @@ #: ../extensions/list_tools/gth-script-editor-dialog.c:290 #: ../gthumb/gth-filter-editor-dialog.c:461 #, c-format -#| msgid "No camera detected" msgid "No name specified" msgstr "Nav norādīts nosaukums" @@ -699,13 +754,11 @@ #: ../extensions/catalogs/actions.c:178 #: ../extensions/catalogs/dlg-add-to-catalog.c:359 -#| msgid "New Catalog" msgid "New catalog" msgstr "Jauns katalogs" #: ../extensions/catalogs/actions.c:179 #: ../extensions/catalogs/dlg-add-to-catalog.c:360 -#| msgid "Enter the catalog name: " msgid "Enter the catalog name:" msgstr "Ievadiet kataloga nosaukumu:" @@ -718,18 +771,15 @@ #: ../extensions/catalogs/actions.c:290 #: ../extensions/catalogs/dlg-add-to-catalog.c:471 -#| msgid "New Library" msgid "New library" msgstr "Jauna bibliotēka" #: ../extensions/catalogs/actions.c:291 #: ../extensions/catalogs/dlg-add-to-catalog.c:472 -#| msgid "Enter the library name: " msgid "Enter the library name:" msgstr "Ievadiet bibliotēkas nosaukumu:" #: ../extensions/catalogs/actions.c:326 -#| msgid "Could not rename the catalog \"%s\": %s" msgid "Could not remove the catalog" msgstr "Nevarēja izņemt katalogu" @@ -739,19 +789,18 @@ msgstr "Vai tiešām vēlaties izņemt “%s”?" #: ../extensions/catalogs/callbacks.c:102 -#| msgid "_Add to Catalog..." msgid "_Add to Catalog" msgstr "Pievienot k_atalogam" #: ../extensions/catalogs/callbacks.c:105 -#| msgid "Current _Folder" +#: ../extensions/selections/callbacks.c:80 msgid "Open _Folder" msgstr "Atvērt _mapi" #: ../extensions/catalogs/callbacks.c:106 -#| msgid "Go to the folder that contains the selected image" +#: ../extensions/selections/callbacks.c:81 msgid "Go to the folder that contains the selected file" -msgstr "Iet uz mapi, kas satur izvēlēto failu" +msgstr "Iet uz mapi, kas satur izvēlēto datni" #: ../extensions/catalogs/callbacks.c:110 #: ../extensions/picasaweb/picasa-account-properties-dialog.c:85 @@ -759,7 +808,6 @@ msgstr "Citi..." #: ../extensions/catalogs/callbacks.c:111 -#| msgid "C_hoose from the catalog" msgid "Choose another catalog" msgstr "Izvēlieties citu katalogu" @@ -780,60 +828,55 @@ msgstr "Izņemt izvēlētos attēlus no kataloga" #: ../extensions/catalogs/callbacks.c:125 -#| msgid "Create a new catalog" msgid "Create _Catalog" msgstr "Izveidot jaunu _katalogu" #: ../extensions/catalogs/callbacks.c:130 -#| msgid "New _Library" msgid "Create _Library" msgstr "Izveidot _bibliotēku" #: ../extensions/catalogs/callbacks.c:140 -#| msgid "Rename" msgid "Rena_me" msgstr "Pā_rsaukt" -#: ../extensions/catalogs/callbacks.c:279 -#: ../extensions/catalogs/callbacks.c:282 +#: ../extensions/catalogs/callbacks.c:281 +#: ../extensions/catalogs/callbacks.c:284 msgid "Command Line" msgstr "Komandrinda" -#: ../extensions/catalogs/callbacks.c:497 -#: ../extensions/catalogs/callbacks.c:502 +#: ../extensions/catalogs/callbacks.c:496 +#: ../extensions/catalogs/callbacks.c:501 #: ../extensions/photo_importer/dlg-photo-importer.c:364 #: ../extensions/photo_importer/dlg-photo-importer.c:404 #: ../gthumb/gth-file-list.c:43 ../gthumb/gth-folder-tree.c:883 msgid "(Empty)" msgstr "(Tukšs)" -#: ../extensions/catalogs/callbacks.c:697 -#| msgid "%s Properties" +#: ../extensions/catalogs/callbacks.c:700 msgid "Catalog Properties" msgstr "Kataloga īpašības" -#: ../extensions/catalogs/callbacks.c:711 +#: ../extensions/catalogs/callbacks.c:714 msgid "Organize" msgstr "Organizēt" -#: ../extensions/catalogs/callbacks.c:712 +#: ../extensions/catalogs/callbacks.c:715 msgid "Automatically organize files by date" -msgstr "Automātiski organizēt failus pēc datuma" +msgstr "Automātiski organizēt datnes pēc datuma" #: ../extensions/catalogs/catalogs.extension.in.in.h:1 #: ../extensions/catalogs/gth-catalog.c:611 #: ../extensions/catalogs/gth-catalog.c:662 -#: ../extensions/catalogs/gth-catalog.c:1024 -#: ../extensions/catalogs/gth-catalog.c:1025 +#: ../extensions/catalogs/gth-catalog.c:1016 +#: ../extensions/catalogs/gth-catalog.c:1017 msgid "Catalogs" msgstr "Katalogi" #: ../extensions/catalogs/catalogs.extension.in.in.h:2 msgid "Create file collections." -msgstr "Izveidot failu kolekcijas." +msgstr "Izveidot datņu kolekcijas." #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:1 -#| msgid "_Add to Catalog..." msgid "Add to Catalog" msgstr "Pievienot katalogam" @@ -851,13 +894,12 @@ #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:5 #: ../extensions/file_manager/actions.c:945 -#: ../extensions/webalbums/gth-web-exporter.c:1842 +#: ../extensions/webalbums/gth-web-exporter.c:1840 msgid "_View the destination" msgstr "_Skatīt mērķi" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:1 -#: ../gthumb/gth-file-properties.c:212 -#| msgid "Proper_ties" +#: ../gthumb/gth-file-properties.c:209 msgid "Properties" msgstr "Īpašības" @@ -868,7 +910,6 @@ #: ../extensions/list_tools/data/ui/script-editor.ui.h:1 #: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 #: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:1 -#| msgid "Name" msgid "_Name:" msgstr "_Nosaukums:" @@ -878,49 +919,44 @@ msgstr "_Datums:" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:5 -#| msgid "Ca_talog" msgid "Catalog" msgstr "Katalogs" #: ../extensions/catalogs/data/ui/organize-files-task.ui.h:1 #: ../extensions/catalogs/data/ui/organize-files.ui.h:6 msgid "Organize Files" -msgstr "Organizēt failus" +msgstr "Organizēt datnes" #: ../extensions/catalogs/data/ui/organize-files-task.ui.h:2 msgid "Organizing files" -msgstr "Organizē failus" +msgstr "Organizē datnes" #: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 msgid "Organization:" msgstr "Organizācija:" #: ../extensions/catalogs/data/ui/organize-files-task.ui.h:4 -#| msgid "_Select All" msgid "Select All" msgstr "Izvēlēties visu" #: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 -#| msgid "Select a font" msgid "Select None" msgstr "Neizvēlēties nevienu" #: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 -#| msgid "Style Preview" msgid "Catalog _Preview:" msgstr "Kataloga _priekšskatījums:" #: ../extensions/catalogs/data/ui/organize-files.ui.h:1 -#: ../extensions/edit_metadata/gth-edit-general-page.c:550 +#: ../extensions/edit_metadata/gth-edit-general-page.c:558 #: ../gthumb/gth-main-default-tests.c:300 msgid "Date photo was taken" msgstr "Fotogrāfijas uzņemšanas datums" #: ../extensions/catalogs/data/ui/organize-files.ui.h:2 #: ../gthumb/gth-main-default-tests.c:292 -#| msgid "Last modified date" msgid "File modified date" -msgstr "Faila izmaiņu datums" +msgstr "Datņu izmaiņu datums" #: ../extensions/catalogs/data/ui/organize-files.ui.h:3 #: ../extensions/comments/main.c:159 @@ -938,7 +974,7 @@ #: ../extensions/catalogs/data/ui/organize-files.ui.h:7 msgid "_Group files by:" -msgstr "_Grupēt failus pēc:" +msgstr "_Grupēt datnes pēc:" #: ../extensions/catalogs/data/ui/organize-files.ui.h:8 #: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 @@ -948,104 +984,88 @@ #: ../extensions/catalogs/data/ui/organize-files.ui.h:9 msgid "Ignore catalogs with a single file" -msgstr "Ignorēt katalogus ar vienu failu" +msgstr "Ignorēt katalogus ar vienu datni" #: ../extensions/catalogs/data/ui/organize-files.ui.h:10 msgid "Put single files in the catalog:" -msgstr "Ievieto vienpatņu failus katalogā:" +msgstr "Ievieto vienpatņu datnes katalogā:" #: ../extensions/catalogs/data/ui/organize-files.ui.h:11 -#| msgid "Simple" msgid "Singles" msgstr "Vienpatņi" #: ../extensions/catalogs/dlg-add-to-catalog.c:105 #: ../extensions/catalogs/dlg-add-to-catalog.c:136 -#| msgid "Could not delete the images:" msgid "Could not add the files to the catalog" -msgstr "Nevarēja pievienot failus katalogam" +msgstr "Nevarēja pievienot datnes katalogam" #: ../extensions/catalogs/dlg-add-to-catalog.c:217 #: ../extensions/search/gth-search-task.c:356 -#| msgid "Could not create the catalog \"%s\": %s" msgid "Could not create the catalog" msgstr "Nevarēja izveidot katalogu" #: ../extensions/catalogs/dlg-catalog-properties.c:80 -#| msgid "Could not rename the catalog \"%s\": %s" msgid "Could not save the catalog" msgstr "Nevarēja saglabāt katalogu" #: ../extensions/catalogs/dlg-catalog-properties.c:159 -#| msgid "Could not rename the catalog \"%s\": %s" msgid "Could not load the catalog" msgstr "Nevarēja ielādēt katalogu" #: ../extensions/catalogs/dlg-organize-files.c:120 msgid "Files will be organized in catalogs. No file will be moved on disk." msgstr "" -"Faili tiks organizēti katalogos. Uz diska neviens fails netiks pārvietots." +"Datnes tiks organizēti katalogos. Uz diska neviena datne netiks pārvietota." -#: ../extensions/catalogs/gth-catalog.c:1122 ../extensions/comments/main.c:44 +#: ../extensions/catalogs/gth-catalog.c:1114 ../extensions/comments/main.c:44 #: ../extensions/edit_metadata/callbacks.c:106 #: ../gthumb/gth-main-default-metadata.c:53 -#| msgid "Images" msgid "Tags" msgstr "Birkas" #: ../extensions/catalogs/gth-file-source-catalogs.c:953 #, c-format -#| msgid "" -#| "An image named \"%s\" is already present. Do you want to overwrite it?" msgid "The catalog '%s' already exists, do you want to overwrite it?" msgstr "Katalogs “%s” jau eksistē. Vai vēlaties to pārrakstīt?" #: ../extensions/catalogs/gth-file-source-catalogs.c:955 #, c-format -#| msgid "" -#| "An image named \"%s\" is already present. Do you want to overwrite it?" msgid "The library '%s' already exists, do you want to overwrite it?" msgstr "Bibliotēka “%s” jau eksistē. Vai vēlaties to pārrakstīt?" #: ../extensions/catalogs/gth-file-source-catalogs.c:963 -#| msgid "_Overwrite" msgid "Over_write" msgstr "Pā_rrakstīt" #: ../extensions/catalogs/gth-file-source-catalogs.c:1081 -#| msgid "Could not move the items:" msgid "Cannot move the files" -msgstr "Nevar pārvietot failus" +msgstr "Nevar pārvietot datnes" #: ../extensions/catalogs/gth-file-source-catalogs.c:1083 -#| msgid "Could not copy the image:" msgid "Cannot copy the files" -msgstr "Nevar kopēt failus" +msgstr "Nevar kopēt datnes" #: ../extensions/catalogs/gth-file-source-catalogs.c:1088 -#| msgid "source contains destination" msgid "Invalid destination." msgstr "Nederīgs mērķis." #: ../extensions/catalogs/gth-file-source-catalogs.c:1135 #, c-format -#| msgid "Copying file %d of %d" msgid "Copying files to '%s'" -msgstr "Kopē failus uz “%s”" +msgstr "Kopē datnes uz “%s”" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1388 -#| msgid "Remove selected images from the catalog" +#: ../extensions/catalogs/gth-file-source-catalogs.c:1322 msgid "Could not remove the files from the catalog" -msgstr "Nevarēja izņemt failus no kataloga" +msgstr "Nevarēja izņemt datnes no kataloga" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1446 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:685 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:694 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:723 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:1228 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1380 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:733 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:742 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:771 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:1304 #: ../extensions/search/gth-search.c:265 msgid "Invalid file format" -msgstr "Nederīgs faila formāts" +msgstr "Nederīgs datnes formāts" #: ../extensions/catalogs/gth-organize-task.c:202 #, c-format @@ -1061,104 +1081,92 @@ msgstr "Mainīt attēla pēdējo izmaiņu datumu" #: ../extensions/change_date/change_date.extension.in.in.h:1 -#| msgid "Change Date" msgid "Change date" msgstr "Mainīt datumu" #: ../extensions/change_date/change_date.extension.in.in.h:2 -#| msgid "Change images last modified date" msgid "Change the files date" -msgstr "Mainīt failu datumus" +msgstr "Mainīt datņu datumus" #: ../extensions/change_date/data/ui/change-date.ui.h:1 +msgid "+" +msgstr "+" + +#: ../extensions/change_date/data/ui/change-date.ui.h:2 +msgid "-" +msgstr "-" + +#: ../extensions/change_date/data/ui/change-date.ui.h:3 msgid "Change Date" msgstr "Mainīt datumu" -#: ../extensions/change_date/data/ui/change-date.ui.h:2 -#| msgid "Change the following values:" +#: ../extensions/change_date/data/ui/change-date.ui.h:4 msgid "Change the following values:" msgstr "Mainīt šādas vērtības:" -#: ../extensions/change_date/data/ui/change-date.ui.h:3 +#: ../extensions/change_date/data/ui/change-date.ui.h:5 msgid "_Last modified date" msgstr "_Pēdējo izmaiņu datums" -#: ../extensions/change_date/data/ui/change-date.ui.h:4 +#: ../extensions/change_date/data/ui/change-date.ui.h:6 msgid "Co_mment date" msgstr "Ko_mentāra datums" -#: ../extensions/change_date/data/ui/change-date.ui.h:5 -msgid "Exif DateTimeOriginal tag" -msgstr "Exif DateTimeOriginal birka" - -#: ../extensions/change_date/data/ui/change-date.ui.h:6 -#| msgid "Change Date" +#: ../extensions/change_date/data/ui/change-date.ui.h:7 msgid "Change to:" msgstr "Mainīt uz:" -#: ../extensions/change_date/data/ui/change-date.ui.h:7 +#: ../extensions/change_date/data/ui/change-date.ui.h:8 msgid "The _following date:" msgstr "Š_o datumu:" -#: ../extensions/change_date/data/ui/change-date.ui.h:8 -#| msgid "Last modified date" +#: ../extensions/change_date/data/ui/change-date.ui.h:9 msgid "File _modified date" -msgstr "Faila iz_maiņu datums" +msgstr "Datnes iz_maiņu datums" -#: ../extensions/change_date/data/ui/change-date.ui.h:9 -#| msgid "Image c_reation date" +#: ../extensions/change_date/data/ui/change-date.ui.h:10 msgid "File c_reation date" -msgstr "Faila _izveidošanas datums" +msgstr "Datnes _izveidošanas datums" -#: ../extensions/change_date/data/ui/change-date.ui.h:10 +#: ../extensions/change_date/data/ui/change-date.ui.h:11 msgid "Date p_hoto was taken" msgstr "_Fotogrāfijas uzņemšanas datums" -#: ../extensions/change_date/data/ui/change-date.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:12 msgid "A_djust by" msgstr "Nobī_dīt par" -#: ../extensions/change_date/data/ui/change-date.ui.h:12 +#: ../extensions/change_date/data/ui/change-date.ui.h:13 msgid "hours" msgstr "stundas" -#: ../extensions/change_date/data/ui/change-date.ui.h:13 +#: ../extensions/change_date/data/ui/change-date.ui.h:14 msgid "minutes" msgstr "minūtes" -#: ../extensions/change_date/data/ui/change-date.ui.h:14 +#: ../extensions/change_date/data/ui/change-date.ui.h:15 #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:6 msgid "seconds" msgstr "sekundes" -#: ../extensions/change_date/data/ui/change-date.ui.h:15 -msgid "+" -msgstr "+" - -#: ../extensions/change_date/data/ui/change-date.ui.h:16 -msgid "-" -msgstr "-" - #: ../extensions/comments/callbacks.c:46 msgid "Import Embedded Metadata" msgstr "Importēt iegultos metadatus" #: ../extensions/comments/callbacks.c:47 msgid "Import the metadata stored inside files into the gThumb comment system" -msgstr "Importēt metadatus, kas ir saglabāti failos gThumb komentāru sistēmā" +msgstr "Importēt metadatus, kas ir saglabāti datnēs gThumb komentāru sistēmā" #: ../extensions/comments/comments.extension.in.in.h:1 -#| msgid "Co_mment date" msgid "Comments and tags" msgstr "Komentāri un birkas" #: ../extensions/comments/comments.extension.in.in.h:2 msgid "Add comments and tags to any file type." -msgstr "Pievienot komentārus un birkas jebkuram failu tipam." +msgstr "Pievienot komentārus un birkas jebkuram datņu tipam." #: ../extensions/comments/data/ui/comments-preferences.ui.h:1 #: ../extensions/importer/gth-import-preferences-dialog.c:318 -#| msgid "_Preferences..." msgid "Preferences" msgstr "Iestatījumi" @@ -1172,7 +1180,6 @@ msgstr "Komentārs" #: ../extensions/comments/main.c:40 ../gthumb/gth-main-default-metadata.c:46 -#| msgid "_Tiled" msgid "Title" msgstr "Nosaukums" @@ -1185,7 +1192,6 @@ #: ../extensions/rename_series/data/ui/rename-series.ui.h:12 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 #: ../gthumb/gth-main-default-metadata.c:52 -#| msgid "_Destination:" msgid "Description" msgstr "Apraksts" @@ -1199,12 +1205,10 @@ msgstr "Datums" #: ../extensions/comments/main.c:45 ../gthumb/gth-main-default-metadata.c:54 -#| msgid "Caption" msgid "Rating" msgstr "Vērtējums" #: ../extensions/contact_sheet/callbacks.c:59 -#| msgid "Rotate _Left" msgid "Contact _Sheet" msgstr "Kontaktu lok_sne" @@ -1213,17 +1217,14 @@ msgstr "Kontaktu lok_sne..." #: ../extensions/contact_sheet/callbacks.c:62 -#| msgid "Create a new category" msgid "Create a contact sheet" msgstr "Izveidot kontaktu loksni" #: ../extensions/contact_sheet/callbacks.c:65 -#| msgid "I_mage Caption..." msgid "Image _Wall..." msgstr "Attēlu _siena..." #: ../extensions/contact_sheet/callbacks.c:66 -#| msgid "Create Index Image" msgid "Create an image-wall" msgstr "Izveidot attēla sienu" @@ -1234,13 +1235,13 @@ #: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:2 msgid "Create an index image displaying the thumbnails of the selected files." -msgstr "Izveido indeksa attēlu, kas attēlo izvēlēto failu sīktēlus." +msgstr "Izveido indeksa attēlu, kas attēlo izvēlēto datņu sīktēlus." #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:1 -#: ../extensions/file_tools/gth-file-tool-crop.c:424 -#: ../extensions/file_tools/gth-file-tool-crop.c:454 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 -#: ../extensions/file_tools/gth-file-tool-rotate.c:415 +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:446 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 +#: ../extensions/file_tools/gth-file-tool-rotate.c:403 #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:14 #: ../extensions/slideshow/main.c:277 msgid "None" @@ -1271,7 +1272,6 @@ msgstr "Ēna uz āru" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:9 -#| msgid "Background style" msgid "Background" msgstr "Fons" @@ -1283,38 +1283,24 @@ msgid "_Gradient" msgstr "_Krāsu pāreja" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 -msgid "_Horizontal:" -msgstr "_Horizontāli:" - -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 -msgid "_Vertical:" -msgstr "_Vertikāli:" - #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:14 msgid "Select a color" msgstr "Izvēlieties krāsu" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:15 -#| msgid "Name" msgid "Frame" msgstr "Ietvars" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:16 -#| msgid "St_yle" msgid "_Style:" msgstr "_Stils" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:17 -#| msgid "Colo_r:" msgid "C_olor:" msgstr "Krā_sa:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:18 #: ../extensions/rename_series/dlg-rename-series.c:57 -#| msgid "Next" msgid "Text" msgstr "Teksts" @@ -1341,14 +1327,12 @@ #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:22 #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 #: ../extensions/image_print/data/ui/print-preferences.ui.h:1 -#| msgid "Caption" msgid "Caption:" msgstr "Paraksts:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:2 #: ../extensions/image_print/data/ui/print-layout.ui.h:5 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:6 -#| msgid "Save current image" msgid "The current page number" msgstr "Pašreizējās lapas numurs" @@ -1380,7 +1364,6 @@ #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:9 #: ../extensions/image_print/data/ui/print-layout.ui.h:12 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 -#| msgid "Current date" msgid "The current date" msgstr "Pašreizējais datums" @@ -1405,9 +1388,8 @@ #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:14 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 -#| msgid "File _name:" msgid "File_name:" -msgstr "Faila _nosaukums:" +msgstr "Datnes _nosaukums:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 @@ -1419,32 +1401,20 @@ msgid "Create _HTML image map" msgstr "Izveidot _HTML attēla karti" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 -#: ../extensions/pixbuf_savers/preferences.c:134 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 -#| msgid "Saving" -msgid "Saving" -msgstr "Saglabā" - #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 -#| msgid "Create a new category" msgid "Create a new theme" msgstr "Izveido jaunu motīvu" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:19 -#| msgid "Open the selected folder" msgid "Edit the selected theme" msgstr "Rediģēt izvēlēto motīvu" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:20 -#| msgid "Delete selected images from the camera" msgid "Delete the selected theme" msgstr "Dzēst izvēlēto motīvu" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:21 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 -#| msgid "_Theme:" msgid "Theme" msgstr "Motīvs" @@ -1452,7 +1422,6 @@ #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 #: ../extensions/image_print/data/ui/print-layout.ui.h:16 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 -#| msgid "Col_umns:" msgid "Columns:" msgstr "Kolonnas:" @@ -1492,45 +1461,37 @@ #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:30 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:15 -#| msgid "_Size :" msgid "_Size:" msgstr "Izmēr_s:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 -#| msgid "Square" msgid "Sq_uared" msgstr "K_vadrāts" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:33 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:16 -#| msgid "_Thumbnails" msgid "Thumbnails" msgstr "Sīktēli" #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 -#| msgid "Image data" msgid "Image Wall" msgstr "Attēlu siena" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:486 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:498 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:512 -#| msgid "Could not move the items:" +#: ../extensions/contact_sheet/dlg-contact-sheet.c:481 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:492 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:506 msgid "Could not save the theme" msgstr "Nevarēja saglabāt motīvu" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:657 -#| msgid "Could not delete the images:" +#: ../extensions/contact_sheet/dlg-contact-sheet.c:651 msgid "Could not delete the theme" msgstr "Nevarēja izdzēst motīvu" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:248 -#| msgid "Creating image: %s.%s" +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:247 msgid "Creating images" msgstr "Veido attēlus" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:897 -#| msgid "Saving thumbnails" +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:895 msgid "Generating thumbnails" msgstr "Veido sīktēlus" @@ -1543,7 +1504,6 @@ msgstr "Kājene" #: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:193 -#| msgid "%s Properties" msgid "Theme Properties" msgstr "Motīva īpašības" @@ -1552,22 +1512,18 @@ msgstr "Kopēt _no" #: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:316 -#| msgid "New Name" msgid "New theme" msgstr "Jauns motīvs" #: ../extensions/convert_format/callbacks.c:45 -#| msgid "Convert F_ormat..." msgid "Convert Format..." msgstr "Pārveidot formātu..." #: ../extensions/convert_format/callbacks.c:46 -#| msgid "Convert Format" msgid "Convert image format" msgstr "Pārveidot attēla formātu" #: ../extensions/convert_format/convert_format.extension.in.in.h:1 -#| msgid "Convert Format" msgid "Convert format" msgstr "Pārveidot formātu" @@ -1580,46 +1536,38 @@ msgstr "Pārveidot formātu" #: ../extensions/convert_format/data/ui/convert-format.ui.h:2 -#| msgid "New Image:" msgid "New format" msgstr "Jauns formāts" #: ../extensions/convert_format/data/ui/convert-format.ui.h:3 #: ../extensions/resize_images/data/ui/resize-images.ui.h:6 -#| msgid "_Destination:" msgid "Destination" msgstr "Mērķis" #: ../extensions/convert_format/data/ui/convert-format.ui.h:5 #: ../extensions/resize_images/data/ui/resize-images.ui.h:8 -#| msgid "Restore the original desktop wallpaper" msgid "_Use the original image folder" msgstr "_Izmantot sākotnējo attēla mapi" -#: ../extensions/convert_format/dlg-convert-format.c:93 -#| msgid "Converting image: %s" +#: ../extensions/convert_format/dlg-convert-format.c:95 msgid "Converting images" msgstr "Pārveido attēlus" -#: ../extensions/desktop_background/actions.c:162 -#| msgid "Set the image as desktop background (tiled)" +#: ../extensions/desktop_background/actions.c:158 msgid "Could not show the desktop background properties" msgstr "Nevarēja parādīt darbvirsmas fona īpašības" -#: ../extensions/desktop_background/actions.c:228 -#: ../extensions/desktop_background/actions.c:246 -#| msgid "Set the image as desktop background (tiled)" +#: ../extensions/desktop_background/actions.c:224 +#: ../extensions/desktop_background/actions.c:242 msgid "Could not set the desktop background" msgstr "Nevarēja iestatīt darbvirsmas fonu" #: ../extensions/desktop_background/callbacks.c:49 -#| msgid "Set the image as desktop background (tiled)" msgid "Set as Desktop Background" msgstr "Iestatīt kā darbvirsmas fonu" #: ../extensions/desktop_background/callbacks.c:50 #: ../extensions/desktop_background/desktop_background.extension.in.in.h:2 -#| msgid "Set the image as desktop background (tiled)" msgid "Set the image as desktop background" msgstr "Iestatīt attēlu kā darbvirsmas fonu" @@ -1631,7 +1579,7 @@ msgid "" "Are you sure you want to permanently delete the metadata of the selected " "files?" -msgstr "Vai tiešām vēlaties neatgriezeniski dzēst izvēlēto failu metadatus?" +msgstr "Vai tiešām vēlaties neatgriezeniski dzēst izvēlēto datņu metadatus?" #: ../extensions/edit_metadata/actions.c:73 msgid "If you delete the metadata, it will be permanently lost." @@ -1643,12 +1591,11 @@ #: ../extensions/edit_metadata/callbacks.c:101 msgid "Edit the comment and other information of the selected files" -msgstr "Rediģēt komentārus un citu informāciju izvēlētajos failos" +msgstr "Rediģēt komentārus un citu informāciju izvēlētajās datnēs" #: ../extensions/edit_metadata/callbacks.c:107 -#| msgid "Assign categories to the selected folder" msgid "Set the tags of the selected files" -msgstr "Iestatīt izvēlēto failu birkas" +msgstr "Iestatīt izvēlēto datņu birkas" #: ../extensions/edit_metadata/callbacks.c:112 msgid "Delete Metadata" @@ -1656,12 +1603,11 @@ #: ../extensions/edit_metadata/callbacks.c:113 msgid "Delete the comment and the embedded metadata of the selected files" -msgstr "Dzēst izvēlēto failu komentārus un iegultos metadatus" +msgstr "Dzēst izvēlēto datņu komentārus un iegultos metadatus" #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:1 #: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 #: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 -#| msgid "_Destination:" msgid "D_escription:" msgstr "A_praksts:" @@ -1671,30 +1617,25 @@ #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 #: ../extensions/edit_metadata/data/ui/tag-chooser.ui.h:1 -#| msgid "C_atalogs:" msgid "T_ags:" msgstr "Birk_as:" #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:5 -#| msgid "_Right:" msgid "_Rating:" msgstr "Vē_rtējums:" #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:6 -#| msgid "_Tiled" msgid "_Title:" msgstr "_Nosaukums:" #: ../extensions/edit_metadata/dlg-edit-metadata.c:121 -#| msgid "Could not move the image:" msgid "Could not save the file metadata" -msgstr "Nevarēja saglabāt faila metadatus" +msgstr "Nevarēja saglabāt datnes metadatus" #: ../extensions/edit_metadata/dlg-edit-metadata.c:234 #: ../gthumb/gth-overwrite-dialog.c:136 -#| msgid "General Information" msgid "Cannot read file information" -msgstr "Nevar nolasīt informāciju par failu" +msgstr "Nevar nolasīt informāciju par datni" #: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:1 msgid "Edit metadata" @@ -1702,7 +1643,7 @@ #: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 msgid "Allow to edit files metadata." -msgstr "Atļaut rediģēt failu metadatus." +msgstr "Atļaut rediģēt datņu metadatus." #. Translators: the %s symbol in the string is a file name #: ../extensions/edit_metadata/gth-edit-comment-dialog.c:63 @@ -1714,16 +1655,14 @@ #: ../extensions/edit_metadata/gth-edit-tags-dialog.c:83 #: ../extensions/flicker_utils/dlg-import-from-flickr.c:335 #, c-format -#| msgid "Inde_x file:" msgid "%d file" msgid_plural "%d files" -msgstr[0] "%d fails" -msgstr[1] "%d faili" -msgstr[2] "%d failu" +msgstr[0] "%d datne" +msgstr[1] "%d datnes" +msgstr[2] "%d datņu" #: ../extensions/edit_metadata/gth-edit-comment-dialog.c:144 -#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:192 -#| msgid "Da_te and Time" +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:197 msgid "Sa_ve and Close" msgstr "Saglabāt un aiz_vērt" @@ -1731,29 +1670,28 @@ msgid "Save only cha_nged fields" msgstr "Saglabāt tikai izmai_nītos laukus" -#: ../extensions/edit_metadata/gth-edit-general-page.c:547 +#: ../extensions/edit_metadata/gth-edit-general-page.c:555 msgid "No date" msgstr "Nav datuma" -#: ../extensions/edit_metadata/gth-edit-general-page.c:548 +#: ../extensions/edit_metadata/gth-edit-general-page.c:556 msgid "The following date" msgstr "Šo datumu" -#: ../extensions/edit_metadata/gth-edit-general-page.c:549 +#: ../extensions/edit_metadata/gth-edit-general-page.c:557 #: ../extensions/importer/gth-import-preferences-dialog.c:331 msgid "Current date" msgstr "Šodienas datumu" -#: ../extensions/edit_metadata/gth-edit-general-page.c:551 +#: ../extensions/edit_metadata/gth-edit-general-page.c:559 msgid "Last modified date" msgstr "Pēdējo izmaiņu datums" -#: ../extensions/edit_metadata/gth-edit-general-page.c:552 -#| msgid "Image creation date" +#: ../extensions/edit_metadata/gth-edit-general-page.c:560 msgid "File creation date" -msgstr "Faila izveidošanas datums" +msgstr "Datnes izveidošanas datums" -#: ../extensions/edit_metadata/gth-edit-general-page.c:553 +#: ../extensions/edit_metadata/gth-edit-general-page.c:561 msgid "Do not modify" msgstr "Nepārveidot" @@ -1763,27 +1701,24 @@ msgid "%s Tags" msgstr "%s birkas" -#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:184 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:189 msgid "Assign Tags" msgstr "Piešķirt birkas" -#: ../extensions/edit_metadata/gth-tag-task.c:115 -#: ../extensions/edit_metadata/gth-tag-task.c:132 -#| msgid "Assign categories to the selected folder" +#: ../extensions/edit_metadata/gth-tag-task.c:119 +#: ../extensions/edit_metadata/gth-tag-task.c:136 msgid "Assigning tags to the selected files" -msgstr "Piešķirt birkas izvēlētajiem failiem" +msgstr "Piešķirt birkas izvēlētajām datnēm" -#: ../extensions/edit_metadata/gth-tag-task.c:115 +#: ../extensions/edit_metadata/gth-tag-task.c:119 msgid "Writing files" -msgstr "Raksta failus" +msgstr "Raksta datnes" -#: ../extensions/edit_metadata/gth-tag-task.c:132 -#| msgid "Loading images" +#: ../extensions/edit_metadata/gth-tag-task.c:136 msgid "Reading files" -msgstr "Lasa failus" +msgstr "Lasa datnes" #: ../extensions/example/src/example.extension.in.in.h:1 -#| msgid "Simple" msgid "Example" msgstr "Piemērs" @@ -1792,28 +1727,23 @@ msgstr "Paplašinājuma piemērs." #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:1 -#| msgid "_Right:" msgid "C_opyright:" msgstr "Aut_ortiesības:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 -#| msgid "Co_mment:" msgid "Co_untry:" msgstr "_Valsts:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:3 -#| msgid "_Model:" msgid "_Code:" msgstr "_Kods:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:4 -#| msgid "_Height:" msgid "Cr_edit:" msgstr "A_tzinība:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:6 #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 -#| msgid "_Sort:" msgid "_Source:" msgstr "Avot_s:" @@ -1830,12 +1760,10 @@ msgstr "Izpildī_tāja rindas virsraksts:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:10 -#| msgid "_Brightness:" msgid "_Byline:" msgstr "_Izpildītāja rinda:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:11 -#| msgid "_Quality:" msgid "_City:" msgstr "_Pilsēta:" @@ -1856,7 +1784,6 @@ msgstr "Lasīt un rakstīt exif, iptc un xmp metadatus." #: ../extensions/exiv2_tools/main.c:33 -#| msgid "General" msgid "Exif General" msgstr "Exif vispārīgi" @@ -1865,12 +1792,10 @@ msgstr "Exif apstākļi" #: ../extensions/exiv2_tools/main.c:35 -#| msgid "Image Structure" msgid "Exif Structure" msgstr "Exif struktūra" #: ../extensions/exiv2_tools/main.c:36 -#| msgid "_Thumbnails" msgid "Exif Thumbnail" msgstr "Exif sīktēls" @@ -1883,12 +1808,10 @@ msgstr "Exif veidotāja piezīmes" #: ../extensions/exiv2_tools/main.c:39 -#| msgid "Dimensions" msgid "Exif Versions" msgstr "Exif versijas" #: ../extensions/exiv2_tools/main.c:40 -#| msgid "Other" msgid "Exif Other" msgstr "Exif citi" @@ -1904,12 +1827,11 @@ msgid "XMP Attached" msgstr "XMP pievienots" -#: ../extensions/exiv2_tools/main.c:256 +#: ../extensions/exiv2_tools/main.c:267 msgid "date photo was taken" msgstr "fotogrāfijas uzņemšanas datums" #: ../extensions/export_tools/callbacks.c:99 -#| msgid "Square" msgid "Share" msgstr "Koplietot" @@ -1922,57 +1844,54 @@ msgstr "Augšupielādēt fotogrāfijas uz Facebook" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:1 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 msgid "Export to Flickr" msgstr "Eksportēt uz Flickr" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:2 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 #: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 -#| msgid "_Reload" msgid "_Upload" msgstr "A_ugšupielādēt" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:3 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 -#| msgid "_Font:" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 msgid "_Account:" msgstr "_Konts:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:4 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 #: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 #: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 msgid "Edit accounts" msgstr "Rediģēt kontus" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 -#| msgid "Web Album" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 msgid "A_lbum:" msgstr "A_lbums:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 msgid "Add a new album" msgstr "Pievienot jaunu albumu" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 -#| msgid "_Resize if larger than:" msgid "Resize the images if larger than this size" msgstr "Mainīt attēlu izmērus, ja tie ir lielāki kā šis izmērs" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:8 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 -#| msgid "_Reset" -msgid "_Resize to:" -msgstr "Mainīt izmē_ru uz:" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 +msgid "_Resize if larger than:" +msgstr "Mainīt izmē_ru, ja lielāks kā:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:9 -#| msgid "200 x 200" msgid "720 x 720" msgstr "720 x 720" @@ -1985,12 +1904,10 @@ msgstr "1280 x 1280" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:12 -#| msgid "800 x 600" msgid "1600 x 1600" msgstr "1600 x 1600" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:13 -#| msgid "48 x 48" msgid "2048 x 2048" msgstr "2048 x 2048" @@ -2001,7 +1918,6 @@ #: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 #: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 #: ../extensions/picasaweb/data/ui/picasa-web-account-chooser.ui.h:1 -#| msgid "_Font:" msgid "A_ccount:" msgstr "_Konts:" @@ -2009,23 +1925,21 @@ #: ../extensions/flicker_utils/data/ui/flicker-account-manager.ui.h:1 #: ../extensions/oauth/data/ui/oauth-account-manager.ui.h:1 #: ../extensions/picasaweb/data/ui/picasa-web-account-manager.ui.h:1 -#| msgid "_Font:" msgid "A_ccounts:" msgstr "_Konti:" #: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 msgid "Public photos" msgstr "Publiskās fotogrāfijas" #: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 msgid "Private photos, visible to friends" msgstr "Privātās fotogrāfijas, redzamas draugiem" #: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 #: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:5 -#| msgid "Print" msgid "Private" msgstr "Privāts" @@ -2037,7 +1951,6 @@ #: ../extensions/facebook/data/ui/facebook-ask-authorization.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-ask-authorization.ui.h:1 #: ../extensions/oauth/data/ui/oauth-ask-authorization.ui.h:1 -#| msgid "_Posterize..." msgid "_Authorize..." msgstr "Pilnv_arot..." @@ -2051,7 +1964,6 @@ #: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 #: ../extensions/flicker_utils/data/ui/flicker-complete-authorization.ui.h:1 #: ../extensions/oauth/data/ui/oauth-complete-authorization.ui.h:1 -#| msgid "Continue" msgid "C_ontinue" msgstr "T_urpināt" @@ -2060,102 +1972,93 @@ #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:1 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:1 msgid "Files successfully uploaded to the server." -msgstr "Faili tika veiksmīgi augšupielādēti uz serveri." +msgstr "Datnes tika veiksmīgi augšupielādētas uz serveri." #: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:2 #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:2 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:2 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:2 -#: ../extensions/webalbums/gth-web-exporter.c:1841 -#| msgid "Open in New Window" +#: ../extensions/webalbums/gth-web-exporter.c:1839 msgid "_Open in the Browser" msgstr "_Atvērt pārlūkā" #: ../extensions/facebook/dlg-export-to-facebook.c:130 #: ../extensions/facebook/dlg-export-to-facebook.c:335 #: ../extensions/facebook/facebook-authentication.c:192 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:138 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:399 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:141 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:417 #: ../extensions/flicker_utils/dlg-import-from-flickr.c:237 #: ../extensions/flicker_utils/flickr-authentication.c:191 #: ../extensions/oauth/oauth-authentication.c:187 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:131 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:376 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:139 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:424 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:133 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:378 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:142 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:442 #: ../extensions/picasaweb/dlg-import-from-picasaweb.c:380 -#| msgid "Could not move the image:" msgid "Could not connect to the server" msgstr "Nevarēja savienoties ar serveri" #: ../extensions/facebook/dlg-export-to-facebook.c:182 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:246 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:182 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:192 -#| msgid "Could not move the items:" +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:249 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:184 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:195 msgid "Could not upload the files" -msgstr "Nevarēju augšupielādēt failus" +msgstr "Nevarēja augšupielādēt datnes" #: ../extensions/facebook/dlg-export-to-facebook.c:412 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:188 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:223 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:462 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:717 -#| msgid "Could not rename the image:" +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:191 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:226 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:464 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:735 msgid "Could not create the album" msgstr "Nevarēja izveidot albumu" #: ../extensions/facebook/dlg-export-to-facebook.c:481 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:534 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:783 -#| msgid "Web Album" +#: ../extensions/photobucket/dlg-export-to-photobucket.c:536 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:801 msgid "New Album" msgstr "Jauns albums" #: ../extensions/facebook/dlg-export-to-facebook.c:561 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:557 -#: ../extensions/image_print/gth-image-print-job.c:1789 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:614 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1002 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:591 +#: ../extensions/image_print/gth-image-print-job.c:1739 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:615 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1036 msgid "No valid file selected." -msgstr "Nav izvēlēts derīgs fails." +msgstr "Nav izvēlēta derīga datne." #: ../extensions/facebook/dlg-export-to-facebook.c:562 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:558 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:615 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1003 -#| msgid "Could not move the items:" +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:592 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:616 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1037 msgid "Could not export the files" -msgstr "Nevarēja eksportēt failus" +msgstr "Nevarēja eksportēt datnes" #: ../extensions/facebook/dlg-export-to-facebook.c:570 -#: ../extensions/find_duplicates/gth-find-duplicates.c:255 -#: ../extensions/find_duplicates/gth-find-duplicates.c:347 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:566 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:623 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1010 +#: ../extensions/find_duplicates/gth-find-duplicates.c:277 +#: ../extensions/find_duplicates/gth-find-duplicates.c:470 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:600 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:624 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1044 #: ../extensions/picasaweb/dlg-import-from-picasaweb.c:803 -#: ../gthumb/gth-browser.c:1005 +#: ../gthumb/gth-browser.c:1072 #, c-format -#| msgid "%d images (%s)" msgid "%d file (%s)" msgid_plural "%d files (%s)" -msgstr[0] "%d fails (%s)" -msgstr[1] "%d faili (%s)" -msgstr[2] "%d failu (%s)" +msgstr[0] "%d datne (%s)" +msgstr[1] "%d datnes (%s)" +msgstr[2] "%d datņu (%s)" #: ../extensions/facebook/dlg-export-to-facebook.c:591 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:589 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:642 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:623 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:643 #, c-format -#| msgid "Import Photos" msgid "Export to %s" msgstr "Eksportēt uz %s" #: ../extensions/facebook/facebook-account-chooser-dialog.c:200 #: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:200 #: ../extensions/oauth/oauth-account-chooser-dialog.c:200 -#| msgid "_View the destination" msgid "New authentication..." msgstr "Jauna autentificēšana..." @@ -2196,7 +2099,7 @@ #: ../extensions/facebook/facebook-authentication.c:652 #: ../extensions/flicker_utils/flickr-authentication.c:588 #: ../extensions/oauth/oauth-authentication.c:605 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:820 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:838 #: ../extensions/picasaweb/dlg-import-from-picasaweb.c:684 msgid "Choose Account" msgstr "Izvēlieties kontu" @@ -2204,7 +2107,7 @@ #: ../extensions/facebook/facebook-authentication.c:761 #: ../extensions/flicker_utils/flickr-authentication.c:697 #: ../extensions/oauth/oauth-authentication.c:714 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:881 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:899 #: ../extensions/picasaweb/dlg-import-from-picasaweb.c:745 msgid "Edit Accounts" msgstr "Rediģēt kontus" @@ -2216,8 +2119,8 @@ #: ../extensions/facebook/facebook-service.c:468 #: ../extensions/flicker_utils/flickr-connection.c:266 #: ../extensions/flicker_utils/flickr-connection.c:413 -#: ../extensions/flicker_utils/flickr-service.c:195 -#: ../extensions/flicker_utils/flickr-service.c:398 +#: ../extensions/flicker_utils/flickr-service.c:197 +#: ../extensions/flicker_utils/flickr-service.c:400 #: ../extensions/photobucket/photobucket-consumer.c:74 #: ../extensions/photobucket/photobucket-consumer.c:79 #: ../extensions/photobucket/photobucket-consumer.c:115 @@ -2231,7 +2134,7 @@ #: ../extensions/facebook/facebook-service.c:290 #: ../extensions/flicker_utils/flickr-connection.c:292 #: ../extensions/flicker_utils/flickr-connection.c:439 -#: ../extensions/flicker_utils/flickr-service.c:219 +#: ../extensions/flicker_utils/flickr-service.c:221 #: ../extensions/oauth/oauth-connection.c:356 #: ../extensions/oauth/oauth-connection.c:431 #: ../extensions/oauth/oauth-connection.c:535 @@ -2249,78 +2152,72 @@ #: ../extensions/facebook/facebook-service.c:188 #: ../extensions/facebook/facebook-service.c:290 -#: ../extensions/flicker_utils/flickr-service.c:219 +#: ../extensions/flicker_utils/flickr-service.c:221 #: ../extensions/oauth/oauth-connection.c:356 #: ../extensions/oauth/oauth-connection.c:431 #: ../extensions/oauth/oauth-connection.c:535 -#| msgid "General Information" msgid "Getting account information" msgstr "Saņem konta informāciju" #: ../extensions/facebook/facebook-service.c:396 -#: ../extensions/flicker_utils/flickr-service.c:323 +#: ../extensions/flicker_utils/flickr-service.c:325 #: ../extensions/photobucket/photobucket-service.c:207 -#: ../extensions/picasaweb/picasa-web-service.c:209 +#: ../extensions/picasaweb/picasa-web-service.c:211 msgid "Getting the album list" msgstr "Saņem albumu sarakstu" #: ../extensions/facebook/facebook-service.c:525 -#: ../extensions/flicker_utils/flickr-service.c:426 -#: ../extensions/flicker_utils/flickr-service.c:546 -#: ../extensions/flicker_utils/flickr-service.c:584 +#: ../extensions/flicker_utils/flickr-service.c:428 +#: ../extensions/flicker_utils/flickr-service.c:548 +#: ../extensions/flicker_utils/flickr-service.c:586 #: ../extensions/photobucket/photobucket-service.c:316 -#: ../extensions/picasaweb/picasa-web-service.c:300 -#| msgid "Create a new catalog" +#: ../extensions/picasaweb/picasa-web-service.c:302 msgid "Creating the new album" msgstr "Izveido jaunu albumu" #: ../extensions/facebook/facebook-service.c:584 -#: ../extensions/flicker_utils/flickr-service.c:634 +#: ../extensions/flicker_utils/flickr-service.c:636 #: ../extensions/photobucket/photobucket-service.c:373 -#: ../extensions/picasaweb/picasa-web-service.c:357 +#: ../extensions/picasaweb/picasa-web-service.c:359 #, c-format -#| msgid "Could not copy the folder \"%s\": %s" msgid "Could not upload '%s': %s" msgstr "Nevarēja augšupielādēt “%s” — %s" #. Translators: %s is a filename #: ../extensions/facebook/facebook-service.c:670 -#: ../extensions/flicker_utils/flickr-service.c:745 +#: ../extensions/flicker_utils/flickr-service.c:747 #: ../extensions/photobucket/photobucket-service.c:430 -#: ../extensions/picasaweb/picasa-web-service.c:412 +#: ../extensions/picasaweb/picasa-web-service.c:414 #, c-format msgid "Uploading '%s'" msgstr "Augšupielādē “%s”" -#: ../extensions/facebook/facebook-service.c:886 -#: ../extensions/flicker_utils/flickr-service.c:914 +#: ../extensions/facebook/facebook-service.c:884 +#: ../extensions/flicker_utils/flickr-service.c:940 #: ../extensions/photobucket/photobucket-service.c:599 -#: ../extensions/picasaweb/picasa-web-service.c:605 +#: ../extensions/picasaweb/picasa-web-service.c:631 msgid "Uploading the files to the server" -msgstr "Augšupielādē failus uz serveri" +msgstr "Augšupielādē datnes uz serveri" -#: ../extensions/facebook/facebook-service.c:1003 -#: ../extensions/flicker_utils/flickr-service.c:1077 -#: ../extensions/picasaweb/picasa-web-service.c:718 +#: ../extensions/facebook/facebook-service.c:1001 +#: ../extensions/flicker_utils/flickr-service.c:1105 +#: ../extensions/picasaweb/picasa-web-service.c:746 msgid "Getting the photo list" msgstr "Saņem fotogrāfiju sarakstu" #: ../extensions/file_manager/actions.c:133 -#| msgid "New Folder" msgid "New folder" msgstr "Jauna mape" #: ../extensions/file_manager/actions.c:134 -#| msgid "Enter the folder name: " msgid "Enter the folder name:" msgstr "Ievadiet mapes nosaukumu:" #: ../extensions/file_manager/actions.c:400 #: ../extensions/file_manager/callbacks.c:380 #: ../extensions/file_manager/callbacks.c:842 -#| msgid "Could not move the items:" msgid "Could not move the files" -msgstr "Nevarēja pārvietot failus" +msgstr "Nevarēja pārvietot datnes" #: ../extensions/file_manager/actions.c:401 #: ../extensions/file_manager/callbacks.c:381 @@ -2329,38 +2226,29 @@ "Files cannot be moved to the current location, as alternative you can choose " "to copy them." msgstr "" -"Failus nevar pārvietot uz pašreizējo vietu, vēl jūs varat izlemt tos kopēt." +"Datnes nevar pārvietot uz pašreizējo vietu, vēl jūs varat izlemt tās kopēt." #: ../extensions/file_manager/actions.c:563 -#| msgid "Could not move the image:" msgid "Could not open the location" msgstr "Nevarēja atvērt vietu" #: ../extensions/file_manager/actions.c:696 -#| msgid "" -#| "The images cannot be moved to the Trash. Do you want to delete them " -#| "permanently?" msgid "" "The folder is not empty, do you want to delete the folder and its content " "permanently?" msgstr "Mape nav tukša, vai vēlaties dzēst šo mapi un tās saturu pavisam?" #: ../extensions/file_manager/actions.c:712 -#| msgid "Could not delete the folder \"%s\": %s" msgid "Could not delete the folder" msgstr "Nevarēja izdzēst mapi" #: ../extensions/file_manager/actions.c:773 -#| msgid "" -#| "The images cannot be moved to the Trash. Do you want to delete them " -#| "permanently?" msgid "" "The folder cannot be moved to the Trash. Do you want to delete it " "permanently?" msgstr "Mapi nevar pārvietot uz miskasti. Vai vēlaties to izdzēst pavisam?" #: ../extensions/file_manager/actions.c:780 -#| msgid "Could not move the folder \"%s\": %s" msgid "Could not move the folder to the Trash" msgstr "Nevarēja pārvietot mapi uz miskasti" @@ -2373,10 +2261,9 @@ #: ../extensions/file_manager/actions.c:826 #: ../gthumb/gth-file-source-vfs.c:854 msgid "If you delete a file, it will be permanently lost." -msgstr "Ja izdzēsīsiet failu, tas tiks neatgriezeniski zaudētas." +msgstr "Ja izdzēsīsiet datni, tā tiks neatgriezeniski zaudēta." #: ../extensions/file_manager/actions.c:920 -#| msgid "_Move" msgid "Move To" msgstr "Pārvietot uz" @@ -2385,24 +2272,20 @@ msgstr "Kopēt uz" #: ../extensions/file_manager/actions.c:924 -#| msgid "_Move" msgid "Move" msgstr "Pārvietot" #: ../extensions/file_manager/actions.c:924 -#| msgid "Crop" msgid "Copy" msgstr "Kopēt" #: ../extensions/file_manager/callbacks.c:163 #: ../extensions/file_manager/callbacks.c:199 -#| msgid "Current _Folder" msgid "Create _Folder" msgstr "Izveidot _mapi" #: ../extensions/file_manager/callbacks.c:164 #: ../extensions/file_manager/callbacks.c:200 -#| msgid "Create a new folder" msgid "Create a new empty folder inside this folder" msgstr "Izveidot jaunu tukšu mapi šajā mapē" @@ -2411,33 +2294,28 @@ msgstr "D_ublēt" #: ../extensions/file_manager/callbacks.c:180 -#| msgid "Duplicate selected images" msgid "Duplicate the selected files" -msgstr "Dublēt izvēlētos failus" +msgstr "Dublēt izvēlētās datnes" #: ../extensions/file_manager/callbacks.c:183 #: ../extensions/file_manager/callbacks.c:219 #: ../gthumb/gth-file-source-vfs.c:813 -#| msgid "Move to _Trash" msgid "Mo_ve to Trash" msgstr "Iz_mest miskastē" #: ../extensions/file_manager/callbacks.c:184 -#| msgid "Move the selected images to the Trash" msgid "Move the selected files to the Trash" msgstr "Pārvietot izvēlētos attēlus uz miskasti" #: ../extensions/file_manager/callbacks.c:187 #: ../extensions/file_manager/callbacks.c:223 #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:5 -#| msgid "_Select" msgid "_Delete" msgstr "_Dzēst" #: ../extensions/file_manager/callbacks.c:188 -#| msgid "Open the selected folder" msgid "Delete the selected files" -msgstr "Dzēst izvēlētos failus" +msgstr "Dzēst izvēlētās datnes" #: ../extensions/file_manager/callbacks.c:191 #: ../extensions/file_manager/callbacks.c:203 @@ -2446,79 +2324,67 @@ msgstr "Pā_rsaukt" #: ../extensions/file_manager/callbacks.c:192 -#| msgid "Rename selected images" msgid "Rename the selected files" -msgstr "Pārsaukt izvēlētos failus" +msgstr "Pārsaukt izvēlētās datnes" #: ../extensions/file_manager/callbacks.c:195 msgid "Open with the _File Manager" -msgstr "Atvērt ar _failu pārvaldnieku" +msgstr "Atvērt ar _datņu pārvaldnieku" #: ../extensions/file_manager/callbacks.c:215 -#| msgid "Current _Folder" msgid "_Paste Into Folder" msgstr "Ielīmēt ma_pē" #: ../extensions/file_manager/callbacks.c:227 #: ../extensions/file_manager/callbacks.c:236 -#| msgid "_Copy..." msgid "Copy to..." msgstr "Kopēt uz..." #: ../extensions/file_manager/callbacks.c:228 -#| msgid "Move the selected folder to the Trash" msgid "Copy the selected folder to another folder" msgstr "Kopēt izvēlēto mapi uz citu mapi" #: ../extensions/file_manager/callbacks.c:231 #: ../extensions/file_manager/callbacks.c:240 -#| msgid "_Move..." msgid "Move to..." msgstr "Pārvietot uz..." #: ../extensions/file_manager/callbacks.c:232 -#| msgid "Move the selected folder to the Trash" msgid "Move the selected folder to another folder" msgstr "Pārvietot izvēlēto mapi uz citu mapi" #: ../extensions/file_manager/callbacks.c:237 -#| msgid "Copy selected images to another location" msgid "Copy the selected files to another folder" -msgstr "Kopēt izvēlētos failus uz citu mapi" +msgstr "Kopēt izvēlētās datnes uz citu mapi" #: ../extensions/file_manager/callbacks.c:241 -#| msgid "Move the selected images to the Trash" msgid "Move the selected files to another folder" -msgstr "Pārvietot izvēlētos failus uz citu mapi" +msgstr "Pārvietot izvēlētās datnes uz citu mapi" #: ../extensions/file_manager/callbacks.c:1003 -#: ../extensions/find_duplicates/gth-find-duplicates.c:581 -#: ../gthumb/gth-browser.c:4939 ../gthumb/gth-browser.c:4973 -#| msgid "Could not import photos" +#: ../extensions/find_duplicates/gth-find-duplicates.c:766 +#: ../gthumb/gth-browser.c:5120 ../gthumb/gth-browser.c:5154 msgid "Could not perform the operation" msgstr "Nevarēja veikt darbību" #: ../extensions/file_manager/file_manager.extension.in.in.h:1 -#| msgid "File _name" msgid "File manager" -msgstr "Failu pārvaldnieks" +msgstr "Datņu pārvaldnieks" #: ../extensions/file_manager/file_manager.extension.in.in.h:2 -#| msgid "View image properties" msgid "File manager operations." -msgstr "Failu pārvaldnieka darbības." +msgstr "Datņu pārvaldnieka darbības." #: ../extensions/file_manager/gth-delete-task.c:62 -#| msgid "Deleting file %ld of %ld" msgid "Deleting files" -msgstr "Dzēš failus" +msgstr "Dzēš datnes" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:1 +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:5 msgid "_Preview" msgstr "_Priekšskatījums" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:2 -#| msgid "_Brightness:" msgid "B_rightness:" msgstr "_Spilgtums:" @@ -2547,7 +2413,6 @@ msgstr "_Dzeltens-zils:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:9 -#| msgid "Color levels" msgid "Color Levels" msgstr "Krāsu līmeņi" @@ -2557,103 +2422,106 @@ msgstr "_Atstatīt" #: ../extensions/file_tools/data/ui/crop-options.ui.h:1 -#| msgid "_Destination:" -msgid "_Position:" -msgstr "No_vietojums:" +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +msgid "Selection" +msgstr "Izvēle" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 +msgid "_Width:" +msgstr "_Platums:" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:3 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 +msgid "Heigh_t:" +msgstr "Augs_tums:" -#. this is used to separate the dimensions, for example: 120 × 250 #: ../extensions/file_tools/data/ui/crop-options.ui.h:4 -msgid "×" -msgstr "×" +msgid "_Position:" +msgstr "No_vietojums:" #: ../extensions/file_tools/data/ui/crop-options.ui.h:5 -#| msgid "_Width:" -msgid "_Grid:" -msgstr "_Režģis:" - -#: ../extensions/file_tools/data/ui/crop-options.ui.h:6 msgid "Maximize" msgstr "Maksimizēt" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 -#| msgid "_Centered" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:6 msgid "Center" msgstr "Vidus" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 -#| msgid "_Select" -msgid "Selection" -msgstr "Izvēle" - -#: ../extensions/file_tools/data/ui/crop-options.ui.h:9 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 #: ../extensions/file_tools/data/ui/resize-options.ui.h:5 +msgid "Aspect ratio" +msgstr "Izmēru attiecība" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 msgid "I_nvert aspect ratio" msgstr "A_pgriezt izmēru attiecību" #. after the colon there is a control to select the size in pixels -#: ../extensions/file_tools/data/ui/crop-options.ui.h:11 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:10 msgid "M_ultiple of:" msgstr "R_eizinātājs šim:" #. abbreviation of pixel -#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:12 msgid "px" msgstr "px" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 +#: ../gthumb/gth-file-chooser-dialog.c:252 +msgid "Options" +msgstr "Opcijas" + #: ../extensions/file_tools/data/ui/crop-options.ui.h:14 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 -#| msgid "Aspect ratio" -msgid "Aspect ratio" -msgstr "Izmēru attiecība" +msgid "_Grid:" +msgstr "_Režģis:" #: ../extensions/file_tools/data/ui/crop-options.ui.h:15 -#| msgid "Crop" msgid "C_rop" msgstr "Apci_rst" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 -msgid "_Width:" -msgstr "_Platums:" +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:1 +msgid "Method" +msgstr "Metode" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:2 +msgid "_Brightness" +msgstr "_Spilgtums" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:3 +msgid "_Saturation" +msgstr "Pie_sātinājums" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:4 +msgid "_Average" +msgstr "_Vidēji" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 -#| msgid "Height:" -msgid "Heigh_t:" -msgstr "Augs_tums:" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 -#| msgid "Set the image as desktop background (tiled)" -msgid "Set the image size to this value" -msgstr "Iestatīt attēla izmērus uz šo vērtību" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 #: ../gthumb/gth-main-default-metadata.c:47 msgid "Dimensions" msgstr "Izmēri" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 -msgid "High _quality" -msgstr "Augsta _kvalitāte" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +msgid "Set the image size to this value" +msgstr "Iestatīt attēla izmērus uz šo vērtību" #: ../extensions/file_tools/data/ui/resize-options.ui.h:8 -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 -#| msgid "PNG Options" -msgid "Options" -msgstr "Opcijas" +msgid "High _quality" +msgstr "Augsta _kvalitāte" #: ../extensions/file_tools/data/ui/resize-options.ui.h:9 -#| msgid "Original dimensions" msgid "Original dimensions:" msgstr "Oriģināla izmēri:" #: ../extensions/file_tools/data/ui/resize-options.ui.h:10 -#| msgid "_Scale:" msgid "Scale factor:" msgstr "Mēroga koeficients:" #: ../extensions/file_tools/data/ui/resize-options.ui.h:11 -#| msgid "New dimensions" msgid "New dimensions:" msgstr "Jaunie izmēri:" @@ -2669,52 +2537,46 @@ msgstr "%" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:1 -msgid "Align" -msgstr "Līdzināt" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 msgid "Angle" msgstr "Leņķis" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 +msgid "Align" +msgstr "Līdzināt" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 -#| msgid "Print" +msgid "Image size" +msgstr "Attēla izmērs" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 msgid "Point 1:" msgstr "Punkts 1:" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 -#| msgid "Print" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 msgid "Point 2:" msgstr "Punkts 2:" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 -#| msgid "_Keep aspect ratio" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 msgid "Keep aspect ratio" msgstr "Paturēt izmēru attiecību" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 -#| msgid "_Image size:" -msgid "Image size" -msgstr "Attēla izmērs" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 msgid "Grid:" msgstr "Režģis:" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 +msgid "_Background:" +msgstr "_Fons:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 msgid "Pick a background color" msgstr "Izvēlieties fona krāsu" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 -#| msgid "Transparency _type:" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 msgid "_Transparent" msgstr "_Caurspīdīgs" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 -msgid "_Background:" -msgstr "_Fons:" - #: ../extensions/file_tools/data/ui/rotate-options.ui.h:12 -#| msgid "_Reset" msgid "Reset" msgstr "Atstatīt" @@ -2739,7 +2601,6 @@ msgstr "Līdzinājums" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:18 -#| msgid "File si_ze" msgid "Original size" msgstr "Sākotnējais izmērs" @@ -2753,7 +2614,6 @@ #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:1 #: ../extensions/rename_series/data/ui/rename-series.ui.h:28 -#| msgid "_Preview" msgid "_Preview:" msgstr "_Priekšskatījums:" @@ -2766,12 +2626,10 @@ msgstr "Rādiuss:" #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:4 -#| msgid "_Font:" msgid "Amount:" msgstr "Apjoms:" #: ../extensions/file_tools/file_tools.extension.in.in.h:1 -#| msgid "Images" msgid "Image tools" msgstr "Attēlu rīki" @@ -2779,179 +2637,162 @@ msgid "Basic tools to modify images." msgstr "Pamatrīki attēlu pārveidošanai." -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 -#| msgid "Reduce Colors" +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:372 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:272 +#: ../extensions/file_tools/gth-file-tool-grayscale.c:248 +#: ../extensions/file_tools/gth-file-tool-negative.c:68 +msgid "Applying changes" +msgstr "Pielieto izmaiņas" + +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 msgid "Adjust Colors..." msgstr "Mainīt krāsas..." -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 -#| msgid "Reduce Colors" +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 msgid "Adjust Colors" msgstr "Mainīt krāsas" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:531 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:619 msgid "Change brightness, contrast, saturation and gamma level of the image" msgstr "Mainīt gaišumu, kontrastu, piesātinājumu un gamma līmeni attēlam" -#: ../extensions/file_tools/gth-file-tool-crop.c:424 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:304 +msgid "Adjust Contrast" +msgstr "Pielāgot kontrastu" + +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:305 +msgid "Automatic contrast adjustment" +msgstr "Automātiska kontrasta pielabošana" + +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 msgid "Square" msgstr "Kvadrāts" -#: ../extensions/file_tools/gth-file-tool-crop.c:425 -#: ../extensions/file_tools/gth-file-tool-resize.c:499 +#: ../extensions/file_tools/gth-file-tool-crop.c:417 +#: ../extensions/file_tools/gth-file-tool-resize.c:590 #, c-format msgid "%d x %d (Image)" msgstr "%d x %d (attēls)" -#: ../extensions/file_tools/gth-file-tool-crop.c:428 -#: ../extensions/file_tools/gth-file-tool-resize.c:503 +#: ../extensions/file_tools/gth-file-tool-crop.c:420 +#: ../extensions/file_tools/gth-file-tool-resize.c:594 #, c-format msgid "%d x %d (Screen)" msgstr "%d x %d (ekrāns)" -#: ../extensions/file_tools/gth-file-tool-crop.c:432 -#: ../extensions/file_tools/gth-file-tool-resize.c:508 -#| msgid "5:" +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-resize.c:599 msgid "5:4" msgstr "5:4" -#: ../extensions/file_tools/gth-file-tool-crop.c:433 -#: ../extensions/file_tools/gth-file-tool-resize.c:509 +#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-resize.c:600 msgid "4:3 (DVD, Book)" msgstr "4:3 (DVD, grāmata)" -#: ../extensions/file_tools/gth-file-tool-crop.c:434 -#: ../extensions/file_tools/gth-file-tool-resize.c:510 -#| msgid "75" +#: ../extensions/file_tools/gth-file-tool-crop.c:426 +#: ../extensions/file_tools/gth-file-tool-resize.c:601 msgid "7:5" msgstr "7:5" -#: ../extensions/file_tools/gth-file-tool-crop.c:435 -#: ../extensions/file_tools/gth-file-tool-resize.c:511 -#| msgid "4 x 6 (Postcard)" +#: ../extensions/file_tools/gth-file-tool-crop.c:427 +#: ../extensions/file_tools/gth-file-tool-resize.c:602 msgid "3:2 (Postcard)" msgstr "3:2 (atklātne)" -#: ../extensions/file_tools/gth-file-tool-crop.c:436 -#: ../extensions/file_tools/gth-file-tool-resize.c:512 -#| msgid "1:1" +#: ../extensions/file_tools/gth-file-tool-crop.c:428 +#: ../extensions/file_tools/gth-file-tool-resize.c:603 msgid "16:10" msgstr "16:10" -#: ../extensions/file_tools/gth-file-tool-crop.c:437 -#: ../extensions/file_tools/gth-file-tool-resize.c:513 +#: ../extensions/file_tools/gth-file-tool-crop.c:429 +#: ../extensions/file_tools/gth-file-tool-resize.c:604 msgid "16:9 (DVD)" msgstr "16:9 (DVD)" -#: ../extensions/file_tools/gth-file-tool-crop.c:438 -#: ../extensions/file_tools/gth-file-tool-resize.c:514 -#| msgid "1:1" +#: ../extensions/file_tools/gth-file-tool-crop.c:430 +#: ../extensions/file_tools/gth-file-tool-resize.c:605 msgid "1.85:1" msgstr "1.85:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:439 -#: ../extensions/file_tools/gth-file-tool-resize.c:515 +#: ../extensions/file_tools/gth-file-tool-crop.c:431 +#: ../extensions/file_tools/gth-file-tool-resize.c:606 msgid "2.39:1" msgstr "2.39:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:440 -#: ../extensions/file_tools/gth-file-tool-resize.c:516 +#: ../extensions/file_tools/gth-file-tool-crop.c:432 +#: ../extensions/file_tools/gth-file-tool-resize.c:607 #: ../extensions/image_print/data/ui/print-layout.ui.h:2 #: ../extensions/rename_series/gth-template-selector.c:234 msgid "Custom" msgstr "Pielāgots" -#: ../extensions/file_tools/gth-file-tool-crop.c:455 -#: ../extensions/file_tools/gth-file-tool-rotate.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:447 +#: ../extensions/file_tools/gth-file-tool-rotate.c:404 msgid "Rule of Thirds" msgstr "Trešdaļu likums" -#: ../extensions/file_tools/gth-file-tool-crop.c:456 -#: ../extensions/file_tools/gth-file-tool-rotate.c:417 +#: ../extensions/file_tools/gth-file-tool-crop.c:448 +#: ../extensions/file_tools/gth-file-tool-rotate.c:405 msgid "Golden Sections" msgstr "Zelta griezums" -#: ../extensions/file_tools/gth-file-tool-crop.c:457 -#: ../extensions/file_tools/gth-file-tool-rotate.c:418 -#| msgid "Center _on Page" +#: ../extensions/file_tools/gth-file-tool-crop.c:449 +#: ../extensions/file_tools/gth-file-tool-rotate.c:406 msgid "Center Lines" msgstr "Viduslīnijas" -#: ../extensions/file_tools/gth-file-tool-crop.c:458 -#: ../extensions/file_tools/gth-file-tool-rotate.c:419 +#: ../extensions/file_tools/gth-file-tool-crop.c:450 +#: ../extensions/file_tools/gth-file-tool-rotate.c:407 msgid "Uniform" msgstr "Vienmērīgs" -#: ../extensions/file_tools/gth-file-tool-crop.c:614 -#| msgid "_Crop..." +#: ../extensions/file_tools/gth-file-tool-crop.c:608 msgid "Crop..." msgstr "Apcirst..." -#: ../extensions/file_tools/gth-file-tool-crop.c:614 +#: ../extensions/file_tools/gth-file-tool-crop.c:608 msgid "Crop" msgstr "Apcirst" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:68 -#: ../extensions/file_tools/gth-file-tool-negative.c:68 -msgid "Applying changes" -msgstr "Pielieto izmaiņas" - -#: ../extensions/file_tools/gth-file-tool-desaturate.c:203 -#| msgid "_Desaturate" -msgid "Desaturate" -msgstr "Noņemt piesātinājumu" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:119 -msgid "White balance correction" -msgstr "Baltās krāsas līdzsvara korekcija" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:342 -#| msgid "Reduce Colors" -msgid "Enhance Colors" -msgstr "Uzlabot krāsas" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:343 -msgid "Automatic white balance correction" -msgstr "Automātiska baltās krāsas līdzsvara korekcija" - -#: ../extensions/file_tools/gth-file-tool-equalize.c:86 -#| msgid "Automatically equalize the image histogram" +#: ../extensions/file_tools/gth-file-tool-equalize.c:45 msgid "Equalizing image histogram" msgstr "Izlīdzina attēla histogrammu" -#: ../extensions/file_tools/gth-file-tool-equalize.c:275 -#| msgid "_Equalize" +#: ../extensions/file_tools/gth-file-tool-equalize.c:230 msgid "Equalize" msgstr "Izlīdzināt" -#: ../extensions/file_tools/gth-file-tool-equalize.c:276 -#| msgid "Automatically equalize the image histogram" +#: ../extensions/file_tools/gth-file-tool-equalize.c:231 msgid "Equalize image histogram" msgstr "Izlīdzināt attēla histogrammu" #: ../extensions/file_tools/gth-file-tool-flip.c:87 -#| msgid "_Flip" msgid "Flip" msgstr "Apmest" #: ../extensions/file_tools/gth-file-tool-flip.c:88 -#| msgid "Rotate images physically" msgid "Flip the image vertically" msgstr "Apmest attēlu vertikāli" +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale..." +msgstr "Pelēktoņu..." + +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale" +msgstr "Pelēktoņu" + #: ../extensions/file_tools/gth-file-tool-mirror.c:87 -#| msgid "_Mirror" msgid "Mirror" msgstr "Spoguļot" #: ../extensions/file_tools/gth-file-tool-mirror.c:88 -#| msgid "Mirror image horizontally (left-right)" msgid "Mirror the image horizontally" msgstr "Atspoguļot attēlu horizontāli" #: ../extensions/file_tools/gth-file-tool-negative.c:197 -#| msgid "_Negative" msgid "Negative" msgstr "Negatīvs" @@ -2959,74 +2800,66 @@ msgid "Redo" msgstr "Atatsaukt" -#: ../extensions/file_tools/gth-file-tool-resize.c:680 -#| msgid "_Resize..." +#: ../extensions/file_tools/gth-file-tool-resize.c:214 +#: ../extensions/resize_images/dlg-resize-images.c:180 +msgid "Resizing images" +msgstr "Attēla izmēru maiņa" + +#: ../extensions/file_tools/gth-file-tool-resize.c:808 msgid "Resize..." msgstr "Mainīt izmēru..." -#: ../extensions/file_tools/gth-file-tool-resize.c:680 -#| msgid "_Resize..." +#: ../extensions/file_tools/gth-file-tool-resize.c:808 msgid "Resize" msgstr "Mainīt izmēru" -#: ../extensions/file_tools/gth-file-tool-rotate.c:636 -#| msgid "_Rename..." +#: ../extensions/file_tools/gth-file-tool-rotate.c:637 msgid "Rotate..." msgstr "Pagriezt..." -#: ../extensions/file_tools/gth-file-tool-rotate.c:636 -#| msgid "Rotate _Left" +#: ../extensions/file_tools/gth-file-tool-rotate.c:637 msgid "Rotate" msgstr "Pagriezt" -#: ../extensions/file_tools/gth-file-tool-rotate.c:637 -#| msgid "Could not rename the image:" +#: ../extensions/file_tools/gth-file-tool-rotate.c:638 msgid "Freely rotate the image" msgstr "Brīvi pagriezt attēlu" #: ../extensions/file_tools/gth-file-tool-rotate-left.c:87 #: ../extensions/image_rotation/callbacks.c:55 -#| msgid "Rotate _Left" msgid "Rotate Left" msgstr "Pagriezt pa kreisi" #: ../extensions/file_tools/gth-file-tool-rotate-left.c:88 -#| msgid "Rotate image 90 degrees counter-clockwise" msgid "Rotate the image by 90 degrees counterclockwise" msgstr "Pagriezt attēlu 90 grādus pretēji pulksteņrādītāja virzienam" #: ../extensions/file_tools/gth-file-tool-rotate-right.c:87 #: ../extensions/image_rotation/callbacks.c:49 -#| msgid "Rotate Ri_ght" msgid "Rotate Right" msgstr "Pagriezt pa labi" #: ../extensions/file_tools/gth-file-tool-rotate-right.c:88 -#| msgid "Rotate image 90 degrees clockwise" msgid "Rotate the image by 90 degrees clockwise" msgstr "Pagriezt attēlu 90 grādus pulksteņrādītāja virzienā" #: ../extensions/file_tools/gth-file-tool-save-as.c:70 -#| msgid "Save _As..." msgid "Save As" msgstr "Saglabāt kā" #: ../extensions/file_tools/gth-file-tool-save.c:66 -#| msgid "_Save" msgid "Save" msgstr "Saglabāt" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:100 -#| msgid "Saving images" +#: ../extensions/file_tools/gth-file-tool-sharpen.c:101 msgid "Sharpening image" msgstr "Asina attēlu" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 msgid "Enhance Focus..." msgstr "Uzlabot fokusu..." -#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 -#| msgid "_Enhance" +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 msgid "Enhance Focus" msgstr "Uzlabot fokusu" @@ -3035,17 +2868,14 @@ msgstr "Atsaukt" #: ../extensions/find_duplicates/callbacks.c:48 -#| msgid "Found duplicates:" msgid "Find _Duplicates..." msgstr "Atrast _dublikātus..." #: ../extensions/find_duplicates/callbacks.c:49 -#| msgid "Reload the current location" msgid "Find duplicated files in the current location" -msgstr "Atrast dublikāta failus šajā vietā" +msgstr "Atrast dublikāta datnes šajā vietā" #: ../extensions/find_duplicates/data/ui/find-duplicates-choose-folders.ui.h:1 -#| msgid "_Folders" msgid "_Folders:" msgstr "_Mapes:" @@ -3054,14 +2884,12 @@ msgstr "Meklēt dublikātus" #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 -#| msgid "Duplicates" msgid "Duplicates:" msgstr "Dublikāti:" #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 -#| msgid "_File" msgid "Files:" -msgstr "Faili:" +msgstr "Datnes:" #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:4 #: ../gthumb/gth-browser-actions-entries.h:33 @@ -3069,13 +2897,11 @@ msgstr "_Skats" #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 -#| msgid "No images found" msgid "No duplicates found." msgstr "Nav atrastu dublikātu." #: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:1 #: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:1 -#| msgid "Found duplicates:" msgid "Find Duplicates" msgstr "Atrast dublikātus" @@ -3086,79 +2912,69 @@ msgstr "Sākt _ar:" #: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 -#| msgid "_Filter" msgid "_Filter:" msgstr "_Filtrs:" #: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:2 -#| msgid "Found duplicates:" msgid "Find duplicated files." -msgstr "Atrast dublikāta failus." +msgstr "Atrast dublikāta datnes." -#: ../extensions/find_duplicates/gth-find-duplicates.c:53 -#| msgid "_Save the new image as:" +#: ../extensions/find_duplicates/gth-find-duplicates.c:65 msgid "leave the newest duplicates" msgstr "atstāt jaunākos dublikātus" -#: ../extensions/find_duplicates/gth-find-duplicates.c:54 -#| msgid "Search for Duplicates" +#: ../extensions/find_duplicates/gth-find-duplicates.c:66 msgid "leave the oldest duplicates" msgstr "atstāt vecākos dublikātus" -#: ../extensions/find_duplicates/gth-find-duplicates.c:55 -#| msgid "_New Folder..." +#: ../extensions/find_duplicates/gth-find-duplicates.c:67 msgid "by folder..." msgstr "pēc mapes..." -#: ../extensions/find_duplicates/gth-find-duplicates.c:56 +#: ../extensions/find_duplicates/gth-find-duplicates.c:68 msgid "all files" -msgstr "visi faili" +msgstr "visas datnes" -#: ../extensions/find_duplicates/gth-find-duplicates.c:57 -#| msgid "Inde_x file:" +#: ../extensions/find_duplicates/gth-find-duplicates.c:69 msgid "no file" -msgstr "nav failu" +msgstr "nav datņu" -#: ../extensions/find_duplicates/gth-find-duplicates.c:397 -#: ../extensions/find_duplicates/gth-find-duplicates.c:492 +#: ../extensions/find_duplicates/gth-find-duplicates.c:560 +#: ../extensions/find_duplicates/gth-find-duplicates.c:668 #, c-format -#| msgid "Found duplicates:" msgid "%d duplicate" msgid_plural "%d duplicates" msgstr[0] "%d dublikāts" msgstr[1] "%d dublikāti" msgstr[2] "%d dublikātu" -#: ../extensions/find_duplicates/gth-find-duplicates.c:536 -#| msgid "Search for Duplicates" +#: ../extensions/find_duplicates/gth-find-duplicates.c:712 msgid "Search completed" msgstr "Meklēšana pabeigta" -#: ../extensions/find_duplicates/gth-find-duplicates.c:548 -#| msgid "Search for Duplicates" +#: ../extensions/find_duplicates/gth-find-duplicates.c:725 msgid "Searching for duplicates" msgstr "Meklē dublikātus" -#: ../extensions/find_duplicates/gth-find-duplicates.c:551 +#: ../extensions/find_duplicates/gth-find-duplicates.c:728 #: ../gthumb/gth-load-file-data-task.c:106 #: ../gthumb/gth-save-file-data-task.c:100 #, c-format msgid "%d file remaining" msgid_plural "%d files remaining" -msgstr[0] "Pārsaukts %d fails" -msgstr[1] "Pārsaukti %d faili" -msgstr[2] "Pārsaukti %d failu" +msgstr[0] "Atlikusi %d datne" +msgstr[1] "Atlikušas %d datnes" +msgstr[2] "Atlikušas %d datnes" -#: ../extensions/find_duplicates/gth-find-duplicates.c:634 +#: ../extensions/find_duplicates/gth-find-duplicates.c:830 msgid "Getting the file list" -msgstr "Saņem failu sarakstu" +msgstr "Saņem datņu sarakstu" -#: ../extensions/find_duplicates/gth-find-duplicates.c:740 +#: ../extensions/find_duplicates/gth-find-duplicates.c:1016 msgid "Duplicates" msgstr "Dublikāti" -#: ../extensions/find_duplicates/gth-find-duplicates.c:997 -#| msgid "_Select" +#: ../extensions/find_duplicates/gth-find-duplicates.c:1306 msgid "Select" msgstr "Izvēlieties" @@ -3183,7 +2999,7 @@ msgstr "Augšupielādēt attēlus uz Flickr" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 #: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 msgid "Free space:" msgstr "Brīvā vieta:" @@ -3194,7 +3010,6 @@ msgstr "F_oto kopa:" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:6 -#| msgid "_Place:" msgid "_Privacy:" msgstr "_Privātums:" @@ -3203,32 +3018,30 @@ msgstr "Slē_pt no publiskas meklēšanas" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:8 -#| msgid "_Scale:" msgid "_Safety:" msgstr "_Drošība:" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 msgid "Private photos, visible to family and friends" msgstr "Privātās fotogrāfijas, redzamas ģimenei un draugiem" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 msgid "Private photos, visible to family" msgstr "Privātās fotogrāfijas, redzamas ģimenei" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 msgid "Private photos" msgstr "Privātās fotogrāfijas" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 -#| msgid "Image comment" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 msgid "Safe content" msgstr "Drošs saturs" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 msgid "Moderate content" msgstr "Mērens saturs" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:17 msgid "Restricted content" msgstr "Ierobežots saturs" @@ -3240,65 +3053,55 @@ #: ../extensions/flicker_utils/dlg-import-from-flickr.c:360 #: ../extensions/picasaweb/dlg-import-from-picasaweb.c:830 -#| msgid "Could not import photos" msgid "Could not get the photo list" msgstr "Nevarēja saņemt fotogrāfiju sarakstu" #: ../extensions/flicker_utils/dlg-import-from-flickr.c:397 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:561 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:562 #: ../extensions/picasaweb/dlg-import-from-picasaweb.c:864 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1026 -#| msgid "No camera detected" +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1027 msgid "No album selected" msgstr "Nav izvēlēts neviens albums" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:579 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:580 #, c-format -#| msgid "Import Photos" msgid "Import from %s" msgstr "Importēt no %s" #: ../extensions/gstreamer_tools/actions.c:66 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1080 -#: ../gthumb/gth-browser.c:2008 -#| msgid "Could not move the image:" +#: ../extensions/image_viewer/gth-image-viewer-page.c:1072 +#: ../gthumb/gth-browser.c:2100 msgid "Could not save the file" -msgstr "Nevarēja saglabāt failu" +msgstr "Nevarēja saglabāt datni" #: ../extensions/gstreamer_tools/actions.c:126 -#| msgid "Could not import photos" msgid "Could not take a screenshot" msgstr "Nevarēja uzņemt ekrānattēlu" #: ../extensions/gstreamer_tools/actions.c:132 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1248 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1243 msgid "Save Image" msgstr "Saglabāt attēlu" #: ../extensions/gstreamer_tools/actions.c:152 -#| msgid "Screenshots" msgctxt "Filename" msgid "Screenshot" msgstr "Ekrānattēls" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:1 -#| msgid "Browser" msgid "Slower" msgstr "Lēnāk" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:686 -#| msgid "Place" +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:687 msgid "Play" msgstr "Atskaņot" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:3 -#| msgid "Footer" msgid "Faster" msgstr "Ātrāk" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 -#| msgid "_Theme:" msgid "Time:" msgstr "Laiks:" @@ -3317,7 +3120,6 @@ #: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 #: ../extensions/photo_importer/actions.c:67 #: ../extensions/photo_importer/dlg-photo-importer.c:620 -#| msgid "Choose startup folder" msgid "Choose a folder" msgstr "Izvēlieties mapi" @@ -3327,36 +3129,31 @@ #: ../extensions/gstreamer_tools/gstreamer_tools.extension.in.in.h:2 msgid "Play audio and video files." -msgstr "Atskaņot audio un video failus." +msgstr "Atskaņot audio un video datnes." #: ../extensions/gstreamer_tools/gth-media-viewer-page.c:104 -#| msgid "Screenshots" msgid "Screenshot" msgstr "Ekrānattēls" #: ../extensions/gstreamer_tools/gth-media-viewer-page.c:105 -#| msgid "Screenshots" msgid "Take a screenshot" msgstr "Uzņemt ekrānattēlu" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:663 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:664 msgid "Playing video" msgstr "Atskaņo video" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 -#| msgid "Page" +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:677 msgid "Pause" msgstr "Pauzēt" #: ../extensions/gstreamer_tools/main.c:31 #: ../gthumb/gth-main-default-tests.c:247 -#| msgid "Slide" msgid "Video" msgstr "Video" #: ../extensions/gstreamer_tools/main.c:32 #: ../gthumb/gth-main-default-tests.c:254 -#| msgid "Auto" msgid "Audio" msgstr "Audio" @@ -3366,7 +3163,6 @@ #: ../extensions/gstreamer_tools/main.c:40 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 -#| msgid "Web Album" msgid "Album" msgstr "Albums" @@ -3380,12 +3176,10 @@ #: ../extensions/gstreamer_tools/main.c:44 #: ../extensions/gstreamer_tools/main.c:49 -#| msgid "Close" msgid "Codec" msgstr "Kodeks" #: ../extensions/gstreamer_tools/main.c:45 -#| msgid "Frame _style:" msgid "Framerate" msgstr "Kadru ātrums" @@ -3397,7 +3191,6 @@ #: ../extensions/gstreamer_tools/main.c:47 #: ../extensions/image_print/data/ui/print-layout.ui.h:25 -#| msgid "Height:" msgid "Height" msgstr "Augstums" @@ -3406,12 +3199,10 @@ msgstr "Kanāli" #: ../extensions/gstreamer_tools/main.c:51 -#| msgid "Scale Image" msgid "Sample rate" msgstr "Nolases ātrums" #: ../extensions/gstreamer_utils/gstreamer-utils.c:363 -#| msgid "Stop" msgid "Stereo" msgstr "Stereo" @@ -3421,34 +3212,28 @@ #. Translators: this is an image size, such as 1024 × 768 #: ../extensions/gstreamer_utils/gstreamer-utils.c:396 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1303 -#: ../extensions/image_viewer/gth-metadata-provider-image.c:190 -#: ../extensions/webalbums/dlg-web-exporter.c:442 -#: ../extensions/webalbums/gth-web-exporter.c:2446 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1298 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:209 +#: ../extensions/webalbums/gth-web-exporter.c:2444 ../gthumb/gtk-utils.c:1055 #, c-format -#| msgid "%d %B %Y" msgid "%d × %d" msgstr "%d × %d" #: ../extensions/image_print/actions.c:69 -#| msgid "Open the selected folder" msgid "Could not print the selected files" -msgstr "Nevarēja izdrukāt izvēlētos failus" +msgstr "Nevarēja izdrukāt izvēlētās datnes" -#: ../extensions/image_print/callbacks.c:54 -#| msgid "Rename selected images" +#: ../extensions/image_print/callbacks.c:65 msgid "Print the selected images" msgstr "Drukāt izvēlētos attēlus" #: ../extensions/image_print/data/ui/print-layout.ui.h:1 -#| msgid "_Centered" msgid "Centered" msgstr "Centrēts" #: ../extensions/image_print/data/ui/print-layout.ui.h:13 -#| msgid "Reduce the number of colors" msgid "The total number of files" -msgstr "Kopējais failu skaits" +msgstr "Kopējais datņu skaits" #: ../extensions/image_print/data/ui/print-layout.ui.h:14 #: ../extensions/importer/data/ui/import-preferences.ui.h:4 @@ -3464,102 +3249,88 @@ msgstr "Attēls" #: ../extensions/image_print/data/ui/print-layout.ui.h:20 -#| msgid "_Destination:" msgid "Position:" msgstr "Novietojums:" #: ../extensions/image_print/data/ui/print-layout.ui.h:21 -#| msgid "_Left:" msgid "Left" msgstr "Pa kreisi" #: ../extensions/image_print/data/ui/print-layout.ui.h:22 -#| msgid "_Top:" msgid "Top" msgstr "Augšā" #: ../extensions/image_print/data/ui/print-layout.ui.h:26 -#| msgid "Location" msgid "Rotation:" msgstr "Pagrieziens:" #: ../extensions/image_print/data/ui/print-layout.ui.h:27 -#| msgid "_Unit:" msgid "Unit:" msgstr "Vienība:" #: ../extensions/image_print/data/ui/print-layout.ui.h:28 -#| msgid "_Preview" msgid "Preview" msgstr "Priekšskatījums" #: ../extensions/image_print/data/ui/print-layout.ui.h:30 -#| msgid "Millimeters" msgid "millimeters" msgstr "milimetri" #: ../extensions/image_print/data/ui/print-layout.ui.h:31 -#| msgid "Inches" msgid "inches" msgstr "collas" #: ../extensions/image_print/data/ui/print-preferences.ui.h:4 -#| msgid "Select a font" msgid "Select Caption Font" msgstr "Izvēlieties paraksta fontu" #: ../extensions/image_print/data/ui/print-preferences.ui.h:5 -#| msgid "Select a font" msgid "Select Header Font" msgstr "Izvēlieties galvenes fontu" #: ../extensions/image_print/data/ui/print-preferences.ui.h:6 -#| msgid "Select a font" msgid "Select Footer Font" msgstr "Izvēlieties kājenes fontu" #: ../extensions/image_print/data/ui/print-preferences.ui.h:7 -#| msgid "_Font:" msgid "Fonts" msgstr "Fonti" -#: ../extensions/image_print/gth-image-print-job.c:971 +#: ../extensions/image_print/gth-image-print-job.c:914 #: ../extensions/webalbums/data/albumthemes/text.h:31 #, c-format msgid "Page %d of %d" msgstr "Lapa %d no %d" -#: ../extensions/image_print/gth-image-print-job.c:1734 -#: ../extensions/image_print/gth-image-print-job.c:1861 -#: ../extensions/image_print/gth-image-print-job.c:1898 -#| msgid "Could not import photos" +#: ../extensions/image_print/gth-image-print-job.c:1680 +#: ../extensions/image_print/gth-image-print-job.c:1845 +#: ../extensions/image_print/gth-image-print-job.c:1888 msgid "Could not print" msgstr "Nevarēja izdrukāt" -#: ../extensions/image_print/gth-image-print-job.c:1796 +#: ../extensions/image_print/gth-image-print-job.c:1746 #: ../gthumb/gth-main-default-tests.c:240 msgid "Images" msgstr "Attēli" -#: ../extensions/image_print/gth-image-print-job.c:1863 -#: ../gthumb/gth-image-loader.c:204 ../gthumb/gth-image-loader.c:278 +#: ../extensions/image_print/gth-image-print-job.c:1847 +#: ../gthumb/gth-image-loader.c:197 ../gthumb/gth-image-loader.c:304 +#: ../gthumb/gth-image-utils.c:131 ../gthumb/gth-image-utils.c:137 msgid "No suitable loader available for this file type" -msgstr "Šim faila tipam nav atrasts piemērots ielādētājs" +msgstr "Šim datņu tipam nav atrasts piemērots ielādētājs" #. translators: %s is a filename #: ../extensions/image_print/gth-load-image-info-task.c:164 #, c-format -#| msgid "Loading images" msgid "Loading \"%s\"" msgstr "Ielādē “%s”" #: ../extensions/image_print/gth-load-image-info-task.c:166 -#: ../extensions/webalbums/gth-web-exporter.c:2685 +#: ../extensions/webalbums/gth-web-exporter.c:2716 msgid "Loading images" msgstr "Ielādē attēlus" #: ../extensions/image_print/image_print.extension.in.in.h:1 -#| msgid "Image Caption" msgid "Image print" msgstr "Attēla drukāšana" @@ -3572,27 +3343,22 @@ msgstr "Drukāt" #: ../extensions/image_rotation/callbacks.c:50 -#| msgid "Move the selected images to the Trash" msgid "Rotate the selected images 90° to the right" msgstr "Pagriezt izvēlētos attēlus pa labi 90°" #: ../extensions/image_rotation/callbacks.c:56 -#| msgid "Move the selected images to the Trash" msgid "Rotate the selected images 90° to the left" msgstr "Pagriezt izvēlētos attēlus pa kreisi 90°" #: ../extensions/image_rotation/callbacks.c:61 -#| msgid "Rotate images physically" msgid "Rotate Physically" msgstr "Fiziski pagriezt" #: ../extensions/image_rotation/callbacks.c:62 -#| msgid "Move the selected images to the Trash" msgid "Rotate the selected images according to the embedded orientation" msgstr "Pagriezt izvēlētos attēlus, vadoties pēc to iegultā virziena" #: ../extensions/image_rotation/callbacks.c:67 -#| msgid "Reload the current location" msgid "Reset the EXIF Orientation" msgstr "Atstatīt EXIF virzienu" @@ -3602,18 +3368,16 @@ #: ../extensions/image_rotation/gth-reset-orientation-task.c:111 #: ../extensions/image_rotation/gth-transform-task.c:141 -#: ../extensions/webalbums/gth-web-exporter.c:2339 -#: ../extensions/webalbums/gth-web-exporter.c:2423 +#: ../extensions/webalbums/gth-web-exporter.c:2337 +#: ../extensions/webalbums/gth-web-exporter.c:2421 msgid "Saving images" msgstr "Saglabā attēlus" #: ../extensions/image_rotation/image_rotation.extension.in.in.h:1 -#| msgid "Image Caption" msgid "Image rotation" msgstr "Attēla pagriešana" #: ../extensions/image_rotation/image_rotation.extension.in.in.h:2 -#| msgid "Rotate images without loss of quality" msgid "Rotate images without data loss." msgstr "Pagriezt attēlus bez kvalitātes zudumiem." @@ -3654,7 +3418,6 @@ msgstr "_Pieņemt izkropļojumus" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:1 -#| msgid "Set image to actual size" msgid "Set to actual size" msgstr "Iestatīt uz patieso izmēru" @@ -3663,7 +3426,6 @@ msgstr "Paturēt iepriekšējos mērogus" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:3 -#| msgid "Fit to window if larger" msgid "Fit to window" msgstr "Pielāgoties logam" @@ -3672,7 +3434,6 @@ msgstr "Pielāgoties logam, ja lielāks" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:5 -#| msgid "Fit to width if larger" msgid "Fit to width" msgstr "Pielāgoties platumam" @@ -3685,12 +3446,10 @@ msgstr "Atstatīt ritjoslas pozīcijas" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:8 -#| msgid "After _loading an image:" msgid "After loading an image:" msgstr "Pēc attēla ielādes:" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:9 -#| msgid "Zoom quality" msgid "_Zoom quality:" msgstr "_Mēroga kvalitāte:" @@ -3699,12 +3458,10 @@ msgstr "Caurspīdīguma _tips:" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:11 -#| msgid "H_igh" msgid "High" msgstr "Augsts" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:12 -#| msgid "Lo_w" msgid "Low" msgstr "Zems" @@ -3721,27 +3478,22 @@ msgstr "Rūtains" #: ../extensions/image_viewer/gth-image-histogram.c:84 -#| msgid "_Histogram" msgid "Histogram" msgstr "Histogramma" #: ../extensions/image_viewer/gth-image-viewer-page.c:179 -#| msgid "Crop image" msgid "Copy Image" msgstr "Kopēt attēlu" #: ../extensions/image_viewer/gth-image-viewer-page.c:180 -#| msgid "Copy this image to another location" msgid "Copy the image to the clipboard" msgstr "Kopēt attēlu uz starpliktuvi" #: ../extensions/image_viewer/gth-image-viewer-page.c:184 -#| msgid "Save Image" msgid "Paste Image" msgstr "Ielīmēt attēlu" #: ../extensions/image_viewer/gth-image-viewer-page.c:185 -#| msgid "Delete selected images from the camera" msgid "Paste the image from the clipboard" msgstr "Ielīmēt attēlu no starpliktuves" @@ -3782,7 +3534,6 @@ msgstr "Pielāgot platumam" #: ../extensions/image_viewer/image_viewer.extension.in.in.h:1 -#| msgid "Image Viewer" msgid "Image viewer" msgstr "Attēlu skatītājs" @@ -3795,17 +3546,14 @@ msgstr "Skatītājs" #: ../extensions/importer/data/ui/import-preferences.ui.h:1 -#| msgid "_Destination:" msgid "_Destination" msgstr "_Mērķis" #: ../extensions/importer/data/ui/import-preferences.ui.h:2 -#| msgid "Automatic sizing" msgid "_Automatic subfolder" msgstr "_Automātiski apakšmapē" #: ../extensions/importer/data/ui/import-preferences.ui.h:3 -#| msgid "_Include sub-folders" msgid "as _single subfolder" msgstr "_kā viena apakšmape" @@ -3822,7 +3570,6 @@ msgstr "Mēneša diena" #: ../extensions/importer/data/ui/import-preferences.ui.h:10 -#| msgid "hours" msgid "The hour" msgstr "Stunda" @@ -3831,12 +3578,10 @@ msgstr "Minūtes" #: ../extensions/importer/data/ui/import-preferences.ui.h:12 -#| msgid "seconds" msgid "The seconds" msgstr "Sekundes" #: ../extensions/importer/gth-import-destination-button.c:183 -#| msgid "_Destination:" msgid "Invalid Destination" msgstr "Nederīgs mērķis" @@ -3847,9 +3592,8 @@ #. subfolder type #: ../extensions/importer/gth-import-preferences-dialog.c:330 -#| msgid "File _name" msgid "File date" -msgstr "Faila datums" +msgstr "Datnes datums" #. gtk_label_set_mnemonic_widget (GTK_LABEL (GET_WIDGET ("subfolder_label")), self->priv->subfolder_type_list); #. subfolder format @@ -3862,7 +3606,6 @@ msgstr "gads-mēnesis" #: ../extensions/importer/gth-import-preferences-dialog.c:342 -#| msgid "Search" msgid "year" msgstr "gads" @@ -3870,42 +3613,39 @@ msgid "custom format" msgstr "pielāgots formāts" -#: ../extensions/importer/gth-import-task.c:442 -#: ../extensions/importer/gth-import-task.c:477 -#: ../extensions/importer/gth-import-task.c:648 +#: ../extensions/importer/gth-import-task.c:445 +#: ../extensions/importer/gth-import-task.c:480 +#: ../extensions/importer/gth-import-task.c:651 msgid "Importing files" -msgstr "Importē failus" +msgstr "Importē datnes" -#: ../extensions/importer/gth-import-task.c:598 +#: ../extensions/importer/gth-import-task.c:601 msgid "No file imported" -msgstr "Nav importēta faila" +msgstr "Nav importētu datņu" -#: ../extensions/importer/gth-import-task.c:599 +#: ../extensions/importer/gth-import-task.c:602 msgid "The selected files are already present in the destination." -msgstr "Izvēlētie faili jau atrodas mērķī." +msgstr "Izvēlētās datnes jau atrodas mērķī." -#: ../extensions/importer/gth-import-task.c:622 +#: ../extensions/importer/gth-import-task.c:625 #: ../gthumb/gth-file-source-vfs.c:694 -#| msgid "Could not delete the images:" msgid "Could not delete the files" -msgstr "Nevarēja izdzēst failus" +msgstr "Nevarēja izdzēst datnes" -#: ../extensions/importer/gth-import-task.c:623 -#| msgid "Image type not supported: %s" +#: ../extensions/importer/gth-import-task.c:626 msgid "Delete operation not supported." msgstr "Dzēšanas darbība nav atbalstīta." -#: ../extensions/importer/gth-import-task.c:709 -#| msgid "Last modified" +#: ../extensions/importer/gth-import-task.c:712 msgid "Last imported" msgstr "Pēdējoreiz importēts" -#: ../extensions/importer/gth-import-task.c:815 +#: ../extensions/importer/gth-import-task.c:818 msgid "No file specified." -msgstr "Nav norādīts fails." +msgstr "Nav norādīta datne." #. Translators: For example: Not enough free space in '/home/user/Images'.\n1.3 GB of space is required but only 300 MB is available. -#: ../extensions/importer/gth-import-task.c:852 +#: ../extensions/importer/gth-import-task.c:855 #, c-format msgid "" "Not enough free space in '%s'.\n" @@ -3914,32 +3654,27 @@ "“%s” nepietiek brīvas vietas.\n" "Vajadzīgs %s brīvas vietas, bet ir pieejams tikai %s." -#: ../extensions/list_tools/callbacks.c:76 ../gthumb/gth-filterbar.c:304 -#| msgid "_Posterize..." +#: ../extensions/list_tools/callbacks.c:76 ../gthumb/gth-filterbar.c:311 msgid "Personalize..." msgstr "Personalizēt..." #: ../extensions/list_tools/callbacks.c:320 -#| msgid "_Tools" msgid "Tools" msgstr "Rīki" #: ../extensions/list_tools/callbacks.c:321 msgid "Batch tools for multiple files" -msgstr "Pakešu rīki vairākiem failiem" +msgstr "Pakešu rīki vairākām datnēm" #: ../extensions/list_tools/data/ui/ask-value.ui.h:1 -#| msgid "Skip" msgid "_Skip" msgstr "Izlai_st" #: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:1 -#| msgid "Co_mments" msgid "Commands" msgstr "Komandas" #: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:2 -#| msgid "Co_mment:" msgid "Co_mmands:" msgstr "Ko_mandas:" @@ -3949,33 +3684,29 @@ #: ../extensions/list_tools/data/ui/script-editor.ui.h:3 msgid "E_xecute command once for every file" -msgstr "I_zpildīt komandu vienu reizi katram failam" +msgstr "I_zpildīt komandu vienu reizi katrai datnei" #: ../extensions/list_tools/data/ui/script-editor.ui.h:4 msgid "_Terminal command (shell script)" msgstr "_Termināļa komanda (čaulas skripts)" #: ../extensions/list_tools/data/ui/script-editor.ui.h:5 -#| msgid "S_ort:" msgid "Sh_ortcut:" msgstr "_Saīsne:" #: ../extensions/list_tools/data/ui/script-editor.ui.h:6 msgid "The file uri" -msgstr "Faila uri" +msgstr "Datnes uri" #: ../extensions/list_tools/data/ui/script-editor.ui.h:7 -#| msgid "File pa_th" msgid "The file path" -msgstr "Faila ceļš" +msgstr "Datnes ceļš" #: ../extensions/list_tools/data/ui/script-editor.ui.h:8 -#| msgid "Include filename" msgid "The file basename" -msgstr "Faila bāzes nosaukums" +msgstr "Datnes bāzes nosaukums" #: ../extensions/list_tools/data/ui/script-editor.ui.h:9 -#| msgid "Move current folder" msgid "The parent folder path" msgstr "Vecāka mape ceļā" @@ -3998,28 +3729,25 @@ #: ../extensions/list_tools/data/ui/script-editor.ui.h:19 #: ../extensions/rename_series/data/ui/rename-series.ui.h:25 msgid "A file attribute" -msgstr "Faila atribūts" +msgstr "Datnes atribūts" #: ../extensions/list_tools/data/ui/script-editor.ui.h:21 #, no-c-format -#| msgid "%" msgid "%N" msgstr "%N" #: ../extensions/list_tools/data/ui/script-editor.ui.h:22 msgid "The file basename without extension" -msgstr "Faila bāzes nosaukums bez paplašinājuma" +msgstr "Datnes bāzes nosaukums bez paplašinājuma" #: ../extensions/list_tools/data/ui/script-editor.ui.h:24 #, no-c-format -#| msgid "%" msgid "%E" msgstr "%E" #: ../extensions/list_tools/data/ui/script-editor.ui.h:25 -#| msgid "Determine by extension" msgid "The file extension" -msgstr "Faila paplašinājums" +msgstr "Datnes paplašinājums" #. Translate only 'text'. #: ../extensions/list_tools/data/ui/script-editor.ui.h:28 @@ -4032,38 +3760,31 @@ msgstr "Citēt tekstu" #: ../extensions/list_tools/data/ui/script-editor.ui.h:30 -#| msgid "Co_mment:" msgid "_Command:" msgstr "_Komanda:" #: ../extensions/list_tools/dlg-personalize-scripts.c:257 -#| msgid "Sort" msgid "Script" msgstr "Skripts" #: ../extensions/list_tools/dlg-personalize-scripts.c:271 -#| msgid "Sort" msgid "Shortcut" msgstr "Saīsne" #: ../extensions/list_tools/dlg-personalize-scripts.c:285 #: ../gthumb/dlg-personalize-filters.c:252 -#| msgid "S_how:" msgid "Show" msgstr "Rādīt" #: ../extensions/list_tools/dlg-personalize-scripts.c:355 -#| msgid "Could not move the items:" msgid "Could not save the script" msgstr "Nevarēja saglabāt skriptu" #: ../extensions/list_tools/dlg-personalize-scripts.c:406 -#| msgid "(No Comment)" msgid "New Command" msgstr "Jauna komanda" #: ../extensions/list_tools/dlg-personalize-scripts.c:433 -#| msgid "Edit bookmarks" msgid "Edit Command" msgstr "Rediģēt komandu" @@ -4076,14 +3797,13 @@ msgstr "Ievadiet vērtību:" #: ../extensions/list_tools/gth-script.c:745 -#: ../extensions/webalbums/gth-web-exporter.c:560 -#: ../extensions/webalbums/gth-web-exporter.c:572 -#: ../extensions/webalbums/gth-web-exporter.c:580 +#: ../extensions/webalbums/gth-web-exporter.c:558 +#: ../extensions/webalbums/gth-web-exporter.c:570 +#: ../extensions/webalbums/gth-web-exporter.c:578 msgid "Malformed command" msgstr "Slikti formatēta komanda" #: ../extensions/list_tools/gth-script-editor-dialog.c:147 -#| msgid "None" msgid "none" msgstr "nekas" @@ -4104,11 +3824,11 @@ #: ../extensions/list_tools/list_tools.extension.in.in.h:1 msgid "File list tools" -msgstr "Failu saraksta rīki" +msgstr "Datņu saraksta rīki" #: ../extensions/list_tools/list_tools.extension.in.in.h:2 msgid "Scripting and batch manipulation of files." -msgstr "Skriptēšana un pakešu manipulācijas ar failiem." +msgstr "Skriptēšana un pakešu manipulācijas ar datnēm." #: ../extensions/map_view/gth-map-view.c:130 msgctxt "Cardinal point" @@ -4152,75 +3872,70 @@ msgid "Upload photos to Photobucket" msgstr "Augšupielādē fotogrāfijas uz Photobucket" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +msgid "_Scramble filenames" +msgstr "_Sajaukt datņu nosaukumus" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 msgid "Tiny ( 100 x 75 )" msgstr "Sīks ( 100 x 75 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 msgid "Small ( 160 x 120 )" msgstr "Mazs ( 160 x 120 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 msgid "Medium ( 320 x 240 )" msgstr "Vidējs ( 320 x 240 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 -#| msgid "640 x 480" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 msgid "Large ( 640 x 480 )" msgstr "Liels ( 640 x 480 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 msgid "15ʺ screen ( 800 x 600 )" msgstr "15ʺ ekrāns ( 800 x 600 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 msgid "17ʺ screen ( 1024 x 768 )" msgstr "17ʺ ekrāns ( 1024 x 768 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 -#| msgid "Sort images by file size" -msgid "1 megabyte file size" -msgstr "1 megabaita faila izmērs" - #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 -#| msgid "Include filename" -msgid "_Scramble filenames" -msgstr "_Sajaukt failu nosaukumus" +#: ../extensions/photobucket/dlg-export-to-photobucket.c:299 +msgid "1 megabyte file size" +msgstr "1 megabaita datņu izmērs" #: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 -#| msgid "_Continue" msgid "_Container:" msgstr "_Konteineris:" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 msgid "Tiny ( 100 × 75 )" msgstr "Sīks ( 100 × 75 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 msgid "Small ( 160 × 120 )" msgstr "Mazs ( 160 × 120 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 msgid "Medium ( 320 × 240 )" msgstr "Vidējs ( 320 × 240 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 msgid "Large ( 640 × 480 )" msgstr "Liels ( 640 × 480 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 msgid "15ʺ screen ( 800 × 600 )" msgstr "15ʺ ekrāns ( 800 × 600 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:298 msgid "17ʺ screen ( 1024 × 768 )" msgstr "17ʺ ekrāns ( 1024 × 768 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:304 -#| msgid "Sort images by file size" +#: ../extensions/photobucket/dlg-export-to-photobucket.c:306 msgid "2 megabyte file size" -msgstr "2 megabaiti faila izmērs" +msgstr "2 megabaitu datņu izmērs" #: ../extensions/photobucket/photobucket.extension.in.in.h:1 msgid "PhotoBucket" @@ -4231,7 +3946,6 @@ msgstr "Augšupielādē fotogrāfijas uz PhotoBucket" #: ../extensions/photo_importer/actions.c:71 -#| msgid "_Import" msgid "Import" msgstr "Importēt" @@ -4241,20 +3955,17 @@ #: ../extensions/photo_importer/callbacks.c:53 msgid "Import photos and other files from a removable device" -msgstr "Importēt fotogrāfijas un citus failus no izņemamas ierīces" +msgstr "Importēt fotogrāfijas un citas datnes no izņemamas ierīces" #: ../extensions/photo_importer/callbacks.c:56 -#| msgid "_New Folder..." msgid "F_older..." msgstr "M_ape..." #: ../extensions/photo_importer/callbacks.c:57 -#| msgid "Import photos from a digital camera" msgid "Import photos and other files from a folder" -msgstr "Importēt fotogrāfijas un citus failus no mapes" +msgstr "Importēt fotogrāfijas un citas datnes no mapes" #: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:1 -#| msgid "Rotate images physically" msgid "_Rotate the images physically" msgstr "Fiziski pag_riezt attēlus" @@ -4264,44 +3975,39 @@ #. view label #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 -#: ../gthumb/gth-filterbar.c:414 +#: ../gthumb/gth-filterbar.c:421 msgid "S_how:" msgstr "Rā_dīt:" #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:4 -#| msgid "C_atalogs:" msgid "_Tags:" msgstr "Bir_kas:" #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 -#| msgid "Co_mment:" msgid "_Event:" msgstr "_Notikums:" #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:7 -#| msgid "_Delete imported images from the camera" msgid "_Delete the imported files from the source" msgstr "_Dzēst importētos attēlus no avota" #: ../extensions/photo_importer/dlg-photo-importer.c:227 #: ../extensions/picasaweb/dlg-import-from-picasaweb.c:174 -#| msgid "Could not move the items:" msgid "Could not import the files" -msgstr "Nevarēja importēt failus" +msgstr "Nevarēja importēt datnes" #. translators: %d is the number of files, %s the total size #: ../extensions/photo_importer/dlg-photo-importer.c:299 #, c-format msgid "Files to import: %d (%s)" -msgstr "Faili, ko importēt — %d (%s)" +msgstr "Datnes, ko importēt — %d (%s)" #: ../extensions/photo_importer/dlg-photo-importer.c:339 -#| msgid "Could not move the folder \"%s\": %s" msgid "Could not load the folder" msgstr "Nevarēja ielādēt mapi" #: ../extensions/photo_importer/dlg-photo-importer.c:369 -#: ../gthumb/gth-browser.c:1921 +#: ../gthumb/gth-browser.c:2014 msgid "Getting folder listing..." msgstr "Saņem mapju sarakstu..." @@ -4318,18 +4024,15 @@ msgstr "Importēt mapi" #: ../extensions/photo_importer/photo_importer.extension.in.in.h:1 -#| msgid "Import Photos" msgid "Import photos" msgstr "Importēt fotogrāfijas" #: ../extensions/photo_importer/photo_importer.extension.in.in.h:2 -#| msgid "Import photos from a digital camera" msgid "Import photos from removable devices." msgstr "Importēt fotogrāfijas no izņemamas ierīces" #: ../extensions/picasaweb/callbacks.c:59 #: ../extensions/picasaweb/callbacks.c:64 -#| msgid "Create _Web Album..." msgid "_Picasa Web Album..." msgstr "_Picasa tīmekļa albums..." @@ -4354,7 +4057,6 @@ msgstr "Importēt no Picasa tīmekļa albuma" #: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 -#| msgid "Web Album" msgid "_Album:" msgstr "_Albums:" @@ -4369,7 +4071,6 @@ msgstr "Ievadiet rakstzīmes, ko redzat attēlā zemāk. Burti nav reģistrjutīgi." #: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:3 -#| msgid "_Port:" msgid "_Password:" msgstr "_Parole:" @@ -4377,30 +4078,26 @@ msgid "Public" msgstr "Publisks" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:354 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:372 #: ../extensions/picasaweb/dlg-import-from-picasaweb.c:310 -#| msgid "Could not move the items:" msgid "Could not get the album list" msgstr "Nevarēja saņemt albumu sarakstu" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:438 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:456 #: ../extensions/picasaweb/dlg-import-from-picasaweb.c:394 -#| msgid "Web Album" msgid "Picasa Web Album" msgstr "Picasa tīmekļa albums" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:525 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:543 #: ../extensions/picasaweb/dlg-import-from-picasaweb.c:481 msgid "Account" msgstr "Konts" #: ../extensions/picasaweb/picasa-account-properties-dialog.c:104 -#| msgid "Could not move the image:" msgid "Could not load the file" -msgstr "Nevarēja ielādēt failu" +msgstr "Nevarēja ielādēt datni" #: ../extensions/picasaweb/picasaweb.extension.in.in.h:1 -#| msgid "Web Album" msgid "Picasa Web Albums" msgstr "Picasa tīmekļa albums" @@ -4408,101 +4105,6 @@ msgid "Upload images to Picasa Web Albums" msgstr "Augšupielādēt attēlus uz Picasa tīmekļa albumu" -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:1 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:1 -#| msgid "Determine by extension" -msgid "_Default extension:" -msgstr "_Noklusējuma paplašinājums:" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:2 -msgid "_Quality:" -msgstr "_Kvalitāte:" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 -msgid "_Smoothing:" -msgstr "_Gludināšana:" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 -msgid "Opti_mize" -msgstr "Opti_mizēt" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:5 -msgid "_Progressive" -msgstr "_Progresīvs" - -#: ../extensions/pixbuf_savers/data/ui/png-options.ui.h:1 -msgid "Compression _level:" -msgstr "Saspiešanas _līmenis:" - -#: ../extensions/pixbuf_savers/data/ui/save-options-preferences.ui.h:1 -msgid "Default options:" -msgstr "Noklusējuma opcijas:" - -#: ../extensions/pixbuf_savers/data/ui/tga-options.ui.h:1 -msgid "_RLE compression" -msgstr "_RLE saspiešana" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:2 -msgid "_No compression" -msgstr "_Bez saspiešanas" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:3 -msgid "No_rmal (Deflate)" -msgstr "No_rmāls (saplacināt)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 -msgid "_Loss compression (JPEG)" -msgstr "_Zudumradošā saspiešana (JPEG)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 -#| msgid "_No compression" -msgid "Compression" -msgstr "Saspiešana" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 -msgid "dpi" -msgstr "dpi" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:9 -#| msgid "Resolution" -msgid "Resolution" -msgstr "Izšķirtspēja" - -#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:519 -#| msgid "_JPEG" -msgid "JPEG" -msgstr "JPEG" - -#: ../extensions/pixbuf_savers/gth-png-saver.c:140 -#| msgid "_PNG" -msgid "PNG" -msgstr "PNG" - -#: ../extensions/pixbuf_savers/gth-tga-saver.c:286 -#: ../gthumb/gth-buffer-data.c:84 -msgid "Insufficient memory" -msgstr "Nepietiek atmiņas" - -#: ../extensions/pixbuf_savers/gth-tga-saver.c:373 -#| msgid "T_GA" -msgid "TGA" -msgstr "TGA" - -#: ../extensions/pixbuf_savers/gth-tiff-saver.c:537 -#| msgid "_TIFF" -msgid "TIFF" -msgstr "TIFF" - -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:1 -#| msgid "Save Image" -msgid "Save images" -msgstr "Saglabāt attēlus" - -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:2 -msgid "Save images in common file formats such as JPEG, PNG and TIFF" -msgstr "" -"Saglabāt attēlus plaši lietotos failu formātos, piemēram JPEG, PNG un TIFF" - #: ../extensions/raw_files/raw_files.extension.in.in.h:1 msgid "Raw format support" msgstr "Jēlā formāta atbalsts" @@ -4511,11 +4113,11 @@ msgid "Allow to load raw format images." msgstr "Ļaut ielādēt jēlā formāta attēlus." -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 msgid "_X:" msgstr "_X:" -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 msgid "_Y:" msgstr "_Y:" @@ -4544,12 +4146,10 @@ msgstr "cipari" #: ../extensions/rename_series/data/ui/code-selector.ui.h:2 -#| msgid "_Port:" msgid "format:" msgstr "formāts:" #: ../extensions/rename_series/data/ui/code-selector.ui.h:3 -#| msgid "Rem_ove" msgid "remove" msgstr "izņemt" @@ -4563,28 +4163,23 @@ #. Translators: this is the text case (upper or lower case). #: ../extensions/rename_series/data/ui/rename-series.ui.h:6 -#| msgid "Cyan-_Red:" msgid "Cas_e:" msgstr "R_eģistrs:" #: ../extensions/rename_series/data/ui/rename-series.ui.h:7 -#| msgid "_Template:" msgid "Edit template" msgstr "Rediģēt veidni" #: ../extensions/rename_series/data/ui/rename-series.ui.h:9 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 -#| msgid "_Keep original filenames" msgid "The original filename" -msgstr "Sākotnējais faila nosaukums" +msgstr "Sākotnējais datnes nosaukums" #: ../extensions/rename_series/data/ui/rename-series.ui.h:10 -#| msgid "Determine by extension" msgid "The original extension" -msgstr "Sākotnējais faila paplašinājums" +msgstr "Sākotnējais datnes paplašinājums" #: ../extensions/rename_series/data/ui/rename-series.ui.h:13 -#| msgid "_Keep original filenames" msgid "The original enumerator" msgstr "Sākotnējais uzskaitītājs" @@ -4595,12 +4190,10 @@ msgstr "%M{ formāts }" #: ../extensions/rename_series/data/ui/rename-series.ui.h:17 -#| msgid "by Modification _Time" msgid "The modification date" msgstr "Izmaiņu datums" #: ../extensions/rename_series/data/ui/rename-series.ui.h:21 -#| msgid "Photo digitalization date (From EXIF data)" msgid "The digitalization date" msgstr "Digitalizēšanas datums" @@ -4623,21 +4216,18 @@ msgstr "Uzskaitītājs" #: ../extensions/rename_series/dlg-rename-series.c:59 -#| msgid "_Keep original filenames" msgid "Original filename" -msgstr "Sākotnējais faila nosaukums" +msgstr "Sākotnējais datnes nosaukums" #: ../extensions/rename_series/dlg-rename-series.c:60 -#| msgid "Original dimensions" msgid "Original extension" -msgstr "Sākotnējais faila paplašinājums" +msgstr "Sākotnējais datnes paplašinājums" #: ../extensions/rename_series/dlg-rename-series.c:61 msgid "Original enumerator" msgstr "Sākotnējais uzskaitītājs" #: ../extensions/rename_series/dlg-rename-series.c:62 -#| msgid "by Modification _Time" msgid "Modification date" msgstr "Izmaiņu datums" @@ -4647,21 +4237,18 @@ #: ../extensions/rename_series/dlg-rename-series.c:64 msgid "File attribute" -msgstr "Faila atribūts" +msgstr "Datnes atribūts" #: ../extensions/rename_series/dlg-rename-series.c:552 #: ../extensions/rename_series/dlg-rename-series.c:683 -#| msgid "Could not rename the image:" msgid "Could not rename the files" -msgstr "Nevarēja pārsaukt failus" +msgstr "Nevarēja pārsaukt datnes" #: ../extensions/rename_series/dlg-rename-series.c:780 -#| msgid "Could not move the image:" msgid "Could not save the template" msgstr "Nevarēja saglabāt veidni" #: ../extensions/rename_series/dlg-rename-series.c:798 -#| msgid "_Template:" msgid "Edit Template" msgstr "Rediģēt veidni" @@ -4674,52 +4261,42 @@ msgstr "Jauns nosaukums" #: ../extensions/rename_series/dlg-rename-series.c:944 -#| msgid "_Keep original filenames" msgid "Keep original case" msgstr "Paturēt sākotnējo reģistru" #: ../extensions/rename_series/dlg-rename-series.c:945 -#| msgid "Convert Format" msgid "Convert to lower-case" msgstr "Pārveidot uz mazajiem burtiem" #: ../extensions/rename_series/dlg-rename-series.c:946 -#| msgid "Convert Format" msgid "Convert to upper-case" msgstr "Pārveidot uz lielajiem burtiem" #: ../extensions/rename_series/gth-rename-task.c:167 -#| msgid "Rename" msgid "Renaming files" -msgstr "Pārsauc failus" +msgstr "Pārsauc datnes" #: ../extensions/rename_series/rename_series.extension.in.in.h:1 -#| msgid "Rename" msgid "Rename files" -msgstr "Pārsaukt failus" +msgstr "Pārsaukt datnes" #: ../extensions/rename_series/rename_series.extension.in.in.h:2 -#| msgid "Rename selected images" msgid "Rename series of files." -msgstr "Pārsaukt failu sēriju." +msgstr "Pārsaukt datņu virkni." #: ../extensions/resize_images/callbacks.c:45 -#| msgid "Resize image" msgid "Resize Images..." msgstr "Mainīt attēlu izmēru..." #: ../extensions/resize_images/callbacks.c:46 -#| msgid "Rename selected images" msgid "Resize the selected images" msgstr "Mainīt izvēlēto attēlu izmēru" #: ../extensions/resize_images/data/ui/resize-images.ui.h:1 -#| msgid "Resize image" msgid "Resize Images" msgstr "Mainīt attēlu izmēru" #: ../extensions/resize_images/data/ui/resize-images.ui.h:2 -#| msgid "New dimensions" msgid "New dimensions" msgstr "Jaunie izmēri" @@ -4728,44 +4305,32 @@ msgstr "_Augstums:" #: ../extensions/resize_images/data/ui/resize-images.ui.h:5 -#| msgid "_Keep aspect ratio" msgid "_Preserve original aspect ratios" msgstr "_Saglabāt sākotnējo izmēru attiecību" #: ../extensions/resize_images/data/ui/resize-images.ui.h:9 #: ../gthumb/gth-main-default-metadata.c:49 -#| msgid "Convert Format" msgid "Format" msgstr "Formāts" #: ../extensions/resize_images/data/ui/resize-images.ui.h:10 -#| msgid "pixels" msgid "pixel" msgstr "pikselis" -#: ../extensions/resize_images/dlg-resize-images.c:168 -#| msgid "Resize image" -msgid "Resizing images" -msgstr "Attēla izmēru maiņa" - -#: ../extensions/resize_images/dlg-resize-images.c:412 -#| msgid "_Keep original filenames" +#: ../extensions/resize_images/dlg-resize-images.c:423 msgid "Keep the original format" msgstr "Paturēt sākotnējo formātu" #: ../extensions/resize_images/resize_images.extension.in.in.h:1 -#| msgid "Resize image" msgid "Resize images" msgstr "Mainīt attēlu izmēru" #: ../extensions/resize_images/resize_images.extension.in.in.h:2 -#| msgid "Resize image" msgid "Resize series of images." msgstr "Mainīt attēlu virknes izmēru." #: ../extensions/search/actions.c:49 ../extensions/search/actions.c:117 #: ../extensions/search/actions.c:123 -#| msgid "Could not rename the image:" msgid "Could not perform the search" msgstr "Nevarēja veikt meklēšanu" @@ -4778,12 +4343,10 @@ msgstr "Meklēt" #: ../extensions/search/callbacks.c:59 -#| msgid "Inde_x file:" msgid "Find files" -msgstr "Meklēt failus" +msgstr "Meklēt datnes" #: ../extensions/search/callbacks.c:132 -#| msgid "Searching in:" msgid "Search again" msgstr "Meklēt vēlreiz" @@ -4795,23 +4358,20 @@ #: ../extensions/search/gth-search-editor.c:112 #: ../gthumb/gth-filter-editor-dialog.c:165 -#| msgid "The following date" msgid "all the following rules" msgstr "visām sekojošām kārtulām" #: ../extensions/search/gth-search-editor.c:113 #: ../gthumb/gth-filter-editor-dialog.c:166 -#| msgid "Change the following values:" msgid "any of the following rules" msgstr "jebkurai no sekojošām kārtulām" #: ../extensions/search/gth-search-task.c:181 #, c-format msgid "Files found until now: %s" -msgstr "Līdz šim atrastie faili — %s" +msgstr "Līdz šim atrastās datnes — %s" #: ../extensions/search/gth-search-task.c:271 -#| msgid "_Search..." msgid "Searching..." msgstr "Meklē..." @@ -4821,58 +4381,51 @@ #: ../extensions/search/search.extension.in.in.h:2 msgid "File search tool." -msgstr "Failu meklēšanas rīks." +msgstr "Datņu meklēšanas rīks." -#: ../extensions/selections/callbacks.c:62 +#: ../extensions/selections/callbacks.c:77 msgid "Add to _Selection" msgstr "Pievienot _izvēlei" -#: ../extensions/selections/callbacks.c:65 -#| msgid "Selection" +#: ../extensions/selections/callbacks.c:86 msgid "Selection 1" msgstr "Izvēle 1" -#: ../extensions/selections/callbacks.c:70 -#| msgid "Selection" +#: ../extensions/selections/callbacks.c:91 msgid "Selection 2" msgstr "Izvēle 2" -#: ../extensions/selections/callbacks.c:75 -#| msgid "Selection" +#: ../extensions/selections/callbacks.c:96 msgid "Selection 3" msgstr "Izvēle 3" -#: ../extensions/selections/callbacks.c:180 +#: ../extensions/selections/callbacks.c:285 #, c-format msgid "" "Use Alt-%d to add files to this selection, Ctrl-%d to view this selection." msgstr "" -"Lietojiet Alt-%d, lai pievienotu šos failus izvēlei. Ctrl-%d, lai skatītu šo " +"Lietojiet Alt-%d, lai pievienotu šīs datnes izvēlei. Ctrl-%d, lai skatītu šo " "izvēli." -#: ../extensions/selections/gth-selections-manager.c:250 +#: ../extensions/selections/gth-selections-manager.c:239 #, c-format -#| msgid "Selection" msgid "Selection %d" msgstr "Izvēle %d" -#: ../extensions/selections/gth-selections-manager.c:253 +#: ../extensions/selections/gth-selections-manager.c:242 #: ../extensions/selections/selections.extension.in.in.h:1 -#| msgid "_Select" msgid "Selections" msgstr "Izvēles" #: ../extensions/selections/selections.extension.in.in.h:2 msgid "Advanced file selection." -msgstr "Paplašinātā failu izvēle." +msgstr "Paplašinātā datņu izvēle." #: ../extensions/slideshow/callbacks.c:56 -#| msgid "_Slide Show" msgid "_Slideshow" msgstr "Slaidrāde" #: ../extensions/slideshow/callbacks.c:57 -#| msgid "View as a slide show" msgid "View as a slideshow" msgstr "Skatīt kā slaidrādi" @@ -4880,12 +4433,10 @@ #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 #: ../extensions/slideshow/preferences.c:162 #: ../extensions/slideshow/slideshow.extension.in.in.h:1 -#| msgid "Slide Show" msgid "Slideshow" msgstr "Slaidrāde" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:1 -#| msgid "Personalize theme" msgid "_Personalize" msgstr "_Personalizēt" @@ -4899,12 +4450,10 @@ msgstr "_Mainīt automātiski katras" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 -#| msgid "Resta_rt when finished" msgid "_Restart when finished" msgstr "Pā_rstartēt, kad pabeigts" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:8 -#| msgid "manual order" msgid "R_andom order" msgstr "Nej_auša secība" @@ -4914,28 +4463,25 @@ #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:10 msgid "Add files to the playlist" -msgstr "Pievienot failus repertuāram" +msgstr "Pievienot datnes repertuāram" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:11 -#| msgid "Open the selected folder" msgid "Remove the selected files" -msgstr "Izņemt izvēlētos failus" +msgstr "Izņemt izvēlētās datnes" -#: ../extensions/slideshow/gth-slideshow.c:229 +#: ../extensions/slideshow/gth-slideshow.c:231 msgid "Playing slideshow" msgstr "Rada slaidrādi" #: ../extensions/slideshow/gth-slideshow-preferences.c:184 -#| msgid "Choose the destination folder" msgid "Choose the files to play" -msgstr "Izvēlieties failus, ko rādīt" +msgstr "Izvēlieties datnes, ko rādīt" #: ../extensions/slideshow/gth-slideshow-preferences.c:193 msgid "Audio files" -msgstr "Audio faili" +msgstr "Audio datnes" #: ../extensions/slideshow/gth-slideshow-preferences.c:259 -#| msgid "Ran_dom" msgid "Random" msgstr "Nejaušs" @@ -4956,7 +4502,6 @@ msgstr "Slīdēt no apakšas" #: ../extensions/slideshow/main.c:307 -#| msgid "Shadow in" msgid "Fade in" msgstr "Ieplūst iekšā" @@ -4973,22 +4518,18 @@ msgstr "Kubs no apakšas" #: ../extensions/slideshow/slideshow.extension.in.in.h:2 -#| msgid "View as a slide show" msgid "View images as a slideshow." msgstr "Skatīt attēlus kā slaidrādi." #: ../extensions/webalbums/callbacks.c:71 -#| msgid "Web Album" msgid "_Web Album..." msgstr "_Tīmekļa albums..." #: ../extensions/webalbums/callbacks.c:72 -#| msgid "Create _Web Album..." msgid "Create a static web album" msgstr "Izveidot statisku tīmekļa albumu" #: ../extensions/webalbums/data/albumthemes/text.h:26 -#| msgid "Could not move the image:" msgid "Click to view the image" msgstr "Spiediet, lai skatītu attēlu" @@ -4998,7 +4539,6 @@ #: ../extensions/webalbums/data/albumthemes/text.h:28 #, c-format -#| msgid "Page %d of %d" msgid "Image %d of %d" msgstr "Attēls %d of %d" @@ -5018,27 +4558,22 @@ #: ../extensions/webalbums/data/albumthemes/text.h:33 #, c-format -#| msgid "View the image" msgid "View page %d" msgstr "Skatīt lapu %d" #: ../extensions/webalbums/data/albumthemes/text.h:34 -#| msgid "View next image" msgid "View the next image" msgstr "Skatīt nākamo attēlu" #: ../extensions/webalbums/data/albumthemes/text.h:35 -#| msgid "View next image" msgid "View the next page" msgstr "Skatīt nākamo lapu" #: ../extensions/webalbums/data/albumthemes/text.h:36 -#| msgid "View previous image" msgid "View the previous image" msgstr "Skatīt iepriekšējo attēlu" #: ../extensions/webalbums/data/albumthemes/text.h:37 -#| msgid "View previous image" msgid "View the previous page" msgstr "Skatīt iepriekšējo lapu" @@ -5056,7 +4591,6 @@ #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:5 #, no-c-format -#| msgid "%" msgid "%P" msgstr "%P" @@ -5064,26 +4598,19 @@ msgid "_Copy originals to destination" msgstr "_Kopēt oriģinālus uz mērķi" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 -msgid "_Resize if larger than:" -msgstr "Mainīt izmē_ru, ja lielāks kā:" - #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 msgid "_Adapt to the window width " msgstr "Pielāgot log_a platumam" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 -#| msgid "Index" msgid "Index Page" msgstr "Indeksa lapa" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 -#| msgid "_Thumbnail Caption..." msgid "Thumbnail Caption" msgstr "Sīktēla paraksts" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 -#| msgid "Save current image" msgid "The current image number" msgstr "Pašreizējā attēla numurs" @@ -5092,104 +4619,90 @@ msgstr "Kopējais attēlu skaits" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 -#| msgid "I_nclude comment" msgid "The file comment" -msgstr "Faila komentārs" +msgstr "Datnes komentārs" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 -#| msgid "Image data" msgid "Image Page" msgstr "Attēla lapa" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 -#| msgid "Choose the destination folder" msgid "Show the description, if available" msgstr "Rādīt aprakstu, ja pieejams" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 -#| msgid "The _following date:" msgid "Show the following attributes:" msgstr "Rādīt sekojošos atribūtus:" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:39 -#| msgid "Image Structure" msgid "Image Attributes" msgstr "Attēla atribūti" -#: ../extensions/webalbums/gth-web-exporter.c:1802 -#| msgid "Choose the destination folder" +#: ../extensions/webalbums/gth-web-exporter.c:1800 msgid "Could not show the destination" msgstr "Nevarēja parādīt galamērķi" -#: ../extensions/webalbums/gth-web-exporter.c:1838 +#: ../extensions/webalbums/gth-web-exporter.c:1836 msgid "The album has been created successfully." msgstr "Albums ir veiksmīgi izveidots." -#: ../extensions/webalbums/gth-web-exporter.c:2106 -#: ../extensions/webalbums/gth-web-exporter.c:2133 +#: ../extensions/webalbums/gth-web-exporter.c:2104 +#: ../extensions/webalbums/gth-web-exporter.c:2131 msgid "Saving thumbnails" msgstr "Saglabā sīktēlus" -#: ../extensions/webalbums/gth-web-exporter.c:2161 +#: ../extensions/webalbums/gth-web-exporter.c:2159 msgid "Saving HTML pages: Images" msgstr "Saglabā HTML lapas — attēlus" -#: ../extensions/webalbums/gth-web-exporter.c:2219 +#: ../extensions/webalbums/gth-web-exporter.c:2217 msgid "Saving HTML pages: Indexes" msgstr "Saglabā HTML lapas — indeksus" -#: ../extensions/webalbums/gth-web-exporter.c:2502 +#: ../extensions/webalbums/gth-web-exporter.c:2500 msgid "Copying original images" msgstr "Kopē sākotnējos attēlus" -#: ../extensions/webalbums/gth-web-exporter.c:2929 -#| msgid "Could not delete the folder \"%s\": %s" +#: ../extensions/webalbums/gth-web-exporter.c:2960 msgid "Could not find the style folder" msgstr "Nevarēja atrast stila mapi" -#: ../extensions/webalbums/gth-web-exporter.c:2967 +#: ../extensions/webalbums/gth-web-exporter.c:2998 msgid "Could not create a temporary folder" msgstr "Nevarēja izveidot pagaidu mapi" #: ../extensions/webalbums/webalbums.extension.in.in.h:1 -#| msgid "Web Album" msgid "Web Albums" msgstr "Tīmekļa albums" #: ../extensions/webalbums/webalbums.extension.in.in.h:2 -#| msgid "Create _Web Album..." msgid "Create static web albums." msgstr "Izveidot statisku tīmekļa albumu." -#: ../gthumb/dlg-location.c:200 ../gthumb/gth-browser.c:1250 -#: ../gthumb/gth-browser.c:1809 ../gthumb/gth-browser.c:5899 -#: ../gthumb/gth-browser.c:5918 ../gthumb/gth-browser.c:5942 +#: ../gthumb/dlg-location.c:200 ../gthumb/gth-browser.c:1336 +#: ../gthumb/gth-browser.c:1905 ../gthumb/gth-browser.c:6100 +#: ../gthumb/gth-browser.c:6119 ../gthumb/gth-browser.c:6143 #, c-format -#| msgid "Could not move the folder \"%s\": %s" msgid "Could not load the position \"%s\"" msgstr "Nevarēja ielādēt pozīciju “%s”" #: ../gthumb/dlg-personalize-filters.c:237 -#| msgid "_Filter" msgid "Filter" msgstr "Filtrs" #: ../gthumb/dlg-personalize-filters.c:315 -#| msgid "Could not move the items:" msgid "Could not save the filter" msgstr "Nevarēja saglabāt filtru" #: ../gthumb/dlg-personalize-filters.c:358 -#| msgid "New Folder" msgid "New Filter" msgstr "Jauns filtrs" #: ../gthumb/dlg-personalize-filters.c:387 -#| msgid "_Filter" msgid "Edit Filter" msgstr "Rediģēt filtru" -#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:270 +#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:277 msgid "All" msgstr "Visi" @@ -5202,7 +4715,6 @@ msgstr "Deaktivēts" #: ../gthumb/dlg-preferences-extensions.c:72 -#| msgid "Viewer" msgid "Viewers" msgstr "Skatītāji" @@ -5211,42 +4723,35 @@ msgstr "Metadati" #: ../gthumb/dlg-preferences-extensions.c:74 -#| msgid "File pa_th" msgid "File tools" -msgstr "Failu rīki" +msgstr "Datņu rīki" #: ../gthumb/dlg-preferences-extensions.c:75 msgid "List tools" msgstr "Saraksta rīki" #: ../gthumb/dlg-preferences-extensions.c:76 -#| msgid "_Import" msgid "Importers" msgstr "Importētāji" #: ../gthumb/dlg-preferences-extensions.c:77 -#| msgid "Exposure time" msgid "Exporters" msgstr "Eksportētāji" #: ../gthumb/dlg-preferences-extensions.c:216 -#| msgid "Could not move the items:" msgid "Could not activate the extension" msgstr "Neizdevās aktivizēt paplašinājumu" #: ../gthumb/dlg-preferences-extensions.c:226 -#| msgid "Could not move the items:" msgid "Could not deactivate the extension" msgstr "Neizdevās deaktivizēt paplašinājumu" #. add the page to the preferences dialog #: ../gthumb/dlg-preferences-extensions.c:772 -#| msgid "Dimensions" msgid "Extensions" msgstr "Paplašinājumi" #: ../gthumb/dlg-preferences-extensions.c:819 -#| msgid "Resta_rt when finished" msgid "Restart required" msgstr "Nepieciešama pārstartēšana" @@ -5259,52 +4764,9 @@ msgstr "_Turpināt" #: ../gthumb/dlg-preferences-extensions.c:822 -#| msgid "_Restore" msgid "_Restart" msgstr "Pā_rstartēt" -#: ../gthumb/eggfileformatchooser.c:236 -#, c-format -msgid "File _Format: %s" -msgstr "Faila _formāts — %s" - -#: ../gthumb/eggfileformatchooser.c:397 ../gthumb/gth-main-default-tests.c:233 -msgid "All Files" -msgstr "Visi faili" - -#: ../gthumb/eggfileformatchooser.c:398 -msgid "All Supported Files" -msgstr "Visi atbalstītie faili" - -#: ../gthumb/eggfileformatchooser.c:407 -msgid "By Extension" -msgstr "Pēc paplašinājuma" - -#: ../gthumb/eggfileformatchooser.c:422 -#| msgid "File pa_th" -msgid "File Format" -msgstr "Faila formāts" - -#: ../gthumb/eggfileformatchooser.c:440 -#| msgid "Dimensions" -msgid "Extension(s)" -msgstr "Paplašinājums(-i)" - -#: ../gthumb/eggfileformatchooser.c:681 -#, c-format -msgid "" -"The program was not able to find out the file format you want to use for `%" -"s'. Please make sure to use a known extension for that file or manually " -"choose a file format from the list below." -msgstr "" -"Lietotne nespēja noteikt, kuru faila formātu jūs vēlaties izmantot failam " -"“%s”. Pārliecinieties, ka izmantojat pareizu faila paplašinājumu, vai arī " -"pašrocīgi izvēlieties faila formātu no apakšā esošā saraksta." - -#: ../gthumb/eggfileformatchooser.c:688 -msgid "File format not recognized" -msgstr "Faila formāts nav atpazīts" - #. For translators: This is a progress size indicator, for example: 230.4 MB of 512.8 MB #: ../gthumb/gio-utils.c:1351 #, c-format @@ -5318,24 +4780,20 @@ #: ../gthumb/gio-utils.c:1388 #, c-format -#| msgid "Copying file %d of %d" msgid "Copying \"%s\" to \"%s\"" msgstr "Kopē “%s” uz “%s”" #: ../gthumb/gio-utils.c:1750 -#| msgid "Moving file %ld of %ld" msgid "Moving files" -msgstr "Pārvieto failus" +msgstr "Pārvieto datnes" #: ../gthumb/gio-utils.c:1750 -#| msgid "Copying file %d of %d" msgid "Copying files" -msgstr "Kopē failus" +msgstr "Kopē datnes" #: ../gthumb/gio-utils.c:1751 -#| msgid "General Information" msgid "Getting file information" -msgstr "Saņem informāciju par failu" +msgstr "Saņem informāciju par datni" #. hour:minutes:seconds #. Translators: This is a time format, like "9:05:02" for 9 @@ -5343,7 +4801,7 @@ #. * the separator that your locale uses or use "%Id" instead #. * of "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2848 +#: ../gthumb/glib-utils.c:3068 #, c-format msgctxt "long time format" msgid "%d:%02d:%02d" @@ -5355,24 +4813,24 @@ #. * separator that your locale uses or use "%Id" instead of #. * "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2857 +#: ../gthumb/glib-utils.c:3077 #, c-format msgctxt "short time format" msgid "%d:%02d" msgstr "%d:%02d" -#: ../gthumb/gth-browser-actions-callbacks.c:400 +#: ../gthumb/gth-browser-actions-callbacks.c:414 msgid "" "gthumb is free software; you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." msgstr "" -"gthumb ir brīvā programmatūra; jūs varat izplatīt un/vai modificēt to saskaņā " -"ar " -"GNU Vispārējās Publiskās Licences 2 vai kādas vēlākas versijas noteikumiem." +"gthumb ir brīvā programmatūra; jūs varat izplatīt un/vai modificēt to " +"saskaņā ar GNU Vispārējās Publiskās Licences 2 vai kādas vēlākas versijas " +"noteikumiem." -#: ../gthumb/gth-browser-actions-callbacks.c:404 +#: ../gthumb/gth-browser-actions-callbacks.c:418 msgid "" "gthumb is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -5383,7 +4841,7 @@ "jebkādas garantijas vai iekļautas ražotāja atbildības par šo produktu. " "Sīkāku informāciju meklējiet GNU Vispārējās Publiskās Licences tekstā." -#: ../gthumb/gth-browser-actions-callbacks.c:408 +#: ../gthumb/gth-browser-actions-callbacks.c:422 msgid "" "You should have received a copy of the GNU General Public License along with " "gthumb. If not, see http://www.gnu.org/licenses/." @@ -5391,11 +4849,11 @@ "Jums vajadzēja saņemt GNU Vispārējo Publisko Licenci ar gthumb. Ja nē, " "skatiet http://www.gnu.org/licenses/." -#: ../gthumb/gth-browser-actions-callbacks.c:427 +#: ../gthumb/gth-browser-actions-callbacks.c:441 msgid "An image viewer and browser for GNOME." msgstr "Attēlu skatītājs un pārlūks GNOME videi." -#: ../gthumb/gth-browser-actions-callbacks.c:430 +#: ../gthumb/gth-browser-actions-callbacks.c:444 msgid "translator_credits" msgstr "" "Artis Trops \n" @@ -5403,7 +4861,7 @@ #: ../gthumb/gth-browser-actions-entries.h:31 msgid "_File" -msgstr "_Fails" +msgstr "_Datne" #: ../gthumb/gth-browser-actions-entries.h:32 msgid "_Edit" @@ -5418,17 +4876,14 @@ msgstr "_Palīdzība" #: ../gthumb/gth-browser-actions-entries.h:36 -#| msgid "_Open With" msgid "Open _With" msgstr "Atvērt _ar" #: ../gthumb/gth-browser-actions-entries.h:37 -#| msgid "Import Photos" msgid "I_mport From" msgstr "I_mportēt no" #: ../gthumb/gth-browser-actions-entries.h:38 -#| msgid "E_xposure mode" msgid "E_xport To" msgstr "E_ksportēt uz" @@ -5437,7 +4892,6 @@ msgstr "Jauns _logs" #: ../gthumb/gth-browser-actions-entries.h:42 -#| msgid "Open in New Window" msgid "Open another window" msgstr "Atvērt citā logā" @@ -5454,17 +4908,14 @@ msgstr "Rediģēt dažādus iestatījumus" #: ../gthumb/gth-browser-actions-entries.h:95 -#| msgid "_Copy..." msgid "_Sort By..." msgstr "_Kārtot pēc..." #: ../gthumb/gth-browser-actions-entries.h:101 -#| msgid "_Filter" msgid "_Filter..." msgstr "_Filtrēt..." #: ../gthumb/gth-browser-actions-entries.h:108 -#| msgid "Stop loading current location" msgid "Stop loading the current location" msgstr "Pārtraukt pašreizējās vietas ielādi" @@ -5481,7 +4932,6 @@ msgstr "Skatīt nākamo attēlu" #: ../gthumb/gth-browser-actions-entries.h:132 -#| msgid "Start in fullscreen mode" msgid "Switch to fullscreen" msgstr "Pārslēgties uz pilnekrānu" @@ -5489,15 +4939,15 @@ msgid "Leave Fullscreen" msgstr "Iziet no pilnekrāna režīma" -#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3586 +#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3749 msgid "Go to the previous visited location" msgstr "Doties uz iepriekš apmeklēto vietu" -#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3604 +#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3767 msgid "Go to the next visited location" msgstr "Doties uz nākamo apmeklēto vietu" -#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3622 +#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3785 msgid "Go up one level" msgstr "Doties vienu līmeni uz augšu" @@ -5506,11 +4956,10 @@ msgstr "_Atrašanās vieta..." #: ../gthumb/gth-browser-actions-entries.h:162 -#| msgid "Specify a location to visit" msgid "Specify a location to open" msgstr "Norādiet vietu, ko atvērt" -#: ../gthumb/gth-browser-actions-entries.h:173 ../gthumb/gth-browser.c:672 +#: ../gthumb/gth-browser-actions-entries.h:173 ../gthumb/gth-browser.c:677 msgid "_Delete History" msgstr "_Dzēst vēsturi" @@ -5523,7 +4972,6 @@ msgstr "Skatīt mapes" #: ../gthumb/gth-browser-actions-entries.h:186 -#| msgid "Show information about gThumb" msgid "Show information about gthumb" msgstr "Rādīt informāciju par gthumb" @@ -5539,201 +4987,182 @@ msgid "_Keyboard Shortcuts" msgstr "_Tastatūras saīsnes" -#: ../gthumb/gth-browser-actions-entries.h:206 +#: ../gthumb/gth-browser-actions-entries.h:203 +#: ../gthumb/gth-browser-actions-entries.h:257 +msgid "Edit" +msgstr "Rediģēt" + +#: ../gthumb/gth-browser-actions-entries.h:204 +#: ../gthumb/gth-browser-actions-entries.h:258 +msgid "Edit file" +msgstr "Rediģēt datni" + +#: ../gthumb/gth-browser-actions-entries.h:212 msgid "_Toolbar" msgstr "_Rīkjosla" -#: ../gthumb/gth-browser-actions-entries.h:207 +#: ../gthumb/gth-browser-actions-entries.h:213 msgid "View or hide the toolbar of this window" msgstr "Rādīt vai slēpt šī loga rīkjoslu" -#: ../gthumb/gth-browser-actions-entries.h:211 +#: ../gthumb/gth-browser-actions-entries.h:217 msgid "_Statusbar" msgstr "_Statusa josla" -#: ../gthumb/gth-browser-actions-entries.h:212 +#: ../gthumb/gth-browser-actions-entries.h:218 msgid "View or hide the statusbar of this window" msgstr "Rādīt vai slēpt šī loga statusa joslu" -#: ../gthumb/gth-browser-actions-entries.h:216 -#| msgid "_Filter" +#: ../gthumb/gth-browser-actions-entries.h:222 msgid "_Filterbar" msgstr "_Filtru josla" -#: ../gthumb/gth-browser-actions-entries.h:217 +#: ../gthumb/gth-browser-actions-entries.h:223 msgid "View or hide the filterbar of this window" msgstr "Rādīt vai slēpt šī loga filtru joslu" -#: ../gthumb/gth-browser-actions-entries.h:221 -#| msgid "_Search" +#: ../gthumb/gth-browser-actions-entries.h:227 msgid "_Sidebar" msgstr "_Sānu josla" -#: ../gthumb/gth-browser-actions-entries.h:222 -#| msgid "View or hide the filterbar of this window" +#: ../gthumb/gth-browser-actions-entries.h:228 msgid "View or hide the sidebar of this window" msgstr "Rādīt vai slēpt šī loga sānu joslu" -#: ../gthumb/gth-browser-actions-entries.h:226 -#| msgid "_Thumbnails" +#: ../gthumb/gth-browser-actions-entries.h:232 msgid "_Thumbnail Pane" msgstr "_Sīktēlu rūts" -#: ../gthumb/gth-browser-actions-entries.h:227 -#| msgid "View or hide the statusbar of this window" +#: ../gthumb/gth-browser-actions-entries.h:233 msgid "View or hide the thumbnail pane in viewer mode" msgstr "Rādīt vai slēpt sīktēlu joslu skatītāja režīmā" -#: ../gthumb/gth-browser-actions-entries.h:231 +#: ../gthumb/gth-browser-actions-entries.h:237 msgid "_Thumbnails" msgstr "Sīk_tēli" -#: ../gthumb/gth-browser-actions-entries.h:232 +#: ../gthumb/gth-browser-actions-entries.h:238 msgid "View thumbnails" msgstr "Skatīt sīktēlus" -#: ../gthumb/gth-browser-actions-entries.h:236 -#| msgid "Show _Hidden Files" +#: ../gthumb/gth-browser-actions-entries.h:242 msgid "_Hidden Files" -msgstr "_Slēptie faili" +msgstr "_Slēptās datnes" -#: ../gthumb/gth-browser-actions-entries.h:237 +#: ../gthumb/gth-browser-actions-entries.h:243 msgid "Show hidden files and folders" -msgstr "Rādīt slēptos failus un mapes" +msgstr "Rādīt slēptās datnes un mapes" -#: ../gthumb/gth-browser-actions-entries.h:242 -#: ../gthumb/gth-browser-actions-entries.h:247 -#| msgid "View image properties" +#: ../gthumb/gth-browser-actions-entries.h:248 +#: ../gthumb/gth-browser-actions-entries.h:253 msgid "View file properties" -msgstr "Skatīt faila īpašības" - -#: ../gthumb/gth-browser-actions-entries.h:251 -#| msgid "_Edit" -msgid "Edit" -msgstr "Rediģēt" - -#: ../gthumb/gth-browser-actions-entries.h:252 -msgid "Edit file" -msgstr "Rediģēt failu" +msgstr "Skatīt datnes īpašības" -#: ../gthumb/gth-browser-actions-entries.h:256 -#| msgid "Fit to window if larger" +#: ../gthumb/gth-browser-actions-entries.h:262 msgid "_Fit Window to Image" msgstr "_Pielāgot logu attēlam" -#: ../gthumb/gth-browser-actions-entries.h:257 -#| msgid "Reuse this window to view other images" +#: ../gthumb/gth-browser-actions-entries.h:263 msgid "Resize the window to the size of the image" msgstr "Mainīt loga izmēru, lai tas pielāgotos attēla izmēram" -#: ../gthumb/gth-browser.c:369 +#: ../gthumb/gth-browser.c:374 #, c-format -#| msgid "Open" msgid "Open %s" msgstr "Atvērt %s" -#: ../gthumb/gth-browser.c:509 +#: ../gthumb/gth-browser.c:514 msgid "[modified]" msgstr "[pārveidots]" -#: ../gthumb/gth-browser.c:1006 +#: ../gthumb/gth-browser.c:1073 #, c-format -#| msgid "%d selected (%s)" msgid "%d file selected (%s)" msgid_plural "%d files selected (%s)" -msgstr[0] "Izvēlēts %d fails (%s)" -msgstr[1] "Izvēlēti %i faili (%s)" -msgstr[2] "Izvēlēti %i failu (%s)" +msgstr[0] "Izvēlēta %d datne (%s)" +msgstr[1] "Izvēlētas %d datnes (%s)" +msgstr[2] "Izvēlētas %d datnes (%s)" -#: ../gthumb/gth-browser.c:1041 +#: ../gthumb/gth-browser.c:1108 #, c-format msgid "%s of free space" msgstr "%s brīvas vietas" -#: ../gthumb/gth-browser.c:1905 ../gthumb/gth-browser.c:1932 +#: ../gthumb/gth-browser.c:1998 ../gthumb/gth-browser.c:2025 #, c-format msgid "No suitable module found for %s" msgstr "%s nav atrasts piemērots modulis" -#: ../gthumb/gth-browser.c:2052 +#: ../gthumb/gth-browser.c:2144 #, c-format -#| msgid "Save only cha_nged fields" msgid "Save changes to file '%s'?" -msgstr "Saglabāt izmaiņas failā “%s”?" +msgstr "Saglabāt izmaiņas datnē “%s”?" -#: ../gthumb/gth-browser.c:2057 +#: ../gthumb/gth-browser.c:2149 msgid "If you don't save, changes to the file will be permanently lost." -msgstr "Ja nesaglabāsiet failā, izmaiņas neatgriezeniski pazudīs." +msgstr "Ja nesaglabāsiet datnē, izmaiņas neatgriezeniski pazudīs." -#: ../gthumb/gth-browser.c:2058 -#| msgid "Do Not Save" +#: ../gthumb/gth-browser.c:2150 msgid "Do _Not Save" msgstr "_Nesaglabāt" -#: ../gthumb/gth-browser.c:2828 ../gthumb/gth-source-tree.c:182 -#| msgid "Could not copy the image:" +#: ../gthumb/gth-browser.c:2928 ../gthumb/gth-source-tree.c:182 msgid "Could not change name" msgstr "Nevarēja mainīt nosaukumu" -#: ../gthumb/gth-browser.c:3257 ../gthumb/gth-main-default-metadata.c:41 +#: ../gthumb/gth-browser.c:3359 ../gthumb/gth-main-default-metadata.c:41 msgid "Modified" msgstr "Pārveidots" -#: ../gthumb/gth-browser.c:3587 ../gthumb/gth-browser.c:3605 -#| msgid "Delete the list of visited locations" +#: ../gthumb/gth-browser.c:3750 ../gthumb/gth-browser.c:3768 msgid "View the list of visited locations" msgstr "Skatīt apmeklēto vietu sarakstu" -#: ../gthumb/gth-browser.c:3623 -#| msgid "Delete the list of visited locations" +#: ../gthumb/gth-browser.c:3786 msgid "View the list of upper locations" msgstr "Skatīt augšējo vietu sarakstu" -#: ../gthumb/gth-browser.c:5900 +#: ../gthumb/gth-browser.c:6101 #, c-format -#| msgid "Image type not supported: %s" msgid "File type not supported" -msgstr "Failu tips nav atbalstīts" +msgstr "Datņu tips nav atbalstīts" -#: ../gthumb/gth-browser.c:5943 +#: ../gthumb/gth-browser.c:6144 #, c-format -#| msgid "No images found" msgid "No suitable module found" msgstr "Nav atrasts piemērots modulis" #: ../gthumb/gth-extensions.c:203 #, c-format -#| msgid "Could not move the folder \"%s\": %s" msgid "Could not open the module `%s`: %s" msgstr "Nevarēja atvērt moduli “%s” — %s" -#: ../gthumb/gth-extensions.c:744 +#: ../gthumb/gth-extensions.c:754 #, c-format msgid "The extension '%1$s' is required by the extension '%2$s'" msgstr "Paplašinājums “%2$s” pieprasa paplašinājumu “%1$s”" +#: ../gthumb/gth-file-chooser-dialog.c:144 +msgid "All Supported Files" +msgstr "Visas atbalstītās datnes" + #: ../gthumb/gth-file-source-vfs.c:121 -#| msgid "New Folder" msgid "Home Folder" msgstr "Mājas mape" #: ../gthumb/gth-file-source-vfs.c:126 msgid "File System" -msgstr "Failu sistēma" +msgstr "Datņu sistēma" #: ../gthumb/gth-file-source-vfs.c:739 -#| msgid "" -#| "The images cannot be moved to the Trash. Do you want to delete them " -#| "permanently?" msgid "" "The files cannot be moved to the Trash. Do you want to delete them " "permanently?" -msgstr "Failus nevar pārvietot uz miskasti. Vai vēlaties tos izdzēst pavisam?" +msgstr "Datnes nevar pārvietot uz miskasti. Vai vēlaties tās izdzēst pavisam?" #: ../gthumb/gth-file-source-vfs.c:750 -#| msgid "Could not move the items:" msgid "Could not move the files to the Trash" -msgstr "Nevarēja pārvietot failus uz miskasti" +msgstr "Nevarēja pārvietot datnes uz miskasti" #: ../gthumb/gth-file-source-vfs.c:797 #, c-format @@ -5744,21 +5173,20 @@ #, c-format msgid "Are you sure you want to move to trash the %'d selected file?" msgid_plural "Are you sure you want to move to trash the %'d selected files?" -msgstr[0] "Vai tiešām vēlaties pārvietot %d izvēlēto failu uz miskasti?" -msgstr[1] "Vai tiešām vēlaties pārvietot %d izvēlētos failus uz miskasti?" -msgstr[2] "Vai tiešām vēlaties pārvietot %d izvēlētos failus uz miskasti?" +msgstr[0] "Vai tiešām vēlaties pārvietot %d izvēlēto datni uz miskasti?" +msgstr[1] "Vai tiešām vēlaties pārvietot %d izvēlētās datnes uz miskasti?" +msgstr[2] "Vai tiešām vēlaties pārvietot %d izvēlēto datņu uz miskasti?" #: ../gthumb/gth-file-source-vfs.c:844 #, c-format msgid "Are you sure you want to permanently delete the %'d selected file?" msgid_plural "" "Are you sure you want to permanently delete the %'d selected files?" -msgstr[0] "Vai tiešām vēlaties neatgriezeniski dzēst %'d izvēlēto failu?" -msgstr[1] "Vai tiešām vēlaties neatgriezeniski dzēst %'d izvēlētos failus?" -msgstr[2] "Vai tiešām vēlaties neatgriezeniski dzēst %'d izvēlēto failu?" +msgstr[0] "Vai tiešām vēlaties neatgriezeniski dzēst %'d izvēlēto datni?" +msgstr[1] "Vai tiešām vēlaties neatgriezeniski dzēst %'d izvēlētās datnes?" +msgstr[2] "Vai tiešām vēlaties neatgriezeniski dzēst %'d izvēlēto datņu?" -#: ../gthumb/gth-filterbar.c:406 -#| msgid "View the folders" +#: ../gthumb/gth-filterbar.c:413 msgid "Hide the filterbar" msgstr "Slēpt filtru joslu" @@ -5778,10 +5206,9 @@ msgstr "GB" #. "files" label -#: ../gthumb/gth-filter.c:291 ../gthumb/gth-filter-editor-dialog.c:177 -#| msgid "_File" +#: ../gthumb/gth-filter.c:286 ../gthumb/gth-filter-editor-dialog.c:177 msgid "files" -msgstr "faili" +msgstr "datnes" #: ../gthumb/gth-filter-editor-dialog.c:224 msgid "ascending" @@ -5797,7 +5224,6 @@ msgstr "Nav norādīts limits" #: ../gthumb/gth-folder-tree.c:857 -#| msgid "_Location..." msgid "Loading..." msgstr "Ielādē..." @@ -5805,51 +5231,62 @@ msgid "(Open Parent)" msgstr "(atvērt virsmapi)" -#: ../gthumb/gth-histogram-view.c:826 +#: ../gthumb/gth-histogram-view.c:825 msgid "Linear scale" msgstr "Lineāra skala" -#: ../gthumb/gth-histogram-view.c:838 +#: ../gthumb/gth-histogram-view.c:837 msgid "Logarithmic scale" msgstr "Logaritmiskā skala" -#: ../gthumb/gth-histogram-view.c:858 +#: ../gthumb/gth-histogram-view.c:857 msgid "Channel:" msgstr "Kanāls:" -#: ../gthumb/gth-histogram-view.c:890 +#: ../gthumb/gth-histogram-view.c:878 msgid "Value" msgstr "Vērtība" -#: ../gthumb/gth-histogram-view.c:896 +#: ../gthumb/gth-histogram-view.c:883 msgid "Red" msgstr "Sarkans" -#: ../gthumb/gth-histogram-view.c:902 +#: ../gthumb/gth-histogram-view.c:888 msgid "Green" msgstr "Zaļš" -#: ../gthumb/gth-histogram-view.c:908 +#: ../gthumb/gth-histogram-view.c:893 msgid "Blue" msgstr "Zils" -#: ../gthumb/gth-histogram-view.c:914 +#: ../gthumb/gth-histogram-view.c:898 msgid "Alpha" msgstr "Alfa" -#: ../gthumb/gth-histogram-view.c:921 +#: ../gthumb/gth-histogram-view.c:904 msgid "RGB" msgstr "RGB" +#: ../gthumb/gth-image-list-task.c:141 +msgid "Could not rename the file" +msgstr "Nevarēja pārsaukt datni" + +#: ../gthumb/gth-image-saver.c:39 +msgid "No options available for this file type" +msgstr "Šim datņu tipam nav pieejamu opciju" + +#: ../gthumb/gth-image-saver.c:181 +#, c-format +msgid "Could not find a suitable module to save the image as \"%s\"" +msgstr "Nevarēja atrast piemērotu moduli, lai saglabātu attēlu kā “%s”" + #: ../gthumb/gth-load-file-data-task.c:108 -#| msgid "General Information" msgid "Reading file information" -msgstr "Lasa informāciju par failu" +msgstr "Lasa informāciju par datni" #: ../gthumb/gth-main-default-metadata.c:32 -#| msgid "_File" msgid "File" -msgstr "Fails" +msgstr "Datne" #: ../gthumb/gth-main-default-metadata.c:39 msgid "Name" @@ -5865,56 +5302,52 @@ msgstr "Tips" #: ../gthumb/gth-main-default-metadata.c:44 -#| msgid "Old Name" msgid "Full Name" msgstr "Pilns vārds" #: ../gthumb/gth-main-default-metadata.c:48 -#| msgid "_Saturation:" msgid "Duration" msgstr "Ilgums" #: ../gthumb/gth-main-default-sort-types.c:131 -#| msgid "File _name" msgid "file name" -msgstr "faila nosaukums" +msgstr "datnes nosaukums" #: ../gthumb/gth-main-default-sort-types.c:132 -#| msgid "File pa_th" msgid "file path" -msgstr "faila ceļš" +msgstr "datnes ceļš" #: ../gthumb/gth-main-default-sort-types.c:133 -#| msgid "File si_ze" msgid "file size" -msgstr "faila izmērs" +msgstr "datnes izmērs" #: ../gthumb/gth-main-default-sort-types.c:134 -#| msgid "by file modified time" msgid "file modified date" -msgstr "faila izmaiņu datums" +msgstr "datnes izmaiņu datums" #: ../gthumb/gth-main-default-sort-types.c:135 msgid "no sorting" msgstr "bez kārtošanas" #: ../gthumb/gth-main-default-sort-types.c:136 -#| msgid "Dimensions" msgid "dimensions" msgstr "izmēri" +#: ../gthumb/gth-main-default-tests.c:233 +msgid "All Files" +msgstr "Visas datnes" + #: ../gthumb/gth-main-default-tests.c:261 msgid "Media" msgstr "Skaņa un video" #: ../gthumb/gth-main-default-tests.c:268 -#| msgid "Text only" msgid "Text Files" -msgstr "Teksta faili" +msgstr "Teksta datnes" #: ../gthumb/gth-main-default-tests.c:276 msgid "Filename" -msgstr "Faila nosaukums" +msgstr "Datnes nosaukums" #: ../gthumb/gth-main-default-tests.c:308 msgid "Title (embedded)" @@ -5924,24 +5357,13 @@ msgid "Description (embedded)" msgstr "Apraksts (iegults)" -#: ../gthumb/gth-pixbuf-list-task.c:139 -#| msgid "Could not rename the image:" -msgid "Could not rename the file" -msgstr "Nevarēja pārsaukt failu" - -#: ../gthumb/gth-pixbuf-saver.c:34 -msgid "No options available for this file type" -msgstr "Šim failu tipam nav pieejamu opciju" - #: ../gthumb/gth-progress-dialog.c:144 -#| msgid "General Information" msgid "Cancel operation" msgstr "Atcelt darbību" #: ../gthumb/gth-save-file-data-task.c:102 -#| msgid "General Information" msgid "Saving file information" -msgstr "Saglabā informāciju par failu" +msgstr "Saglabā informāciju par datni" #: ../gthumb/gth-tags-entry.c:388 #, c-format @@ -5952,52 +5374,51 @@ msgid "Show all the tags" msgstr "Rādīt visas birkas" -#: ../gthumb/gth-tags-file.c:236 +#: ../gthumb/gth-tags-file.c:235 msgid "Holidays" msgstr "Brīvdienas" -#: ../gthumb/gth-tags-file.c:237 +#: ../gthumb/gth-tags-file.c:236 msgid "Temporary" msgstr "Pagaidu" -#: ../gthumb/gth-tags-file.c:238 +#: ../gthumb/gth-tags-file.c:237 msgid "Screenshots" msgstr "Ekrānattēli" -#: ../gthumb/gth-tags-file.c:239 +#: ../gthumb/gth-tags-file.c:238 msgid "Science" msgstr "Zinātne" -#: ../gthumb/gth-tags-file.c:240 -#| msgid "Favourite" +#: ../gthumb/gth-tags-file.c:239 msgid "Favorite" msgstr "Iecienītās" -#: ../gthumb/gth-tags-file.c:241 +#: ../gthumb/gth-tags-file.c:240 msgid "Important" msgstr "Svarīgi" -#: ../gthumb/gth-tags-file.c:242 +#: ../gthumb/gth-tags-file.c:241 msgid "GNOME" msgstr "GNOME" -#: ../gthumb/gth-tags-file.c:243 +#: ../gthumb/gth-tags-file.c:242 msgid "Games" msgstr "Spēles" -#: ../gthumb/gth-tags-file.c:244 +#: ../gthumb/gth-tags-file.c:243 msgid "Party" msgstr "Ballīte" -#: ../gthumb/gth-tags-file.c:245 +#: ../gthumb/gth-tags-file.c:244 msgid "Birthday" msgstr "Dzimšanas diena" -#: ../gthumb/gth-tags-file.c:246 +#: ../gthumb/gth-tags-file.c:245 msgid "Astronomy" msgstr "Astronomija" -#: ../gthumb/gth-tags-file.c:247 +#: ../gthumb/gth-tags-file.c:246 msgid "Family" msgstr "Ģimene" @@ -6007,7 +5428,6 @@ msgstr "ir" #: ../gthumb/gth-test-category.c:47 -#| msgid "Icons only" msgid "is only" msgstr "ir tikai" @@ -6016,7 +5436,7 @@ msgid "is not" msgstr "nav" -#: ../gthumb/gth-test-category.c:394 ../gthumb/gth-test-simple.c:812 +#: ../gthumb/gth-test-category.c:407 ../gthumb/gth-test-simple.c:812 #: ../gthumb/gth-test-simple.c:838 ../gthumb/gth-test-simple.c:859 #: ../gthumb/gth-test-simple.c:885 #, c-format @@ -6028,7 +5448,6 @@ msgstr "Pievienot jaunu kārtulu" #: ../gthumb/gth-test-selector.c:263 -#| msgid "Rename this image" msgid "Remove this rule" msgstr "Izņemt šo kārtulu" @@ -6049,7 +5468,6 @@ msgstr "nesatur" #: ../gthumb/gth-test-simple.c:52 -#| msgid "Images" msgid "matches" msgstr "sakrīt" @@ -6073,12 +5491,11 @@ msgid "is after" msgstr "ir pēc" -#: ../gthumb/gth-time-selector.c:477 -#| msgid "Holidays" +#: ../gthumb/gth-time-selector.c:478 msgid "Today" msgstr "Šodien" -#: ../gthumb/gth-time-selector.c:485 +#: ../gthumb/gth-time-selector.c:486 msgid "Now" msgstr "Tagad" @@ -6087,68 +5504,114 @@ msgstr "Aizvērt šo logu" #: ../gthumb/gth-window-actions-entries.h:36 -#| msgid "Close this window" msgid "Close _All Windows" msgstr "_Aizvērt visus logus" -#: ../gthumb/gtk-utils.c:551 +#: ../gthumb/gtk-utils.c:499 msgid "Could not display help" msgstr "Nevarēja parādīt palīdzību" -#: ../gthumb/gtk-utils.c:868 ../gthumb/gtk-utils.c:875 -#| msgid "Could not copy the image:" +#: ../gthumb/gtk-utils.c:828 ../gthumb/gtk-utils.c:835 msgid "Could not launch the application" msgstr "Nevarēja palaist lietotni" -#: ../gthumb/gtk-utils.c:978 +#: ../gthumb/gtk-utils.c:938 msgid "_Copy Here" msgstr "_Kopēt šeit" -#: ../gthumb/gtk-utils.c:983 -#| msgid "_Move" +#: ../gthumb/gtk-utils.c:943 msgid "_Move Here" msgstr "_Pārvietot šeit" -#: ../gthumb/gtk-utils.c:988 +#: ../gthumb/gtk-utils.c:948 msgid "_Link Here" msgstr "_Veidot saiti šeit" -#: ../gthumb/gtk-utils.c:997 +#: ../gthumb/gtk-utils.c:957 msgid "Cancel" msgstr "Atcelt" -#: ../gthumb/main.c:59 -#| msgid "Open in New Window" +#: ../gthumb/main.c:61 msgid "Open a new window" msgstr "Atvērt jaunu logu" -#: ../gthumb/main.c:63 +#: ../gthumb/main.c:65 msgid "Start in fullscreen mode" msgstr "Palaist pilnekrāna režīmā" -#: ../gthumb/main.c:67 +#: ../gthumb/main.c:69 msgid "Automatically start a slideshow" msgstr "Automātiski palaist slaidrādi" -#: ../gthumb/main.c:71 +#: ../gthumb/main.c:73 msgid "Automatically import digital camera photos" msgstr "Automātiski importēt digitālās fotokameras fotogrāfijas" -#: ../gthumb/main.c:75 -#| msgid "Shadow in" +#: ../gthumb/main.c:77 msgid "Show version" msgstr "Rādīt versiju" -#: ../gthumb/main.c:344 -#| msgid "Image preview" +#: ../gthumb/main.c:483 msgid "- Image browser and viewer" msgstr "- Attēlu pārlūks un skatītājs" -#: ../gthumb/pixbuf-io.c:174 -#, c-format -#| msgid "Could not duplicate the image \"%s\": %s" -msgid "Could not find a suitable module to save the image as \"%s\"" -msgstr "Nevarēja atrast piemērotu moduli, lai saglabātu attēlu kā “%s”" +#~ msgid "Exif DateTimeOriginal tag" +#~ msgstr "Exif DateTimeOriginal birka" + +#~| msgid "_Reset" +#~ msgid "_Resize to:" +#~ msgstr "Mainīt izmē_ru uz:" + +#~ msgid "×" +#~ msgstr "×" + +#~| msgid "_Desaturate" +#~ msgid "Desaturate" +#~ msgstr "Noņemt piesātinājumu" + +#~ msgid "White balance correction" +#~ msgstr "Baltās krāsas līdzsvara korekcija" + +#~| msgid "Reduce Colors" +#~ msgid "Enhance Colors" +#~ msgstr "Uzlabot krāsas" + +#~ msgid "Automatic white balance correction" +#~ msgstr "Automātiska baltās krāsas līdzsvara korekcija" + +#~| msgid "Save Image" +#~ msgid "Save images" +#~ msgstr "Saglabāt attēlus" + +#~ msgid "Save images in common file formats such as JPEG, PNG and TIFF" +#~ msgstr "" +#~ "Saglabāt attēlus plaši lietotos failu formātos, piemēram JPEG, PNG un TIFF" + +#~ msgid "File _Format: %s" +#~ msgstr "Faila _formāts — %s" + +#~ msgid "By Extension" +#~ msgstr "Pēc paplašinājuma" + +#~| msgid "File pa_th" +#~ msgid "File Format" +#~ msgstr "Faila formāts" + +#~| msgid "Dimensions" +#~ msgid "Extension(s)" +#~ msgstr "Paplašinājums(-i)" + +#~ msgid "" +#~ "The program was not able to find out the file format you want to use for `" +#~ "%s'. Please make sure to use a known extension for that file or manually " +#~ "choose a file format from the list below." +#~ msgstr "" +#~ "Lietotne nespēja noteikt, kuru faila formātu jūs vēlaties izmantot failam " +#~ "“%s”. Pārliecinieties, ka izmantojat pareizu faila paplašinājumu, vai arī " +#~ "pašrocīgi izvēlieties faila formātu no apakšā esošā saraksta." + +#~ msgid "File format not recognized" +#~ msgstr "Faila formāts nav atpazīts" #~ msgid "Bytes" #~ msgstr "Baiti" diff -Nru gthumb-3.0.2/po/pl.po gthumb-3.2.3/po/pl.po --- gthumb-3.0.2/po/pl.po 2012-08-14 16:25:43.000000000 +0000 +++ gthumb-3.2.3/po/pl.po 2013-04-30 17:06:23.000000000 +0000 @@ -4,12 +4,16 @@ # pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas: # gnomepl@aviary.pl # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +# Artur Flinta , 2003-2004. +# Tomasz Dominikowski , 2007. +# Piotr Drąg , 2011-2013. +# Aviary.pl , 2007-2013. msgid "" msgstr "" "Project-Id-Version: gthumb\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-25 22:44+0200\n" -"PO-Revision-Date: 2012-03-25 22:45+0200\n" +"POT-Creation-Date: 2013-02-17 19:18+0100\n" +"PO-Revision-Date: 2013-02-17 19:19+0100\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "Language: pl\n" @@ -90,8 +94,8 @@ msgstr "Wyświetla opcje zarządzania sesją" #. manually set name and icon -#: ../data/gthumb.desktop.in.in.h:1 ../gthumb/gth-browser.c:529 -#: ../gthumb/gth-progress-dialog.c:388 ../gthumb/main.c:313 +#: ../data/gthumb.desktop.in.in.h:1 ../gthumb/gth-browser.c:578 +#: ../gthumb/gth-progress-dialog.c:390 ../gthumb/main.c:315 msgid "gThumb" msgstr "gThumb" @@ -190,8 +194,8 @@ msgstr "_Dopasowanie" #. limit label -#: ../data/ui/filter-editor.ui.h:3 ../gthumb/gth-filter.c:270 -#: ../gthumb/gth-filter.c:342 +#: ../data/ui/filter-editor.ui.h:3 ../gthumb/gth-filter.c:269 +#: ../gthumb/gth-filter.c:337 msgid "_Limit to" msgstr "_Ograniczenie do" @@ -230,7 +234,6 @@ msgstr "Wybrano:" #: ../data/ui/location.ui.h:1 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 msgid "_Location:" msgstr "_Położenie:" @@ -247,7 +250,6 @@ msgstr "Nazwa pliku:" #: ../data/ui/overwrite-dialog.ui.h:4 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 #: ../extensions/image_print/data/ui/print-layout.ui.h:23 msgid "Size:" msgstr "Rozmiar:" @@ -394,7 +396,7 @@ #: ../data/ui/preferences.ui.h:25 #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 -#: ../extensions/edit_metadata/gth-edit-general-page.c:473 +#: ../extensions/edit_metadata/gth-edit-general-page.c:481 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 #: ../gthumb/gth-main-default-metadata.c:33 msgid "General" @@ -512,7 +514,6 @@ #: ../extensions/image_viewer/image_viewer.extension.in.in.h:3 #: ../extensions/list_tools/list_tools.extension.in.in.h:3 #: ../extensions/photo_importer/photo_importer.extension.in.in.h:3 -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:3 #: ../extensions/raw_files/raw_files.extension.in.in.h:3 #: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:3 #: ../extensions/rename_series/rename_series.extension.in.in.h:3 @@ -606,16 +607,128 @@ msgid "Write to Disc" msgstr "Zapisz na płytę" -#: ../extensions/cairo_io/cairo-io-jpeg.c:62 +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:62 #, c-format msgid "Error interpreting JPEG image file: %s" msgstr "Błąd podczas interpretowania pliku obrazu JPEG: %s" -#: ../extensions/cairo_io/cairo-io-jpeg.c:482 +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:483 #, c-format msgid "Unknown JPEG color space (%d)" msgstr "Nieznana przestrzeń kolorów JPEG (%d)" +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:1 +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:1 +msgid "_Default extension:" +msgstr "_Domyślne rozszerzenie:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:2 +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:1 +msgid "_Quality:" +msgstr "_Jakość:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:3 +msgid "_Smoothing:" +msgstr "W_ygładzanie:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:4 +msgid "Opti_mize" +msgstr "_Optymalizacja" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:5 +msgid "_Progressive" +msgstr "_Przyrostowy" + +#: ../extensions/cairo_io/data/ui/png-options.ui.h:1 +msgid "Compression _level:" +msgstr "Poziom _kompresji:" + +#: ../extensions/cairo_io/data/ui/save-options-preferences.ui.h:1 +msgid "Default options:" +msgstr "Domyślne opcje:" + +#: ../extensions/cairo_io/data/ui/tga-options.ui.h:1 +msgid "_RLE compression" +msgstr "Kompresja _RLE" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:2 +msgid "Compression" +msgstr "Kompresja" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:3 +msgid "_No compression" +msgstr "_Bez kompresji" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:4 +msgid "No_rmal (Deflate)" +msgstr "_Zwykła (deflacja)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:5 +msgid "_Loss compression (JPEG)" +msgstr "Kompresja _stratna (JPEG)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:6 +msgid "Resolution" +msgstr "Rozdzielczość" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:7 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 +msgid "_Horizontal:" +msgstr "_Poziomo:" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:8 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 +msgid "_Vertical:" +msgstr "P_ionowo:" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:9 +msgid "dpi" +msgstr "dpi" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:2 +msgid "_Method:" +msgstr "_Metoda:" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:3 +msgid "_Lossless" +msgstr "_Bezstratna" + +#: ../extensions/cairo_io/gth-image-saver-jpeg.c:516 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:140 +msgid "JPEG" +msgstr "JPEG" + +#: ../extensions/cairo_io/gth-image-saver-png.c:353 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:110 +msgid "PNG" +msgstr "PNG" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:257 +#: ../extensions/cairo_io/gth-image-saver-tiff.c:435 +#: ../gthumb/gth-buffer-data.c:84 +msgid "Insufficient memory" +msgstr "Brak pamięci" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:344 +msgid "TGA" +msgstr "TGA" + +#: ../extensions/cairo_io/gth-image-saver-tiff.c:559 +msgid "TIFF" +msgstr "TIFF" + +#: ../extensions/cairo_io/gth-image-saver-webp.c:382 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:165 +msgid "WebP" +msgstr "WebP" + +#: ../extensions/cairo_io/preferences.c:134 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 +msgid "Saving" +msgstr "Zapisywanie" + #: ../extensions/catalogs/actions.c:92 ../extensions/catalogs/actions.c:213 #: ../extensions/catalogs/dlg-add-to-catalog.c:274 #: ../extensions/catalogs/dlg-add-to-catalog.c:394 @@ -650,7 +763,7 @@ #: ../extensions/catalogs/actions.c:179 #: ../extensions/catalogs/dlg-add-to-catalog.c:360 msgid "Enter the catalog name:" -msgstr "Nazwa katalogu: " +msgstr "Nazwa katalogu:" #: ../extensions/catalogs/actions.c:181 ../extensions/catalogs/actions.c:293 #: ../extensions/catalogs/dlg-add-to-catalog.c:362 @@ -667,7 +780,7 @@ #: ../extensions/catalogs/actions.c:291 #: ../extensions/catalogs/dlg-add-to-catalog.c:472 msgid "Enter the library name:" -msgstr "Nazwa kolekcji: " +msgstr "Nazwa kolekcji:" #: ../extensions/catalogs/actions.c:326 msgid "Could not remove the catalog" @@ -683,15 +796,16 @@ msgstr "_Dodaj do katalogu" #: ../extensions/catalogs/callbacks.c:105 +#: ../extensions/selections/callbacks.c:80 msgid "Open _Folder" msgstr "Otwórz _katalog" #: ../extensions/catalogs/callbacks.c:106 +#: ../extensions/selections/callbacks.c:81 msgid "Go to the folder that contains the selected file" msgstr "Przechodzi do katalogu zawierającego zaznaczony plik" #: ../extensions/catalogs/callbacks.c:110 -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:85 msgid "Other..." msgstr "Inne..." @@ -727,36 +841,36 @@ msgid "Rena_me" msgstr "Z_mień nazwę" -#: ../extensions/catalogs/callbacks.c:279 -#: ../extensions/catalogs/callbacks.c:282 +#: ../extensions/catalogs/callbacks.c:281 +#: ../extensions/catalogs/callbacks.c:284 msgid "Command Line" msgstr "Wiersz poleceń" -#: ../extensions/catalogs/callbacks.c:497 -#: ../extensions/catalogs/callbacks.c:502 +#: ../extensions/catalogs/callbacks.c:496 +#: ../extensions/catalogs/callbacks.c:501 #: ../extensions/photo_importer/dlg-photo-importer.c:364 #: ../extensions/photo_importer/dlg-photo-importer.c:404 -#: ../gthumb/gth-file-list.c:43 ../gthumb/gth-folder-tree.c:883 +#: ../gthumb/gth-file-list.c:43 ../gthumb/gth-folder-tree.c:1093 msgid "(Empty)" msgstr "(Pusty)" -#: ../extensions/catalogs/callbacks.c:697 +#: ../extensions/catalogs/callbacks.c:700 msgid "Catalog Properties" msgstr "Właściwości katalogu" -#: ../extensions/catalogs/callbacks.c:711 +#: ../extensions/catalogs/callbacks.c:714 msgid "Organize" msgstr "Organizuj" -#: ../extensions/catalogs/callbacks.c:712 +#: ../extensions/catalogs/callbacks.c:715 msgid "Automatically organize files by date" msgstr "Automatycznie organizuje pliki według daty" #: ../extensions/catalogs/catalogs.extension.in.in.h:1 #: ../extensions/catalogs/gth-catalog.c:611 #: ../extensions/catalogs/gth-catalog.c:662 -#: ../extensions/catalogs/gth-catalog.c:1024 -#: ../extensions/catalogs/gth-catalog.c:1025 +#: ../extensions/catalogs/gth-catalog.c:1016 +#: ../extensions/catalogs/gth-catalog.c:1017 msgid "Catalogs" msgstr "Katalogi" @@ -782,12 +896,12 @@ #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:5 #: ../extensions/file_manager/actions.c:945 -#: ../extensions/webalbums/gth-web-exporter.c:1842 +#: ../extensions/webalbums/gth-web-exporter.c:1840 msgid "_View the destination" msgstr "_Wyświetl miejsce docelowe" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:1 -#: ../gthumb/gth-file-properties.c:212 +#: ../gthumb/gth-file-properties.c:209 msgid "Properties" msgstr "Właściwości" @@ -836,7 +950,7 @@ msgstr "Podgląd _katalogu:" #: ../extensions/catalogs/data/ui/organize-files.ui.h:1 -#: ../extensions/edit_metadata/gth-edit-general-page.c:550 +#: ../extensions/edit_metadata/gth-edit-general-page.c:558 #: ../gthumb/gth-main-default-tests.c:300 msgid "Date photo was taken" msgstr "Data wykonania zdjęcia" @@ -847,7 +961,7 @@ msgstr "Data modyfikacji pliku" #: ../extensions/catalogs/data/ui/organize-files.ui.h:3 -#: ../extensions/comments/main.c:159 +#: ../extensions/comments/main.c:182 msgid "Tag" msgstr "Etykieta" @@ -906,7 +1020,7 @@ "Pliki zostaną zorganizowane w katalogach. Żaden plik nie zostanie " "przeniesiony na dysku." -#: ../extensions/catalogs/gth-catalog.c:1122 ../extensions/comments/main.c:44 +#: ../extensions/catalogs/gth-catalog.c:1114 ../extensions/comments/main.c:45 #: ../extensions/edit_metadata/callbacks.c:106 #: ../gthumb/gth-main-default-metadata.c:53 msgid "Tags" @@ -943,15 +1057,15 @@ msgid "Copying files to '%s'" msgstr "Kopiowanie plików do \"%s\"" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1388 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1322 msgid "Could not remove the files from the catalog" msgstr "Nie można usunąć plików z katalogu" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1446 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:685 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:694 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:723 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:1228 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1380 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:746 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:755 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:785 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:1320 #: ../extensions/search/gth-search.c:265 msgid "Invalid file format" msgstr "Nieprawidłowy format pliku" @@ -978,70 +1092,66 @@ msgstr "Zmiana daty plików" #: ../extensions/change_date/data/ui/change-date.ui.h:1 +msgid "+" +msgstr "+" + +#: ../extensions/change_date/data/ui/change-date.ui.h:2 +msgid "-" +msgstr "-" + +#: ../extensions/change_date/data/ui/change-date.ui.h:3 msgid "Change Date" msgstr "Zmiana daty" -#: ../extensions/change_date/data/ui/change-date.ui.h:2 +#: ../extensions/change_date/data/ui/change-date.ui.h:4 msgid "Change the following values:" msgstr "Zmienianie następujących wartości:" -#: ../extensions/change_date/data/ui/change-date.ui.h:3 +#: ../extensions/change_date/data/ui/change-date.ui.h:5 msgid "_Last modified date" msgstr "Data _ostatniej modyfikacji" -#: ../extensions/change_date/data/ui/change-date.ui.h:4 +#: ../extensions/change_date/data/ui/change-date.ui.h:6 msgid "Co_mment date" msgstr "Data ko_mentarza" -#: ../extensions/change_date/data/ui/change-date.ui.h:5 -msgid "Exif DateTimeOriginal tag" -msgstr "Znacznik DateTimeOriginal formatu Exif" - -#: ../extensions/change_date/data/ui/change-date.ui.h:6 +#: ../extensions/change_date/data/ui/change-date.ui.h:7 msgid "Change to:" msgstr "Zmiana na:" -#: ../extensions/change_date/data/ui/change-date.ui.h:7 +#: ../extensions/change_date/data/ui/change-date.ui.h:8 msgid "The _following date:" msgstr "_Następująca data:" -#: ../extensions/change_date/data/ui/change-date.ui.h:8 +#: ../extensions/change_date/data/ui/change-date.ui.h:9 msgid "File _modified date" msgstr "Data _modyfikacji pliku" -#: ../extensions/change_date/data/ui/change-date.ui.h:9 +#: ../extensions/change_date/data/ui/change-date.ui.h:10 msgid "File c_reation date" msgstr "_Data utworzenia pliku" -#: ../extensions/change_date/data/ui/change-date.ui.h:10 +#: ../extensions/change_date/data/ui/change-date.ui.h:11 msgid "Date p_hoto was taken" msgstr "Data wykonania _zdjęcia" -#: ../extensions/change_date/data/ui/change-date.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:12 msgid "A_djust by" msgstr "_Dostosowanie według" -#: ../extensions/change_date/data/ui/change-date.ui.h:12 +#: ../extensions/change_date/data/ui/change-date.ui.h:13 msgid "hours" msgstr "godziny" -#: ../extensions/change_date/data/ui/change-date.ui.h:13 +#: ../extensions/change_date/data/ui/change-date.ui.h:14 msgid "minutes" msgstr "minuty" -#: ../extensions/change_date/data/ui/change-date.ui.h:14 +#: ../extensions/change_date/data/ui/change-date.ui.h:15 #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:6 msgid "seconds" msgstr "sekundy" -#: ../extensions/change_date/data/ui/change-date.ui.h:15 -msgid "+" -msgstr "+" - -#: ../extensions/change_date/data/ui/change-date.ui.h:16 -msgid "-" -msgstr "-" - #: ../extensions/comments/callbacks.c:46 msgid "Import Embedded Metadata" msgstr "Zaimportuj osadzone metadane" @@ -1069,16 +1179,16 @@ msgid "_Synchronize with the embedded metadata" msgstr "_Synchronizowanie z osadzonymi metadanymi" -#: ../extensions/comments/main.c:34 +#: ../extensions/comments/main.c:35 #: ../extensions/edit_metadata/callbacks.c:100 msgid "Comment" msgstr "Komentarz" -#: ../extensions/comments/main.c:40 ../gthumb/gth-main-default-metadata.c:46 +#: ../extensions/comments/main.c:41 ../gthumb/gth-main-default-metadata.c:46 msgid "Title" msgstr "Tytuł" -#: ../extensions/comments/main.c:41 ../extensions/comments/main.c:143 +#: ../extensions/comments/main.c:42 ../extensions/comments/main.c:166 #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 #: ../extensions/image_print/data/ui/print-layout.ui.h:8 @@ -1090,16 +1200,16 @@ msgid "Description" msgstr "Opis" -#: ../extensions/comments/main.c:42 ../extensions/comments/main.c:151 +#: ../extensions/comments/main.c:43 ../extensions/comments/main.c:174 #: ../gthumb/gth-main-default-metadata.c:50 msgid "Place" msgstr "Miejsce" -#: ../extensions/comments/main.c:43 ../gthumb/gth-main-default-metadata.c:51 +#: ../extensions/comments/main.c:44 ../gthumb/gth-main-default-metadata.c:51 msgid "Date" msgstr "Data" -#: ../extensions/comments/main.c:45 ../gthumb/gth-main-default-metadata.c:54 +#: ../extensions/comments/main.c:46 ../gthumb/gth-main-default-metadata.c:54 msgid "Rating" msgstr "Ocena" @@ -1133,10 +1243,10 @@ msgstr "Tworzenie obrazu indeksu zawierającego miniatury zaznaczonych plików." #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:1 -#: ../extensions/file_tools/gth-file-tool-crop.c:424 -#: ../extensions/file_tools/gth-file-tool-crop.c:454 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 -#: ../extensions/file_tools/gth-file-tool-rotate.c:415 +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:446 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 +#: ../extensions/file_tools/gth-file-tool-rotate.c:397 #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:14 #: ../extensions/slideshow/main.c:277 msgid "None" @@ -1178,16 +1288,6 @@ msgid "_Gradient" msgstr "_Gradient" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 -msgid "_Horizontal:" -msgstr "_Poziomo:" - -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 -msgid "_Vertical:" -msgstr "P_ionowo:" - #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:14 msgid "Select a color" msgstr "Wybór koloru" @@ -1275,6 +1375,7 @@ #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:6 #: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 #: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 @@ -1306,13 +1407,6 @@ msgid "Create _HTML image map" msgstr "Utwórz mapę _HTML obrazu" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 -#: ../extensions/pixbuf_savers/preferences.c:134 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 -msgid "Saving" -msgstr "Zapisywanie" - #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 msgid "Create a new theme" msgstr "Utwórz nowy motyw" @@ -1389,21 +1483,21 @@ msgid "Image Wall" msgstr "Ściana obrazu" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:486 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:498 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:512 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:481 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:492 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:506 msgid "Could not save the theme" msgstr "Nie można zapisać motywu" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:657 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:651 msgid "Could not delete the theme" msgstr "Nie można usunąć motywu" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:248 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:247 msgid "Creating images" msgstr "Tworzenie obrazów" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:897 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:896 msgid "Generating thumbnails" msgstr "Tworzenie miniatur" @@ -1461,16 +1555,16 @@ msgid "_Use the original image folder" msgstr "_Użycie katalogu pierwotnego obrazu" -#: ../extensions/convert_format/dlg-convert-format.c:93 +#: ../extensions/convert_format/dlg-convert-format.c:95 msgid "Converting images" msgstr "Konwertowanie obrazów" -#: ../extensions/desktop_background/actions.c:162 +#: ../extensions/desktop_background/actions.c:158 msgid "Could not show the desktop background properties" msgstr "Nie można wyświetlić właściwości tła pulpitu" -#: ../extensions/desktop_background/actions.c:228 -#: ../extensions/desktop_background/actions.c:246 +#: ../extensions/desktop_background/actions.c:224 +#: ../extensions/desktop_background/actions.c:242 msgid "Could not set the desktop background" msgstr "Nie można ustawić tła pulpitu" @@ -1565,7 +1659,8 @@ #: ../extensions/edit_metadata/gth-edit-comment-dialog.c:66 #: ../extensions/edit_metadata/gth-edit-tags-dialog.c:83 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:335 +#: ../extensions/facebook/dlg-import-from-facebook.c:319 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:324 #, c-format msgid "%d file" msgid_plural "%d files" @@ -1574,7 +1669,7 @@ msgstr[2] "%d plików" #: ../extensions/edit_metadata/gth-edit-comment-dialog.c:144 -#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:192 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:197 msgid "Sa_ve and Close" msgstr "_Zapisz i zamknij" @@ -1582,28 +1677,28 @@ msgid "Save only cha_nged fields" msgstr "Zapisywanie tylko zmie_nionych pól" -#: ../extensions/edit_metadata/gth-edit-general-page.c:547 +#: ../extensions/edit_metadata/gth-edit-general-page.c:555 msgid "No date" msgstr "Brak daty" -#: ../extensions/edit_metadata/gth-edit-general-page.c:548 +#: ../extensions/edit_metadata/gth-edit-general-page.c:556 msgid "The following date" msgstr "Następująca data" -#: ../extensions/edit_metadata/gth-edit-general-page.c:549 +#: ../extensions/edit_metadata/gth-edit-general-page.c:557 #: ../extensions/importer/gth-import-preferences-dialog.c:331 msgid "Current date" msgstr "Bieżąca data" -#: ../extensions/edit_metadata/gth-edit-general-page.c:551 +#: ../extensions/edit_metadata/gth-edit-general-page.c:559 msgid "Last modified date" msgstr "Data ostatniej modyfikacji" -#: ../extensions/edit_metadata/gth-edit-general-page.c:552 +#: ../extensions/edit_metadata/gth-edit-general-page.c:560 msgid "File creation date" msgstr "Data utworzenia pliku" -#: ../extensions/edit_metadata/gth-edit-general-page.c:553 +#: ../extensions/edit_metadata/gth-edit-general-page.c:561 msgid "Do not modify" msgstr "Bez modyfikacji" @@ -1613,20 +1708,20 @@ msgid "%s Tags" msgstr "Etykiety pliku %s" -#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:184 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:189 msgid "Assign Tags" msgstr "Przydzielenie etykiet" -#: ../extensions/edit_metadata/gth-tag-task.c:115 -#: ../extensions/edit_metadata/gth-tag-task.c:132 +#: ../extensions/edit_metadata/gth-tag-task.c:119 +#: ../extensions/edit_metadata/gth-tag-task.c:136 msgid "Assigning tags to the selected files" msgstr "Przydzielanie etykiet do zaznaczonych plików" -#: ../extensions/edit_metadata/gth-tag-task.c:115 +#: ../extensions/edit_metadata/gth-tag-task.c:119 msgid "Writing files" msgstr "Zapisywanie plików" -#: ../extensions/edit_metadata/gth-tag-task.c:132 +#: ../extensions/edit_metadata/gth-tag-task.c:136 msgid "Reading files" msgstr "Odczytywanie plików" @@ -1739,7 +1834,7 @@ msgid "XMP Attached" msgstr "Dołączone XMP" -#: ../extensions/exiv2_tools/main.c:256 +#: ../extensions/exiv2_tools/main.c:272 msgid "date photo was taken" msgstr "data wykonania zdjęcia" @@ -1747,47 +1842,52 @@ msgid "Share" msgstr "Współdziel" -#: ../extensions/facebook/callbacks.c:54 +#: ../extensions/facebook/callbacks.c:59 ../extensions/facebook/callbacks.c:64 msgid "Face_book..." msgstr "Face_book..." -#: ../extensions/facebook/callbacks.c:55 +#: ../extensions/facebook/callbacks.c:60 +msgid "Download photos from Facebook" +msgstr "Pobieranie zdjęć z serwisu Facebook" + +#: ../extensions/facebook/callbacks.c:65 msgid "Upload photos to Facebook" -msgstr "Wysyła zdjęcia do serwisu Facebook" +msgstr "Wysyłanie zdjęć do serwisu Facebook" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:1 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 msgid "Export to Flickr" msgstr "Wyeksportuj do serwisu Flickr" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:2 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 #: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 msgid "_Upload" msgstr "_Wyślij" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:3 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 msgid "_Account:" msgstr "_Konto:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:4 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:3 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 #: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 #: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 msgid "Edit accounts" msgstr "Modyfikuj konta" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 msgid "A_lbum:" msgstr "A_lbum:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 msgid "Add a new album" msgstr "Dodaj nowy album" @@ -1796,9 +1896,12 @@ msgstr "Zmiana rozmiaru obrazów, jeśli jest większy niż dany rozmiar" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:8 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 -msgid "_Resize to:" -msgstr "Zmiana _rozmiaru na:" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 +msgid "_Resize if larger than:" +msgstr "_Zmienianie rozmiaru, jeśli większe od:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:9 msgid "720 x 720" @@ -1820,30 +1923,13 @@ msgid "2048 x 2048" msgstr "2048 x 2048" -#: ../extensions/facebook/data/ui/facebook-account-chooser.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-account-chooser.ui.h:1 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 -#: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 -#: ../extensions/picasaweb/data/ui/picasa-web-account-chooser.ui.h:1 -msgid "A_ccount:" -msgstr "_Konto:" - -#: ../extensions/facebook/data/ui/facebook-account-manager.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-account-manager.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-account-manager.ui.h:1 -#: ../extensions/picasaweb/data/ui/picasa-web-account-manager.ui.h:1 -msgid "A_ccounts:" -msgstr "_Konta:" - #: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 msgid "Public photos" msgstr "Zdjęcia publiczne" #: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 msgid "Private photos, visible to friends" msgstr "Prywatne zdjęcia, widoczne dla przyjaciół" @@ -1857,25 +1943,6 @@ msgid "_Visibility:" msgstr "_Widoczność:" -#: ../extensions/facebook/data/ui/facebook-ask-authorization.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-ask-authorization.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-ask-authorization.ui.h:1 -msgid "_Authorize..." -msgstr "_Upoważnij..." - -#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:1 -#: ../extensions/facebook/facebook-authentication.c:472 -#: ../extensions/flicker_utils/flickr-authentication.c:408 -#: ../extensions/oauth/oauth-authentication.c:423 -msgid "Once you're done, click the 'Continue' button below." -msgstr "Po ukończeniu należy kliknąć przycisk \"Kontynuuj\" poniżej." - -#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 -#: ../extensions/flicker_utils/data/ui/flicker-complete-authorization.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-complete-authorization.ui.h:1 -msgid "C_ontinue" -msgstr "K_ontynuuj" - #: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:1 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:1 @@ -1887,70 +1954,92 @@ #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:2 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:2 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:2 -#: ../extensions/webalbums/gth-web-exporter.c:1841 +#: ../extensions/webalbums/gth-web-exporter.c:1839 msgid "_Open in the Browser" msgstr "_Otwórz w przeglądarce" -#: ../extensions/facebook/dlg-export-to-facebook.c:130 -#: ../extensions/facebook/dlg-export-to-facebook.c:335 -#: ../extensions/facebook/facebook-authentication.c:192 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 +msgid "Import from Picasa Web Album" +msgstr "Zaimportuj z serwisu Picasa Web Album" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:2 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 +msgid "_Import" +msgstr "Za_importuj" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:4 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 +#: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 +msgid "A_ccount:" +msgstr "_Konto:" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:5 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 +msgid "_Album:" +msgstr "_Album:" + +#: ../extensions/facebook/dlg-export-to-facebook.c:123 +#: ../extensions/facebook/dlg-export-to-facebook.c:326 +#: ../extensions/facebook/dlg-import-from-facebook.c:226 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:138 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:399 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:237 -#: ../extensions/flicker_utils/flickr-authentication.c:191 -#: ../extensions/oauth/oauth-authentication.c:187 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:414 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:231 +#: ../extensions/oauth/web-service.c:380 #: ../extensions/photobucket/dlg-export-to-photobucket.c:131 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:376 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:139 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:424 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:380 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:375 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:124 msgid "Could not connect to the server" msgstr "Nie można połączyć się z serwerem" -#: ../extensions/facebook/dlg-export-to-facebook.c:182 +#: ../extensions/facebook/dlg-export-to-facebook.c:175 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:246 #: ../extensions/photobucket/dlg-export-to-photobucket.c:182 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:192 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:176 msgid "Could not upload the files" msgstr "Nie można wysłać plików" -#: ../extensions/facebook/dlg-export-to-facebook.c:412 +#: ../extensions/facebook/dlg-export-to-facebook.c:397 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:188 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:223 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:462 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:717 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:457 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:309 msgid "Could not create the album" msgstr "Nie można utworzyć albumu" -#: ../extensions/facebook/dlg-export-to-facebook.c:481 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:534 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:783 +#: ../extensions/facebook/dlg-export-to-facebook.c:465 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:528 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:375 msgid "New Album" msgstr "Nowy album" -#: ../extensions/facebook/dlg-export-to-facebook.c:561 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:557 -#: ../extensions/image_print/gth-image-print-job.c:1789 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:614 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1002 +#: ../extensions/facebook/dlg-export-to-facebook.c:557 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:583 +#: ../extensions/image_print/gth-image-print-job.c:1739 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:607 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:597 msgid "No valid file selected." msgstr "Nie wybrano prawidłowych plików." -#: ../extensions/facebook/dlg-export-to-facebook.c:562 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:558 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:615 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1003 +#: ../extensions/facebook/dlg-export-to-facebook.c:558 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:584 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:608 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:598 msgid "Could not export the files" msgstr "Nie można wyeksportować plików" -#: ../extensions/facebook/dlg-export-to-facebook.c:570 -#: ../extensions/find_duplicates/gth-find-duplicates.c:255 -#: ../extensions/find_duplicates/gth-find-duplicates.c:347 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:566 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:623 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1010 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:803 -#: ../gthumb/gth-browser.c:1005 +#: ../extensions/facebook/dlg-export-to-facebook.c:566 +#: ../extensions/find_duplicates/gth-find-duplicates.c:277 +#: ../extensions/find_duplicates/gth-find-duplicates.c:470 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:592 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:616 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:605 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:254 +#: ../gthumb/gth-browser.c:1116 #, c-format msgid "%d file (%s)" msgid_plural "%d files (%s)" @@ -1958,100 +2047,35 @@ msgstr[1] "%d pliki (%s)" msgstr[2] "%d plików (%s)" -#: ../extensions/facebook/dlg-export-to-facebook.c:591 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:589 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:642 +#: ../extensions/facebook/dlg-export-to-facebook.c:587 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:615 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:635 #, c-format msgid "Export to %s" msgstr "Eksport do serwisu %s" -#: ../extensions/facebook/facebook-account-chooser-dialog.c:200 -#: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:200 -#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 -msgid "New authentication..." -msgstr "Nowe dane uwierzytelniające..." - -#: ../extensions/facebook/facebook-authentication.c:194 -#: ../extensions/flicker_utils/flickr-authentication.c:193 -#: ../extensions/oauth/oauth-authentication.c:189 -msgid "Choose _Account..." -msgstr "Wybierz _konto..." - -#: ../extensions/facebook/facebook-authentication.c:471 -#: ../extensions/flicker_utils/flickr-authentication.c:407 -#: ../extensions/oauth/oauth-authentication.c:422 -#, c-format -msgid "" -"Return to this window when you have finished the authorization process on %s" -msgstr "" -"Należy wrócić do tego okna po ukończeniu procesu upoważnienia w serwisie %s" +#: ../extensions/facebook/dlg-import-from-facebook.c:344 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:349 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:279 +msgid "Could not get the photo list" +msgstr "Nie można pobrać listy zdjęć" -#: ../extensions/facebook/facebook-authentication.c:556 -#: ../extensions/flicker_utils/flickr-authentication.c:487 -#: ../extensions/oauth/oauth-authentication.c:502 -#, c-format -msgid "gthumb requires your authorization to upload the photos to %s" -msgstr "Program gthumb wymaga upoważnienia, aby wysłać zdjęcia do serwisu %s" +#: ../extensions/facebook/dlg-import-from-facebook.c:378 +#: ../extensions/facebook/dlg-import-from-facebook.c:533 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:386 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:551 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:313 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:586 +msgid "No album selected" +msgstr "Nie wybrano albumu" -#: ../extensions/facebook/facebook-authentication.c:557 -#: ../extensions/flicker_utils/flickr-authentication.c:488 -#: ../extensions/oauth/oauth-authentication.c:503 +#: ../extensions/facebook/dlg-import-from-facebook.c:551 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:569 #, c-format -msgid "" -"Click 'Authorize' to open your web browser and authorize gthumb to upload " -"photos to %s. When you're finished, return to this window to complete the " -"authorization." -msgstr "" -"Należy kliknąć przycisk \"Upoważnij\", aby otworzyć przeglądarkę WWW i " -"upoważnić program gthumb do wysyłania zdjęć do serwisu %s. Po ukończeniu " -"należy wrócić do tego okna, aby zakończyć upoważnienie." - -#: ../extensions/facebook/facebook-authentication.c:652 -#: ../extensions/flicker_utils/flickr-authentication.c:588 -#: ../extensions/oauth/oauth-authentication.c:605 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:820 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:684 -msgid "Choose Account" -msgstr "Wybierz konto" - -#: ../extensions/facebook/facebook-authentication.c:761 -#: ../extensions/flicker_utils/flickr-authentication.c:697 -#: ../extensions/oauth/oauth-authentication.c:714 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:881 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:745 -msgid "Edit Accounts" -msgstr "Modyfikuj konta" - -#: ../extensions/facebook/facebook-connection.c:275 -#: ../extensions/facebook/facebook-connection.c:435 -#: ../extensions/facebook/facebook-service.c:162 -#: ../extensions/facebook/facebook-service.c:265 -#: ../extensions/facebook/facebook-service.c:468 -#: ../extensions/flicker_utils/flickr-connection.c:266 -#: ../extensions/flicker_utils/flickr-connection.c:413 -#: ../extensions/flicker_utils/flickr-service.c:195 -#: ../extensions/flicker_utils/flickr-service.c:398 -#: ../extensions/photobucket/photobucket-consumer.c:74 -#: ../extensions/photobucket/photobucket-consumer.c:79 -#: ../extensions/photobucket/photobucket-consumer.c:115 -#: ../extensions/photobucket/photobucket-consumer.c:170 -msgid "Unknown error" -msgstr "Nieznany błąd" - -#: ../extensions/facebook/facebook-connection.c:310 -#: ../extensions/facebook/facebook-connection.c:461 -#: ../extensions/facebook/facebook-service.c:188 -#: ../extensions/facebook/facebook-service.c:290 -#: ../extensions/flicker_utils/flickr-connection.c:292 -#: ../extensions/flicker_utils/flickr-connection.c:439 -#: ../extensions/flicker_utils/flickr-service.c:219 -#: ../extensions/oauth/oauth-connection.c:356 -#: ../extensions/oauth/oauth-connection.c:431 -#: ../extensions/oauth/oauth-connection.c:535 -#: ../extensions/picasaweb/google-connection.c:344 -msgid "Connecting to the server" -msgstr "Łączenie z serwerem" +msgid "Import from %s" +msgstr "Import zdjęć z serwisu %s" +#: ../extensions/facebook/dlg-import-from-facebook.c:551 #: ../extensions/facebook/facebook.extension.in.in.h:1 msgid "Facebook" msgstr "Facebook" @@ -2060,58 +2084,49 @@ msgid "Upload images to Facebook" msgstr "Wysyłanie obrazów do serwisu Facebook" -#: ../extensions/facebook/facebook-service.c:188 -#: ../extensions/facebook/facebook-service.c:290 -#: ../extensions/flicker_utils/flickr-service.c:219 -#: ../extensions/oauth/oauth-connection.c:356 -#: ../extensions/oauth/oauth-connection.c:431 -#: ../extensions/oauth/oauth-connection.c:535 -msgid "Getting account information" -msgstr "Pobieranie informacji o koncie" - -#: ../extensions/facebook/facebook-service.c:396 -#: ../extensions/flicker_utils/flickr-service.c:323 -#: ../extensions/photobucket/photobucket-service.c:207 -#: ../extensions/picasaweb/picasa-web-service.c:209 +#: ../extensions/facebook/facebook-service.c:462 +#: ../extensions/flicker_utils/flickr-service.c:863 +#: ../extensions/photobucket/photobucket-service.c:310 +#: ../extensions/picasaweb/picasa-web-service.c:711 msgid "Getting the album list" msgstr "Pobieranie listy albumów" -#: ../extensions/facebook/facebook-service.c:525 -#: ../extensions/flicker_utils/flickr-service.c:426 -#: ../extensions/flicker_utils/flickr-service.c:546 -#: ../extensions/flicker_utils/flickr-service.c:584 -#: ../extensions/photobucket/photobucket-service.c:316 -#: ../extensions/picasaweb/picasa-web-service.c:300 +#: ../extensions/facebook/facebook-service.c:584 +#: ../extensions/flicker_utils/flickr-service.c:965 +#: ../extensions/flicker_utils/flickr-service.c:1087 +#: ../extensions/flicker_utils/flickr-service.c:1126 +#: ../extensions/photobucket/photobucket-service.c:423 +#: ../extensions/picasaweb/picasa-web-service.c:805 msgid "Creating the new album" msgstr "Tworzenie nowego albumu" -#: ../extensions/facebook/facebook-service.c:584 -#: ../extensions/flicker_utils/flickr-service.c:634 -#: ../extensions/photobucket/photobucket-service.c:373 -#: ../extensions/picasaweb/picasa-web-service.c:357 +#: ../extensions/facebook/facebook-service.c:645 +#: ../extensions/flicker_utils/flickr-service.c:1176 +#: ../extensions/photobucket/photobucket-service.c:485 +#: ../extensions/picasaweb/picasa-web-service.c:860 #, c-format msgid "Could not upload '%s': %s" msgstr "Nie można wysłać \"%s\": %s" #. Translators: %s is a filename -#: ../extensions/facebook/facebook-service.c:670 -#: ../extensions/flicker_utils/flickr-service.c:745 -#: ../extensions/photobucket/photobucket-service.c:430 -#: ../extensions/picasaweb/picasa-web-service.c:412 +#: ../extensions/facebook/facebook-service.c:710 +#: ../extensions/flicker_utils/flickr-service.c:1287 +#: ../extensions/photobucket/photobucket-service.c:542 +#: ../extensions/picasaweb/picasa-web-service.c:917 #, c-format msgid "Uploading '%s'" msgstr "Wysyłanie \"%s\"" -#: ../extensions/facebook/facebook-service.c:886 -#: ../extensions/flicker_utils/flickr-service.c:914 -#: ../extensions/photobucket/photobucket-service.c:599 -#: ../extensions/picasaweb/picasa-web-service.c:605 +#: ../extensions/facebook/facebook-service.c:923 +#: ../extensions/flicker_utils/flickr-service.c:1482 +#: ../extensions/photobucket/photobucket-service.c:714 +#: ../extensions/picasaweb/picasa-web-service.c:1138 msgid "Uploading the files to the server" msgstr "Wysyłanie plików na serwer" -#: ../extensions/facebook/facebook-service.c:1003 -#: ../extensions/flicker_utils/flickr-service.c:1077 -#: ../extensions/picasaweb/picasa-web-service.c:718 +#: ../extensions/facebook/facebook-service.c:1022 +#: ../extensions/flicker_utils/flickr-service.c:1651 +#: ../extensions/picasaweb/picasa-web-service.c:1257 msgid "Getting the photo list" msgstr "Pobieranie listy zdjęć" @@ -2121,17 +2136,17 @@ #: ../extensions/file_manager/actions.c:134 msgid "Enter the folder name:" -msgstr "Nazwę katalogu: " +msgstr "Nazwę katalogu:" #: ../extensions/file_manager/actions.c:400 #: ../extensions/file_manager/callbacks.c:380 -#: ../extensions/file_manager/callbacks.c:842 +#: ../extensions/file_manager/callbacks.c:838 msgid "Could not move the files" msgstr "Nie można przenieść plików" #: ../extensions/file_manager/actions.c:401 #: ../extensions/file_manager/callbacks.c:381 -#: ../extensions/file_manager/callbacks.c:843 +#: ../extensions/file_manager/callbacks.c:839 msgid "" "Files cannot be moved to the current location, as alternative you can choose " "to copy them." @@ -2220,6 +2235,7 @@ #: ../extensions/file_manager/callbacks.c:187 #: ../extensions/file_manager/callbacks.c:223 #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:5 +#: ../gthumb/gth-tags-entry.c:871 msgid "_Delete" msgstr "_Usuń" @@ -2271,9 +2287,10 @@ msgid "Move the selected files to another folder" msgstr "Przenosi zaznaczone pliki do innego katalogu" -#: ../extensions/file_manager/callbacks.c:1003 -#: ../extensions/find_duplicates/gth-find-duplicates.c:581 -#: ../gthumb/gth-browser.c:4939 ../gthumb/gth-browser.c:4973 +#: ../extensions/file_manager/callbacks.c:999 +#: ../extensions/find_duplicates/gth-find-duplicates.c:766 +#: ../gthumb/gth-browser.c:5234 ../gthumb/gth-browser.c:5268 +#: ../gthumb/gth-progress-dialog.c:406 msgid "Could not perform the operation" msgstr "Nie można wykonać działania" @@ -2290,6 +2307,7 @@ msgstr "Usuwanie plików" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:1 +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:5 msgid "_Preview" msgstr "_Podgląd" @@ -2311,11 +2329,11 @@ #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:6 msgid "Cyan-_Red:" -msgstr "_Cyjan-czerwony" +msgstr "_Cyjan-czerwony:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:7 msgid "_Magenta-Green:" -msgstr "_Magenta-zielony" +msgstr "_Magenta-zielony:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:8 msgid "_Yellow-Blue:" @@ -2331,81 +2349,96 @@ msgstr "P_rzywróć" #: ../extensions/file_tools/data/ui/crop-options.ui.h:1 -msgid "_Position:" -msgstr "_Położenie:" +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +msgid "Selection" +msgstr "Wybór" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 +msgid "_Width:" +msgstr "_Szerokość:" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:3 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 +msgid "Heigh_t:" +msgstr "_Wysokość:" -#. this is used to separate the dimensions, for example: 120 × 250 #: ../extensions/file_tools/data/ui/crop-options.ui.h:4 -msgid "×" -msgstr "×" +msgid "_Position:" +msgstr "_Położenie:" #: ../extensions/file_tools/data/ui/crop-options.ui.h:5 -msgid "_Grid:" -msgstr "_Siatka:" - -#: ../extensions/file_tools/data/ui/crop-options.ui.h:6 msgid "Maximize" msgstr "Zmaksymalizuj" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:6 msgid "Center" msgstr "Wyśrodkuj" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 -msgid "Selection" -msgstr "Wybór" - -#: ../extensions/file_tools/data/ui/crop-options.ui.h:9 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 #: ../extensions/file_tools/data/ui/resize-options.ui.h:5 +msgid "Aspect ratio" +msgstr "Współczynnik proporcji" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 msgid "I_nvert aspect ratio" msgstr "Odwróć proporcje obra_zu" #. after the colon there is a control to select the size in pixels -#: ../extensions/file_tools/data/ui/crop-options.ui.h:11 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:10 msgid "M_ultiple of:" msgstr "_Wielokrotność liczby:" #. abbreviation of pixel -#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:12 msgid "px" msgstr "pks" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 +#: ../gthumb/gth-file-chooser-dialog.c:252 +msgid "Options" +msgstr "Opcje" + #: ../extensions/file_tools/data/ui/crop-options.ui.h:14 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 -msgid "Aspect ratio" -msgstr "Współczynnik proporcji" +msgid "_Grid:" +msgstr "_Siatka:" #: ../extensions/file_tools/data/ui/crop-options.ui.h:15 msgid "C_rop" msgstr "_Przytnij" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 -msgid "_Width:" -msgstr "_Szerokość:" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 -msgid "Heigh_t:" -msgstr "_Wysokość:" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 -msgid "Set the image size to this value" -msgstr "Ustawienie rozmiaru obrazu na tę wartość" +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:1 +msgid "Method" +msgstr "Metoda" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:2 +msgid "_Brightness" +msgstr "_Jasność" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:3 +msgid "_Saturation" +msgstr "_Nasycenie" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:4 +msgid "_Average" +msgstr "Śre_dnia" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 #: ../gthumb/gth-main-default-metadata.c:47 msgid "Dimensions" msgstr "Wymiary" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 -msgid "High _quality" -msgstr "Wy_soka jakość" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +msgid "Set the image size to this value" +msgstr "Ustawienie rozmiaru obrazu na tę wartość" #: ../extensions/file_tools/data/ui/resize-options.ui.h:8 -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 -msgid "Options" -msgstr "Opcje" +msgid "High _quality" +msgstr "Wy_soka jakość" #: ../extensions/file_tools/data/ui/resize-options.ui.h:9 msgid "Original dimensions:" @@ -2431,45 +2464,45 @@ msgstr "%" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:1 -msgid "Align" -msgstr "Wyrównaj" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 msgid "Angle" msgstr "Kąt" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 +msgid "Align" +msgstr "Wyrównaj" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 +msgid "Image size" +msgstr "Rozmiar obrazu" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 msgid "Point 1:" msgstr "Punkt 1:" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 msgid "Point 2:" msgstr "Punkt 2:" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 msgid "Keep aspect ratio" msgstr "Utrzymanie współczynnika skalowania" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 -msgid "Image size" -msgstr "Rozmiar obrazu" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 msgid "Grid:" msgstr "Siatka:" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 +msgid "_Background:" +msgstr "_Tło:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 msgid "Pick a background color" msgstr "Proszę wybrać kolor tła" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 msgid "_Transparent" msgstr "_Przezroczyste" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 -msgid "_Background:" -msgstr "_Tło:" - #: ../extensions/file_tools/data/ui/rotate-options.ui.h:12 msgid "Reset" msgstr "Przywróć" @@ -2531,140 +2564,134 @@ msgid "Basic tools to modify images." msgstr "Podstawowe narzędzia do modyfikowania obrazów." -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:372 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:272 +#: ../extensions/file_tools/gth-file-tool-grayscale.c:248 +#: ../extensions/file_tools/gth-file-tool-negative.c:68 +msgid "Applying changes" +msgstr "Zastosowywanie zmian" + +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 msgid "Adjust Colors..." msgstr "Dostosuj kolory..." -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 msgid "Adjust Colors" msgstr "Dostosowanie kolorów" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:531 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:619 msgid "Change brightness, contrast, saturation and gamma level of the image" msgstr "Zmiana jasności, kontrastu, nasycenia i poziomu gamma obrazu" -#: ../extensions/file_tools/gth-file-tool-crop.c:424 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:304 +msgid "Adjust Contrast" +msgstr "Dostosowanie kontrastu" + +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:305 +msgid "Automatic contrast adjustment" +msgstr "Automatyczne dostosowanie kontrastu" + +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 msgid "Square" msgstr "Kwadrat" -#: ../extensions/file_tools/gth-file-tool-crop.c:425 -#: ../extensions/file_tools/gth-file-tool-resize.c:499 +#: ../extensions/file_tools/gth-file-tool-crop.c:417 +#: ../extensions/file_tools/gth-file-tool-resize.c:590 #, c-format msgid "%d x %d (Image)" msgstr "%d x %d (obraz)" -#: ../extensions/file_tools/gth-file-tool-crop.c:428 -#: ../extensions/file_tools/gth-file-tool-resize.c:503 +#: ../extensions/file_tools/gth-file-tool-crop.c:420 +#: ../extensions/file_tools/gth-file-tool-resize.c:594 #, c-format msgid "%d x %d (Screen)" msgstr "%d x %d (ekran)" -#: ../extensions/file_tools/gth-file-tool-crop.c:432 -#: ../extensions/file_tools/gth-file-tool-resize.c:508 +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-resize.c:599 msgid "5:4" msgstr "5:4" -#: ../extensions/file_tools/gth-file-tool-crop.c:433 -#: ../extensions/file_tools/gth-file-tool-resize.c:509 +#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-resize.c:600 msgid "4:3 (DVD, Book)" msgstr "4:3 (DVD, książka)" -#: ../extensions/file_tools/gth-file-tool-crop.c:434 -#: ../extensions/file_tools/gth-file-tool-resize.c:510 +#: ../extensions/file_tools/gth-file-tool-crop.c:426 +#: ../extensions/file_tools/gth-file-tool-resize.c:601 msgid "7:5" msgstr "7:5" -#: ../extensions/file_tools/gth-file-tool-crop.c:435 -#: ../extensions/file_tools/gth-file-tool-resize.c:511 +#: ../extensions/file_tools/gth-file-tool-crop.c:427 +#: ../extensions/file_tools/gth-file-tool-resize.c:602 msgid "3:2 (Postcard)" msgstr "3:2 (pocztówka)" -#: ../extensions/file_tools/gth-file-tool-crop.c:436 -#: ../extensions/file_tools/gth-file-tool-resize.c:512 +#: ../extensions/file_tools/gth-file-tool-crop.c:428 +#: ../extensions/file_tools/gth-file-tool-resize.c:603 msgid "16:10" msgstr "16:10" -#: ../extensions/file_tools/gth-file-tool-crop.c:437 -#: ../extensions/file_tools/gth-file-tool-resize.c:513 +#: ../extensions/file_tools/gth-file-tool-crop.c:429 +#: ../extensions/file_tools/gth-file-tool-resize.c:604 msgid "16:9 (DVD)" msgstr "16:9 (DVD)" -#: ../extensions/file_tools/gth-file-tool-crop.c:438 -#: ../extensions/file_tools/gth-file-tool-resize.c:514 +#: ../extensions/file_tools/gth-file-tool-crop.c:430 +#: ../extensions/file_tools/gth-file-tool-resize.c:605 msgid "1.85:1" msgstr "1.85:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:439 -#: ../extensions/file_tools/gth-file-tool-resize.c:515 +#: ../extensions/file_tools/gth-file-tool-crop.c:431 +#: ../extensions/file_tools/gth-file-tool-resize.c:606 msgid "2.39:1" msgstr "2.39:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:440 -#: ../extensions/file_tools/gth-file-tool-resize.c:516 +#: ../extensions/file_tools/gth-file-tool-crop.c:432 +#: ../extensions/file_tools/gth-file-tool-resize.c:607 #: ../extensions/image_print/data/ui/print-layout.ui.h:2 #: ../extensions/rename_series/gth-template-selector.c:234 msgid "Custom" msgstr "Własny" -#: ../extensions/file_tools/gth-file-tool-crop.c:455 -#: ../extensions/file_tools/gth-file-tool-rotate.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:447 +#: ../extensions/file_tools/gth-file-tool-rotate.c:398 msgid "Rule of Thirds" msgstr "Reguła trzech" -#: ../extensions/file_tools/gth-file-tool-crop.c:456 -#: ../extensions/file_tools/gth-file-tool-rotate.c:417 +#: ../extensions/file_tools/gth-file-tool-crop.c:448 +#: ../extensions/file_tools/gth-file-tool-rotate.c:399 msgid "Golden Sections" msgstr "Złoty podział" -#: ../extensions/file_tools/gth-file-tool-crop.c:457 -#: ../extensions/file_tools/gth-file-tool-rotate.c:418 +#: ../extensions/file_tools/gth-file-tool-crop.c:449 +#: ../extensions/file_tools/gth-file-tool-rotate.c:400 msgid "Center Lines" msgstr "Linie wyśrodkowane" -#: ../extensions/file_tools/gth-file-tool-crop.c:458 -#: ../extensions/file_tools/gth-file-tool-rotate.c:419 +#: ../extensions/file_tools/gth-file-tool-crop.c:450 +#: ../extensions/file_tools/gth-file-tool-rotate.c:401 msgid "Uniform" msgstr "Jednolite" -#: ../extensions/file_tools/gth-file-tool-crop.c:614 +#: ../extensions/file_tools/gth-file-tool-crop.c:608 msgid "Crop..." msgstr "Przytnij..." -#: ../extensions/file_tools/gth-file-tool-crop.c:614 +#: ../extensions/file_tools/gth-file-tool-crop.c:608 msgid "Crop" msgstr "Przycięcie" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:68 -#: ../extensions/file_tools/gth-file-tool-negative.c:68 -msgid "Applying changes" -msgstr "Zastosowywanie zmian" - -#: ../extensions/file_tools/gth-file-tool-desaturate.c:203 -msgid "Desaturate" -msgstr "Desaturacja" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:119 -msgid "White balance correction" -msgstr "Korekcja balansu bieli" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:342 -msgid "Enhance Colors" -msgstr "Ulepszenie kolorów" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:343 -msgid "Automatic white balance correction" -msgstr "Automatyczna korekcja balansu bieli" - -#: ../extensions/file_tools/gth-file-tool-equalize.c:86 +#: ../extensions/file_tools/gth-file-tool-equalize.c:45 msgid "Equalizing image histogram" msgstr "Wyrównywanie histogramu obrazu" -#: ../extensions/file_tools/gth-file-tool-equalize.c:275 +#: ../extensions/file_tools/gth-file-tool-equalize.c:230 msgid "Equalize" msgstr "Wyrównaj histogram" -#: ../extensions/file_tools/gth-file-tool-equalize.c:276 +#: ../extensions/file_tools/gth-file-tool-equalize.c:231 msgid "Equalize image histogram" msgstr "Wyrównaj histogram obrazu" @@ -2676,6 +2703,14 @@ msgid "Flip the image vertically" msgstr "Obraca obraz pionowo" +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale..." +msgstr "Skala szarości..." + +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale" +msgstr "Skala szarości" + #: ../extensions/file_tools/gth-file-tool-mirror.c:87 msgid "Mirror" msgstr "Odbij w poziomie" @@ -2692,23 +2727,28 @@ msgid "Redo" msgstr "Ponów" -#: ../extensions/file_tools/gth-file-tool-resize.c:680 +#: ../extensions/file_tools/gth-file-tool-resize.c:214 +#: ../extensions/resize_images/dlg-resize-images.c:180 +msgid "Resizing images" +msgstr "Zmienianie rozmiarów obrazów" + +#: ../extensions/file_tools/gth-file-tool-resize.c:808 msgid "Resize..." msgstr "Zmień rozmiar..." -#: ../extensions/file_tools/gth-file-tool-resize.c:680 +#: ../extensions/file_tools/gth-file-tool-resize.c:808 msgid "Resize" msgstr "Zmień rozmiar" -#: ../extensions/file_tools/gth-file-tool-rotate.c:636 +#: ../extensions/file_tools/gth-file-tool-rotate.c:628 msgid "Rotate..." msgstr "Obróć..." -#: ../extensions/file_tools/gth-file-tool-rotate.c:636 +#: ../extensions/file_tools/gth-file-tool-rotate.c:628 msgid "Rotate" msgstr "Obróć" -#: ../extensions/file_tools/gth-file-tool-rotate.c:637 +#: ../extensions/file_tools/gth-file-tool-rotate.c:629 msgid "Freely rotate the image" msgstr "Dowolnie obraca obraz" @@ -2738,15 +2778,15 @@ msgid "Save" msgstr "Zapisz" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:100 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:101 msgid "Sharpening image" msgstr "Wyostrzanie obrazu" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 msgid "Enhance Focus..." msgstr "Zwiększ ostrość..." -#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 msgid "Enhance Focus" msgstr "Zwiększenie ostrości" @@ -2806,28 +2846,28 @@ msgid "Find duplicated files." msgstr "Wyszukiwanie duplikatów plików." -#: ../extensions/find_duplicates/gth-find-duplicates.c:53 +#: ../extensions/find_duplicates/gth-find-duplicates.c:65 msgid "leave the newest duplicates" msgstr "pozostawienie najnowszych duplikatów" -#: ../extensions/find_duplicates/gth-find-duplicates.c:54 +#: ../extensions/find_duplicates/gth-find-duplicates.c:66 msgid "leave the oldest duplicates" msgstr "pozostawienie najstarszych duplikatów" -#: ../extensions/find_duplicates/gth-find-duplicates.c:55 +#: ../extensions/find_duplicates/gth-find-duplicates.c:67 msgid "by folder..." msgstr "według katalogu..." -#: ../extensions/find_duplicates/gth-find-duplicates.c:56 +#: ../extensions/find_duplicates/gth-find-duplicates.c:68 msgid "all files" msgstr "wszystkie pliki" -#: ../extensions/find_duplicates/gth-find-duplicates.c:57 +#: ../extensions/find_duplicates/gth-find-duplicates.c:69 msgid "no file" msgstr "brak pliku" -#: ../extensions/find_duplicates/gth-find-duplicates.c:397 -#: ../extensions/find_duplicates/gth-find-duplicates.c:492 +#: ../extensions/find_duplicates/gth-find-duplicates.c:560 +#: ../extensions/find_duplicates/gth-find-duplicates.c:668 #, c-format msgid "%d duplicate" msgid_plural "%d duplicates" @@ -2835,15 +2875,15 @@ msgstr[1] "%d duplikaty" msgstr[2] "%d duplikatów" -#: ../extensions/find_duplicates/gth-find-duplicates.c:536 +#: ../extensions/find_duplicates/gth-find-duplicates.c:712 msgid "Search completed" msgstr "Ukończono wyszukiwanie" -#: ../extensions/find_duplicates/gth-find-duplicates.c:548 +#: ../extensions/find_duplicates/gth-find-duplicates.c:725 msgid "Searching for duplicates" msgstr "Wyszukiwanie duplikatów" -#: ../extensions/find_duplicates/gth-find-duplicates.c:551 +#: ../extensions/find_duplicates/gth-find-duplicates.c:728 #: ../gthumb/gth-load-file-data-task.c:106 #: ../gthumb/gth-save-file-data-task.c:100 #, c-format @@ -2853,15 +2893,15 @@ msgstr[1] "Pozostały %d pliki" msgstr[2] "Pozostało %d plików" -#: ../extensions/find_duplicates/gth-find-duplicates.c:634 +#: ../extensions/find_duplicates/gth-find-duplicates.c:830 msgid "Getting the file list" msgstr "Pobieranie listy plików" -#: ../extensions/find_duplicates/gth-find-duplicates.c:740 +#: ../extensions/find_duplicates/gth-find-duplicates.c:1016 msgid "Duplicates" msgstr "Duplikaty" -#: ../extensions/find_duplicates/gth-find-duplicates.c:997 +#: ../extensions/find_duplicates/gth-find-duplicates.c:1306 msgid "Select" msgstr "Wybierz" @@ -2886,7 +2926,7 @@ msgstr "Wysyłanie obrazów do serwisu Flickr" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 #: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 msgid "Free space:" msgstr "Wolne miejsce:" @@ -2908,69 +2948,94 @@ msgid "_Safety:" msgstr "_Bezpieczeństwo:" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 msgid "Private photos, visible to family and friends" msgstr "Prywatne zdjęcia, widoczne dla rodziny i przyjaciół" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 msgid "Private photos, visible to family" msgstr "Prywatne zdjęcia, widoczne dla rodziny" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 msgid "Private photos" msgstr "Prywatne zdjęcia" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 msgid "Safe content" msgstr "Bezpieczna treść" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 msgid "Moderate content" msgstr "Umiarkowana treść" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:17 msgid "Restricted content" msgstr "Ograniczona treść" -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 -msgid "_Import" -msgstr "Za_importuj" +#: ../extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui.h:1 +msgid "C_ontinue" +msgstr "K_ontynuuj" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:360 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:830 -msgid "Could not get the photo list" -msgstr "Nie można pobrać listy zdjęć" +#: ../extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui.h:2 +msgid "_Authorize..." +msgstr "_Upoważnij..." -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:397 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:561 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:864 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1026 -msgid "No album selected" -msgstr "Nie wybrano albumu" +#: ../extensions/flicker_utils/flickr-consumer.c:124 +#: ../extensions/flicker_utils/flickr-service.c:237 +#: ../extensions/flicker_utils/flickr-service.c:348 +#: ../extensions/flicker_utils/flickr-service.c:672 +#: ../extensions/flicker_utils/flickr-service.c:937 +#: ../extensions/oauth/oauth-service.c:154 +#: ../extensions/photobucket/photobucket-consumer.c:74 +#: ../extensions/photobucket/photobucket-consumer.c:82 +#: ../extensions/photobucket/photobucket-consumer.c:149 +#: ../extensions/photobucket/photobucket-service.c:132 +msgid "Unknown error" +msgstr "Nieznany błąd" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:579 +#: ../extensions/flicker_utils/flickr-service.c:502 #, c-format -msgid "Import from %s" -msgstr "Import zdjęć z serwisu %s" +msgid "" +"Return to this window when you have finished the authorization process on %s" +msgstr "" +"Należy wrócić do tego okna po ukończeniu procesu upoważnienia w serwisie %s" + +#: ../extensions/flicker_utils/flickr-service.c:503 +msgid "Once you're done, click the 'Continue' button below." +msgstr "Po ukończeniu należy kliknąć przycisk \"Kontynuuj\" poniżej." + +#: ../extensions/flicker_utils/flickr-service.c:571 +#, c-format +msgid "gThumb requires your authorization to upload the photos to %s" +msgstr "Program gthumb wymaga upoważnienia, aby wysłać zdjęcia do serwisu %s" + +#: ../extensions/flicker_utils/flickr-service.c:572 +#, c-format +msgid "" +"Click 'Authorize' to open your web browser and authorize gthumb to upload " +"photos to %s. When you're finished, return to this window to complete the " +"authorization." +msgstr "" +"Należy kliknąć przycisk \"Upoważnij\", aby otworzyć przeglądarkę WWW i " +"upoważnić program gthumb do wysyłania zdjęć do serwisu %s. Po ukończeniu " +"należy wrócić do tego okna, aby zakończyć upoważnienie." #: ../extensions/gstreamer_tools/actions.c:66 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1080 -#: ../gthumb/gth-browser.c:2008 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1072 +#: ../gthumb/gth-browser.c:2175 msgid "Could not save the file" msgstr "Nie można zapisać pliku" -#: ../extensions/gstreamer_tools/actions.c:126 +#: ../extensions/gstreamer_tools/actions.c:130 msgid "Could not take a screenshot" msgstr "Nie można wykonać zrzutu ekranu" -#: ../extensions/gstreamer_tools/actions.c:132 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1248 +#: ../extensions/gstreamer_tools/actions.c:136 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1245 msgid "Save Image" msgstr "Zapis obrazu" -#: ../extensions/gstreamer_tools/actions.c:152 +#: ../extensions/gstreamer_tools/actions.c:156 msgctxt "Filename" msgid "Screenshot" msgstr "Zrzut ekranu" @@ -2980,7 +3045,7 @@ msgstr "Wolniej" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:686 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:699 msgid "Play" msgstr "Odtwórz" @@ -3026,11 +3091,11 @@ msgid "Take a screenshot" msgstr "Wykonaj zrzut ekranu" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:663 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 msgid "Playing video" msgstr "Odtwarzanie nagrania wideo" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:689 msgid "Pause" msgstr "Wstrzymaj" @@ -3089,20 +3154,19 @@ msgid "Sample rate" msgstr "Częstotliwość próbkowania" -#: ../extensions/gstreamer_utils/gstreamer-utils.c:363 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:362 msgid "Stereo" msgstr "Stereo" -#: ../extensions/gstreamer_utils/gstreamer-utils.c:363 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:362 msgid "Mono" msgstr "Mono" #. Translators: this is an image size, such as 1024 × 768 -#: ../extensions/gstreamer_utils/gstreamer-utils.c:396 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1303 -#: ../extensions/image_viewer/gth-metadata-provider-image.c:190 -#: ../extensions/webalbums/dlg-web-exporter.c:442 -#: ../extensions/webalbums/gth-web-exporter.c:2446 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:395 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1300 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:209 +#: ../extensions/webalbums/gth-web-exporter.c:2446 ../gthumb/gtk-utils.c:1037 #, c-format msgid "%d × %d" msgstr "%d × %d" @@ -3111,7 +3175,7 @@ msgid "Could not print the selected files" msgstr "Nie można wydrukować zaznaczonych plików" -#: ../extensions/image_print/callbacks.c:54 +#: ../extensions/image_print/callbacks.c:65 msgid "Print the selected images" msgstr "Drukuje zaznaczone obrazy" @@ -3184,25 +3248,26 @@ msgid "Fonts" msgstr "Czcionki" -#: ../extensions/image_print/gth-image-print-job.c:971 +#: ../extensions/image_print/gth-image-print-job.c:914 #: ../extensions/webalbums/data/albumthemes/text.h:31 #, c-format msgid "Page %d of %d" msgstr "Strona %d z %d" -#: ../extensions/image_print/gth-image-print-job.c:1734 -#: ../extensions/image_print/gth-image-print-job.c:1861 -#: ../extensions/image_print/gth-image-print-job.c:1898 +#: ../extensions/image_print/gth-image-print-job.c:1680 +#: ../extensions/image_print/gth-image-print-job.c:1845 +#: ../extensions/image_print/gth-image-print-job.c:1888 msgid "Could not print" msgstr "Nie można wydrukować" -#: ../extensions/image_print/gth-image-print-job.c:1796 +#: ../extensions/image_print/gth-image-print-job.c:1746 #: ../gthumb/gth-main-default-tests.c:240 msgid "Images" msgstr "Obrazy" -#: ../extensions/image_print/gth-image-print-job.c:1863 -#: ../gthumb/gth-image-loader.c:204 ../gthumb/gth-image-loader.c:278 +#: ../extensions/image_print/gth-image-print-job.c:1847 +#: ../gthumb/gth-image-loader.c:197 ../gthumb/gth-image-loader.c:304 +#: ../gthumb/gth-image-utils.c:131 ../gthumb/gth-image-utils.c:137 msgid "No suitable loader available for this file type" msgstr "" "Brak dostępnego odpowiedniego programu wczytującego dla tego typu pliku" @@ -3214,7 +3279,7 @@ msgstr "Wczytywanie \"%s\"" #: ../extensions/image_print/gth-load-image-info-task.c:166 -#: ../extensions/webalbums/gth-web-exporter.c:2685 +#: ../extensions/webalbums/gth-web-exporter.c:2719 msgid "Loading images" msgstr "Wczytywanie obrazów" @@ -3256,7 +3321,7 @@ #: ../extensions/image_rotation/gth-reset-orientation-task.c:111 #: ../extensions/image_rotation/gth-transform-task.c:141 -#: ../extensions/webalbums/gth-web-exporter.c:2339 +#: ../extensions/webalbums/gth-web-exporter.c:2338 #: ../extensions/webalbums/gth-web-exporter.c:2423 msgid "Saving images" msgstr "Zapisywanie obrazów" @@ -3503,39 +3568,39 @@ msgid "custom format" msgstr "własny format" -#: ../extensions/importer/gth-import-task.c:442 -#: ../extensions/importer/gth-import-task.c:477 -#: ../extensions/importer/gth-import-task.c:648 +#: ../extensions/importer/gth-import-task.c:426 +#: ../extensions/importer/gth-import-task.c:461 +#: ../extensions/importer/gth-import-task.c:671 msgid "Importing files" msgstr "Importowanie plików" -#: ../extensions/importer/gth-import-task.c:598 +#: ../extensions/importer/gth-import-task.c:620 msgid "No file imported" msgstr "Nie zaimportowano plików" -#: ../extensions/importer/gth-import-task.c:599 +#: ../extensions/importer/gth-import-task.c:621 msgid "The selected files are already present in the destination." msgstr "Zaznaczone pliki już znajdują się w miejscu docelowym." -#: ../extensions/importer/gth-import-task.c:622 +#: ../extensions/importer/gth-import-task.c:644 #: ../gthumb/gth-file-source-vfs.c:694 msgid "Could not delete the files" msgstr "Nie można usunąć plików" -#: ../extensions/importer/gth-import-task.c:623 +#: ../extensions/importer/gth-import-task.c:645 msgid "Delete operation not supported." msgstr "Działanie usuwania jest nieobsługiwane." -#: ../extensions/importer/gth-import-task.c:709 +#: ../extensions/importer/gth-import-task.c:732 msgid "Last imported" msgstr "Ostatnio zaimportowano" -#: ../extensions/importer/gth-import-task.c:815 +#: ../extensions/importer/gth-import-task.c:838 msgid "No file specified." msgstr "Nie podano pliku." #. Translators: For example: Not enough free space in '/home/user/Images'.\n1.3 GB of space is required but only 300 MB is available. -#: ../extensions/importer/gth-import-task.c:852 +#: ../extensions/importer/gth-import-task.c:875 #, c-format msgid "" "Not enough free space in '%s'.\n" @@ -3544,7 +3609,7 @@ "Za mało wolnego miejsca w \"%s\".\n" "Wymagane: %s. Dostępne: %s." -#: ../extensions/list_tools/callbacks.c:76 ../gthumb/gth-filterbar.c:304 +#: ../extensions/list_tools/callbacks.c:76 ../gthumb/gth-filterbar.c:311 msgid "Personalize..." msgstr "Dostosuj..." @@ -3687,9 +3752,9 @@ msgstr "Wartość:" #: ../extensions/list_tools/gth-script.c:745 -#: ../extensions/webalbums/gth-web-exporter.c:560 -#: ../extensions/webalbums/gth-web-exporter.c:572 -#: ../extensions/webalbums/gth-web-exporter.c:580 +#: ../extensions/webalbums/gth-web-exporter.c:558 +#: ../extensions/webalbums/gth-web-exporter.c:570 +#: ../extensions/webalbums/gth-web-exporter.c:578 msgid "Malformed command" msgstr "Błędnie sformatowane polecenie" @@ -3754,6 +3819,47 @@ msgid "View the photo position on the map" msgstr "Wyświetlanie położenia zdjęcia na mapie" +#: ../extensions/oauth/data/ui/oauth-account-manager.ui.h:1 +msgid "A_ccounts:" +msgstr "_Konta:" + +#: ../extensions/oauth/data/ui/oauth-ask-authorization.ui.h:1 +#: ../gthumb/gth-folder-tree.c:1067 +msgid "Loading..." +msgstr "Wczytywanie..." + +#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 +msgid "New authentication..." +msgstr "Nowe dane uwierzytelniające..." + +#: ../extensions/oauth/oauth-ask-authorization-dialog.c:191 +msgid "Authorization Required" +msgstr "Wymagane jest upoważnienie" + +#: ../extensions/oauth/web-service.c:382 +msgid "Choose _Account..." +msgstr "Wybierz _konto..." + +#: ../extensions/oauth/web-service.c:660 +msgid "Choose Account" +msgstr "Wybierz konto" + +#: ../extensions/oauth/web-service.c:777 +msgid "Edit Accounts" +msgstr "Modyfikuj konta" + +#: ../extensions/oauth/web-service.c:795 ../extensions/oauth/web-service.c:812 +msgid "Connecting to the server" +msgstr "Łączenie z serwerem" + +#: ../extensions/oauth/web-service.c:796 +msgid "Asking authorization" +msgstr "Pytanie o upoważnienie" + +#: ../extensions/oauth/web-service.c:813 +msgid "Getting account information" +msgstr "Pobieranie informacji o koncie" + #: ../extensions/photobucket/callbacks.c:54 msgid "Photobucket..." msgstr "PhotoBucket..." @@ -3762,68 +3868,68 @@ msgid "Upload photos to Photobucket" msgstr "Wyślij zdjęcia do serwisu PhotoBucket" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +msgid "_Scramble filenames" +msgstr "_Szyfrowanie nazw plików" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 msgid "Tiny ( 100 x 75 )" msgstr "Malutkie (100 x 75)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 msgid "Small ( 160 x 120 )" msgstr "Małe (160 x 120)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 msgid "Medium ( 320 x 240 )" msgstr "Średnie (320 x 240)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 msgid "Large ( 640 x 480 )" msgstr "Duże (640 x 480)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 msgid "15ʺ screen ( 800 x 600 )" msgstr "Ekran 15ʺ (800 x 600)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 msgid "17ʺ screen ( 1024 x 768 )" msgstr "Ekran 17ʺ (1024 x 768)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 msgid "1 megabyte file size" msgstr "Plik o rozmiarze 1 megabajta" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 -msgid "_Scramble filenames" -msgstr "_Szyfrowanie nazw plików" - #: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 msgid "_Container:" msgstr "_Kontener:" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:290 msgid "Tiny ( 100 × 75 )" msgstr "Malutkie (100 × 75)" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 msgid "Small ( 160 × 120 )" msgstr "Małe (160 x 120)" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 msgid "Medium ( 320 × 240 )" msgstr "Średnie (320 x 240)" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 msgid "Large ( 640 × 480 )" msgstr "Duże (640 x 480)" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 msgid "15ʺ screen ( 800 × 600 )" msgstr "Ekran 15ʺ (800 x 600)" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 msgid "17ʺ screen ( 1024 × 768 )" msgstr "Ekran 17ʺ (1024 x 768)" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:304 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:303 msgid "2 megabyte file size" msgstr "Plik o rozmiarze 2 megabajtów" @@ -3865,7 +3971,7 @@ #. view label #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 -#: ../gthumb/gth-filterbar.c:414 +#: ../gthumb/gth-filterbar.c:421 msgid "S_how:" msgstr "_Wyświetlanie:" @@ -3882,7 +3988,7 @@ msgstr "_Usuwanie zaimportowanych plików ze źródła" #: ../extensions/photo_importer/dlg-photo-importer.c:227 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:174 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:149 msgid "Could not import the files" msgstr "Nie można zaimportować plików" @@ -3897,7 +4003,7 @@ msgstr "Nie można wczytać katalogu" #: ../extensions/photo_importer/dlg-photo-importer.c:369 -#: ../gthumb/gth-browser.c:1921 +#: ../gthumb/gth-browser.c:2089 msgid "Getting folder listing..." msgstr "Pobieranie listy katalogu..." @@ -3942,51 +4048,15 @@ msgid "_Albums:" msgstr "_Albumy:" -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 -msgid "Import from Picasa Web Album" -msgstr "Zaimportuj z serwisu Picasa Web Album" - -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 -msgid "_Album:" -msgstr "_Album:" - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:1 -msgid "_E-Mail:" -msgstr "Adres _e-mail:" - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 -msgid "" -"Type the characters you see in the picture below. Letters are not case-" -"sensitive." -msgstr "Proszę wpisać poniższe znaki. Wielkość liter nie ma znaczenia." - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:3 -msgid "_Password:" -msgstr "_Hasło:" - #: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 msgid "Public" msgstr "Publiczne" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:354 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:310 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:458 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:469 msgid "Could not get the album list" msgstr "Nie można pobrać listy albumów" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:438 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:394 -msgid "Picasa Web Album" -msgstr "Picasa Web Album" - -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:525 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:481 -msgid "Account" -msgstr "Konto" - -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:104 -msgid "Could not load the file" -msgstr "Nie można wczytać pliku" - #: ../extensions/picasaweb/picasaweb.extension.in.in.h:1 msgid "Picasa Web Albums" msgstr "Picasa Web Album" @@ -3995,93 +4065,6 @@ msgid "Upload images to Picasa Web Albums" msgstr "Wysyłanie obrazów do serwisu Picasa Web Album" -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:1 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:1 -msgid "_Default extension:" -msgstr "_Domyślne rozszerzenie:" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:2 -msgid "_Quality:" -msgstr "_Jakość:" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 -msgid "_Smoothing:" -msgstr "W_ygładzanie:" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 -msgid "Opti_mize" -msgstr "_Optymalizacja" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:5 -msgid "_Progressive" -msgstr "_Przyrostowy" - -#: ../extensions/pixbuf_savers/data/ui/png-options.ui.h:1 -msgid "Compression _level:" -msgstr "Poziom _kompresji:" - -#: ../extensions/pixbuf_savers/data/ui/save-options-preferences.ui.h:1 -msgid "Default options:" -msgstr "Domyślne opcje:" - -#: ../extensions/pixbuf_savers/data/ui/tga-options.ui.h:1 -msgid "_RLE compression" -msgstr "Kompresja _RLE" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:2 -msgid "_No compression" -msgstr "_Bez kompresji" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:3 -msgid "No_rmal (Deflate)" -msgstr "_Zwykła (deflacja)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 -msgid "_Loss compression (JPEG)" -msgstr "Kompresja _stratna (JPEG)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 -msgid "Compression" -msgstr "Kompresja" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 -msgid "dpi" -msgstr "dpi" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:9 -msgid "Resolution" -msgstr "Rozdzielczość" - -#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:519 -msgid "JPEG" -msgstr "JPEG" - -#: ../extensions/pixbuf_savers/gth-png-saver.c:140 -msgid "PNG" -msgstr "PNG" - -#: ../extensions/pixbuf_savers/gth-tga-saver.c:286 -#: ../gthumb/gth-buffer-data.c:84 -msgid "Insufficient memory" -msgstr "Brak pamięci" - -#: ../extensions/pixbuf_savers/gth-tga-saver.c:373 -msgid "TGA" -msgstr "TGA" - -#: ../extensions/pixbuf_savers/gth-tiff-saver.c:537 -msgid "TIFF" -msgstr "TIFF" - -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:1 -msgid "Save images" -msgstr "Zapisywanie obrazów" - -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:2 -msgid "Save images in common file formats such as JPEG, PNG and TIFF" -msgstr "" -"Zapisywanie obrazów w często używanych formatach, takich jak JPEG, PNG i TIFF" - #: ../extensions/raw_files/raw_files.extension.in.in.h:1 msgid "Raw format support" msgstr "Obsługa formatu Raw" @@ -4090,11 +4073,11 @@ msgid "Allow to load raw format images." msgstr "Umożliwienie wczytywania obrazów w formacie Raw." -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 msgid "_X:" msgstr "_X:" -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 msgid "_Y:" msgstr "_Y:" @@ -4108,7 +4091,7 @@ #: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:511 msgid "Remove the red eye effect caused by camera flashes" -msgstr "usuwa efekt czerwonych oczu powodowany przez lampy błyskowe" +msgstr "Usuwa efekt czerwonych oczu powodowany przez lampy błyskowe" #: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:1 msgid "Red-eye removal" @@ -4216,36 +4199,36 @@ msgid "File attribute" msgstr "Atrybut pliku" -#: ../extensions/rename_series/dlg-rename-series.c:552 -#: ../extensions/rename_series/dlg-rename-series.c:683 +#: ../extensions/rename_series/dlg-rename-series.c:558 +#: ../extensions/rename_series/dlg-rename-series.c:689 msgid "Could not rename the files" msgstr "Nie można zmienić nazw plików" -#: ../extensions/rename_series/dlg-rename-series.c:780 +#: ../extensions/rename_series/dlg-rename-series.c:786 msgid "Could not save the template" msgstr "Nie można zapisać szablonu" -#: ../extensions/rename_series/dlg-rename-series.c:798 +#: ../extensions/rename_series/dlg-rename-series.c:804 msgid "Edit Template" msgstr "Modyfikuj szablon" -#: ../extensions/rename_series/dlg-rename-series.c:856 +#: ../extensions/rename_series/dlg-rename-series.c:862 msgid "Old Name" msgstr "Poprzednia nazwa" -#: ../extensions/rename_series/dlg-rename-series.c:867 +#: ../extensions/rename_series/dlg-rename-series.c:873 msgid "New Name" msgstr "Nowa nazwa" -#: ../extensions/rename_series/dlg-rename-series.c:944 +#: ../extensions/rename_series/dlg-rename-series.c:950 msgid "Keep original case" msgstr "Zachowanie pierwotnej wielości liter" -#: ../extensions/rename_series/dlg-rename-series.c:945 +#: ../extensions/rename_series/dlg-rename-series.c:951 msgid "Convert to lower-case" msgstr "Konwersja do małych liter" -#: ../extensions/rename_series/dlg-rename-series.c:946 +#: ../extensions/rename_series/dlg-rename-series.c:952 msgid "Convert to upper-case" msgstr "Konwersja do wielkich liter" @@ -4283,7 +4266,7 @@ #: ../extensions/resize_images/data/ui/resize-images.ui.h:5 msgid "_Preserve original aspect ratios" -msgstr "Zachowanie pierwotnych proporcji obrazów" +msgstr "_Zachowanie pierwotnych proporcji obrazów" #: ../extensions/resize_images/data/ui/resize-images.ui.h:9 #: ../gthumb/gth-main-default-metadata.c:49 @@ -4294,11 +4277,7 @@ msgid "pixel" msgstr "piksel" -#: ../extensions/resize_images/dlg-resize-images.c:168 -msgid "Resizing images" -msgstr "Zmienianie rozmiarów obrazów" - -#: ../extensions/resize_images/dlg-resize-images.c:412 +#: ../extensions/resize_images/dlg-resize-images.c:423 msgid "Keep the original format" msgstr "Zachowanie pierwotnego formatu" @@ -4364,23 +4343,23 @@ msgid "File search tool." msgstr "Narzędzie do wyszukiwania plików." -#: ../extensions/selections/callbacks.c:62 +#: ../extensions/selections/callbacks.c:77 msgid "Add to _Selection" msgstr "Dodaj do _zaznaczenia" -#: ../extensions/selections/callbacks.c:65 +#: ../extensions/selections/callbacks.c:86 msgid "Selection 1" msgstr "Zaznaczenie 1" -#: ../extensions/selections/callbacks.c:70 +#: ../extensions/selections/callbacks.c:91 msgid "Selection 2" msgstr "Zaznaczenie 2" -#: ../extensions/selections/callbacks.c:75 +#: ../extensions/selections/callbacks.c:96 msgid "Selection 3" msgstr "Zaznaczenie 3" -#: ../extensions/selections/callbacks.c:180 +#: ../extensions/selections/callbacks.c:285 #, c-format msgid "" "Use Alt-%d to add files to this selection, Ctrl-%d to view this selection." @@ -4388,12 +4367,12 @@ "Użycie klawiszy lt-%d dodaje pliki do tego zaznaczenia, a użycie Ctrl-%d je " "wyświetla." -#: ../extensions/selections/gth-selections-manager.c:250 +#: ../extensions/selections/gth-selections-manager.c:239 #, c-format msgid "Selection %d" msgstr "Zaznaczenie %d" -#: ../extensions/selections/gth-selections-manager.c:253 +#: ../extensions/selections/gth-selections-manager.c:242 #: ../extensions/selections/selections.extension.in.in.h:1 msgid "Selections" msgstr "Zaznaczenia" @@ -4450,7 +4429,7 @@ msgid "Remove the selected files" msgstr "Usuń zaznaczone pliki" -#: ../extensions/slideshow/gth-slideshow.c:229 +#: ../extensions/slideshow/gth-slideshow.c:231 msgid "Playing slideshow" msgstr "Odtwarzanie pokazu slajdów" @@ -4579,13 +4558,9 @@ msgid "_Copy originals to destination" msgstr "_Kopiowanie oryginałów do katalogu docelowego" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 -msgid "_Resize if larger than:" -msgstr "_Zmienianie rozmiaru, jeśli większe od:" - #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 msgid "_Adapt to the window width " -msgstr "_Dostosowanie do szerokości okna" +msgstr "_Dostosowanie do szerokości okna " #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 msgid "Index Page" @@ -4623,36 +4598,36 @@ msgid "Image Attributes" msgstr "Atrybuty obrazu" -#: ../extensions/webalbums/gth-web-exporter.c:1802 +#: ../extensions/webalbums/gth-web-exporter.c:1800 msgid "Could not show the destination" msgstr "Nie można wyświetlić miejsca docelowego" -#: ../extensions/webalbums/gth-web-exporter.c:1838 +#: ../extensions/webalbums/gth-web-exporter.c:1836 msgid "The album has been created successfully." msgstr "Pomyślnie utworzono album." -#: ../extensions/webalbums/gth-web-exporter.c:2106 -#: ../extensions/webalbums/gth-web-exporter.c:2133 +#: ../extensions/webalbums/gth-web-exporter.c:2104 +#: ../extensions/webalbums/gth-web-exporter.c:2132 msgid "Saving thumbnails" msgstr "Zapisywanie miniatur" -#: ../extensions/webalbums/gth-web-exporter.c:2161 +#: ../extensions/webalbums/gth-web-exporter.c:2160 msgid "Saving HTML pages: Images" msgstr "Zapisywanie stron HTML: obrazy" -#: ../extensions/webalbums/gth-web-exporter.c:2219 +#: ../extensions/webalbums/gth-web-exporter.c:2218 msgid "Saving HTML pages: Indexes" msgstr "Zapisywanie stron HTML: indeksy" -#: ../extensions/webalbums/gth-web-exporter.c:2502 +#: ../extensions/webalbums/gth-web-exporter.c:2503 msgid "Copying original images" msgstr "Kopiowanie oryginalnych obrazów" -#: ../extensions/webalbums/gth-web-exporter.c:2929 +#: ../extensions/webalbums/gth-web-exporter.c:2963 msgid "Could not find the style folder" msgstr "Nie można odnaleźć katalogu stylów" -#: ../extensions/webalbums/gth-web-exporter.c:2967 +#: ../extensions/webalbums/gth-web-exporter.c:3001 msgid "Could not create a temporary folder" msgstr "Nie można utworzyć katalogu tymczasowego" @@ -4664,9 +4639,9 @@ msgid "Create static web albums." msgstr "Tworzenie statycznych albumów WWW." -#: ../gthumb/dlg-location.c:200 ../gthumb/gth-browser.c:1250 -#: ../gthumb/gth-browser.c:1809 ../gthumb/gth-browser.c:5899 -#: ../gthumb/gth-browser.c:5918 ../gthumb/gth-browser.c:5942 +#: ../gthumb/dlg-location.c:200 ../gthumb/gth-browser.c:1396 +#: ../gthumb/gth-browser.c:1969 ../gthumb/gth-browser.c:6214 +#: ../gthumb/gth-browser.c:6233 ../gthumb/gth-browser.c:6257 #, c-format msgid "Could not load the position \"%s\"" msgstr "Nie można wczytać położenia \"%s\"" @@ -4687,7 +4662,7 @@ msgid "Edit Filter" msgstr "Modyfikuj filtr" -#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:270 +#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:277 msgid "All" msgstr "Wszystko" @@ -4752,45 +4727,6 @@ msgid "_Restart" msgstr "_Przywróć" -#: ../gthumb/eggfileformatchooser.c:236 -#, c-format -msgid "File _Format: %s" -msgstr "_Format pliku: %s" - -#: ../gthumb/eggfileformatchooser.c:397 ../gthumb/gth-main-default-tests.c:233 -msgid "All Files" -msgstr "Wszystkie pliki" - -#: ../gthumb/eggfileformatchooser.c:398 -msgid "All Supported Files" -msgstr "Wszystkie obsługiwane pliki" - -#: ../gthumb/eggfileformatchooser.c:407 -msgid "By Extension" -msgstr "Według rozszerzenia" - -#: ../gthumb/eggfileformatchooser.c:422 -msgid "File Format" -msgstr "Format pliku" - -#: ../gthumb/eggfileformatchooser.c:440 -msgid "Extension(s)" -msgstr "Rozszerzenia" - -#: ../gthumb/eggfileformatchooser.c:681 -#, c-format -msgid "" -"The program was not able to find out the file format you want to use for `" -"%s'. Please make sure to use a known extension for that file or manually " -"choose a file format from the list below." -msgstr "" -"Program nie może rozpoznać formatu pliku dla \"%s\". Proszę się upewnić, że " -"używane jest znane rozszerzenie lub ręczni wybrać format z poniższej listy." - -#: ../gthumb/eggfileformatchooser.c:688 -msgid "File format not recognized" -msgstr "Nie rozpoznano formatu pliku" - #. For translators: This is a progress size indicator, for example: 230.4 MB of 512.8 MB #: ../gthumb/gio-utils.c:1351 #, c-format @@ -4825,7 +4761,7 @@ #. * the separator that your locale uses or use "%Id" instead #. * of "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2848 +#: ../gthumb/glib-utils.c:3068 #, c-format msgctxt "long time format" msgid "%d:%02d:%02d" @@ -4837,13 +4773,13 @@ #. * separator that your locale uses or use "%Id" instead of #. * "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2857 +#: ../gthumb/glib-utils.c:3077 #, c-format msgctxt "short time format" msgid "%d:%02d" msgstr "%d:%02d" -#: ../gthumb/gth-browser-actions-callbacks.c:400 +#: ../gthumb/gth-browser-actions-callbacks.c:414 msgid "" "gthumb is free software; you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -4855,7 +4791,7 @@ "przez Fundację Wolnego Oprogramowania (Free Software Foundation) - według " "wersji drugiej tej Licencji lub którejś z późniejszych wersji." -#: ../gthumb/gth-browser-actions-callbacks.c:404 +#: ../gthumb/gth-browser-actions-callbacks.c:418 msgid "" "gthumb is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -4867,7 +4803,7 @@ "HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. W celu uzyskania " "bliższych informacji należy zapoznać się z Powszechną Licencją Publiczną GNU." -#: ../gthumb/gth-browser-actions-callbacks.c:408 +#: ../gthumb/gth-browser-actions-callbacks.c:422 msgid "" "You should have received a copy of the GNU General Public License along with " "gthumb. If not, see http://www.gnu.org/licenses/." @@ -4876,13 +4812,17 @@ "Powszechnej Licencji Publicznej GNU (GNU General Public License); jeśli nie " "- proszę odwiedzić stronę internetową ." -#: ../gthumb/gth-browser-actions-callbacks.c:427 +#: ../gthumb/gth-browser-actions-callbacks.c:441 msgid "An image viewer and browser for GNOME." msgstr "Przeglądarka obrazów dla środowiska GNOME." -#: ../gthumb/gth-browser-actions-callbacks.c:430 +#: ../gthumb/gth-browser-actions-callbacks.c:444 msgid "translator_credits" -msgstr "Aviary.pl , 2011, 2012" +msgstr "" +"Artur Flinta , 2003-2004\n" +"Tomasz Dominikowski , 2007\n" +"Piotr Drąg , 2011-2013\n" +"Aviary.pl , 2007-2013" #: ../gthumb/gth-browser-actions-entries.h:31 msgid "_File" @@ -4934,7 +4874,7 @@ #: ../gthumb/gth-browser-actions-entries.h:95 msgid "_Sort By..." -msgstr "Porzą_dkowanie według.." +msgstr "Porzą_dkowanie według..." #: ../gthumb/gth-browser-actions-entries.h:101 msgid "_Filter..." @@ -4964,15 +4904,15 @@ msgid "Leave Fullscreen" msgstr "Opuść tryb pełnoekranowy" -#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3586 +#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3841 msgid "Go to the previous visited location" msgstr "Przechodzi do poprzednio odwiedzonego położenia" -#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3604 +#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3859 msgid "Go to the next visited location" msgstr "Przechodzi do kolejnej odwiedzonego położenia" -#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3622 +#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3877 msgid "Go up one level" msgstr "Przechodzi o jeden poziom do góry" @@ -4984,7 +4924,7 @@ msgid "Specify a location to open" msgstr "Określa położenie do otwarcia" -#: ../gthumb/gth-browser-actions-entries.h:173 ../gthumb/gth-browser.c:672 +#: ../gthumb/gth-browser-actions-entries.h:173 ../gthumb/gth-browser.c:721 msgid "_Delete History" msgstr "_Usuń historię" @@ -5012,93 +4952,95 @@ msgid "_Keyboard Shortcuts" msgstr "_Skróty klawiszowe" -#: ../gthumb/gth-browser-actions-entries.h:206 +#: ../gthumb/gth-browser-actions-entries.h:203 +#: ../gthumb/gth-browser-actions-entries.h:257 +msgid "Edit" +msgstr "Edycja" + +#: ../gthumb/gth-browser-actions-entries.h:204 +#: ../gthumb/gth-browser-actions-entries.h:258 +msgid "Edit file" +msgstr "Modyfikuje plik" + +#: ../gthumb/gth-browser-actions-entries.h:212 msgid "_Toolbar" msgstr "Pasek _narzędziowy" -#: ../gthumb/gth-browser-actions-entries.h:207 +#: ../gthumb/gth-browser-actions-entries.h:213 msgid "View or hide the toolbar of this window" msgstr "Wyświetla lub ukrywa pasek narzędziowy tego okna" -#: ../gthumb/gth-browser-actions-entries.h:211 +#: ../gthumb/gth-browser-actions-entries.h:217 msgid "_Statusbar" msgstr "Pasek _stanu" -#: ../gthumb/gth-browser-actions-entries.h:212 +#: ../gthumb/gth-browser-actions-entries.h:218 msgid "View or hide the statusbar of this window" msgstr "Wyświetla lub ukrywa pasek stanu tego okna" -#: ../gthumb/gth-browser-actions-entries.h:216 +#: ../gthumb/gth-browser-actions-entries.h:222 msgid "_Filterbar" msgstr "Pasek _filtru" -#: ../gthumb/gth-browser-actions-entries.h:217 +#: ../gthumb/gth-browser-actions-entries.h:223 msgid "View or hide the filterbar of this window" msgstr "Wyświetla lub ukrywa pasek filtra tego okna" -#: ../gthumb/gth-browser-actions-entries.h:221 +#: ../gthumb/gth-browser-actions-entries.h:227 msgid "_Sidebar" msgstr "Pasek _boczny" -#: ../gthumb/gth-browser-actions-entries.h:222 +#: ../gthumb/gth-browser-actions-entries.h:228 msgid "View or hide the sidebar of this window" msgstr "Wyświetla lub ukrywa pasek filtra tego okna" -#: ../gthumb/gth-browser-actions-entries.h:226 +#: ../gthumb/gth-browser-actions-entries.h:232 msgid "_Thumbnail Pane" msgstr "Panel _miniatur" -#: ../gthumb/gth-browser-actions-entries.h:227 +#: ../gthumb/gth-browser-actions-entries.h:233 msgid "View or hide the thumbnail pane in viewer mode" msgstr "Wyświetla lub ukrywa panel miniatur w trybie przeglądarki" -#: ../gthumb/gth-browser-actions-entries.h:231 +#: ../gthumb/gth-browser-actions-entries.h:237 msgid "_Thumbnails" msgstr "_Miniatury" -#: ../gthumb/gth-browser-actions-entries.h:232 +#: ../gthumb/gth-browser-actions-entries.h:238 msgid "View thumbnails" msgstr "Wyświetla miniatury" -#: ../gthumb/gth-browser-actions-entries.h:236 +#: ../gthumb/gth-browser-actions-entries.h:242 msgid "_Hidden Files" msgstr "_Ukryte pliki" -#: ../gthumb/gth-browser-actions-entries.h:237 +#: ../gthumb/gth-browser-actions-entries.h:243 msgid "Show hidden files and folders" msgstr "Wyświetla ukryte pliki i katalogi" -#: ../gthumb/gth-browser-actions-entries.h:242 -#: ../gthumb/gth-browser-actions-entries.h:247 +#: ../gthumb/gth-browser-actions-entries.h:248 +#: ../gthumb/gth-browser-actions-entries.h:253 msgid "View file properties" msgstr "Wyświetla właściwości pliku" -#: ../gthumb/gth-browser-actions-entries.h:251 -msgid "Edit" -msgstr "Edycja" - -#: ../gthumb/gth-browser-actions-entries.h:252 -msgid "Edit file" -msgstr "Modyfikuje plik" - -#: ../gthumb/gth-browser-actions-entries.h:256 +#: ../gthumb/gth-browser-actions-entries.h:262 msgid "_Fit Window to Image" msgstr "_Dopasowanie okna do obrazu" -#: ../gthumb/gth-browser-actions-entries.h:257 +#: ../gthumb/gth-browser-actions-entries.h:263 msgid "Resize the window to the size of the image" msgstr "Zmienia rozmiar okna na rozmiar obrazu" -#: ../gthumb/gth-browser.c:369 +#: ../gthumb/gth-browser.c:418 #, c-format msgid "Open %s" msgstr "Otwórz %s" -#: ../gthumb/gth-browser.c:509 +#: ../gthumb/gth-browser.c:558 msgid "[modified]" msgstr "[zmodyfikowano]" -#: ../gthumb/gth-browser.c:1006 +#: ../gthumb/gth-browser.c:1117 #, c-format msgid "%d file selected (%s)" msgid_plural "%d files selected (%s)" @@ -5106,52 +5048,52 @@ msgstr[1] "Wybrano %d pliki (%s)" msgstr[2] "Wybrano %d plików (%s)" -#: ../gthumb/gth-browser.c:1041 +#: ../gthumb/gth-browser.c:1152 #, c-format msgid "%s of free space" msgstr "Wolne miejsce: %s" -#: ../gthumb/gth-browser.c:1905 ../gthumb/gth-browser.c:1932 +#: ../gthumb/gth-browser.c:2073 ../gthumb/gth-browser.c:2100 #, c-format msgid "No suitable module found for %s" msgstr "Nie odnaleziono odpowiedniego modułu dla %s" -#: ../gthumb/gth-browser.c:2052 +#: ../gthumb/gth-browser.c:2219 #, c-format msgid "Save changes to file '%s'?" msgstr "Zapisać zmiany w pliku \"%s\"?" -#: ../gthumb/gth-browser.c:2057 +#: ../gthumb/gth-browser.c:2224 msgid "If you don't save, changes to the file will be permanently lost." msgstr "" "Jeśli nie zostanie zapisane, to wszystkie zmiany zostaną trwale utracone." -#: ../gthumb/gth-browser.c:2058 +#: ../gthumb/gth-browser.c:2225 msgid "Do _Not Save" msgstr "_Nie zapisuj" -#: ../gthumb/gth-browser.c:2828 ../gthumb/gth-source-tree.c:182 +#: ../gthumb/gth-browser.c:3020 ../gthumb/gth-source-tree.c:182 msgid "Could not change name" msgstr "Nie można zmienić nazwy" -#: ../gthumb/gth-browser.c:3257 ../gthumb/gth-main-default-metadata.c:41 +#: ../gthumb/gth-browser.c:3451 ../gthumb/gth-main-default-metadata.c:41 msgid "Modified" msgstr "Zmodyfikowano" -#: ../gthumb/gth-browser.c:3587 ../gthumb/gth-browser.c:3605 +#: ../gthumb/gth-browser.c:3842 ../gthumb/gth-browser.c:3860 msgid "View the list of visited locations" msgstr "Wyświetla listę odwiedzonych położeń" -#: ../gthumb/gth-browser.c:3623 +#: ../gthumb/gth-browser.c:3878 msgid "View the list of upper locations" msgstr "Wyświetla listę wyższych położeń" -#: ../gthumb/gth-browser.c:5900 +#: ../gthumb/gth-browser.c:6215 #, c-format msgid "File type not supported" msgstr "Nieobsługiwany typ pliku" -#: ../gthumb/gth-browser.c:5943 +#: ../gthumb/gth-browser.c:6258 #, c-format msgid "No suitable module found" msgstr "Nie odnaleziono odpowiedniego modułu" @@ -5161,11 +5103,15 @@ msgid "Could not open the module `%s`: %s" msgstr "Nie można otworzyć modułu \"%s\": %s" -#: ../gthumb/gth-extensions.c:744 +#: ../gthumb/gth-extensions.c:754 #, c-format msgid "The extension '%1$s' is required by the extension '%2$s'" msgstr "Rozszerzenie \"%1$s\" jest wymagane przez rozszerzenie \"%2$s\"" +#: ../gthumb/gth-file-chooser-dialog.c:144 +msgid "All Supported Files" +msgstr "Wszystkie obsługiwane pliki" + #: ../gthumb/gth-file-source-vfs.c:121 msgid "Home Folder" msgstr "Katalog domowy" @@ -5206,7 +5152,7 @@ msgstr[1] "Na pewno trwale usunąć %'d zaznaczone pliki?" msgstr[2] "Na pewno trwale usunąć %'d zaznaczonych plików?" -#: ../gthumb/gth-filterbar.c:406 +#: ../gthumb/gth-filterbar.c:413 msgid "Hide the filterbar" msgstr "Ukrywa pasek filtru" @@ -5226,7 +5172,7 @@ msgstr "GB" #. "files" label -#: ../gthumb/gth-filter.c:291 ../gthumb/gth-filter-editor-dialog.c:177 +#: ../gthumb/gth-filter.c:286 ../gthumb/gth-filter-editor-dialog.c:177 msgid "files" msgstr "pliki" @@ -5243,50 +5189,60 @@ msgid "No limit specified" msgstr "Nie podano ograniczenia" -#: ../gthumb/gth-folder-tree.c:857 -msgid "Loading..." -msgstr "Wczytywanie..." - -#: ../gthumb/gth-folder-tree.c:1100 +#: ../gthumb/gth-folder-tree.c:1369 msgid "(Open Parent)" msgstr "(Otwórz nadrzędny)" -#: ../gthumb/gth-histogram-view.c:826 +#: ../gthumb/gth-histogram-view.c:825 msgid "Linear scale" msgstr "Skala liniowa" -#: ../gthumb/gth-histogram-view.c:838 +#: ../gthumb/gth-histogram-view.c:837 msgid "Logarithmic scale" msgstr "Skala logarytmiczna" -#: ../gthumb/gth-histogram-view.c:858 +#: ../gthumb/gth-histogram-view.c:857 msgid "Channel:" msgstr "Kanał:" -#: ../gthumb/gth-histogram-view.c:890 +#: ../gthumb/gth-histogram-view.c:878 msgid "Value" msgstr "Wartość" -#: ../gthumb/gth-histogram-view.c:896 +#: ../gthumb/gth-histogram-view.c:883 msgid "Red" msgstr "Czerwony" -#: ../gthumb/gth-histogram-view.c:902 +#: ../gthumb/gth-histogram-view.c:888 msgid "Green" msgstr "Zielony" -#: ../gthumb/gth-histogram-view.c:908 +#: ../gthumb/gth-histogram-view.c:893 msgid "Blue" msgstr "Niebieski" -#: ../gthumb/gth-histogram-view.c:914 +#: ../gthumb/gth-histogram-view.c:898 msgid "Alpha" msgstr "Alfa" -#: ../gthumb/gth-histogram-view.c:921 +#: ../gthumb/gth-histogram-view.c:904 msgid "RGB" msgstr "RGB" +#: ../gthumb/gth-image-list-task.c:141 +msgid "Could not rename the file" +msgstr "Nie można zmienić nazwy pliku" + +#: ../gthumb/gth-image-saver.c:39 +msgid "No options available for this file type" +msgstr "Brak dostępnych opcji dla tego typu pliku" + +#: ../gthumb/gth-image-saver.c:185 +#, c-format +msgid "Could not find a suitable module to save the image as \"%s\"" +msgstr "" +"Nie można odnaleźć odpowiedniego modułu do zapisania obrazu jako \"%s\"" + #: ../gthumb/gth-load-file-data-task.c:108 msgid "Reading file information" msgstr "Odczytywanie informacji o pliku" @@ -5340,6 +5296,10 @@ msgid "dimensions" msgstr "wymiary" +#: ../gthumb/gth-main-default-tests.c:233 +msgid "All Files" +msgstr "Wszystkie pliki" + #: ../gthumb/gth-main-default-tests.c:261 msgid "Media" msgstr "Multimedia" @@ -5360,15 +5320,7 @@ msgid "Description (embedded)" msgstr "Opis (osadzony)" -#: ../gthumb/gth-pixbuf-list-task.c:139 -msgid "Could not rename the file" -msgstr "Nie można zmienić nazwy pliku" - -#: ../gthumb/gth-pixbuf-saver.c:34 -msgid "No options available for this file type" -msgstr "Brak dostępnych opcji dla tego typu pliku" - -#: ../gthumb/gth-progress-dialog.c:144 +#: ../gthumb/gth-progress-dialog.c:146 msgid "Cancel operation" msgstr "Anuluj działanie" @@ -5376,60 +5328,66 @@ msgid "Saving file information" msgstr "Zapisywanie informacji o pliku" -#: ../gthumb/gth-tags-entry.c:388 +#. Translators: %s is a filename +#: ../gthumb/gth-save-image-task.c:160 +#, c-format +msgid "Saving '%s'" +msgstr "Zapisywanie pliku \"%s\"" + +#: ../gthumb/gth-tags-entry.c:390 #, c-format msgid "Create tag «%s»" msgstr "Utwórz etykietę \"%s\"" -#: ../gthumb/gth-tags-entry.c:735 +#: ../gthumb/gth-tags-entry.c:814 msgid "Show all the tags" msgstr "Wyświetl wszystkie etykiety" -#: ../gthumb/gth-tags-file.c:236 +#: ../gthumb/gth-tags-file.c:235 msgid "Holidays" msgstr "Wakacje" -#: ../gthumb/gth-tags-file.c:237 +#: ../gthumb/gth-tags-file.c:236 msgid "Temporary" msgstr "Tymczasowe" -#: ../gthumb/gth-tags-file.c:238 +#: ../gthumb/gth-tags-file.c:237 msgid "Screenshots" msgstr "Zrzuty ekranu" -#: ../gthumb/gth-tags-file.c:239 +#: ../gthumb/gth-tags-file.c:238 msgid "Science" msgstr "Nauka" -#: ../gthumb/gth-tags-file.c:240 +#: ../gthumb/gth-tags-file.c:239 msgid "Favorite" msgstr "Ulubione" -#: ../gthumb/gth-tags-file.c:241 +#: ../gthumb/gth-tags-file.c:240 msgid "Important" msgstr "Ważne" -#: ../gthumb/gth-tags-file.c:242 +#: ../gthumb/gth-tags-file.c:241 msgid "GNOME" msgstr "GNOME" -#: ../gthumb/gth-tags-file.c:243 +#: ../gthumb/gth-tags-file.c:242 msgid "Games" msgstr "Gry" -#: ../gthumb/gth-tags-file.c:244 +#: ../gthumb/gth-tags-file.c:243 msgid "Party" msgstr "Impreza" -#: ../gthumb/gth-tags-file.c:245 +#: ../gthumb/gth-tags-file.c:244 msgid "Birthday" msgstr "Urodziny" -#: ../gthumb/gth-tags-file.c:246 +#: ../gthumb/gth-tags-file.c:245 msgid "Astronomy" msgstr "Astronomia" -#: ../gthumb/gth-tags-file.c:247 +#: ../gthumb/gth-tags-file.c:246 msgid "Family" msgstr "Rodzina" @@ -5447,7 +5405,7 @@ msgid "is not" msgstr "nie wynosi" -#: ../gthumb/gth-test-category.c:394 ../gthumb/gth-test-simple.c:812 +#: ../gthumb/gth-test-category.c:407 ../gthumb/gth-test-simple.c:812 #: ../gthumb/gth-test-simple.c:838 ../gthumb/gth-test-simple.c:859 #: ../gthumb/gth-test-simple.c:885 #, c-format @@ -5502,11 +5460,11 @@ msgid "is after" msgstr "jest po" -#: ../gthumb/gth-time-selector.c:477 +#: ../gthumb/gth-time-selector.c:478 msgid "Today" msgstr "Dzisiaj" -#: ../gthumb/gth-time-selector.c:485 +#: ../gthumb/gth-time-selector.c:486 msgid "Now" msgstr "Teraz" @@ -5518,56 +5476,50 @@ msgid "Close _All Windows" msgstr "Z_amknij wszystkie okna" -#: ../gthumb/gtk-utils.c:551 +#: ../gthumb/gtk-utils.c:490 msgid "Could not display help" msgstr "Nie można wyświetlić pomocy" -#: ../gthumb/gtk-utils.c:868 ../gthumb/gtk-utils.c:875 +#: ../gthumb/gtk-utils.c:810 ../gthumb/gtk-utils.c:817 msgid "Could not launch the application" msgstr "Nie można uruchomić programu" -#: ../gthumb/gtk-utils.c:978 +#: ../gthumb/gtk-utils.c:920 msgid "_Copy Here" msgstr "S_kopiuj tutaj" -#: ../gthumb/gtk-utils.c:983 +#: ../gthumb/gtk-utils.c:925 msgid "_Move Here" msgstr "_Przenieś tutaj" -#: ../gthumb/gtk-utils.c:988 +#: ../gthumb/gtk-utils.c:930 msgid "_Link Here" msgstr "_Dowiąż tutaj" -#: ../gthumb/gtk-utils.c:997 +#: ../gthumb/gtk-utils.c:939 msgid "Cancel" msgstr "Anuluj" -#: ../gthumb/main.c:59 +#: ../gthumb/main.c:61 msgid "Open a new window" msgstr "Otwiera nowe okno" -#: ../gthumb/main.c:63 +#: ../gthumb/main.c:65 msgid "Start in fullscreen mode" msgstr "Uruchamia w trybie pełnoekranowym" -#: ../gthumb/main.c:67 +#: ../gthumb/main.c:69 msgid "Automatically start a slideshow" msgstr "Automatycznie uruchomia pokaz slajdów" -#: ../gthumb/main.c:71 +#: ../gthumb/main.c:73 msgid "Automatically import digital camera photos" msgstr "Automatycznie importuje zdjęcia z aparatu" -#: ../gthumb/main.c:75 +#: ../gthumb/main.c:77 msgid "Show version" msgstr "Wyświetla wersję" -#: ../gthumb/main.c:344 +#: ../gthumb/main.c:483 msgid "- Image browser and viewer" msgstr "- przeglądarka obrazów" - -#: ../gthumb/pixbuf-io.c:174 -#, c-format -msgid "Could not find a suitable module to save the image as \"%s\"" -msgstr "" -"Nie można odnaleźć odpowiedniego modułu do zapisania obrazu jako \"%s\"" diff -Nru gthumb-3.0.2/po/pt_BR.po gthumb-3.2.3/po/pt_BR.po --- gthumb-3.0.2/po/pt_BR.po 2012-08-14 16:25:43.000000000 +0000 +++ gthumb-3.2.3/po/pt_BR.po 2013-04-30 17:06:23.000000000 +0000 @@ -7,4407 +7,7180 @@ # Raphael Higino , 2004-2006. # Igor Pires Soares , 2007,2008. # Leonardo Ferreira Fontenelle , 2009. +# Rafael Ferreira , 2013. # msgid "" msgstr "" "Project-Id-Version: gthumb\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-21 18:48-0300\n" -"PO-Revision-Date: 2008-04-12 16:03-0300\n" -"Last-Translator: Leonardo Ferreira Fontenelle , 2009\n" -"Language-Team: Brazilian Portuguese \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=gthumb&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-02-04 13:44+0000\n" +"PO-Revision-Date: 2013-02-14 23:36-0300\n" +"Last-Translator: Rafael Ferreira \n" +"Language-Team: Brazilian Portuguese \n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Poedit-Language: Portuguese\n" -"X-Poedit-Country: BRAZIL\n" +"X-Generator: Poedit 1.5.4\n" -#: ../data/albumthemes/text.h:27 ../src/gth-browser-actions-entries.h:289 -#: ../src/gth-fullscreen-actions-entries.h:52 -msgid "Previous" -msgstr "Anterior" +#: ../copy-n-paste/eggdesktopfile.c:165 +#, c-format +msgid "File is not a valid .desktop file" +msgstr "O arquivo não é um arquivo .desktop válido" -#: ../data/albumthemes/text.h:28 ../src/gth-browser-actions-entries.h:284 -#: ../src/gth-fullscreen-actions-entries.h:47 -msgid "Next" -msgstr "Próxima" +#. translators: 'Version' is from a desktop file, and +#. * should not be translated. '%s' would probably be a +#. * version number. +#: ../copy-n-paste/eggdesktopfile.c:191 +#, c-format +msgid "Unrecognized desktop file Version '%s'" +msgstr "Versão \"%s\" desconhecida de arquivo desktop" -#: ../data/albumthemes/text.h:29 -msgid "Index" -msgstr "Índice" +#: ../copy-n-paste/eggdesktopfile.c:974 +#, c-format +msgid "Starting %s" +msgstr "Iniciando %s" -#: ../data/albumthemes/text.h:30 ../src/dlg-duplicates.c:269 -msgid "Image" -msgstr "Imagem" +#: ../copy-n-paste/eggdesktopfile.c:1116 +#, c-format +msgid "Application does not accept documents on command line" +msgstr "O aplicativo não aceita documentos na linha de comando" -#: ../data/albumthemes/text.h:31 ../src/gth-exif-data-viewer.c:350 -msgid "Dimensions" -msgstr "Dimensões" +#: ../copy-n-paste/eggdesktopfile.c:1184 +#, c-format +msgid "Unrecognized launch option: %d" +msgstr "Opção de inicialização desconhecida: %d" -#: ../data/albumthemes/text.h:32 ../src/dlg-image-prop.c:613 -msgid "Bytes" -msgstr "Bytes" +#. translators: The 'Type=Link' string is found in a +#. * desktop file, and should not be translated. +#: ../copy-n-paste/eggdesktopfile.c:1391 +#, c-format +msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +msgstr "" +"Não é possível passar URIs de documentos para uma entrada de desktop " +"\"Type=Link\"" -#: ../data/albumthemes/text.h:33 ../src/gth-filter-bar.c:208 -msgid "Date" -msgstr "Data" +#: ../copy-n-paste/eggdesktopfile.c:1412 +#, c-format +msgid "Not a launchable item" +msgstr "Não é um item inicializável" -#: ../data/albumthemes/text.h:34 -msgid "Exposure time" -msgstr "Tempo de exposição" - -#: ../data/albumthemes/text.h:35 -msgid "Exposure mode" -msgstr "Modo de exposição" - -#: ../data/albumthemes/text.h:36 -msgid "Flash" -msgstr "Flash" - -#: ../data/albumthemes/text.h:37 -msgid "Shutter speed" -msgstr "Velocidade do obturador" - -#: ../data/albumthemes/text.h:38 -msgid "Aperture value" -msgstr "Valor da abertura" - -#: ../data/albumthemes/text.h:39 -msgid "Focal length" -msgstr "Distância focal" - -#: ../data/albumthemes/text.h:40 -msgid "Camera model" -msgstr "Modelo da câmera" +#: ../copy-n-paste/eggsmclient.c:226 +msgid "Disable connection to session manager" +msgstr "Desabilitar conexão com gerenciador de sessão" -#: ../data/albumthemes/text.h:41 ../data/glade/gthumb_edit.glade.h:33 -#: ../data/glade/gthumb_tools.glade.h:112 -msgid "pixels" -msgstr "pixels" +#: ../copy-n-paste/eggsmclient.c:229 +msgid "Specify file containing saved configuration" +msgstr "Especificar arquivo contendo configuração salva" -#: ../data/glade/gthumb.glade.h:1 ../data/glade/gthumb_convert.glade.h:1 -#: ../data/glade/gthumb_edit.glade.h:1 -#: ../data/glade/gthumb_png_exporter.glade.h:1 -#: ../data/glade/gthumb_preferences.glade.h:1 -#: ../data/glade/gthumb_print.glade.h:1 ../data/glade/gthumb_tools.glade.h:1 -#: ../data/glade/gthumb_web_exporter.glade.h:1 -msgid " " -msgstr " " - -#: ../data/glade/gthumb.glade.h:2 -msgid "Information on Channel:" -msgstr "Informações do Canal:" - -#: ../data/glade/gthumb.glade.h:3 -msgid "Overwrite the old image with the new one?" -msgstr "Sobrescrever a imagem antiga com a nova?" +#: ../copy-n-paste/eggsmclient.c:229 +msgid "FILE" +msgstr "ARQUIVO" -#: ../data/glade/gthumb.glade.h:4 -#, fuzzy -msgid "Tags:" -msgstr "Margens" +#: ../copy-n-paste/eggsmclient.c:232 +msgid "Specify session management ID" +msgstr "Especificar um ID de gerenciamento de sessão" -#: ../data/glade/gthumb.glade.h:5 -msgid "A_vailable applications:" -msgstr "Aplicações disponí_veis:" +#: ../copy-n-paste/eggsmclient.c:232 +msgid "ID" +msgstr "ID" -#: ../data/glade/gthumb.glade.h:6 -msgid "Alpha" -msgstr "Alfa" +#: ../copy-n-paste/eggsmclient.c:253 +msgid "Session management options:" +msgstr "Opções de gerenciamento de sessão:" -#: ../data/glade/gthumb.glade.h:7 -msgid "Blue" -msgstr "Azul" +#: ../copy-n-paste/eggsmclient.c:254 +msgid "Show session management options" +msgstr "Mostrar opções de gerenciamento de sessão" -#: ../data/glade/gthumb.glade.h:8 -msgid "Bookmarks" -msgstr "Marcadores" +#. manually set name and icon +#: ../data/gthumb.desktop.in.in.h:1 ../gthumb/gth-browser.c:578 +#: ../gthumb/gth-progress-dialog.c:390 ../gthumb/main.c:315 +msgid "gThumb" +msgstr "gThumb" -#: ../data/glade/gthumb.glade.h:9 -msgid "C_atalogs:" -msgstr "C_atálogos:" +#: ../data/gthumb.desktop.in.in.h:2 +msgid "Image Viewer" +msgstr "Visualizador de imagens" -#: ../data/glade/gthumb.glade.h:10 -msgid "Choose a Catalog" -msgstr "Escolha um Catálogo" - -#: ../data/glade/gthumb.glade.h:11 ../src/gth-window-actions-entries.h:85 -msgid "Comm_ent" -msgstr "Com_entário" - -#: ../data/glade/gthumb.glade.h:12 -msgid "Do not overwrite _the old image" -msgstr "Não sobrescrever a imagem an_tiga" +#: ../data/gthumb.desktop.in.in.h:3 +msgid "gThumb Image Viewer" +msgstr "Visualizador de imagens gThumb" -#: ../data/glade/gthumb.glade.h:13 -msgid "Green" -msgstr "Verde" +#: ../data/gthumb.desktop.in.in.h:4 +msgid "View and organize your images" +msgstr "Veja e organize as suas imagens" -#: ../data/glade/gthumb.glade.h:14 -msgid "New Image:" -msgstr "Nova Imagem:" +#: ../data/gthumb-import.desktop.in.in.h:1 +msgid "Import with gThumb" +msgstr "Importar com gThumb" -#: ../data/glade/gthumb.glade.h:15 -msgid "New _Library" -msgstr "Nova _Biblioteca" +#: ../data/gthumb-import.desktop.in.in.h:2 +msgid "Photo Import Tool" +msgstr "Ferramenta de importação de imagens" -#: ../data/glade/gthumb.glade.h:16 -msgid "Old Image:" -msgstr "Imagem Antiga:" +#: ../data/gthumb-import.desktop.in.in.h:3 +msgid "gThumb Photo Import Tool" +msgstr "Ferramenta de importação de imagens do gThumb" -#: ../data/glade/gthumb.glade.h:17 -msgid "Open Images" -msgstr "Abrir Imagens" +#: ../data/gthumb-import.desktop.in.in.h:4 +msgid "Import the photos on your camera card" +msgstr "Importa fotos do cartão da sua câmera" -#: ../data/glade/gthumb.glade.h:18 -msgid "Over_write the old image" -msgstr "Sobrescre_ver a imagem antiga" +#: ../data/org.gnome.gthumb.gschema.xml.in.h:1 +msgid "" +"Images over this size (in bytes) will not be thumbnailed. Use 0 if you want " +"to generate thumbnails for all images." +msgstr "" +"Imagens além deste tamanho (em bytes) não terão miniaturas. Use 0 se você " +"quiser gerar miniaturas para todas as imagens." -#: ../data/glade/gthumb.glade.h:19 -msgid "Overwrite Image" -msgstr "Sobrescrever Imagem" +#: ../data/org.gnome.gthumb.gschema.xml.in.h:2 +msgid "Whether to resize the window to fit the size of the image" +msgstr "Redimensiona a janela para ajustar o tamanho à imagem" + +#: ../data/org.gnome.gthumb.gschema.xml.in.h:3 +msgid "Open files in the active window" +msgstr "Abre arquivos na janela ativa" -#: ../data/glade/gthumb.glade.h:20 -msgid "Overwrite _all images" -msgstr "Sobrescrever _todas as imagens" +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:1 +msgid "Possible values are: white, black, checked, none." +msgstr "Valores possíveis são: white, black, checked, none." -#: ../data/glade/gthumb.glade.h:21 -msgid "R_ecent applications:" -msgstr "Aplicações r_ecentes:" +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:2 +msgid "Whether to reset the scrollbars position after changing image" +msgstr "Restaurar as posições da barra de rolagem após modificar a imagem" -#: ../data/glade/gthumb.glade.h:22 -msgid "Red" -msgstr "Vermelho" +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:3 +msgid "Whether to always use a black background." +msgstr "Sempre usar plano de fundo preto." -#: ../data/glade/gthumb.glade.h:23 -msgid "Value" -msgstr "Valor" +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:1 +msgid "Possible values are: jpeg, jpg." +msgstr "Valores possíveis são: jpeg, jpg." -#: ../data/glade/gthumb.glade.h:24 -msgid "_Application:" -msgstr "_Aplicação:" +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:2 +msgid "Possible values are: tiff, tif." +msgstr "Valores possíveis são: tiff, tif." -#: ../data/glade/gthumb.glade.h:25 -msgid "_Bookmarks:" -msgstr "Ma_rcadores:" +#: ../data/org.gnome.gthumb.rename-series.gschema.xml.in.h:1 +msgid "" +"Possible values include: general::unsorted, file::name, file::size, file::" +"mtime, exif::photo::datetimeoriginal" +msgstr "" +"Valores possíveis inclui: general::unsorted, file::name, file::size, file::" +"mtime, exif::photo::datetimeoriginal" -#: ../data/glade/gthumb.glade.h:26 -msgid "_Do not overwrite any image" -msgstr "_Não sobrescrever nenhuma imagem" - -#: ../data/glade/gthumb.glade.h:27 -msgid "_General" -msgstr "_Geral" - -#: ../data/glade/gthumb.glade.h:28 -msgid "_Histogram" -msgstr "_Histograma" - -#: ../data/glade/gthumb.glade.h:29 -msgid "_Metadata" -msgstr "_Metadados" +#: ../data/ui/extensions-preferences.ui.h:1 +msgid "_Extensions:" +msgstr "_Extensões:" + +#: ../data/ui/extensions-preferences.ui.h:2 +msgid "More extensions..." +msgstr "Mais extensões..." + +#: ../data/ui/extensions-preferences.ui.h:3 +msgid "Some extensions are configurable." +msgstr "Algumas extensões são configuráveis." + +# ou Nome do filtro? +#: ../data/ui/filter-editor.ui.h:1 +msgid "Filter _Name:" +msgstr "_Nome do filtro:" + +#: ../data/ui/filter-editor.ui.h:2 +#: ../extensions/search/data/ui/search-editor.ui.h:3 +msgid "_Match" +msgstr "C_orresponder a" + +#. limit label +#: ../data/ui/filter-editor.ui.h:3 ../gthumb/gth-filter.c:269 +#: ../gthumb/gth-filter.c:337 +msgid "_Limit to" +msgstr "_Limitar a" + +#: ../data/ui/filter-editor.ui.h:4 +msgid "selected by" +msgstr "selecionado(s) por" + +#: ../data/ui/histogram-info.ui.h:1 +msgid "Mean:" +msgstr "Média:" + +#. Short for "Standard deviation". Try to keep it under the 12 characters in the translation or it will be ellipsizied at the end. +#: ../data/ui/histogram-info.ui.h:3 +msgid "Std dev:" +msgstr "Desv padrão:" + +#: ../data/ui/histogram-info.ui.h:4 +msgid "Median:" +msgstr "Mediana:" + +#. After the colon there is the total number of pixels +#: ../data/ui/histogram-info.ui.h:6 +msgid "Pixels:" +msgstr "Pixeis:" + +#. After the colon there is a percentile. +#: ../data/ui/histogram-info.ui.h:8 +msgctxt "Pixels" +msgid "Max:" +msgstr "Máx:" + +#. After the colon there is the percentile of selected pixels. +#: ../data/ui/histogram-info.ui.h:10 +msgctxt "Pixels" +msgid "Selected:" +msgstr "Selecionado:" + +#: ../data/ui/location.ui.h:1 +msgid "_Location:" +msgstr "_Localização:" + +#: ../data/ui/overwrite-dialog.ui.h:1 +msgid "Overwrite the old file with the new one?" +msgstr "Sobrescrever a imagem antiga com a nova?" + +#: ../data/ui/overwrite-dialog.ui.h:2 +msgid "Old File:" +msgstr "Arquivo antigo:" + +#: ../data/ui/overwrite-dialog.ui.h:3 +msgid "Filename:" +msgstr "Nome do arquivo:" + +#: ../data/ui/overwrite-dialog.ui.h:4 +#: ../extensions/image_print/data/ui/print-layout.ui.h:23 +msgid "Size:" +msgstr "Tamanho:" + +#: ../data/ui/overwrite-dialog.ui.h:5 +msgid "Modified:" +msgstr "Modificado:" + +#: ../data/ui/overwrite-dialog.ui.h:6 +msgid "New File:" +msgstr "Novo arquivo:" + +#: ../data/ui/overwrite-dialog.ui.h:7 +msgid "Over_write the old file" +msgstr "Sobrescre_ver o arquivo antiga" + +#: ../data/ui/overwrite-dialog.ui.h:8 +msgid "Do not overwrite _the old file" +msgstr "Não sobrescrever o arquivo an_tigo" + +#: ../data/ui/overwrite-dialog.ui.h:9 +msgid "Overwrite _all files" +msgstr "Sobrescrever todos _arquivos" + +#: ../data/ui/overwrite-dialog.ui.h:10 +msgid "_Do not overwrite any file" +msgstr "_Não sobrescrever nenhum arquivo" + +#: ../data/ui/overwrite-dialog.ui.h:11 +msgid "_Save the new file as:" +msgstr "_Salvar o novo arquivo como:" + +#: ../data/ui/personalize-filters.ui.h:1 +msgid "Filters" +msgstr "Filtros" + +#: ../data/ui/personalize-filters.ui.h:2 +msgid "_General filter:" +msgstr "Filtro _geral:" + +#: ../data/ui/personalize-filters.ui.h:3 +msgid "_Other filters:" +msgstr "_Outros filtros:" + +#: ../data/ui/preferences.ui.h:1 +msgid "below the folder list" +msgstr "embaixo da lista de pastas" + +#: ../data/ui/preferences.ui.h:2 +msgid "on the right" +msgstr "na direita" -#: ../data/glade/gthumb.glade.h:30 -msgid "_New Catalog" -msgstr "_Novo Catálogo" +#: ../data/ui/preferences.ui.h:3 +msgid "gThumb Preferences" +msgstr "Preferências do gThumb" -#: ../data/glade/gthumb.glade.h:31 -msgid "_Next" -msgstr "_Próximo" +#: ../data/ui/preferences.ui.h:4 +msgid "_Toolbar style:" +msgstr "_Estilo da barra de ferramentas:" -#: ../data/glade/gthumb.glade.h:32 -msgid "_Previous" -msgstr "_Anterior" +#: ../data/ui/preferences.ui.h:5 +msgid "T_humbnails in viewer:" +msgstr "_Miniaturas no visualizador:" -#: ../data/glade/gthumb.glade.h:33 -msgid "_Save the new image as:" -msgstr "_Salvar a nova imagem como:" +#: ../data/ui/preferences.ui.h:6 +msgid "System settings" +msgstr "configurações do sistema" -#: ../data/glade/gthumb.glade.h:34 -msgid "_View the destination" -msgstr "_Ver o destino" +#: ../data/ui/preferences.ui.h:7 +msgid "Text below icons" +msgstr "texto abaixo dos ícones" -#: ../data/glade/gthumb_camera.glade.h:1 ../data/glade/gthumb_search.glade.h:1 -#: ../data/glade/gthumb_web_exporter.glade.h:3 -msgid "..." -msgstr "..." +#: ../data/ui/preferences.ui.h:8 +msgid "Text beside icons" +msgstr "texto ao lado dos ícones" -#: ../data/glade/gthumb_camera.glade.h:2 -msgid "Click \"Help\" for format code information." -msgstr "" -"Clique em \"Ajuda\" para informações sobre o código de formatação." +#: ../data/ui/preferences.ui.h:9 +msgid "Icons only" +msgstr "apenas ícones" -#: ../data/glade/gthumb_camera.glade.h:3 -#: ../data/glade/gthumb_convert.glade.h:6 -#: ../data/glade/gthumb_png_exporter.glade.h:24 -#: ../data/glade/gthumb_tools.glade.h:31 -#: ../data/glade/gthumb_web_exporter.glade.h:30 -msgid "Choose destination folder" -msgstr "Escolher pasta de destino" +#: ../data/ui/preferences.ui.h:10 +msgid "Text only" +msgstr "apenas texto" -#: ../data/glade/gthumb_camera.glade.h:4 -msgid "Custom subfolder:" -msgstr "Subpasta personalizada:" - -#: ../data/glade/gthumb_camera.glade.h:5 -msgid "Delete selected images from the camera" -msgstr "Excluir imagens selecionadas da câmera" +#: ../data/ui/preferences.ui.h:11 +msgid "on the bottom" +msgstr "embaixo" -#: ../data/glade/gthumb_camera.glade.h:6 -msgid "" -"If valuable photos have been deleted accidently, download the excellent " -"PhotoRec tool from http://www.cgsecurity.org. PhotoRec can usually recover " -"images that have been recently deleted from flash cards and other media." -msgstr "" +#: ../data/ui/preferences.ui.h:12 +msgid "on the side" +msgstr "lateral" -#: ../data/glade/gthumb_camera.glade.h:7 -msgid "Import Photos" -msgstr "Importar Fotos" - -#: ../data/glade/gthumb_camera.glade.h:8 -msgid "Update previews" -msgstr "Atualizar visualizações" - -#: ../data/glade/gthumb_camera.glade.h:9 -msgid "_Delete imported images from the camera" -msgstr "_Excluir imagens importadas da câmera" - -#: ../data/glade/gthumb_camera.glade.h:10 -msgid "_Destination folder:" -msgstr "Pasta de _destino:" - -#: ../data/glade/gthumb_camera.glade.h:11 -msgid "_Group into subfolders:" -msgstr "A_grupar em subpastas:" +#: ../data/ui/preferences.ui.h:13 +msgid "File _properties in browser:" +msgstr "_Propriedades do arquivo no navegador:" -#: ../data/glade/gthumb_camera.glade.h:12 -msgid "_Import" -msgstr "_Importar" +#: ../data/ui/preferences.ui.h:14 +msgid "Appearance" +msgstr "Aparência" -#: ../data/glade/gthumb_camera.glade.h:13 -#: ../data/glade/gthumb_search.glade.h:29 -#, fuzzy -msgid "_Tags:" -msgstr "C_atálogos:" +#: ../data/ui/preferences.ui.h:15 +msgid "Go to last _visited location" +msgstr "_Vai para a última localização visitada" -#: ../data/glade/gthumb_comments.glade.h:1 -#: ../data/glade/gthumb_search.glade.h:4 -#, fuzzy -msgid "A_vailable tags:" -msgstr "Categorias disponí_veis:" +#: ../data/ui/preferences.ui.h:16 +msgid "Go to this _folder:" +msgstr "Va_i para esta pasta:" -#: ../data/glade/gthumb_comments.glade.h:2 -#: ../data/glade/gthumb_search.glade.h:10 -msgid "Co_mment:" -msgstr "Co_mentário:" +#: ../data/ui/preferences.ui.h:17 +msgid "Choose startup folder" +msgstr "Escolha a pasta de inicial" -#: ../data/glade/gthumb_comments.glade.h:3 ../src/gth-filter-bar.c:206 -msgid "Comment" -msgstr "Comentário" +#: ../data/ui/preferences.ui.h:18 +msgid "Set to C_urrent" +msgstr "Usar a _atual" -#: ../data/glade/gthumb_comments.glade.h:4 -#, fuzzy -msgid "Create a new tag" -msgstr "Cria novo catálogo" +#: ../data/ui/preferences.ui.h:19 +msgid "_Reuse the active window to open files" +msgstr "_Usar a janela ativa para abrir arquivos" + +#: ../data/ui/preferences.ui.h:20 +msgid "On startup:" +msgstr "Ao iniciar:" -#: ../data/glade/gthumb_comments.glade.h:5 -msgid "Current date" -msgstr "Data atual" +#: ../data/ui/preferences.ui.h:21 +msgid "As_k confirmation before deleting files or catalogs" +msgstr "Pedir confirmação antes de e_xcluir imagens ou catálogos" -#: ../data/glade/gthumb_comments.glade.h:6 -msgid "Date photo taken (from EXIF metadata)" -msgstr "Data na qual a foto foi tirada (a partir dos metadados EXIF)" +#: ../data/ui/preferences.ui.h:22 +msgid "Ask whether to save _modified files" +msgstr "Perguntar quando for _salvar imagens modificadas" + +#: ../data/ui/preferences.ui.h:23 +msgid "_Store metadata inside files if possible" +msgstr "Arma_zenar metadados dentro de arquivos, se possível" + +#: ../data/ui/preferences.ui.h:24 +#: ../extensions/exiv2_tools/gth-edit-iptc-page.c:198 +#: ../extensions/gstreamer_tools/main.c:33 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:17 +msgid "Other" +msgstr "Outros" -#: ../data/glade/gthumb_comments.glade.h:7 -msgid "Do not modify" -msgstr "Não modificar" +#: ../data/ui/preferences.ui.h:25 +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 +#: ../extensions/edit_metadata/gth-edit-general-page.c:481 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 +#: ../gthumb/gth-main-default-metadata.c:33 +msgid "General" +msgstr "Geral" -#: ../data/glade/gthumb_comments.glade.h:8 -msgid "Image creation date" -msgstr "Data de criação da imagem" +#: ../data/ui/preferences.ui.h:26 +#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 +#: ../extensions/image_print/data/ui/print-layout.ui.h:18 +msgid "Caption" +msgstr "Legenda" -#: ../data/glade/gthumb_comments.glade.h:9 -msgid "Last modified date" -msgstr "Data da última modificação" +#: ../data/ui/preferences.ui.h:27 +msgid "Thumbnail _size:" +msgstr "_Tamanho da miniatura:" -#: ../data/glade/gthumb_comments.glade.h:10 -msgid "No date" -msgstr "Sem data" +#: ../data/ui/preferences.ui.h:28 +msgid "48" +msgstr "48" -#: ../data/glade/gthumb_comments.glade.h:11 -#, fuzzy -msgid "Remove selected tag" -msgstr "Remove catálogo selecionado" +#: ../data/ui/preferences.ui.h:29 +msgid "64" +msgstr "64" -#: ../data/glade/gthumb_comments.glade.h:12 -msgid "Save only cha_nged fields" -msgstr "Salvar some_nte campos alterados" +#: ../data/ui/preferences.ui.h:30 +msgid "85" +msgstr "85" -#: ../data/glade/gthumb_comments.glade.h:13 -#: ../data/glade/gthumb_search.glade.h:21 -#, fuzzy -msgid "Tags" -msgstr "Imagens" +#: ../data/ui/preferences.ui.h:31 +msgid "95" +msgstr "95" -#: ../data/glade/gthumb_comments.glade.h:14 -msgid "The following date" -msgstr "A data a seguir" +#: ../data/ui/preferences.ui.h:32 +msgid "112" +msgstr "112" -#: ../data/glade/gthumb_comments.glade.h:15 -#: ../data/glade/gthumb_search.glade.h:22 -msgid "_Date:" -msgstr "_Data:" +#: ../data/ui/preferences.ui.h:33 +msgid "128" +msgstr "128" -#: ../data/glade/gthumb_comments.glade.h:16 -#: ../data/glade/gthumb_search.glade.h:25 -msgid "_Place:" -msgstr "_Lugar:" +#: ../data/ui/preferences.ui.h:34 +msgid "164" +msgstr "164" -#: ../data/glade/gthumb_comments.glade.h:17 -#: ../data/glade/gthumb_search.glade.h:28 -#, fuzzy -msgid "_Selected tags:" -msgstr "Imagens _Selecionadas" +#: ../data/ui/preferences.ui.h:35 +msgid "200" +msgstr "200" -#: ../data/glade/gthumb_convert.glade.h:2 -msgid "Compression" -msgstr "Compressão" - -#: ../data/glade/gthumb_convert.glade.h:3 ../data/glade/gthumb_tools.glade.h:7 -msgid "Image type" -msgstr "Tipo de imagem" - -#: ../data/glade/gthumb_convert.glade.h:4 -#: ../data/glade/gthumb_print.glade.h:16 -msgid "Resolution" -msgstr "Resolução" - -#: ../data/glade/gthumb_convert.glade.h:5 -#: ../data/glade/gthumb_png_exporter.glade.h:20 -#: ../data/glade/gthumb_tools.glade.h:9 -#: ../data/glade/gthumb_web_exporter.glade.h:20 -msgid "Saving" -msgstr "Salvando" +#: ../data/ui/preferences.ui.h:36 +msgid "256" +msgstr "256" -#: ../data/glade/gthumb_convert.glade.h:7 -msgid "Compression _level:" -msgstr "_Nível de compressão:" +#: ../data/ui/preferences.ui.h:37 +msgid "D_etermine image type from content (slower)" +msgstr "D_eterminar tipo de imagem pelo conteúdo (lento)" -#: ../data/glade/gthumb_convert.glade.h:8 -msgid "Convert Format" -msgstr "Converter Formato" +#: ../data/ui/preferences.ui.h:38 ../gthumb/dlg-preferences-extensions.c:71 +#: ../gthumb/gth-browser-actions-entries.h:179 +msgid "Browser" +msgstr "Navegador" -#: ../data/glade/gthumb_convert.glade.h:9 -msgid "JPEG Options" -msgstr "Opções de JPEG" +#: ../data/ui/sort-order.ui.h:1 +msgid "Sort By" +msgstr "Ordenar por" + +#: ../data/ui/sort-order.ui.h:2 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:4 +msgid "_Sort by:" +msgstr "_Ordenar por:" + +#: ../data/ui/sort-order.ui.h:3 +msgid "_Inverse order" +msgstr "Ordem _inversa" + +#: ../extensions/23hq/23hq.extension.in.in.h:1 +msgid "23" +msgstr "23" + +#: ../extensions/23hq/23hq.extension.in.in.h:2 +msgid "Upload images to 23hq.com" +msgstr "Envia imagens para o 23hq.com" + +#: ../extensions/23hq/callbacks.c:68 +msgid "_23..." +msgstr "_23..." + +#: ../extensions/23hq/callbacks.c:69 +msgid "Upload photos to 23" +msgstr "Envia fotos para o 23" -#: ../data/glade/gthumb_convert.glade.h:10 -msgid "No_rmal (Deflate)" -msgstr "No_rmal (Desinflar)" +#: ../extensions/bookmarks/bookmarks.extension.in.in.h:1 +#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:1 +msgid "Bookmarks" +msgstr "Marcadores" -#: ../data/glade/gthumb_convert.glade.h:11 -msgid "Opti_mize" -msgstr "Oti_mizar" +#: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 +msgid "Add bookmarks support." +msgstr "Adiciona suporte a marcadores." + +#: ../extensions/bookmarks/bookmarks.extension.in.in.h:3 +#: ../extensions/burn_disc/burn_disc.extension.in.in.h:3 +#: ../extensions/catalogs/catalogs.extension.in.in.h:3 +#: ../extensions/change_date/change_date.extension.in.in.h:3 +#: ../extensions/comments/comments.extension.in.in.h:3 +#: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:3 +#: ../extensions/convert_format/convert_format.extension.in.in.h:3 +#: ../extensions/desktop_background/desktop_background.extension.in.in.h:3 +#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:3 +#: ../extensions/exiv2_tools/exiv2_tools.extension.in.in.h:3 +#: ../extensions/file_manager/file_manager.extension.in.in.h:3 +#: ../extensions/file_tools/file_tools.extension.in.in.h:3 +#: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:3 +#: ../extensions/gstreamer_tools/gstreamer_tools.extension.in.in.h:3 +#: ../extensions/image_print/image_print.extension.in.in.h:3 +#: ../extensions/image_rotation/image_rotation.extension.in.in.h:3 +#: ../extensions/image_viewer/image_viewer.extension.in.in.h:3 +#: ../extensions/list_tools/list_tools.extension.in.in.h:3 +#: ../extensions/photo_importer/photo_importer.extension.in.in.h:3 +#: ../extensions/raw_files/raw_files.extension.in.in.h:3 +#: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:3 +#: ../extensions/rename_series/rename_series.extension.in.in.h:3 +#: ../extensions/resize_images/resize_images.extension.in.in.h:3 +#: ../extensions/search/search.extension.in.in.h:3 +#: ../extensions/selections/selections.extension.in.in.h:3 +#: ../extensions/slideshow/slideshow.extension.in.in.h:3 +#: ../extensions/webalbums/webalbums.extension.in.in.h:3 +msgid "gthumb development team" +msgstr "equipe de desenvolvimento do gThumb" -#: ../data/glade/gthumb_convert.glade.h:12 -#: ../data/glade/gthumb_tools.glade.h:67 -msgid "Overwrite mode:" -msgstr "Modo de sobrescrita:" - -#: ../data/glade/gthumb_convert.glade.h:13 -msgid "PNG Options" -msgstr "Opções de PNG" - -#: ../data/glade/gthumb_convert.glade.h:14 -#: ../data/glade/gthumb_tools.glade.h:68 -msgid "R_emove original" -msgstr "R_emover original" +#: ../extensions/bookmarks/callbacks.c:54 +msgid "_Bookmarks" +msgstr "Ma_rcadores" -#: ../data/glade/gthumb_convert.glade.h:15 -#: ../data/glade/gthumb_tools.glade.h:71 -msgid "Rename" -msgstr "Renomear" +#: ../extensions/bookmarks/callbacks.c:55 +msgid "_System Bookmarks" +msgstr "Marcadores do _sistema" -#: ../data/glade/gthumb_convert.glade.h:16 -#: ../data/glade/gthumb_tools.glade.h:79 -msgid "" -"Skip\n" -"Rename\n" -"Ask\n" -"Overwrite" -msgstr "" -"Pular\n" -"Renomear\n" -"Perguntar\n" -"Sobrescrever" - -#: ../data/glade/gthumb_convert.glade.h:20 -msgid "TGA Options" -msgstr "Opções de TGA" - -#: ../data/glade/gthumb_convert.glade.h:21 -msgid "TIFF Options" -msgstr "Opções de TIFF" - -#: ../data/glade/gthumb_convert.glade.h:22 -#: ../data/glade/gthumb_tools.glade.h:85 -msgid "T_GA" -msgstr "T_GA" - -#: ../data/glade/gthumb_convert.glade.h:23 -#: ../data/glade/gthumb_png_exporter.glade.h:61 -#: ../data/glade/gthumb_tools.glade.h:93 -#: ../data/glade/gthumb_web_exporter.glade.h:49 -msgid "_Destination:" -msgstr "_Destino:" +#: ../extensions/bookmarks/callbacks.c:58 +msgid "_Add Bookmark" +msgstr "_Adicionar marcador" -#: ../data/glade/gthumb_convert.glade.h:24 -#: ../data/glade/gthumb_png_exporter.glade.h:65 -msgid "_Horizontal:" -msgstr "_Horizontal:" +#: ../extensions/bookmarks/callbacks.c:59 +msgid "Add current location to bookmarks" +msgstr "Adiciona a localização atual aos marcadores" -#: ../data/glade/gthumb_convert.glade.h:25 -#: ../data/glade/gthumb_tools.glade.h:96 -msgid "_JPEG" -msgstr "_JPEG" +#: ../extensions/bookmarks/callbacks.c:63 +msgid "_Edit Bookmarks..." +msgstr "_Editar marcadores..." -#: ../data/glade/gthumb_convert.glade.h:26 -msgid "_Loss compression (JPEG)" -msgstr "_Compressão com perda (JPEG)" +#: ../extensions/bookmarks/callbacks.c:64 +msgid "Edit bookmarks" +msgstr "Edita os marcadores" -#: ../data/glade/gthumb_convert.glade.h:27 -msgid "_No compression" -msgstr "_Sem compressão" +#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:2 +msgid "_Bookmarks:" +msgstr "Ma_rcadores:" + +#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:3 +msgid "_Name" +msgstr "_Nome" + +#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:4 +msgid "_Location" +msgstr "_Localização" + +#: ../extensions/bookmarks/dlg-bookmarks.c:70 +msgid "Could not remove the bookmark" +msgstr "Não foi possível remover o marcador" + +#: ../extensions/burn_disc/burn_disc.extension.in.in.h:1 +msgid "Burn CD/DVD" +msgstr "Gravar CD/DVD" + +# Descrição de extensão +#: ../extensions/burn_disc/burn_disc.extension.in.in.h:2 +msgid "Save files to an optical disc." +msgstr "Salva arquivos para um disco óptico." + +#: ../extensions/burn_disc/callbacks.c:55 +msgid "_Optical Disc..." +msgstr "_Disco óptico..." + +#: ../extensions/burn_disc/callbacks.c:56 +msgid "Write files to an optical disc" +msgstr "Grava arquivos em um disco óptico" + +#: ../extensions/burn_disc/data/ui/burn-disc-options.ui.h:1 +msgid "Disc Name" +msgstr "Nome do disco" + +#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:1 +msgid "Current _folder" +msgstr "_Pasta atual" + +#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:2 +msgid "Current folder and its s_ub-folders" +msgstr "Pasta atual e suas s_ubpastas" + +#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:3 +msgid "_Selected files" +msgstr "Arquivos _selecionados" + +#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:4 +msgid "Source" +msgstr "Fonte" + +#: ../extensions/burn_disc/gth-burn-task.c:238 +#: ../extensions/burn_disc/gth-burn-task.c:259 +#: ../extensions/burn_disc/gth-burn-task.c:397 +msgid "Write to Disc" +msgstr "Gravar em disco" + +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:62 +#, c-format +msgid "Error interpreting JPEG image file: %s" +msgstr "Erro ao interpretar o arquivo de imagem JPEG: %s" + +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:483 +#, c-format +msgid "Unknown JPEG color space (%d)" +msgstr "Espaço de cores JPEG desconhecido (%d)" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:1 +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:1 +msgid "_Default extension:" +msgstr "_Extensão padrão:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:2 +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:1 +msgid "_Quality:" +msgstr "_Qualidade:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:3 +msgid "_Smoothing:" +msgstr "_Suavização:" -#: ../data/glade/gthumb_convert.glade.h:28 -#: ../data/glade/gthumb_tools.glade.h:99 -msgid "_PNG" -msgstr "_PNG" +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:4 +msgid "Opti_mize" +msgstr "Oti_mizar" -#: ../data/glade/gthumb_convert.glade.h:29 +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:5 msgid "_Progressive" msgstr "_Progressiva" -#: ../data/glade/gthumb_convert.glade.h:30 -msgid "_Quality:" -msgstr "_Qualidade:" +#: ../extensions/cairo_io/data/ui/png-options.ui.h:1 +msgid "Compression _level:" +msgstr "_Nível de compressão:" -#: ../data/glade/gthumb_convert.glade.h:31 +#: ../extensions/cairo_io/data/ui/save-options-preferences.ui.h:1 +msgid "Default options:" +msgstr "Opções padrões:" + +#: ../extensions/cairo_io/data/ui/tga-options.ui.h:1 msgid "_RLE compression" msgstr "Compressão _RLE" -#: ../data/glade/gthumb_convert.glade.h:32 -msgid "_Smoothing:" -msgstr "_Suavização:" +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:2 +msgid "Compression" +msgstr "Compressão" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:3 +msgid "_No compression" +msgstr "_Sem compressão" -#: ../data/glade/gthumb_convert.glade.h:33 -#: ../data/glade/gthumb_tools.glade.h:106 -msgid "_TIFF" -msgstr "_TIFF" +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:4 +msgid "No_rmal (Deflate)" +msgstr "No_rmal (desinflar)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:5 +msgid "_Loss compression (JPEG)" +msgstr "_Compressão com perda (JPEG)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:6 +msgid "Resolution" +msgstr "Resolução" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:7 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 +msgid "_Horizontal:" +msgstr "_Horizontal:" -#: ../data/glade/gthumb_convert.glade.h:34 -#: ../data/glade/gthumb_png_exporter.glade.h:70 +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:8 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 msgid "_Vertical:" msgstr "_Vertical:" -#: ../data/glade/gthumb_convert.glade.h:35 -#: ../data/glade/gthumb_print.glade.h:54 +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:9 msgid "dpi" msgstr "dpi" -#: ../data/glade/gthumb_crop.glade.h:1 -msgid "4 x 3 (Book, DVD)" -msgstr "4 x 3 (Livro, DVD)" - -#: ../data/glade/gthumb_crop.glade.h:2 -msgid "4 x 6 (Postcard)" -msgstr "4 x 6 (Cartão Postal)" - -#: ../data/glade/gthumb_crop.glade.h:3 -msgid "5 x 7" -msgstr "5 x 7" - -#: ../data/glade/gthumb_crop.glade.h:4 -msgid "8 x 10" -msgstr "8 x 10" - -#: ../data/glade/gthumb_crop.glade.h:5 -msgid "Actions" -msgstr "Ações" - -#: ../data/glade/gthumb_crop.glade.h:6 -msgid "Aspect ratio" -msgstr "Proporção" - -#: ../data/glade/gthumb_crop.glade.h:7 -msgid "Display" -msgstr "Exibição" - -#: ../data/glade/gthumb_crop.glade.h:8 -msgid "Selection" -msgstr "Seleção" +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:2 +msgid "_Method:" +msgstr "_Método:" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:3 +msgid "_Lossless" +msgstr "_Sem perda" + +#: ../extensions/cairo_io/gth-image-saver-jpeg.c:516 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:140 +msgid "JPEG" +msgstr "JPEG" + +#: ../extensions/cairo_io/gth-image-saver-png.c:353 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:110 +msgid "PNG" +msgstr "PNG" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:257 +#: ../extensions/cairo_io/gth-image-saver-tiff.c:435 +#: ../gthumb/gth-buffer-data.c:84 +msgid "Insufficient memory" +msgstr "Memória insuficiente" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:344 +msgid "TGA" +msgstr "TGA" + +#: ../extensions/cairo_io/gth-image-saver-tiff.c:559 +msgid "TIFF" +msgstr "TIFF" + +#: ../extensions/cairo_io/gth-image-saver-webp.c:382 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:165 +msgid "WebP" +msgstr "WebP" + +#: ../extensions/cairo_io/preferences.c:134 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 +msgid "Saving" +msgstr "Salvar" + +#: ../extensions/catalogs/actions.c:92 ../extensions/catalogs/actions.c:213 +#: ../extensions/catalogs/dlg-add-to-catalog.c:274 +#: ../extensions/catalogs/dlg-add-to-catalog.c:394 +#: ../extensions/file_manager/actions.c:68 +#: ../extensions/list_tools/gth-script-editor-dialog.c:290 +#: ../gthumb/gth-filter-editor-dialog.c:461 +#, c-format +msgid "No name specified" +msgstr "Nenhum nome especificado" + +#: ../extensions/catalogs/actions.c:99 ../extensions/catalogs/actions.c:220 +#: ../extensions/catalogs/dlg-add-to-catalog.c:281 +#: ../extensions/catalogs/dlg-add-to-catalog.c:401 +#: ../extensions/file_manager/actions.c:75 +#, c-format +msgid "Invalid name. The following characters are not allowed: %s" +msgstr "Nome inválido. Os caracteres a seguir não são permitidos: %s" + +#: ../extensions/catalogs/actions.c:155 ../extensions/catalogs/actions.c:267 +#: ../extensions/catalogs/dlg-add-to-catalog.c:338 +#: ../extensions/catalogs/dlg-add-to-catalog.c:448 +#: ../extensions/catalogs/gth-file-source-catalogs.c:508 +#: ../extensions/file_manager/actions.c:106 +msgid "Name already used" +msgstr "Nome já usado" + +#: ../extensions/catalogs/actions.c:178 +#: ../extensions/catalogs/dlg-add-to-catalog.c:359 +msgid "New catalog" +msgstr "Novo catálogo" + +#: ../extensions/catalogs/actions.c:179 +#: ../extensions/catalogs/dlg-add-to-catalog.c:360 +msgid "Enter the catalog name:" +msgstr "Digite o nome do catálogo:" + +#: ../extensions/catalogs/actions.c:181 ../extensions/catalogs/actions.c:293 +#: ../extensions/catalogs/dlg-add-to-catalog.c:362 +#: ../extensions/catalogs/dlg-add-to-catalog.c:474 +#: ../extensions/file_manager/actions.c:136 +msgid "C_reate" +msgstr "C_riar" + +#: ../extensions/catalogs/actions.c:290 +#: ../extensions/catalogs/dlg-add-to-catalog.c:471 +msgid "New library" +msgstr "Nova biblioteca" + +#: ../extensions/catalogs/actions.c:291 +#: ../extensions/catalogs/dlg-add-to-catalog.c:472 +msgid "Enter the library name:" +msgstr "Digite o nome da biblioteca:" + +#: ../extensions/catalogs/actions.c:326 +msgid "Could not remove the catalog" +msgstr "Não foi possível remover o catálogo" + +#: ../extensions/catalogs/actions.c:363 +#, c-format +msgid "Are you sure you want to remove \"%s\"?" +msgstr "Você tem certeza de que quer remover \"%s\"?" + +#: ../extensions/catalogs/callbacks.c:102 +msgid "_Add to Catalog" +msgstr "A_dicionar ao catálogo" + +#: ../extensions/catalogs/callbacks.c:105 +#: ../extensions/selections/callbacks.c:80 +msgid "Open _Folder" +msgstr "Abrir _pasta" + +#: ../extensions/catalogs/callbacks.c:106 +#: ../extensions/selections/callbacks.c:81 +msgid "Go to the folder that contains the selected file" +msgstr "Vai para a pasta que contém a imagem selecionada" + +#: ../extensions/catalogs/callbacks.c:110 +msgid "Other..." +msgstr "Outras..." + +#: ../extensions/catalogs/callbacks.c:111 +msgid "Choose another catalog" +msgstr "Escolha outro catálogo" + +#: ../extensions/catalogs/callbacks.c:115 +msgid "_Add to Catalog..." +msgstr "_Adicionar ao catálogo..." + +#: ../extensions/catalogs/callbacks.c:116 +msgid "Add selected images to a catalog" +msgstr "Adiciona as imagens selecionadas a um catálogo" + +#: ../extensions/catalogs/callbacks.c:120 +msgid "Remo_ve from Catalog" +msgstr "Remo_ver do catálogo" + +#: ../extensions/catalogs/callbacks.c:121 +msgid "Remove selected images from the catalog" +msgstr "Remove as imagens selecionadas do catálogo" + +#: ../extensions/catalogs/callbacks.c:125 +msgid "Create _Catalog" +msgstr "Criar _catálogo" + +#: ../extensions/catalogs/callbacks.c:130 +msgid "Create _Library" +msgstr "Criar _biblioteca" + +#: ../extensions/catalogs/callbacks.c:140 +msgid "Rena_me" +msgstr "Reno_mear" + +#: ../extensions/catalogs/callbacks.c:281 +#: ../extensions/catalogs/callbacks.c:284 +msgid "Command Line" +msgstr "Linha de comando" + +#: ../extensions/catalogs/callbacks.c:496 +#: ../extensions/catalogs/callbacks.c:501 +#: ../extensions/photo_importer/dlg-photo-importer.c:364 +#: ../extensions/photo_importer/dlg-photo-importer.c:404 +#: ../gthumb/gth-file-list.c:43 ../gthumb/gth-folder-tree.c:1093 +msgid "(Empty)" +msgstr "(Vazio)" + +#: ../extensions/catalogs/callbacks.c:700 +msgid "Catalog Properties" +msgstr "Propriedades do catálogo" + +#: ../extensions/catalogs/callbacks.c:714 +msgid "Organize" +msgstr "Organizar" + +#: ../extensions/catalogs/callbacks.c:715 +msgid "Automatically organize files by date" +msgstr "Organiza automaticamente os arquivos por data" + +#: ../extensions/catalogs/catalogs.extension.in.in.h:1 +#: ../extensions/catalogs/gth-catalog.c:611 +#: ../extensions/catalogs/gth-catalog.c:662 +#: ../extensions/catalogs/gth-catalog.c:1016 +#: ../extensions/catalogs/gth-catalog.c:1017 +msgid "Catalogs" +msgstr "Catálogos" + +# Descrição de extensão +#: ../extensions/catalogs/catalogs.extension.in.in.h:2 +msgid "Create file collections." +msgstr "Cria coleções de arquivos." + +#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:1 +msgid "Add to Catalog" +msgstr "Adicionar ao catálogo" + +#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:2 +msgid "C_atalogs:" +msgstr "C_atálogos:" + +#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:3 +msgid "_New Catalog" +msgstr "_Novo catálogo" + +#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:4 +msgid "New _Library" +msgstr "Nova _biblioteca" + +#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:5 +#: ../extensions/file_manager/actions.c:945 +#: ../extensions/webalbums/gth-web-exporter.c:1840 +msgid "_View the destination" +msgstr "_Ver o destino" + +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:1 +#: ../gthumb/gth-file-properties.c:209 +msgid "Properties" +msgstr "Propriedades" + +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:1 +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:1 +msgid "_Name:" +msgstr "_Nome:" + +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:4 +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:2 +msgid "_Date:" +msgstr "_Data:" + +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:5 +msgid "Catalog" +msgstr "Catálogo" + +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:1 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 +msgid "Organize Files" +msgstr "Organizar arquivos" + +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:2 +msgid "Organizing files" +msgstr "Organizando arquivos" + +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 +msgid "Organization:" +msgstr "Organização:" + +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:4 +msgid "Select All" +msgstr "Selecionar tudo" + +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 +msgid "Select None" +msgstr "Selecionar nenhum" + +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 +msgid "Catalog _Preview:" +msgstr "_Visualização do catálogo:" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:1 +#: ../extensions/edit_metadata/gth-edit-general-page.c:558 +#: ../gthumb/gth-main-default-tests.c:300 +msgid "Date photo was taken" +msgstr "Data na qual a foto foi tirada" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:2 +#: ../gthumb/gth-main-default-tests.c:292 +msgid "File modified date" +msgstr "Data de modificação do arquivo" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:3 +#: ../extensions/comments/main.c:182 +msgid "Tag" +msgstr "Etiqueta" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:4 +msgid "tag" +msgstr "etiqueta" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:5 +#: ../gthumb/gth-main-default-tests.c:324 +msgid "Tag (embedded)" +msgstr "Etiqueta (embutida)" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:7 +msgid "_Group files by:" +msgstr "A_grupar por:" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:8 +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 +#: ../extensions/search/data/ui/search-editor.ui.h:2 +msgid "_Include sub-folders" +msgstr "Incluir _subpastas" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:9 +msgid "Ignore catalogs with a single file" +msgstr "Ignorar catálogos com um arquivo singular" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:10 +msgid "Put single files in the catalog:" +msgstr "Colocar arquivos singulares no catálogo:" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:11 +msgid "Singles" +msgstr "Singulares" + +#: ../extensions/catalogs/dlg-add-to-catalog.c:105 +#: ../extensions/catalogs/dlg-add-to-catalog.c:136 +msgid "Could not add the files to the catalog" +msgstr "Não foi possível adicionar os arquivos ao catálogo" + +#: ../extensions/catalogs/dlg-add-to-catalog.c:217 +#: ../extensions/search/gth-search-task.c:356 +msgid "Could not create the catalog" +msgstr "Não foi possível criar o catálogo" + +#: ../extensions/catalogs/dlg-catalog-properties.c:80 +msgid "Could not save the catalog" +msgstr "Não foi possível salvar o catálogo" + +#: ../extensions/catalogs/dlg-catalog-properties.c:159 +msgid "Could not load the catalog" +msgstr "Não foi possível carregar o catálogo" + +#: ../extensions/catalogs/dlg-organize-files.c:120 +msgid "Files will be organized in catalogs. No file will be moved on disk." +msgstr "" +"Arquivos serão organizados em catálogos. Nenhum arquivo será movido no disco." + +#: ../extensions/catalogs/gth-catalog.c:1114 ../extensions/comments/main.c:45 +#: ../extensions/edit_metadata/callbacks.c:106 +#: ../gthumb/gth-main-default-metadata.c:53 +msgid "Tags" +msgstr "Etiquetas" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:953 +#, c-format +msgid "The catalog '%s' already exists, do you want to overwrite it?" +msgstr "O catálogo \"%s\" já existe. Você deseja sobrescrevê-lo?" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:955 +#, c-format +msgid "The library '%s' already exists, do you want to overwrite it?" +msgstr "A biblioteca \"%s\" já existe. Você deseja sobrescrevê-la?" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:963 +msgid "Over_write" +msgstr "Sobrescre_ver" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1081 +msgid "Cannot move the files" +msgstr "Não foi possível mover os arquivos" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1083 +msgid "Cannot copy the files" +msgstr "Não foi possível copiar os arquivos" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1088 +msgid "Invalid destination." +msgstr "Destino inválido." + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1135 +#, c-format +msgid "Copying files to '%s'" +msgstr "Copiando os arquivos para \"%s\"" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1322 +msgid "Could not remove the files from the catalog" +msgstr "Não foi possível remover os arquivos do catálogo" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1380 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:746 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:755 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:785 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:1320 +#: ../extensions/search/gth-search.c:265 +msgid "Invalid file format" +msgstr "Formato de arquivo inválido" + +#: ../extensions/catalogs/gth-organize-task.c:202 +#, c-format +msgid "Operation completed. Catalogs: %d. Images: %d." +msgstr "Operação concluída. Catálogos: %d. Imagens: %d." + +#: ../extensions/change_date/callbacks.c:44 +msgid "Change _Date..." +msgstr "Alterar _data..." + +#: ../extensions/change_date/callbacks.c:45 +msgid "Change images last modified date" +msgstr "Altera a data da última modificação das imagens" + +#: ../extensions/change_date/change_date.extension.in.in.h:1 +msgid "Change date" +msgstr "Alterar data" + +# Descrição de extensão - ponto final acrescentado propositalmente. +#: ../extensions/change_date/change_date.extension.in.in.h:2 +msgid "Change the files date" +msgstr "Altera a data dos arquivos." + +#: ../extensions/change_date/data/ui/change-date.ui.h:1 +msgid "+" +msgstr "+" + +#: ../extensions/change_date/data/ui/change-date.ui.h:2 +msgid "-" +msgstr "-" + +#: ../extensions/change_date/data/ui/change-date.ui.h:3 +msgid "Change Date" +msgstr "Alterar data" + +#: ../extensions/change_date/data/ui/change-date.ui.h:4 +msgid "Change the following values:" +msgstr "Alterar os seguintes valores:" + +#: ../extensions/change_date/data/ui/change-date.ui.h:5 +msgid "_Last modified date" +msgstr "Data da ú_ltima modificação" + +#: ../extensions/change_date/data/ui/change-date.ui.h:6 +msgid "Co_mment date" +msgstr "Data do c_omentário" + +#: ../extensions/change_date/data/ui/change-date.ui.h:7 +msgid "Change to:" +msgstr "Alterar para:" + +#: ../extensions/change_date/data/ui/change-date.ui.h:8 +msgid "The _following date:" +msgstr "_Esta data:" + +#: ../extensions/change_date/data/ui/change-date.ui.h:9 +msgid "File _modified date" +msgstr "Data de _modificação do arquivo" + +#: ../extensions/change_date/data/ui/change-date.ui.h:10 +msgid "File c_reation date" +msgstr "Data de c_riação do arquivo" + +#: ../extensions/change_date/data/ui/change-date.ui.h:11 +msgid "Date p_hoto was taken" +msgstr "Data na qual a _foto foi tirada" + +#: ../extensions/change_date/data/ui/change-date.ui.h:12 +msgid "A_djust by" +msgstr "_Ajustar por" + +#: ../extensions/change_date/data/ui/change-date.ui.h:13 +msgid "hours" +msgstr "horas" + +#: ../extensions/change_date/data/ui/change-date.ui.h:14 +msgid "minutes" +msgstr "minutos" + +#: ../extensions/change_date/data/ui/change-date.ui.h:15 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:6 +msgid "seconds" +msgstr "segundos" + +#: ../extensions/comments/callbacks.c:46 +msgid "Import Embedded Metadata" +msgstr "Importar metadados embutidos" + +#: ../extensions/comments/callbacks.c:47 +msgid "Import the metadata stored inside files into the gThumb comment system" +msgstr "" +"Importa os metadados armazenados dentro de arquivos para o sistema de " +"comentários do gThumb" + +#: ../extensions/comments/comments.extension.in.in.h:1 +msgid "Comments and tags" +msgstr "Comentários e etiquetas" + +# Descrição de extensão +#: ../extensions/comments/comments.extension.in.in.h:2 +msgid "Add comments and tags to any file type." +msgstr "Adiciona comentários e etiquetas a qualquer tipo de arquivo." + +#: ../extensions/comments/data/ui/comments-preferences.ui.h:1 +#: ../extensions/importer/gth-import-preferences-dialog.c:318 +msgid "Preferences" +msgstr "Preferências" + +#: ../extensions/comments/data/ui/comments-preferences.ui.h:2 +msgid "_Synchronize with the embedded metadata" +msgstr "_Sincronizar com os metadados embutidos" + +#: ../extensions/comments/main.c:35 +#: ../extensions/edit_metadata/callbacks.c:100 +msgid "Comment" +msgstr "Comentário" + +#: ../extensions/comments/main.c:41 ../gthumb/gth-main-default-metadata.c:46 +msgid "Title" +msgstr "Título" + +#: ../extensions/comments/main.c:42 ../extensions/comments/main.c:166 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 +#: ../extensions/image_print/data/ui/print-layout.ui.h:8 +#: ../extensions/importer/data/ui/import-preferences.ui.h:6 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 +#: ../gthumb/gth-main-default-metadata.c:52 +msgid "Description" +msgstr "Descrição" + +#: ../extensions/comments/main.c:43 ../extensions/comments/main.c:174 +#: ../gthumb/gth-main-default-metadata.c:50 +msgid "Place" +msgstr "Lugar" + +#: ../extensions/comments/main.c:44 ../gthumb/gth-main-default-metadata.c:51 +msgid "Date" +msgstr "Data" + +#: ../extensions/comments/main.c:46 ../gthumb/gth-main-default-metadata.c:54 +msgid "Rating" +msgstr "Classificação" + +#: ../extensions/contact_sheet/callbacks.c:59 +msgid "Contact _Sheet" +msgstr "Folha de _contato" + +#: ../extensions/contact_sheet/callbacks.c:61 +msgid "Contact _Sheet..." +msgstr "Folha de _contato..." + +#: ../extensions/contact_sheet/callbacks.c:62 +msgid "Create a contact sheet" +msgstr "Cria uma folha de contato" + +#: ../extensions/contact_sheet/callbacks.c:65 +msgid "Image _Wall..." +msgstr "Parede de _imagens..." + +#: ../extensions/contact_sheet/callbacks.c:66 +msgid "Create an image-wall" +msgstr "Cria uma parede de imagens" + +#: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:1 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:1 +msgid "Contact Sheet" +msgstr "Folha de contato" + +# Descrição de extensão +#: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:2 +msgid "Create an index image displaying the thumbnails of the selected files." +msgstr "" +"Cria uma imagem de índice exibindo as miniaturas dos arquivos selecionados." + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:1 +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:446 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 +#: ../extensions/file_tools/gth-file-tool-rotate.c:397 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:14 +#: ../extensions/slideshow/main.c:277 +msgid "None" +msgstr "Nenhum" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:2 +msgid "Simple" +msgstr "Simples" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:3 +msgid "Simple with shadow" +msgstr "Simples com sombra" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:4 +msgid "Shadow only" +msgstr "Sombra apenas" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:5 +msgid "Slide" +msgstr "Slide" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:6 +msgid "Inward Shadow" +msgstr "Sombra interior" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:7 +msgid "Outward Shadow" +msgstr "Sombra exterior" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:9 +msgid "Background" +msgstr "Fundo" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:10 +msgid "_Solid color" +msgstr "Cor _sólida" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:11 +msgid "_Gradient" +msgstr "_Gradiente" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:14 +msgid "Select a color" +msgstr "Selecione uma cor" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:15 +msgid "Frame" +msgstr "Quadro" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:16 +msgid "_Style:" +msgstr "_Estilo:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:17 +msgid "C_olor:" +msgstr "C_or:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:18 +#: ../extensions/rename_series/dlg-rename-series.c:57 +msgid "Text" +msgstr "Texto" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 +#: ../extensions/image_print/data/ui/print-layout.ui.h:3 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 +msgid "_Header:" +msgstr "Cabeçal_ho:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:20 +msgid "Select a font" +msgstr "Selecione uma fonte" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:21 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 +#: ../extensions/image_print/data/ui/print-layout.ui.h:4 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 +msgid "_Footer:" +msgstr "_Rodapé:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:22 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 +msgid "Caption:" +msgstr "Legenda:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:2 +#: ../extensions/image_print/data/ui/print-layout.ui.h:5 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:6 +msgid "The current page number" +msgstr "O número atual de páginas" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:3 +#: ../extensions/image_print/data/ui/print-layout.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 +msgid "The total number of pages" +msgstr "O número total de páginas" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:4 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 +#: ../extensions/image_print/data/ui/print-layout.ui.h:7 +#: ../extensions/importer/data/ui/import-preferences.ui.h:5 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:8 +msgid "Special code" +msgstr "Código especial" + +#. translate only the text in the curly brackets +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:8 +#: ../extensions/image_print/data/ui/print-layout.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 +#, no-c-format +msgid "%D{ format }" +msgstr "%D{ formato }" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 +msgid "The current date" +msgstr "A data atual" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:6 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 +msgid "_Destination:" +msgstr "_Destino:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:13 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:3 +#: ../extensions/convert_format/data/ui/convert-format.ui.h:4 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 +msgid "Choose destination folder" +msgstr "Escolher pasta de destino" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:14 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 +msgid "File_name:" +msgstr "_Nome do arquivo:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:8 +msgid "New enumerator digit" +msgstr "Novo dígito enumerador" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:16 +msgid "Create _HTML image map" +msgstr "Criar _mapa de imagens em HTML" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 +msgid "Create a new theme" +msgstr "Criar um novo tema" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:19 +msgid "Edit the selected theme" +msgstr "Editar o tema selecionado" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:20 +msgid "Delete the selected theme" +msgstr "Exclui o tema selecionado" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:21 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 +msgid "Theme" +msgstr "Tema" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:23 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:16 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 +msgid "Columns:" +msgstr "Colunas:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:24 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:10 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 +msgid "Images per page:" +msgstr "Imagens por página:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:25 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 +msgid "All images on a single page" +msgstr "Todas as imagens em uma única página" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:26 +msgid "_All pages with the same size" +msgstr "_Todas as páginas com o mesmo tamanho" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:27 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:15 +msgid "Layout" +msgstr "Disposição" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:28 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:13 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 +msgid "S_ort:" +msgstr "_Ordenar:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:29 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:14 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 +msgid "Re_verse order" +msgstr "In_verter ordem" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:30 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:15 +msgid "_Size:" +msgstr "Ta_manho:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 +msgid "Sq_uared" +msgstr "_Quadrado" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:33 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:16 +msgid "Thumbnails" +msgstr "Miniaturas" + +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 +msgid "Image Wall" +msgstr "Parede de imagens" + +#: ../extensions/contact_sheet/dlg-contact-sheet.c:481 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:492 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:506 +msgid "Could not save the theme" +msgstr "Não foi possível salvar o tema" + +#: ../extensions/contact_sheet/dlg-contact-sheet.c:651 +msgid "Could not delete the theme" +msgstr "Não foi possível excluir o tema" + +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:247 +msgid "Creating images" +msgstr "Carregando imagens" + +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:896 +msgid "Generating thumbnails" +msgstr "Gerando miniaturas" + +#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:32 +msgid "Header" +msgstr "Cabeçalho" + +#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:33 +msgid "Footer" +msgstr "Rodapé" + +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:193 +msgid "Theme Properties" +msgstr "Propriedades do tema" + +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:208 +msgid "Copy _From" +msgstr "Copiar _de" + +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:316 +msgid "New theme" +msgstr "Novo tema" + +#: ../extensions/convert_format/callbacks.c:45 +msgid "Convert Format..." +msgstr "Converter formato..." + +#: ../extensions/convert_format/callbacks.c:46 +msgid "Convert image format" +msgstr "Converte o formato da imagem" + +#: ../extensions/convert_format/convert_format.extension.in.in.h:1 +msgid "Convert format" +msgstr "Converter formato" + +# Descrição de extensão - ponto final acrescentado propositalmente. +#: ../extensions/convert_format/convert_format.extension.in.in.h:2 +msgid "Save images in a different format" +msgstr "Salva imagens em um formato diferente." + +#: ../extensions/convert_format/data/ui/convert-format.ui.h:1 +msgid "Convert Format" +msgstr "Converter Formato" + +#: ../extensions/convert_format/data/ui/convert-format.ui.h:2 +msgid "New format" +msgstr "Novo formato" + +#: ../extensions/convert_format/data/ui/convert-format.ui.h:3 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 +msgid "Destination" +msgstr "Destino" + +#: ../extensions/convert_format/data/ui/convert-format.ui.h:5 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 +msgid "_Use the original image folder" +msgstr "_Usar a pasta de imagens original" + +#: ../extensions/convert_format/dlg-convert-format.c:95 +msgid "Converting images" +msgstr "Convertendo imagens" + +#: ../extensions/desktop_background/actions.c:158 +msgid "Could not show the desktop background properties" +msgstr "" +"Não foi possível mostrar as propriedades de plano de fundo da área de " +"trabalho" + +#: ../extensions/desktop_background/actions.c:224 +#: ../extensions/desktop_background/actions.c:242 +msgid "Could not set the desktop background" +msgstr "Não foi possível definir o plano de fundo da área de trabalho" + +#: ../extensions/desktop_background/callbacks.c:49 +msgid "Set as Desktop Background" +msgstr "Definir como plano de fundo" + +# Descrição de extensão - ponto final acrescentado propositalmente. +#: ../extensions/desktop_background/callbacks.c:50 +#: ../extensions/desktop_background/desktop_background.extension.in.in.h:2 +msgid "Set the image as desktop background" +msgstr "Define a imagem como plano de fundo da área de trabalho." + +#: ../extensions/desktop_background/desktop_background.extension.in.in.h:1 +msgid "Desktop background" +msgstr "Plano de fundo da área de trabalho" + +#: ../extensions/edit_metadata/actions.c:66 +msgid "" +"Are you sure you want to permanently delete the metadata of the selected " +"files?" +msgstr "" +"Você tem certeza que quer excluir permanentemente os metadados dos arquivos " +"selecionados?" + +#: ../extensions/edit_metadata/actions.c:73 +msgid "If you delete the metadata, it will be permanently lost." +msgstr "Se você excluir os metadados, eles serão perdidos permanentemente." + +#: ../extensions/edit_metadata/callbacks.c:97 +msgid "T_ags" +msgstr "Etiquet_as" + +#: ../extensions/edit_metadata/callbacks.c:101 +msgid "Edit the comment and other information of the selected files" +msgstr "Edita o comentário e outras informações dos arquivos selecionados" + +#: ../extensions/edit_metadata/callbacks.c:107 +msgid "Set the tags of the selected files" +msgstr "Define as etiquetas dos arquivos selecionados" + +#: ../extensions/edit_metadata/callbacks.c:112 +msgid "Delete Metadata" +msgstr "Excluir metadados" + +#: ../extensions/edit_metadata/callbacks.c:113 +msgid "Delete the comment and the embedded metadata of the selected files" +msgstr "Exclui a comentário e os metadados embutidos dos arquivos selecionados" + +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:1 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 +msgid "D_escription:" +msgstr "D_escrição:" + +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:3 +msgid "_Place:" +msgstr "_Lugar:" + +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 +#: ../extensions/edit_metadata/data/ui/tag-chooser.ui.h:1 +msgid "T_ags:" +msgstr "Etiquet_as:" + +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:5 +msgid "_Rating:" +msgstr "Classi_ficação:" + +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:6 +msgid "_Title:" +msgstr "_Título:" + +#: ../extensions/edit_metadata/dlg-edit-metadata.c:121 +msgid "Could not save the file metadata" +msgstr "Não foi possível salvar os metadados do arquivo" + +#: ../extensions/edit_metadata/dlg-edit-metadata.c:234 +#: ../gthumb/gth-overwrite-dialog.c:136 +msgid "Cannot read file information" +msgstr "Não foi possível ler informações" + +#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:1 +msgid "Edit metadata" +msgstr "Editar metadados" + +# Descrição de extensão +#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 +msgid "Allow to edit files metadata." +msgstr "Permite editar metadados de arquivos." + +#. Translators: the %s symbol in the string is a file name +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:63 +#, c-format +msgid "%s Metadata" +msgstr "Metadados de %s" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:66 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:83 +#: ../extensions/facebook/dlg-import-from-facebook.c:319 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:324 +#, c-format +msgid "%d file" +msgid_plural "%d files" +msgstr[0] "%d arquivo" +msgstr[1] "%d arquivos" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:144 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:197 +msgid "Sa_ve and Close" +msgstr "Sal_var e fechar" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:156 +msgid "Save only cha_nged fields" +msgstr "Salvar some_nte campos alterados" + +#: ../extensions/edit_metadata/gth-edit-general-page.c:555 +msgid "No date" +msgstr "Sem data" + +#: ../extensions/edit_metadata/gth-edit-general-page.c:556 +msgid "The following date" +msgstr "A data a seguir" + +#: ../extensions/edit_metadata/gth-edit-general-page.c:557 +#: ../extensions/importer/gth-import-preferences-dialog.c:331 +msgid "Current date" +msgstr "Data atual" + +#: ../extensions/edit_metadata/gth-edit-general-page.c:559 +msgid "Last modified date" +msgstr "Data da última modificação" + +#: ../extensions/edit_metadata/gth-edit-general-page.c:560 +msgid "File creation date" +msgstr "Data de criação do arquivo" + +#: ../extensions/edit_metadata/gth-edit-general-page.c:561 +msgid "Do not modify" +msgstr "Não modificar" + +#. Translators: the %s symbol in the string is a file name +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:80 +#, c-format +msgid "%s Tags" +msgstr "Etiquetas de %s" + +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:189 +msgid "Assign Tags" +msgstr "Atribuir etiquetas" + +#: ../extensions/edit_metadata/gth-tag-task.c:119 +#: ../extensions/edit_metadata/gth-tag-task.c:136 +msgid "Assigning tags to the selected files" +msgstr "Atribuindo etiquetas aos arquivos selecionados" + +#: ../extensions/edit_metadata/gth-tag-task.c:119 +msgid "Writing files" +msgstr "Escrevendo arquivos" + +#: ../extensions/edit_metadata/gth-tag-task.c:136 +msgid "Reading files" +msgstr "Lendo arquivos" + +#: ../extensions/example/src/example.extension.in.in.h:1 +msgid "Example" +msgstr "Exemplo" + +#: ../extensions/example/src/example.extension.in.in.h:2 +msgid "Extension example." +msgstr "Extensão exemplo." + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:1 +msgid "C_opyright:" +msgstr "C_opyright:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 +msgid "Co_untry:" +msgstr "_País:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:3 +msgid "_Code:" +msgstr "Có_digo:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:4 +msgid "Cr_edit:" +msgstr "C_réditos:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:6 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 +msgid "_Source:" +msgstr "_Fonte:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:7 +msgid "_Urgency:" +msgstr "Ur_gência:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:8 +msgid "_Object Name:" +msgstr "_Nome do objeto:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:9 +msgid "Byline _Title:" +msgstr "_Título do autor:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:10 +msgid "_Byline:" +msgstr "_Autor:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:11 +msgid "_City:" +msgstr "Ci_dade:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:12 +msgid "_Language:" +msgstr "_Idioma:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:13 +msgid "State/Province:" +msgstr "Estado/Província:" + +#: ../extensions/exiv2_tools/exiv2_tools.extension.in.in.h:1 +msgid "EXIF, IPTC, XMP support" +msgstr "Suporte a EXIF, IPTC e XMP" + +# Descrição de extensão +#: ../extensions/exiv2_tools/exiv2_tools.extension.in.in.h:2 +msgid "Read and write exif, iptc and xmp metadata." +msgstr "Leia e escreva metadados exif, iptc e xmp." + +#: ../extensions/exiv2_tools/main.c:33 +msgid "Exif General" +msgstr "Exif Geral" + +#: ../extensions/exiv2_tools/main.c:34 +msgid "Exif Conditions" +msgstr "Condições Exif" + +#: ../extensions/exiv2_tools/main.c:35 +msgid "Exif Structure" +msgstr "Estrutura Exif" + +#: ../extensions/exiv2_tools/main.c:36 +msgid "Exif Thumbnail" +msgstr "Miniatura Exif" + +#: ../extensions/exiv2_tools/main.c:37 +msgid "Exif GPS" +msgstr "Exif GPS" + +#: ../extensions/exiv2_tools/main.c:38 +msgid "Exif Maker Notes" +msgstr "Editor de notas Exif" + +#: ../extensions/exiv2_tools/main.c:39 +msgid "Exif Versions" +msgstr "Versões Exif" + +#: ../extensions/exiv2_tools/main.c:40 +msgid "Exif Other" +msgstr "Exif outro" + +#: ../extensions/exiv2_tools/main.c:41 +msgid "IPTC" +msgstr "IPTC" + +#: ../extensions/exiv2_tools/main.c:42 +msgid "XMP Embedded" +msgstr "XMP embutido" + +#: ../extensions/exiv2_tools/main.c:43 +msgid "XMP Attached" +msgstr "XMP anexado" + +#: ../extensions/exiv2_tools/main.c:272 +msgid "date photo was taken" +msgstr "data na qual a foto foi tirada" + +#: ../extensions/export_tools/callbacks.c:99 +msgid "Share" +msgstr "Compartilhar" + +#: ../extensions/facebook/callbacks.c:59 ../extensions/facebook/callbacks.c:64 +msgid "Face_book..." +msgstr "Face_book..." + +#: ../extensions/facebook/callbacks.c:60 +msgid "Download photos from Facebook" +msgstr "Baixa fotos do Facebook" + +#: ../extensions/facebook/callbacks.c:65 +msgid "Upload photos to Facebook" +msgstr "Envia fotos para o Facebook" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 +msgid "Export to Flickr" +msgstr "Exportar para o Flickr" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:2 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 +msgid "_Upload" +msgstr "_Enviar" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:3 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 +msgid "_Account:" +msgstr "Cont_a:" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:4 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:3 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 +msgid "Edit accounts" +msgstr "Edita contas" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 +msgid "A_lbum:" +msgstr "Á_lbum:" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 +msgid "Add a new album" +msgstr "Adiciona um novo álbum" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 +msgid "Resize the images if larger than this size" +msgstr "Redimensiona as imagens se for maior que este tamanho" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:8 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 +msgid "_Resize if larger than:" +msgstr "_Redimensionar se for maior que:" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:9 +msgid "720 x 720" +msgstr "720 x 720" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:10 +msgid "1024 x 1024" +msgstr "1024 x 1024" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:11 +msgid "1280 x 1280" +msgstr "1280 x 1280" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:12 +msgid "1600 x 1600" +msgstr "1600 x 1600" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:13 +msgid "2048 x 2048" +msgstr "2048 x 2048" + +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 +msgid "Public photos" +msgstr "Fotos públicas" + +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 +msgid "Private photos, visible to friends" +msgstr "Fotos privadas, visível para amigos" + +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:5 +msgid "Private" +msgstr "Privado" + +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:5 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 +msgid "_Visibility:" +msgstr "_Visibilidade:" + +#: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:1 +#: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:1 +#: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:1 +#: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:1 +msgid "Files successfully uploaded to the server." +msgstr "Arquivos enviados com sucesso para o servidor." + +#: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:2 +#: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:2 +#: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:2 +#: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:2 +#: ../extensions/webalbums/gth-web-exporter.c:1839 +msgid "_Open in the Browser" +msgstr "Abrir atalho n_o navegador" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 +msgid "Import from Picasa Web Album" +msgstr "Importar do Álbuns da web do Picasa" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:2 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 +msgid "_Import" +msgstr "_Importar" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:4 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 +#: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 +msgid "A_ccount:" +msgstr "_Conta:" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:5 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 +msgid "_Album:" +msgstr "Á_lbum:" + +#: ../extensions/facebook/dlg-export-to-facebook.c:123 +#: ../extensions/facebook/dlg-export-to-facebook.c:326 +#: ../extensions/facebook/dlg-import-from-facebook.c:226 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:138 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:414 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:231 +#: ../extensions/oauth/web-service.c:380 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:131 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:375 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:124 +msgid "Could not connect to the server" +msgstr "Não foi possível conectar ao servidor" + +#: ../extensions/facebook/dlg-export-to-facebook.c:175 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:246 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:182 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:176 +msgid "Could not upload the files" +msgstr "Não foi possível enviar os arquivos" + +#: ../extensions/facebook/dlg-export-to-facebook.c:397 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:188 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:223 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:457 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:309 +msgid "Could not create the album" +msgstr "Não foi possível criar o álbum" + +#: ../extensions/facebook/dlg-export-to-facebook.c:465 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:528 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:375 +msgid "New Album" +msgstr "Novo álbum" + +#: ../extensions/facebook/dlg-export-to-facebook.c:557 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:583 +#: ../extensions/image_print/gth-image-print-job.c:1739 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:607 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:597 +msgid "No valid file selected." +msgstr "Nenhum arquivo válido selecionado." + +#: ../extensions/facebook/dlg-export-to-facebook.c:558 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:584 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:608 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:598 +msgid "Could not export the files" +msgstr "Não foi possível exportar os arquivos" + +#: ../extensions/facebook/dlg-export-to-facebook.c:566 +#: ../extensions/find_duplicates/gth-find-duplicates.c:277 +#: ../extensions/find_duplicates/gth-find-duplicates.c:470 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:592 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:616 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:605 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:254 +#: ../gthumb/gth-browser.c:1116 +#, c-format +msgid "%d file (%s)" +msgid_plural "%d files (%s)" +msgstr[0] "%d arquivo (%s)" +msgstr[1] "%d arquivos (%s)" + +#: ../extensions/facebook/dlg-export-to-facebook.c:587 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:615 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:635 +#, c-format +msgid "Export to %s" +msgstr "Exportar para %s" + +#: ../extensions/facebook/dlg-import-from-facebook.c:344 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:349 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:279 +msgid "Could not get the photo list" +msgstr "Não foi possível obter a lista de fotos" + +#: ../extensions/facebook/dlg-import-from-facebook.c:378 +#: ../extensions/facebook/dlg-import-from-facebook.c:533 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:386 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:551 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:313 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:586 +msgid "No album selected" +msgstr "Nenhum álbum selecionado" + +#: ../extensions/facebook/dlg-import-from-facebook.c:551 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:569 +#, c-format +msgid "Import from %s" +msgstr "Importar do %s" + +#: ../extensions/facebook/dlg-import-from-facebook.c:551 +#: ../extensions/facebook/facebook.extension.in.in.h:1 +msgid "Facebook" +msgstr "Facebook" + +#: ../extensions/facebook/facebook.extension.in.in.h:2 +msgid "Upload images to Facebook" +msgstr "Envia imagens para o Facebook" + +#: ../extensions/facebook/facebook-service.c:462 +#: ../extensions/flicker_utils/flickr-service.c:863 +#: ../extensions/photobucket/photobucket-service.c:310 +#: ../extensions/picasaweb/picasa-web-service.c:711 +msgid "Getting the album list" +msgstr "Obtendo a lista de álbuns" + +#: ../extensions/facebook/facebook-service.c:584 +#: ../extensions/flicker_utils/flickr-service.c:965 +#: ../extensions/flicker_utils/flickr-service.c:1087 +#: ../extensions/flicker_utils/flickr-service.c:1126 +#: ../extensions/photobucket/photobucket-service.c:423 +#: ../extensions/picasaweb/picasa-web-service.c:805 +msgid "Creating the new album" +msgstr "Criando o novo álbum" + +#: ../extensions/facebook/facebook-service.c:645 +#: ../extensions/flicker_utils/flickr-service.c:1176 +#: ../extensions/photobucket/photobucket-service.c:485 +#: ../extensions/picasaweb/picasa-web-service.c:860 +#, c-format +msgid "Could not upload '%s': %s" +msgstr "Não foi possível enviar \"%s\": %s" + +#. Translators: %s is a filename +#: ../extensions/facebook/facebook-service.c:710 +#: ../extensions/flicker_utils/flickr-service.c:1287 +#: ../extensions/photobucket/photobucket-service.c:542 +#: ../extensions/picasaweb/picasa-web-service.c:917 +#, c-format +msgid "Uploading '%s'" +msgstr "Enviando \"%s\"" + +#: ../extensions/facebook/facebook-service.c:923 +#: ../extensions/flicker_utils/flickr-service.c:1482 +#: ../extensions/photobucket/photobucket-service.c:714 +#: ../extensions/picasaweb/picasa-web-service.c:1138 +msgid "Uploading the files to the server" +msgstr "Enviando os arquivos para o servidor" + +#: ../extensions/facebook/facebook-service.c:1022 +#: ../extensions/flicker_utils/flickr-service.c:1651 +#: ../extensions/picasaweb/picasa-web-service.c:1257 +msgid "Getting the photo list" +msgstr "Obtendo a lista de fotos" + +#: ../extensions/file_manager/actions.c:133 +msgid "New folder" +msgstr "Nova pasta" + +#: ../extensions/file_manager/actions.c:134 +msgid "Enter the folder name:" +msgstr "Digite o nome da pasta:" + +#: ../extensions/file_manager/actions.c:400 +#: ../extensions/file_manager/callbacks.c:380 +#: ../extensions/file_manager/callbacks.c:838 +msgid "Could not move the files" +msgstr "Não foi possível mover os aqruivos" + +#: ../extensions/file_manager/actions.c:401 +#: ../extensions/file_manager/callbacks.c:381 +#: ../extensions/file_manager/callbacks.c:839 +msgid "" +"Files cannot be moved to the current location, as alternative you can choose " +"to copy them." +msgstr "" +"Arquivos não podem ser movidos da localização atual, mas você pode optar por " +"copiá-los." + +#: ../extensions/file_manager/actions.c:563 +msgid "Could not open the location" +msgstr "Não foi possível abrir a localização" + +#: ../extensions/file_manager/actions.c:696 +msgid "" +"The folder is not empty, do you want to delete the folder and its content " +"permanently?" +msgstr "" +"As imagens não podem ser movidas para a Lixeira. Deseja excluí-las " +"permanentemente?" + +#: ../extensions/file_manager/actions.c:712 +msgid "Could not delete the folder" +msgstr "Não foi possível excluir a pasta" + +#: ../extensions/file_manager/actions.c:773 +msgid "" +"The folder cannot be moved to the Trash. Do you want to delete it " +"permanently?" +msgstr "" +"As imagens não podem ser movidas para a lixeira. Deseja excluí-las " +"permanentemente?" + +#: ../extensions/file_manager/actions.c:780 +msgid "Could not move the folder to the Trash" +msgstr "Não foi possível mover a pasta para a lixeira" + +#: ../extensions/file_manager/actions.c:816 +#: ../gthumb/gth-file-source-vfs.c:841 +#, c-format +msgid "Are you sure you want to permanently delete \"%s\"?" +msgstr "Você tem certeza de que quer excluir \"%s\" permanentemente?" + +# Traduzi "permanently" para "para sempre" para não repetir "permanentemente", o que já era óbvio da string acima. +#: ../extensions/file_manager/actions.c:826 +#: ../gthumb/gth-file-source-vfs.c:854 +msgid "If you delete a file, it will be permanently lost." +msgstr "Se você excluir um arquivo, ele será perdido para sempre." + +#: ../extensions/file_manager/actions.c:920 +msgid "Move To" +msgstr "Mover para" + +#: ../extensions/file_manager/actions.c:920 +msgid "Copy To" +msgstr "Copiar para" + +#: ../extensions/file_manager/actions.c:924 +msgid "Move" +msgstr "Mover" + +#: ../extensions/file_manager/actions.c:924 +msgid "Copy" +msgstr "Copiar" + +#: ../extensions/file_manager/callbacks.c:163 +#: ../extensions/file_manager/callbacks.c:199 +msgid "Create _Folder" +msgstr "Criar _pasta" + +#: ../extensions/file_manager/callbacks.c:164 +#: ../extensions/file_manager/callbacks.c:200 +msgid "Create a new empty folder inside this folder" +msgstr "Cria uma nova pasta vazia dentro desta pasta" + +#: ../extensions/file_manager/callbacks.c:179 +msgid "D_uplicate" +msgstr "D_uplicar" + +#: ../extensions/file_manager/callbacks.c:180 +msgid "Duplicate the selected files" +msgstr "Duplicar os arquivos selecionados" + +#: ../extensions/file_manager/callbacks.c:183 +#: ../extensions/file_manager/callbacks.c:219 +#: ../gthumb/gth-file-source-vfs.c:813 +msgid "Mo_ve to Trash" +msgstr "Mo_ver para a lixeira" + +#: ../extensions/file_manager/callbacks.c:184 +msgid "Move the selected files to the Trash" +msgstr "Move os arquivos selecionados para a lixeira" + +#: ../extensions/file_manager/callbacks.c:187 +#: ../extensions/file_manager/callbacks.c:223 +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:5 +#: ../gthumb/gth-tags-entry.c:871 +msgid "_Delete" +msgstr "E_xcluir" + +#: ../extensions/file_manager/callbacks.c:188 +msgid "Delete the selected files" +msgstr "Exclui os arquivos selecionados" + +#: ../extensions/file_manager/callbacks.c:191 +#: ../extensions/file_manager/callbacks.c:203 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:2 +msgid "_Rename" +msgstr "_Renomear" + +#: ../extensions/file_manager/callbacks.c:192 +msgid "Rename the selected files" +msgstr "Renomeia os arquivos selecionados" + +#: ../extensions/file_manager/callbacks.c:195 +msgid "Open with the _File Manager" +msgstr "Abrir com o _gerenciador de arquivos" + +#: ../extensions/file_manager/callbacks.c:215 +msgid "_Paste Into Folder" +msgstr "Colar para a pa_sta" + +#: ../extensions/file_manager/callbacks.c:227 +#: ../extensions/file_manager/callbacks.c:236 +msgid "Copy to..." +msgstr "Copiar para..." + +#: ../extensions/file_manager/callbacks.c:228 +msgid "Copy the selected folder to another folder" +msgstr "Copia as pastas selecionadas para outra pasta" + +#: ../extensions/file_manager/callbacks.c:231 +#: ../extensions/file_manager/callbacks.c:240 +msgid "Move to..." +msgstr "Mover para..." + +#: ../extensions/file_manager/callbacks.c:232 +msgid "Move the selected folder to another folder" +msgstr "Move as pastas selecionadas para outra pasta" + +#: ../extensions/file_manager/callbacks.c:237 +msgid "Copy the selected files to another folder" +msgstr "Copia os arquivos selecionados para outra pasta" + +#: ../extensions/file_manager/callbacks.c:241 +msgid "Move the selected files to another folder" +msgstr "Move os arquivos selecionados para outra pasta" + +#: ../extensions/file_manager/callbacks.c:999 +#: ../extensions/find_duplicates/gth-find-duplicates.c:766 +#: ../gthumb/gth-browser.c:5234 ../gthumb/gth-browser.c:5268 +#: ../gthumb/gth-progress-dialog.c:406 +msgid "Could not perform the operation" +msgstr "Não foi possível executar a operação" + +#: ../extensions/file_manager/file_manager.extension.in.in.h:1 +msgid "File manager" +msgstr "Gerenciador de arquivos" + +#: ../extensions/file_manager/file_manager.extension.in.in.h:2 +msgid "File manager operations." +msgstr "Operações do gerenciador de arquivos." + +#: ../extensions/file_manager/gth-delete-task.c:62 +msgid "Deleting files" +msgstr "Excluindo arquivos" + +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:1 +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:5 +msgid "_Preview" +msgstr "_Visualização" + +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:2 +msgid "B_rightness:" +msgstr "B_rilho:" + +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:3 +msgid "Con_trast:" +msgstr "Con_traste:" + +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:4 +msgid "_Saturation:" +msgstr "_Saturação:" + +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:5 +msgid "G_amma:" +msgstr "_Gama:" + +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:6 +msgid "Cyan-_Red:" +msgstr "Cia_no-vermelho:" + +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:7 +msgid "_Magenta-Green:" +msgstr "_Magenta-verde:" + +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:8 +msgid "_Yellow-Blue:" +msgstr "Amar_elo-azul:" + +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:9 +msgid "Color Levels" +msgstr "Níveis de cor" + +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:10 +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:5 +msgid "_Reset" +msgstr "_Restaurar" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:1 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +msgid "Selection" +msgstr "Seleção" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 +msgid "_Width:" +msgstr "_Largura:" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:3 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 +msgid "Heigh_t:" +msgstr "Al_tura:" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:4 +msgid "_Position:" +msgstr "_Posição:" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:5 +msgid "Maximize" +msgstr "Maximizar" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:6 +msgid "Center" +msgstr "Centralizar" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:5 +msgid "Aspect ratio" +msgstr "Proporção" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 +msgid "I_nvert aspect ratio" +msgstr "I_nverter proporção" + +#. after the colon there is a control to select the size in pixels +#: ../extensions/file_tools/data/ui/crop-options.ui.h:10 +msgid "M_ultiple of:" +msgstr "_Múltiplo de:" + +#. abbreviation of pixel +#: ../extensions/file_tools/data/ui/crop-options.ui.h:12 +msgid "px" +msgstr "px" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 +#: ../gthumb/gth-file-chooser-dialog.c:252 +msgid "Options" +msgstr "Opções" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:14 +msgid "_Grid:" +msgstr "_Grade:" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:15 +msgid "C_rop" +msgstr "_Recortar" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:1 +msgid "Method" +msgstr "Método" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:2 +msgid "_Brightness" +msgstr "_Brilho" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:3 +msgid "_Saturation" +msgstr "_Saturação" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:4 +msgid "_Average" +msgstr "_Médio" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 +#: ../gthumb/gth-main-default-metadata.c:47 +msgid "Dimensions" +msgstr "Dimensões" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +msgid "Set the image size to this value" +msgstr "Define o tamanho da imagem para este valore" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:8 +msgid "High _quality" +msgstr "_Alta qualidade" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:9 +msgid "Original dimensions:" +msgstr "Dimensões originais:" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 +msgid "Scale factor:" +msgstr "Fator de ajuste:" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 +msgid "New dimensions:" +msgstr "Novas dimensões:" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:29 +msgid "pixels" +msgstr "pixeis" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:14 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:12 +#, no-c-format +msgid "%" +msgstr "%" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:1 +msgid "Angle" +msgstr "Ângulo" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 +msgid "Align" +msgstr "Alinhar" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 +msgid "Image size" +msgstr "Tamanho da imagem" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 +msgid "Point 1:" +msgstr "Ponto 1:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 +msgid "Point 2:" +msgstr "Ponto 2:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 +msgid "Keep aspect ratio" +msgstr "Manter a proporção" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 +msgid "Grid:" +msgstr "Grade:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 +msgid "_Background:" +msgstr "_Fundo:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 +msgid "Pick a background color" +msgstr "Escolha uma cor de fundo" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 +msgid "_Transparent" +msgstr "_Transparente" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:12 +msgid "Reset" +msgstr "Restaurar" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:13 +msgid "" +"Draw a line on the image \n" +"to set the alignment." +msgstr "" +"Desenhe uma linha na imagem \n" +"para definir o alinhamento." + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:15 +msgid "Parallel" +msgstr "Paralelo" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:16 +msgid "Perpendicular" +msgstr "Perpendicular" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:17 +msgid "Alignment" +msgstr "Alinhamento" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:18 +msgid "Original size" +msgstr "Tamanho original" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:19 +msgid "Bounding box" +msgstr "Caixa delimitadora" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:20 +msgid "Crop borders" +msgstr "Recortar bordas" + +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:1 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 +msgid "_Preview:" +msgstr "_Visualização:" + +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:2 +msgid "Threshold:" +msgstr "Limite:" + +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:3 +msgid "Radius:" +msgstr "Raio:" + +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:4 +msgid "Amount:" +msgstr "Quantidade:" + +#: ../extensions/file_tools/file_tools.extension.in.in.h:1 +msgid "Image tools" +msgstr "Ferramentas de imagem" + +#: ../extensions/file_tools/file_tools.extension.in.in.h:2 +msgid "Basic tools to modify images." +msgstr "Ferramentas básicas para modificar imagens." + +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:372 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:272 +#: ../extensions/file_tools/gth-file-tool-grayscale.c:248 +#: ../extensions/file_tools/gth-file-tool-negative.c:68 +msgid "Applying changes" +msgstr "Aplicando alterações" + +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 +msgid "Adjust Colors..." +msgstr "Ajustar cores..." + +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 +msgid "Adjust Colors" +msgstr "Ajustar cores" + +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:619 +msgid "Change brightness, contrast, saturation and gamma level of the image" +msgstr "Altera os níveis de brilho, contraste, saturação e gama da imagem" + +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:304 +msgid "Adjust Contrast" +msgstr "Ajustar contraste" + +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:305 +msgid "Automatic contrast adjustment" +msgstr "Ajuste automático de contraste" + +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 +msgid "Square" +msgstr "Quadrado" + +#: ../extensions/file_tools/gth-file-tool-crop.c:417 +#: ../extensions/file_tools/gth-file-tool-resize.c:590 +#, c-format +msgid "%d x %d (Image)" +msgstr "%d x %d (imagem)" + +#: ../extensions/file_tools/gth-file-tool-crop.c:420 +#: ../extensions/file_tools/gth-file-tool-resize.c:594 +#, c-format +msgid "%d x %d (Screen)" +msgstr "%d x %d (tela)" + +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-resize.c:599 +msgid "5:4" +msgstr "5:4" + +#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-resize.c:600 +msgid "4:3 (DVD, Book)" +msgstr "4 x 3 (DVD, livro)" + +#: ../extensions/file_tools/gth-file-tool-crop.c:426 +#: ../extensions/file_tools/gth-file-tool-resize.c:601 +msgid "7:5" +msgstr "7:5" + +#: ../extensions/file_tools/gth-file-tool-crop.c:427 +#: ../extensions/file_tools/gth-file-tool-resize.c:602 +msgid "3:2 (Postcard)" +msgstr "3:2 (cartão postal)" + +#: ../extensions/file_tools/gth-file-tool-crop.c:428 +#: ../extensions/file_tools/gth-file-tool-resize.c:603 +msgid "16:10" +msgstr "16:10" + +#: ../extensions/file_tools/gth-file-tool-crop.c:429 +#: ../extensions/file_tools/gth-file-tool-resize.c:604 +msgid "16:9 (DVD)" +msgstr "16:9 (DVD)" + +#: ../extensions/file_tools/gth-file-tool-crop.c:430 +#: ../extensions/file_tools/gth-file-tool-resize.c:605 +msgid "1.85:1" +msgstr "1.85:1" + +#: ../extensions/file_tools/gth-file-tool-crop.c:431 +#: ../extensions/file_tools/gth-file-tool-resize.c:606 +msgid "2.39:1" +msgstr "2.39:1" + +#: ../extensions/file_tools/gth-file-tool-crop.c:432 +#: ../extensions/file_tools/gth-file-tool-resize.c:607 +#: ../extensions/image_print/data/ui/print-layout.ui.h:2 +#: ../extensions/rename_series/gth-template-selector.c:234 +msgid "Custom" +msgstr "Personalizado" + +#: ../extensions/file_tools/gth-file-tool-crop.c:447 +#: ../extensions/file_tools/gth-file-tool-rotate.c:398 +msgid "Rule of Thirds" +msgstr "Regra de três" + +#: ../extensions/file_tools/gth-file-tool-crop.c:448 +#: ../extensions/file_tools/gth-file-tool-rotate.c:399 +msgid "Golden Sections" +msgstr "Proporção áurea" + +#: ../extensions/file_tools/gth-file-tool-crop.c:449 +#: ../extensions/file_tools/gth-file-tool-rotate.c:400 +msgid "Center Lines" +msgstr "Linhas centrais" + +#: ../extensions/file_tools/gth-file-tool-crop.c:450 +#: ../extensions/file_tools/gth-file-tool-rotate.c:401 +msgid "Uniform" +msgstr "Uniforme" + +#: ../extensions/file_tools/gth-file-tool-crop.c:608 +msgid "Crop..." +msgstr "Recortar..." + +#: ../extensions/file_tools/gth-file-tool-crop.c:608 +msgid "Crop" +msgstr "Recortar" + +#: ../extensions/file_tools/gth-file-tool-equalize.c:45 +msgid "Equalizing image histogram" +msgstr "Equalizando o histograma da imagem" + +#: ../extensions/file_tools/gth-file-tool-equalize.c:230 +msgid "Equalize" +msgstr "Equalizar" + +#: ../extensions/file_tools/gth-file-tool-equalize.c:231 +msgid "Equalize image histogram" +msgstr "Equaliza o histograma da imagem" + +#: ../extensions/file_tools/gth-file-tool-flip.c:87 +msgid "Flip" +msgstr "Virar" + +#: ../extensions/file_tools/gth-file-tool-flip.c:88 +msgid "Flip the image vertically" +msgstr "Vira verticalmente a imagem" + +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale..." +msgstr "Escala de cinza..." + +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale" +msgstr "Escala de cinza" + +#: ../extensions/file_tools/gth-file-tool-mirror.c:87 +msgid "Mirror" +msgstr "Espelhar" + +#: ../extensions/file_tools/gth-file-tool-mirror.c:88 +msgid "Mirror the image horizontally" +msgstr "Espelha horizontalmente a imagem" + +#: ../extensions/file_tools/gth-file-tool-negative.c:197 +msgid "Negative" +msgstr "Negativo" + +#: ../extensions/file_tools/gth-file-tool-redo.c:75 +msgid "Redo" +msgstr "Refazer" + +#: ../extensions/file_tools/gth-file-tool-resize.c:214 +#: ../extensions/resize_images/dlg-resize-images.c:180 +msgid "Resizing images" +msgstr "Redimensionando imagens" + +#: ../extensions/file_tools/gth-file-tool-resize.c:808 +msgid "Resize..." +msgstr "Redimensionar..." + +#: ../extensions/file_tools/gth-file-tool-resize.c:808 +msgid "Resize" +msgstr "Redimensionar" + +#: ../extensions/file_tools/gth-file-tool-rotate.c:628 +msgid "Rotate..." +msgstr "Girar..." + +#: ../extensions/file_tools/gth-file-tool-rotate.c:628 +msgid "Rotate" +msgstr "Girar" + +#: ../extensions/file_tools/gth-file-tool-rotate.c:629 +msgid "Freely rotate the image" +msgstr "Gira livremente a imagem" + +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:87 +#: ../extensions/image_rotation/callbacks.c:55 +msgid "Rotate Left" +msgstr "Girar para esquerda" + +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:88 +msgid "Rotate the image by 90 degrees counterclockwise" +msgstr "Gira a imagem 90 graus no sentido anti-horário" + +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:87 +#: ../extensions/image_rotation/callbacks.c:49 +msgid "Rotate Right" +msgstr "Girar para direita" + +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:88 +msgid "Rotate the image by 90 degrees clockwise" +msgstr "Gira a imagem 90 graus no sentido horário" + +#: ../extensions/file_tools/gth-file-tool-save-as.c:70 +msgid "Save As" +msgstr "Salvar como" + +#: ../extensions/file_tools/gth-file-tool-save.c:66 +msgid "Save" +msgstr "Salvar" + +#: ../extensions/file_tools/gth-file-tool-sharpen.c:101 +msgid "Sharpening image" +msgstr "Nitidez da imagem" + +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 +msgid "Enhance Focus..." +msgstr "Realçar foco..." + +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 +msgid "Enhance Focus" +msgstr "Realçar foco" + +#: ../extensions/file_tools/gth-file-tool-undo.c:75 +msgid "Undo" +msgstr "Desfazer" + +#: ../extensions/find_duplicates/callbacks.c:48 +msgid "Find _Duplicates..." +msgstr "Localizar _duplicados..." + +#: ../extensions/find_duplicates/callbacks.c:49 +msgid "Find duplicated files in the current location" +msgstr "Localiza os arquivos duplicados na localização atual" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-choose-folders.ui.h:1 +msgid "_Folders:" +msgstr "_Pastas:" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:1 +msgid "Search for Duplicates" +msgstr "Pesquisar duplicados" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 +msgid "Duplicates:" +msgstr "Duplicados:" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 +msgid "Files:" +msgstr "Arquivos:" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:4 +#: ../gthumb/gth-browser-actions-entries.h:33 +msgid "_View" +msgstr "_Ver" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 +msgid "No duplicates found." +msgstr "Nenhum duplicado encontrado." + +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:1 +#: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:1 +msgid "Find Duplicates" +msgstr "Localizar duplicados" + +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:2 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 +#: ../extensions/search/data/ui/search-editor.ui.h:1 +msgid "Start _at:" +msgstr "_Iniciar em:" + +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 +msgid "_Filter:" +msgstr "_Filtro:" + +#: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:2 +msgid "Find duplicated files." +msgstr "Localiza arquivos duplicados." + +#: ../extensions/find_duplicates/gth-find-duplicates.c:65 +msgid "leave the newest duplicates" +msgstr "deixar os duplicados mais novos" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:66 +msgid "leave the oldest duplicates" +msgstr "deixar os duplicados mais antigos" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:67 +msgid "by folder..." +msgstr "por pasta..." + +#: ../extensions/find_duplicates/gth-find-duplicates.c:68 +msgid "all files" +msgstr "todos arquivos" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:69 +msgid "no file" +msgstr "nenhum arquivo" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:560 +#: ../extensions/find_duplicates/gth-find-duplicates.c:668 +#, c-format +msgid "%d duplicate" +msgid_plural "%d duplicates" +msgstr[0] "%d duplicado" +msgstr[1] "%d duplicados" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:712 +msgid "Search completed" +msgstr "Pesquisa concluída" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:725 +msgid "Searching for duplicates" +msgstr "Pesquisando por duplicados" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:728 +#: ../gthumb/gth-load-file-data-task.c:106 +#: ../gthumb/gth-save-file-data-task.c:100 +#, c-format +msgid "%d file remaining" +msgid_plural "%d files remaining" +msgstr[0] "%d arquivo restante" +msgstr[1] "%d arquivos restantes" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:830 +msgid "Getting the file list" +msgstr "Obtendo a lista de arquivos" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:1016 +msgid "Duplicates" +msgstr "Duplicados" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:1306 +msgid "Select" +msgstr "Selecionar" + +#: ../extensions/flicker/callbacks.c:59 ../extensions/flicker/callbacks.c:64 +msgid "_Flickr..." +msgstr "_Flickr..." + +#: ../extensions/flicker/callbacks.c:60 +msgid "Download photos from Flickr" +msgstr "Baixa fotos do Flickr" + +#: ../extensions/flicker/callbacks.c:65 +msgid "Upload photos to Flickr" +msgstr "Envia fotos para o Flickr" + +#: ../extensions/flicker/flicker.extension.in.in.h:1 +msgid "Flicker" +msgstr "Flicker" + +# Descrição de extnesão - ponto final acrescentado propositalmente. +#: ../extensions/flicker/flicker.extension.in.in.h:2 +msgid "Upload images to Flickr" +msgstr "Envia imagens para o Flickr." + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 +msgid "Free space:" +msgstr "Espaço livre:" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:5 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 +msgid "Ph_otoset:" +msgstr "Conjunto do _fotos:" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:6 +msgid "_Privacy:" +msgstr "_Privacidade:" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:7 +msgid "Hi_de from public searches" +msgstr "Escon_der das pesquisas públicas" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:8 +msgid "_Safety:" +msgstr "_Segurança:" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 +msgid "Private photos, visible to family and friends" +msgstr "Fotos privadas, visível para família e amigos" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 +msgid "Private photos, visible to family" +msgstr "Fotos privadas, visível para família" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 +msgid "Private photos" +msgstr "Fotos privadas" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 +msgid "Safe content" +msgstr "Conteúdo seguro" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 +msgid "Moderate content" +msgstr "Conteúdo moderado" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:17 +msgid "Restricted content" +msgstr "Conteúdo restrito" + +#: ../extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui.h:1 +msgid "C_ontinue" +msgstr "C_ontinuar" + +#: ../extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui.h:2 +msgid "_Authorize..." +msgstr "_Autorizar..." + +#: ../extensions/flicker_utils/flickr-consumer.c:124 +#: ../extensions/flicker_utils/flickr-service.c:237 +#: ../extensions/flicker_utils/flickr-service.c:348 +#: ../extensions/flicker_utils/flickr-service.c:672 +#: ../extensions/flicker_utils/flickr-service.c:937 +#: ../extensions/oauth/oauth-service.c:154 +#: ../extensions/photobucket/photobucket-consumer.c:74 +#: ../extensions/photobucket/photobucket-consumer.c:82 +#: ../extensions/photobucket/photobucket-consumer.c:149 +#: ../extensions/photobucket/photobucket-service.c:132 +msgid "Unknown error" +msgstr "Erro desconhecido" + +#: ../extensions/flicker_utils/flickr-service.c:502 +#, c-format +msgid "" +"Return to this window when you have finished the authorization process on %s" +msgstr "" +"Retorne a esta janela quando você tiver terminado o processo de autorização " +"no %s" + +#: ../extensions/flicker_utils/flickr-service.c:503 +msgid "Once you're done, click the 'Continue' button below." +msgstr "Assim que você tiver terminado, clique no botão \"Continuar\" abaixo." + +#: ../extensions/flicker_utils/flickr-service.c:571 +#, c-format +msgid "gThumb requires your authorization to upload the photos to %s" +msgstr "gThumb precisa da sua autorização para enviar as fotos para o %s" + +#: ../extensions/flicker_utils/flickr-service.c:572 +#, c-format +msgid "" +"Click 'Authorize' to open your web browser and authorize gthumb to upload " +"photos to %s. When you're finished, return to this window to complete the " +"authorization." +msgstr "" +"Clique em \"Autorizar\" para abrir seu navegador de internet e autorize que " +"o gThumb envie fotos para o %s. Quando você tiver terminado, retorne a esta " +"janela para concluir a autorização." + +#: ../extensions/gstreamer_tools/actions.c:66 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1072 +#: ../gthumb/gth-browser.c:2175 +msgid "Could not save the file" +msgstr "Não foi possível salvar o arquivo" + +#: ../extensions/gstreamer_tools/actions.c:130 +msgid "Could not take a screenshot" +msgstr "Não foi possível capturar uma imagem" + +#: ../extensions/gstreamer_tools/actions.c:136 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1245 +msgid "Save Image" +msgstr "Salvar imagem" + +#: ../extensions/gstreamer_tools/actions.c:156 +msgctxt "Filename" +msgid "Screenshot" +msgstr "Captura de tela" + +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:1 +msgid "Slower" +msgstr "Mais lento" + +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:699 +msgid "Play" +msgstr "Reproduzir" + +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:3 +msgid "Faster" +msgstr "Mais rápido" + +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 +msgid "Time:" +msgstr "Tempo:" + +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 +msgid "--:--" +msgstr "--:--" + +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 +msgid "Toggle volume" +msgstr "Volume" + +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 +msgid "Change volume level" +msgstr "Altere o nível do volume" + +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 +#: ../extensions/photo_importer/actions.c:67 +#: ../extensions/photo_importer/dlg-photo-importer.c:620 +msgid "Choose a folder" +msgstr "Escolha uma pasta" + +#: ../extensions/gstreamer_tools/gstreamer_tools.extension.in.in.h:1 +msgid "Audio/Video support" +msgstr "Suporte a áudio/vídeo" + +#: ../extensions/gstreamer_tools/gstreamer_tools.extension.in.in.h:2 +msgid "Play audio and video files." +msgstr "Reproduz arquivos de áudio e vídeo." + +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:104 +msgid "Screenshot" +msgstr "Captura de tela" + +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:105 +msgid "Take a screenshot" +msgstr "Obtém uma captura de tela" + +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 +msgid "Playing video" +msgstr "Reproduzindo vídeo" + +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:689 +msgid "Pause" +msgstr "Pausar" + +#: ../extensions/gstreamer_tools/main.c:31 +#: ../gthumb/gth-main-default-tests.c:247 +msgid "Video" +msgstr "Vídeo" + +#: ../extensions/gstreamer_tools/main.c:32 +#: ../gthumb/gth-main-default-tests.c:254 +msgid "Audio" +msgstr "Áudio" + +#: ../extensions/gstreamer_tools/main.c:39 +msgid "Artist" +msgstr "Artista" + +#: ../extensions/gstreamer_tools/main.c:40 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 +msgid "Album" +msgstr "Álbum" + +#: ../extensions/gstreamer_tools/main.c:41 +msgid "Bitrate" +msgstr "Taxa de bits" + +#: ../extensions/gstreamer_tools/main.c:42 +msgid "Encoder" +msgstr "Codificador" + +#: ../extensions/gstreamer_tools/main.c:44 +#: ../extensions/gstreamer_tools/main.c:49 +msgid "Codec" +msgstr "Codec" + +#: ../extensions/gstreamer_tools/main.c:45 +msgid "Framerate" +msgstr "Taxa de quadros" + +#: ../extensions/gstreamer_tools/main.c:46 +#: ../extensions/image_print/data/ui/print-layout.ui.h:24 +#: ../extensions/image_viewer/gth-image-viewer-page.c:209 +msgid "Width" +msgstr "Largura" + +#: ../extensions/gstreamer_tools/main.c:47 +#: ../extensions/image_print/data/ui/print-layout.ui.h:25 +msgid "Height" +msgstr "Altura" + +#: ../extensions/gstreamer_tools/main.c:50 +msgid "Channels" +msgstr "Canais" + +#: ../extensions/gstreamer_tools/main.c:51 +msgid "Sample rate" +msgstr "Taxa de amostragem" + +#: ../extensions/gstreamer_utils/gstreamer-utils.c:362 +msgid "Stereo" +msgstr "Estéreo" + +#: ../extensions/gstreamer_utils/gstreamer-utils.c:362 +msgid "Mono" +msgstr "Mono" + +#. Translators: this is an image size, such as 1024 × 768 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:395 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1300 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:209 +#: ../extensions/webalbums/gth-web-exporter.c:2446 ../gthumb/gtk-utils.c:1037 +#, c-format +msgid "%d × %d" +msgstr "%d × %d" + +#: ../extensions/image_print/actions.c:69 +msgid "Could not print the selected files" +msgstr "Não foi possível imprimir os arquivos selecionados" + +#: ../extensions/image_print/callbacks.c:65 +msgid "Print the selected images" +msgstr "Imprimir as imagens selecionadas" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:1 +msgid "Centered" +msgstr "Centralizada" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:13 +msgid "The total number of files" +msgstr "O número total de arquivos" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:14 +#: ../extensions/importer/data/ui/import-preferences.ui.h:4 +msgid "The event description" +msgstr "A descrição do evento" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:17 +msgid "_Rows:" +msgstr "_Linhas:" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:19 +msgid "Image" +msgstr "Imagem" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:20 +msgid "Position:" +msgstr "Posição:" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:21 +msgid "Left" +msgstr "Esquerda" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:22 +msgid "Top" +msgstr "Topo" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:26 +msgid "Rotation:" +msgstr "Rotação:" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:27 +msgid "Unit:" +msgstr "Unidade:" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:28 +msgid "Preview" +msgstr "Visualização" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:30 +msgid "millimeters" +msgstr "milímetros" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:31 +msgid "inches" +msgstr "polegadas" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:4 +msgid "Select Caption Font" +msgstr "Selecionar fonte das legendas" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:5 +msgid "Select Header Font" +msgstr "Selecionar fonte dos cabeçalhos" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 +msgid "Select Footer Font" +msgstr "Selecionar fontes dos rodapés" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 +msgid "Fonts" +msgstr "Fontes" + +#: ../extensions/image_print/gth-image-print-job.c:914 +#: ../extensions/webalbums/data/albumthemes/text.h:31 +#, c-format +msgid "Page %d of %d" +msgstr "Página %d de %d" + +#: ../extensions/image_print/gth-image-print-job.c:1680 +#: ../extensions/image_print/gth-image-print-job.c:1845 +#: ../extensions/image_print/gth-image-print-job.c:1888 +msgid "Could not print" +msgstr "Não foi possível imprimir" + +#: ../extensions/image_print/gth-image-print-job.c:1746 +#: ../gthumb/gth-main-default-tests.c:240 +msgid "Images" +msgstr "Imagens" + +# carregador é o mais apropriado? +#: ../extensions/image_print/gth-image-print-job.c:1847 +#: ../gthumb/gth-image-loader.c:197 ../gthumb/gth-image-loader.c:304 +#: ../gthumb/gth-image-utils.c:131 ../gthumb/gth-image-utils.c:137 +msgid "No suitable loader available for this file type" +msgstr "Nenhum carregador adequado para esse tipo de arquivo" + +#. translators: %s is a filename +#: ../extensions/image_print/gth-load-image-info-task.c:164 +#, c-format +msgid "Loading \"%s\"" +msgstr "Carregando \"%s\"" + +#: ../extensions/image_print/gth-load-image-info-task.c:166 +#: ../extensions/webalbums/gth-web-exporter.c:2719 +msgid "Loading images" +msgstr "Carregando imagens" + +#: ../extensions/image_print/image_print.extension.in.in.h:1 +msgid "Image print" +msgstr "Impressão de imagem" + +#: ../extensions/image_print/image_print.extension.in.in.h:2 +msgid "Allow to print images choosing the page layout." +msgstr "Permite imprimir imagens escolhendo a disposição da página." + +#: ../extensions/image_print/preferences.c:79 +msgid "Print" +msgstr "Imprimir" + +#: ../extensions/image_rotation/callbacks.c:50 +msgid "Rotate the selected images 90° to the right" +msgstr "Gira as imagens selecionadas 90° para a direita" + +#: ../extensions/image_rotation/callbacks.c:56 +msgid "Rotate the selected images 90° to the left" +msgstr "Gira as imagens selecionadas 90° para a esquerda" + +#: ../extensions/image_rotation/callbacks.c:61 +msgid "Rotate Physically" +msgstr "Girar fisicamente" + +#: ../extensions/image_rotation/callbacks.c:62 +msgid "Rotate the selected images according to the embedded orientation" +msgstr "Gira as imagens selecionadas de acordo com a orientação embutida" + +#: ../extensions/image_rotation/callbacks.c:67 +msgid "Reset the EXIF Orientation" +msgstr "Restaurar a orientação EXIF" + +#: ../extensions/image_rotation/callbacks.c:68 +msgid "Reset the embedded orientation without rotating the images" +msgstr "Redefine a orientação embutida sem girar as imagens" + +#: ../extensions/image_rotation/gth-reset-orientation-task.c:111 +#: ../extensions/image_rotation/gth-transform-task.c:141 +#: ../extensions/webalbums/gth-web-exporter.c:2338 +#: ../extensions/webalbums/gth-web-exporter.c:2423 +msgid "Saving images" +msgstr "Salvando imagens" + +#: ../extensions/image_rotation/image_rotation.extension.in.in.h:1 +msgid "Image rotation" +msgstr "Rotação de imagem" + +#: ../extensions/image_rotation/image_rotation.extension.in.in.h:2 +msgid "Rotate images without data loss." +msgstr "Gira imagens sem perda de qualidade." + +#: ../extensions/image_rotation/rotation-utils.c:117 +#, c-format +msgid "Problem transforming the image: %s" +msgstr "Problema ao transformar a imagem: %s" + +#: ../extensions/image_rotation/rotation-utils.c:122 +msgid "" +"This transformation may introduce small image distortions along one or more " +"edges, because the image dimensions are not multiples of 8.\n" +"\n" +"The distortion is reversible, however. If the resulting image is " +"unacceptable, simply apply the reverse transformation to return to the " +"original image.\n" +"\n" +"You can also choose to discard (or trim) any untransformable edge pixels. " +"For practical use, this mode gives the best looking results, but the " +"transformation is not strictly lossless anymore." +msgstr "" +"Essa transformação pode introduzir pequenas distorções na imagem em uma ou " +"mais extremidades, porque as dimensões dela não são múltiplas de 8.\n" +"\n" +"Entretanto, a distorção é reversível. Se a imagem resultante for " +"inaceitável, basta aplicar a transformação reversa para retornar à imagem " +"original.\n" +"\n" +"Você também pode escolher descartar (ou aparar) quaisquer pixeis não " +"transformáveis nas extremidades. Por praticidade, esse modo oferece os " +"melhores resultados visuais, mas a transformação não é mais estritamente sem " +"perdas." + +#: ../extensions/image_rotation/rotation-utils.c:128 +msgid "_Trim" +msgstr "A_parar" + +#: ../extensions/image_rotation/rotation-utils.c:130 +msgid "_Accept distortion" +msgstr "Distorção _aceita" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:1 +msgid "Set to actual size" +msgstr "Utilizar tamanho original" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:2 +msgid "Keep previous zoom" +msgstr "Manter zoom anterior" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:3 +msgid "Fit to window" +msgstr "Ajustar à janela" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 +msgid "Fit to window if larger" +msgstr "Ajustar à janela se for maior" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:5 +msgid "Fit to width" +msgstr "Ajustar à largura" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:6 +msgid "Fit to width if larger" +msgstr "Ajustar à largura se for maior" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:7 +msgid "Reset scrollbar positions" +msgstr "Restaurar as posições da barra de rolagem" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:8 +msgid "After loading an image:" +msgstr "Após carregar uma imagem:" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:9 +msgid "_Zoom quality:" +msgstr "Qualidade do _zoom:" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:10 +msgid "Transparency _type:" +msgstr "Tip_o de transparência:" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:11 +msgid "High" +msgstr "Alta" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:12 +msgid "Low" +msgstr "Baixa" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:13 +msgid "White" +msgstr "Branco" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:15 +msgid "Black" +msgstr "Preto" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:16 +msgid "Checked" +msgstr "Verificado" + +#: ../extensions/image_viewer/gth-image-histogram.c:84 +msgid "Histogram" +msgstr "Histograma" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:179 +msgid "Copy Image" +msgstr "Copiar imagem" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:180 +msgid "Copy the image to the clipboard" +msgstr "Copia a imagem para a área de transferência" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:184 +msgid "Paste Image" +msgstr "Colar imagem" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:185 +msgid "Paste the image from the clipboard" +msgstr "Cola a imagem da área de transferência" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:189 +msgid "In" +msgstr "Aproximar" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:190 +msgid "Zoom in" +msgstr "Mais zoom" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:194 +msgid "Out" +msgstr "Afastar" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:195 +msgid "Zoom out" +msgstr "Menos zoom" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:199 +msgid "1:1" +msgstr "1:1" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:200 +msgid "Actual size" +msgstr "Tamanho real" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:204 +msgid "Fit" +msgstr "Ajustar" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:205 +msgid "Zoom to fit window" +msgstr "Zoom para ajustar à janela" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:210 +msgid "Zoom to fit width" +msgstr "Zoom para ajustar à largura" + +#: ../extensions/image_viewer/image_viewer.extension.in.in.h:1 +msgid "Image viewer" +msgstr "Visualizador de imagens" + +#: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 +msgid "Basic image viewing." +msgstr "Visualização básica de imagem." + +#: ../extensions/image_viewer/preferences.c:125 +msgid "Viewer" +msgstr "Visualizador" + +#: ../extensions/importer/data/ui/import-preferences.ui.h:1 +msgid "_Destination" +msgstr "_Destino" + +#: ../extensions/importer/data/ui/import-preferences.ui.h:2 +msgid "_Automatic subfolder" +msgstr "Subpasta _automática" + +#: ../extensions/importer/data/ui/import-preferences.ui.h:3 +msgid "as _single subfolder" +msgstr "como subpasta _singular" + +#: ../extensions/importer/data/ui/import-preferences.ui.h:7 +msgid "The year" +msgstr "O ano" + +#: ../extensions/importer/data/ui/import-preferences.ui.h:8 +msgid "The month" +msgstr "O mês" + +#: ../extensions/importer/data/ui/import-preferences.ui.h:9 +msgid "The day of the month" +msgstr "O dia do mês" + +#: ../extensions/importer/data/ui/import-preferences.ui.h:10 +msgid "The hour" +msgstr "A hora" + +#: ../extensions/importer/data/ui/import-preferences.ui.h:11 +msgid "The minutes" +msgstr "Os minutos" + +#: ../extensions/importer/data/ui/import-preferences.ui.h:12 +msgid "The seconds" +msgstr "Os segundos" + +#: ../extensions/importer/gth-import-destination-button.c:183 +msgid "Invalid Destination" +msgstr "Destino inválido" + +#: ../extensions/importer/gth-import-preferences-dialog.c:198 +#, c-format +msgid "example: %s" +msgstr "exemplo: %s" + +#. subfolder type +#: ../extensions/importer/gth-import-preferences-dialog.c:330 +msgid "File date" +msgstr "Data do arquivo" + +#. gtk_label_set_mnemonic_widget (GTK_LABEL (GET_WIDGET ("subfolder_label")), self->priv->subfolder_type_list); +#. subfolder format +#: ../extensions/importer/gth-import-preferences-dialog.c:340 +msgid "year-month-day" +msgstr "ano-mês-dia" + +#: ../extensions/importer/gth-import-preferences-dialog.c:341 +msgid "year-month" +msgstr "ano-mês" + +#: ../extensions/importer/gth-import-preferences-dialog.c:342 +msgid "year" +msgstr "ano" + +#: ../extensions/importer/gth-import-preferences-dialog.c:343 +msgid "custom format" +msgstr "formato personalizado" + +#: ../extensions/importer/gth-import-task.c:426 +#: ../extensions/importer/gth-import-task.c:461 +#: ../extensions/importer/gth-import-task.c:671 +msgid "Importing files" +msgstr "Importando arquivos" + +#: ../extensions/importer/gth-import-task.c:620 +msgid "No file imported" +msgstr "Nenhum arquivo importado" + +#: ../extensions/importer/gth-import-task.c:621 +msgid "The selected files are already present in the destination." +msgstr "Os arquivos selecionados já se encontram no destino." + +#: ../extensions/importer/gth-import-task.c:644 +#: ../gthumb/gth-file-source-vfs.c:694 +msgid "Could not delete the files" +msgstr "Não foi possível excluir os arquivos" + +#: ../extensions/importer/gth-import-task.c:645 +msgid "Delete operation not supported." +msgstr "Não há suporte à operação de exclusão." + +#: ../extensions/importer/gth-import-task.c:732 +msgid "Last imported" +msgstr "Última importação" + +#: ../extensions/importer/gth-import-task.c:838 +msgid "No file specified." +msgstr "Nenhum arquivo especificado." + +# "300MB is available" is wrong, as it should be in plural. +#. Translators: For example: Not enough free space in '/home/user/Images'.\n1.3 GB of space is required but only 300 MB is available. +#: ../extensions/importer/gth-import-task.c:875 +#, c-format +msgid "" +"Not enough free space in '%s'.\n" +"%s of space is required but only %s is available." +msgstr "" +"Sem espaço suficiente em \"%s\".\n" +"Precisa de %s, mas há apenas %s." + +#: ../extensions/list_tools/callbacks.c:76 ../gthumb/gth-filterbar.c:311 +msgid "Personalize..." +msgstr "Personalizar..." + +#: ../extensions/list_tools/callbacks.c:320 +msgid "Tools" +msgstr "Ferramentas" + +#: ../extensions/list_tools/callbacks.c:321 +msgid "Batch tools for multiple files" +msgstr "Ferramentas de processamento em lote para múltiplos arquivos" + +#: ../extensions/list_tools/data/ui/ask-value.ui.h:1 +msgid "_Skip" +msgstr "_Pular" + +#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:1 +msgid "Commands" +msgstr "Comandos" + +#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:2 +msgid "Co_mmands:" +msgstr "C_omandos:" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:2 +msgid "_Wait for the command to finish" +msgstr "_Esperar até o comando concluir" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:3 +msgid "E_xecute command once for every file" +msgstr "E_xecutar comando uma vez para todos arquivos" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:4 +msgid "_Terminal command (shell script)" +msgstr "Comando de _terminal (shell script)" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:5 +msgid "Sh_ortcut:" +msgstr "Atalh_o:" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:6 +msgid "The file uri" +msgstr "A uri do arquivo" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:7 +msgid "The file path" +msgstr "O caminho do arquivo" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:8 +msgid "The file basename" +msgstr "O nome base do arquivo" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:9 +msgid "The parent folder path" +msgstr "O caminho da pasta pai" + +#. Translate only 'message' and 'default_value'. +#: ../extensions/list_tools/data/ui/script-editor.ui.h:14 +#, no-c-format +msgid "%ask{ message }{ default value }" +msgstr "%ask{ mensagem }{ valor padrão }" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:15 +msgid "Ask an input value" +msgstr "Solicita um valor da entrada" + +#. Translate only 'attribute name' +#: ../extensions/list_tools/data/ui/script-editor.ui.h:18 +#, no-c-format +msgid "%attr{ attribute name }" +msgstr "%attr{ nome do atributo }" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:19 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 +msgid "A file attribute" +msgstr "Um atributo do arquivo" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:21 +#, no-c-format +msgid "%N" +msgstr "%N" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:22 +msgid "The file basename without extension" +msgstr "O nome base do arquivo sem a extensão" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:24 +#, no-c-format +msgid "%E" +msgstr "%E" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:25 +msgid "The file extension" +msgstr "A extensão do arquivo" + +#. Translate only 'text'. +#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 +#, no-c-format +msgid "%quote{ text }" +msgstr "%quote{ texto }" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:29 +msgid "Quote the text " +msgstr "Cita o texto " + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:30 +msgid "_Command:" +msgstr "Co_mando:" + +#: ../extensions/list_tools/dlg-personalize-scripts.c:257 +msgid "Script" +msgstr "Script" + +#: ../extensions/list_tools/dlg-personalize-scripts.c:271 +msgid "Shortcut" +msgstr "Atalho" + +#: ../extensions/list_tools/dlg-personalize-scripts.c:285 +#: ../gthumb/dlg-personalize-filters.c:252 +msgid "Show" +msgstr "Mostrar" + +#: ../extensions/list_tools/dlg-personalize-scripts.c:355 +msgid "Could not save the script" +msgstr "Não foi possível salvar o script" + +#: ../extensions/list_tools/dlg-personalize-scripts.c:406 +msgid "New Command" +msgstr "Novo comando" + +#: ../extensions/list_tools/dlg-personalize-scripts.c:433 +msgid "Edit Command" +msgstr "Editar comando" + +#: ../extensions/list_tools/dlg-personalize-scripts.c:461 +msgid "Are you sure you want to delete the selected command?" +msgstr "Você tem certeza que quer excluir o comando selecionado?" + +#: ../extensions/list_tools/gth-script.c:610 +msgid "Enter a value:" +msgstr "Digite um valor:" + +#: ../extensions/list_tools/gth-script.c:745 +#: ../extensions/webalbums/gth-web-exporter.c:558 +#: ../extensions/webalbums/gth-web-exporter.c:570 +#: ../extensions/webalbums/gth-web-exporter.c:578 +msgid "Malformed command" +msgstr "Comando mal formado" + +#: ../extensions/list_tools/gth-script-editor-dialog.c:147 +msgid "none" +msgstr "nenhum" + +#: ../extensions/list_tools/gth-script-editor-dialog.c:153 +#, c-format +msgid "key %d on the numeric keypad" +msgstr "tecla %d do teclado numérico" + +#: ../extensions/list_tools/gth-script-editor-dialog.c:296 +#, c-format +msgid "No command specified" +msgstr "Nenhum comando especificado" + +#: ../extensions/list_tools/gth-script-task.c:83 +#, c-format +msgid "Command exited abnormally with status %d" +msgstr "Comando sai anormalmente com o status %d" + +#: ../extensions/list_tools/list_tools.extension.in.in.h:1 +msgid "File list tools" +msgstr "Ferramentas de lista de arquivos" + +#: ../extensions/list_tools/list_tools.extension.in.in.h:2 +msgid "Scripting and batch manipulation of files." +msgstr "Scripts e manipulação em lote de arquivos." + +#: ../extensions/map_view/gth-map-view.c:130 +msgctxt "Cardinal point" +msgid "S" +msgstr "S" + +#: ../extensions/map_view/gth-map-view.c:130 +msgctxt "Cardinal point" +msgid "N" +msgstr "N" + +#: ../extensions/map_view/gth-map-view.c:132 +msgctxt "Cardinal point" +msgid "W" +msgstr "O" + +#: ../extensions/map_view/gth-map-view.c:132 +msgctxt "Cardinal point" +msgid "E" +msgstr "L" + +#: ../extensions/map_view/gth-map-view.c:205 +#: ../extensions/map_view/map_view.extension.in.in.h:1 +msgid "Map" +msgstr "Mapa" + +#. No GPS label +#: ../extensions/map_view/gth-map-view.c:276 +msgid "The geographical position information is not available for this image." +msgstr "" +"As informações da posição geográfica não estão disponíveis para esta imagem." + +# Descrição de extensão - ponto final acrescentado propositalmente. +#: ../extensions/map_view/map_view.extension.in.in.h:2 +msgid "View the photo position on the map" +msgstr "Veja a posição da foto no mapa." + +#: ../extensions/oauth/data/ui/oauth-account-manager.ui.h:1 +msgid "A_ccounts:" +msgstr "_Contas:" + +#: ../extensions/oauth/data/ui/oauth-ask-authorization.ui.h:1 +#: ../gthumb/gth-folder-tree.c:1067 +msgid "Loading..." +msgstr "Carregando..." + +#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 +msgid "New authentication..." +msgstr "Nova autenticação..." + +#: ../extensions/oauth/oauth-ask-authorization-dialog.c:191 +msgid "Authorization Required" +msgstr "Autorização necessária" + +#: ../extensions/oauth/web-service.c:382 +msgid "Choose _Account..." +msgstr "Escolher _conta..." + +#: ../extensions/oauth/web-service.c:660 +msgid "Choose Account" +msgstr "Escolher conta" + +#: ../extensions/oauth/web-service.c:777 +msgid "Edit Accounts" +msgstr "Editar contas" + +#: ../extensions/oauth/web-service.c:795 ../extensions/oauth/web-service.c:812 +msgid "Connecting to the server" +msgstr "Conectando ao servidor" + +#: ../extensions/oauth/web-service.c:796 +msgid "Asking authorization" +msgstr "Pedindo autorização" + +#: ../extensions/oauth/web-service.c:813 +msgid "Getting account information" +msgstr "Obtendo informações da conta" + +#: ../extensions/photobucket/callbacks.c:54 +msgid "Photobucket..." +msgstr "Photobucket..." + +#: ../extensions/photobucket/callbacks.c:55 +msgid "Upload photos to Photobucket" +msgstr "Envia fotos para o PhotoBucket" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +msgid "_Scramble filenames" +msgstr "_Embaralhar nomes de arquivos" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 +msgid "Tiny ( 100 x 75 )" +msgstr "Minúscula ( 100 x 75 )" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 +msgid "Small ( 160 x 120 )" +msgstr "Pequena ( 160 x 120 )" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 +msgid "Medium ( 320 x 240 )" +msgstr "Média ( 320 x 240 )" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 +msgid "Large ( 640 x 480 )" +msgstr "Grande ( 640 x 480 )" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 +msgid "15ʺ screen ( 800 x 600 )" +msgstr "Tela 15ʺ ( 800 x 600 )" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 +msgid "17ʺ screen ( 1024 x 768 )" +msgstr "Tela 17ʺ ( 1024 x 768 )" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 +msgid "1 megabyte file size" +msgstr "1 megabyte de tamanho de arquivo" + +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 +msgid "_Container:" +msgstr "C_ontêiner:" + +#: ../extensions/photobucket/dlg-export-to-photobucket.c:290 +msgid "Tiny ( 100 × 75 )" +msgstr "Minúscula ( 100 × 75 )" + +#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 +msgid "Small ( 160 × 120 )" +msgstr "Pequena ( 160 × 120 )" + +#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 +msgid "Medium ( 320 × 240 )" +msgstr "Média ( 320 × 240 )" + +#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 +msgid "Large ( 640 × 480 )" +msgstr "Grande ( 640 × 480 )" + +#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 +msgid "15ʺ screen ( 800 × 600 )" +msgstr "Tela 15ʺ ( 800 × 600 )" + +#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 +msgid "17ʺ screen ( 1024 × 768 )" +msgstr "Tela 17ʺ ( 1024 × 768 )" + +#: ../extensions/photobucket/dlg-export-to-photobucket.c:303 +msgid "2 megabyte file size" +msgstr "2 megabyte de tamanho de arquivo" + +#: ../extensions/photobucket/photobucket.extension.in.in.h:1 +msgid "PhotoBucket" +msgstr "PhotoBucket" + +#: ../extensions/photobucket/photobucket.extension.in.in.h:2 +msgid "Upload images to PhotoBucket" +msgstr "Envia imagens para o PhotoBucket" + +#: ../extensions/photo_importer/actions.c:71 +msgid "Import" +msgstr "Importar" + +#: ../extensions/photo_importer/callbacks.c:52 +msgid "_Removable Device..." +msgstr "Dispositivo _removível..." + +#: ../extensions/photo_importer/callbacks.c:53 +msgid "Import photos and other files from a removable device" +msgstr "Importa fotos e outros arquivos de um dispositivo removível" + +#: ../extensions/photo_importer/callbacks.c:56 +msgid "F_older..." +msgstr "P_asta..." + +#: ../extensions/photo_importer/callbacks.c:57 +msgid "Import photos and other files from a folder" +msgstr "Importa fotos e outros arquivos de uma pasta" + +#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:1 +msgid "_Rotate the images physically" +msgstr "_Girar as imagens fisicamente" + +#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 +msgid "After importing from a device:" +msgstr "Após importar de um dispositivo:" + +#. view label +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 +#: ../gthumb/gth-filterbar.c:421 +msgid "S_how:" +msgstr "_Mostrar:" + +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:4 +msgid "_Tags:" +msgstr "Etique_tas:" + +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 +msgid "_Event:" +msgstr "_Evento:" + +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:7 +msgid "_Delete the imported files from the source" +msgstr "E_xcluir da fonte os arquivos importados" + +#: ../extensions/photo_importer/dlg-photo-importer.c:227 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:149 +msgid "Could not import the files" +msgstr "Não foi possível importar os arquivos" + +#. translators: %d is the number of files, %s the total size +#: ../extensions/photo_importer/dlg-photo-importer.c:299 +#, c-format +msgid "Files to import: %d (%s)" +msgstr "Arquivos para importar: %d (%s)" + +#: ../extensions/photo_importer/dlg-photo-importer.c:339 +msgid "Could not load the folder" +msgstr "Não foi possível remover a pasta" + +#: ../extensions/photo_importer/dlg-photo-importer.c:369 +#: ../gthumb/gth-browser.c:2089 +msgid "Getting folder listing..." +msgstr "Obtendo lista do diretório..." + +#: ../extensions/photo_importer/dlg-photo-importer.c:415 +msgid "Empty" +msgstr "Vazio" + +#: ../extensions/photo_importer/dlg-photo-importer.c:586 +msgid "Import from Removable Device" +msgstr "Importar de dispositivo removível" + +#: ../extensions/photo_importer/dlg-photo-importer.c:618 +msgid "Import from Folder" +msgstr "Importar de pasta" + +#: ../extensions/photo_importer/photo_importer.extension.in.in.h:1 +msgid "Import photos" +msgstr "Importar fotos" + +#: ../extensions/photo_importer/photo_importer.extension.in.in.h:2 +msgid "Import photos from removable devices." +msgstr "Importa fotos de dispositivos removíveis." + +#: ../extensions/picasaweb/callbacks.c:59 +#: ../extensions/picasaweb/callbacks.c:64 +msgid "_Picasa Web Album..." +msgstr "Álbum da web do _Picasa..." + +# Álbuns em miúsculo por ser parte do nome do "Picasa Web" (vide site) +#: ../extensions/picasaweb/callbacks.c:60 +msgid "Download photos from Picasa Web Album" +msgstr "Baixa fotos do Álbuns da web do Picasa" + +# Álbuns em miúsculo por ser parte do nome do "Picasa Web" (vide site) +#: ../extensions/picasaweb/callbacks.c:65 +msgid "Upload photos to Picasa Web Album" +msgstr "Envia fotos para o Álbuns da web do Picasa" + +# Álbuns em miúsculo por ser parte do nome do "Picasa Web" (vide site) +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 +msgid "Export to Picasa Web Albums" +msgstr "Exporta para o Álbuns da web do Picasa" + +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 +msgid "_Albums:" +msgstr "Ál_buns:" + +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 +msgid "Public" +msgstr "Público" + +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:458 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:469 +msgid "Could not get the album list" +msgstr "Não foi possível obter a lista de álbuns" + +#: ../extensions/picasaweb/picasaweb.extension.in.in.h:1 +msgid "Picasa Web Albums" +msgstr "Álbuns da web do Picasa" + +#: ../extensions/picasaweb/picasaweb.extension.in.in.h:2 +msgid "Upload images to Picasa Web Albums" +msgstr "Enviar imagens para o Álbuns da web do Picasa" + +#: ../extensions/raw_files/raw_files.extension.in.in.h:1 +msgid "Raw format support" +msgstr "Suporte formato RAW" + +#: ../extensions/raw_files/raw_files.extension.in.in.h:2 +msgid "Allow to load raw format images." +msgstr "Permite carregar imagens não tratadas (raw)." + +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 +msgid "_X:" +msgstr "_X:" + +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 +msgid "_Y:" +msgstr "_Y:" + +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 +msgid "Red Eye Removal..." +msgstr "Remoção de olho vermelho..." + +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 +msgid "Red Eye Removal" +msgstr "Remoção de olho vermelho" + +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:511 +msgid "Remove the red eye effect caused by camera flashes" +msgstr "Remove o efeito de olho vermelho causado por flashes da câmera" + +#: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:1 +msgid "Red-eye removal" +msgstr "Remoção de olho vermelho" + +#: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:2 +msgid "Tool to remove the red-eye effect from a photo." +msgstr "Ferramenta para remover o efeito de olho vermelho de uma foto." + +#: ../extensions/rename_series/data/ui/code-selector.ui.h:1 +msgid "digits" +msgstr "dígitos" + +#: ../extensions/rename_series/data/ui/code-selector.ui.h:2 +msgid "format:" +msgstr "formato:" + +#: ../extensions/rename_series/data/ui/code-selector.ui.h:3 +msgid "remove" +msgstr "remover" + +#: ../extensions/rename_series/data/ui/code-selector.ui.h:4 +msgid "add" +msgstr "adicionar" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:1 +msgid "Rename" +msgstr "Renomear" + +#. Translators: this is the text case (upper or lower case). +#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 +msgid "Cas_e:" +msgstr "_Maiúsculo/Minúsculo:" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:7 +msgid "Edit template" +msgstr "Edita modelo" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 +msgid "The original filename" +msgstr "O nome de arquivo original" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 +msgid "The original extension" +msgstr "A extensão original" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:13 +msgid "The original enumerator" +msgstr "O enumerador original" + +#. translate only the text in the curly brackets +#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 +#, no-c-format +msgid "%M{ format }" +msgstr "%M{ formato }" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 +msgid "The modification date" +msgstr "A data de modificação" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:21 +msgid "The digitalization date" +msgstr "A data de digitalização" + +#. translate only the text in the curly brackets +#: ../extensions/rename_series/data/ui/rename-series.ui.h:24 +#, no-c-format +msgid "%A{ identifier }" +msgstr "%A{ identificador }" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 +msgid "_Template:" +msgstr "Mo_delo:" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +msgid "Re_verse Order" +msgstr "In_verter ordem" + +#: ../extensions/rename_series/dlg-rename-series.c:58 +msgid "Enumerator" +msgstr "Enumerador" + +#: ../extensions/rename_series/dlg-rename-series.c:59 +msgid "Original filename" +msgstr "Nome de arquivo original" + +#: ../extensions/rename_series/dlg-rename-series.c:60 +msgid "Original extension" +msgstr "Extensão original" + +#: ../extensions/rename_series/dlg-rename-series.c:61 +msgid "Original enumerator" +msgstr "Enumerador original" + +#: ../extensions/rename_series/dlg-rename-series.c:62 +msgid "Modification date" +msgstr "Data de modificação" + +#: ../extensions/rename_series/dlg-rename-series.c:63 +msgid "Digitalization date" +msgstr "Data de digitalização" + +#: ../extensions/rename_series/dlg-rename-series.c:64 +msgid "File attribute" +msgstr "Atributo do arquivo" + +#: ../extensions/rename_series/dlg-rename-series.c:558 +#: ../extensions/rename_series/dlg-rename-series.c:689 +msgid "Could not rename the files" +msgstr "Não foi possível renomear os arquivos" + +#: ../extensions/rename_series/dlg-rename-series.c:786 +msgid "Could not save the template" +msgstr "Não foi possível salvar o modelo" + +#: ../extensions/rename_series/dlg-rename-series.c:804 +msgid "Edit Template" +msgstr "Editar modelo" + +#: ../extensions/rename_series/dlg-rename-series.c:862 +msgid "Old Name" +msgstr "Nome antigo" + +#: ../extensions/rename_series/dlg-rename-series.c:873 +msgid "New Name" +msgstr "Novo nome" + +# Na interface gráfica está visível estar relacionado com maiúsculo/minúsculo. +#: ../extensions/rename_series/dlg-rename-series.c:950 +msgid "Keep original case" +msgstr "Manter original" + +#: ../extensions/rename_series/dlg-rename-series.c:951 +msgid "Convert to lower-case" +msgstr "Converter letras para minúsculo" + +#: ../extensions/rename_series/dlg-rename-series.c:952 +msgid "Convert to upper-case" +msgstr "Converter letras para maiúsculo" + +#: ../extensions/rename_series/gth-rename-task.c:167 +msgid "Renaming files" +msgstr "Renomeando arquivos" + +#: ../extensions/rename_series/rename_series.extension.in.in.h:1 +msgid "Rename files" +msgstr "Renomear arquivos" + +#: ../extensions/rename_series/rename_series.extension.in.in.h:2 +msgid "Rename series of files." +msgstr "Renomeia séries de arquivos." + +#: ../extensions/resize_images/callbacks.c:45 +msgid "Resize Images..." +msgstr "Redimensionar imagens..." + +#: ../extensions/resize_images/callbacks.c:46 +msgid "Resize the selected images" +msgstr "Redimensiona as imagens selecionadas" + +#: ../extensions/resize_images/data/ui/resize-images.ui.h:1 +msgid "Resize Images" +msgstr "Redimensionar imagens" + +#: ../extensions/resize_images/data/ui/resize-images.ui.h:2 +msgid "New dimensions" +msgstr "Novas dimensões" + +#: ../extensions/resize_images/data/ui/resize-images.ui.h:4 +msgid "_Height:" +msgstr "_Altura:" + +#: ../extensions/resize_images/data/ui/resize-images.ui.h:5 +msgid "_Preserve original aspect ratios" +msgstr "_Preservar as proporções originais" + +#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 +#: ../gthumb/gth-main-default-metadata.c:49 +msgid "Format" +msgstr "Formato" + +#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 +msgid "pixel" +msgstr "pixel" + +#: ../extensions/resize_images/dlg-resize-images.c:423 +msgid "Keep the original format" +msgstr "Manter o formato original" + +#: ../extensions/resize_images/resize_images.extension.in.in.h:1 +msgid "Resize images" +msgstr "Redimensionar imagens" + +#: ../extensions/resize_images/resize_images.extension.in.in.h:2 +msgid "Resize series of images." +msgstr "Redimensiona séries de imagens." + +#: ../extensions/search/actions.c:49 ../extensions/search/actions.c:117 +#: ../extensions/search/actions.c:123 +msgid "Could not perform the search" +msgstr "Não foi possível realizar a pesquisa" + +#: ../extensions/search/actions.c:54 +msgid "Search Result" +msgstr "Resultado da pesquisa" + +#: ../extensions/search/actions.c:76 +msgid "Find" +msgstr "Localizar" + +#: ../extensions/search/callbacks.c:59 +msgid "Find files" +msgstr "Localiza arquivos" + +#: ../extensions/search/callbacks.c:132 +msgid "Search again" +msgstr "Pesquisar novamente" + +#. Translators: This is not a verb, it's a name as in "the search properties". +#: ../extensions/search/callbacks.c:174 +#: ../extensions/search/search.extension.in.in.h:1 +msgid "Search" +msgstr "Pesquisar" + +#: ../extensions/search/gth-search-editor.c:112 +#: ../gthumb/gth-filter-editor-dialog.c:165 +msgid "all the following rules" +msgstr "todos os critérios a seguir" + +#: ../extensions/search/gth-search-editor.c:113 +#: ../gthumb/gth-filter-editor-dialog.c:166 +msgid "any of the following rules" +msgstr "qualquer um dos critérios a seguir" + +#: ../extensions/search/gth-search-task.c:181 +#, c-format +msgid "Files found until now: %s" +msgstr "Arquivos encontrados até agora: %s" + +#: ../extensions/search/gth-search-task.c:271 +msgid "Searching..." +msgstr "Pesquisando..." + +#: ../extensions/search/gth-search-task.c:277 +msgid "Cancel the operation" +msgstr "Cancelar a operação" + +#: ../extensions/search/search.extension.in.in.h:2 +msgid "File search tool." +msgstr "Ferramenta de pesquisa por arquivos." + +#: ../extensions/selections/callbacks.c:77 +msgid "Add to _Selection" +msgstr "Adicionar à _seleção" + +#: ../extensions/selections/callbacks.c:86 +msgid "Selection 1" +msgstr "Seleção 1" + +#: ../extensions/selections/callbacks.c:91 +msgid "Selection 2" +msgstr "Seleção 2" + +#: ../extensions/selections/callbacks.c:96 +msgid "Selection 3" +msgstr "Seleção 3" + +#: ../extensions/selections/callbacks.c:285 +#, c-format +msgid "" +"Use Alt-%d to add files to this selection, Ctrl-%d to view this selection." +msgstr "" +"Use Alt-%d para adicionar arquivos a esta seleção, Ctrl-%d para ver esta " +"seleção." + +#: ../extensions/selections/gth-selections-manager.c:239 +#, c-format +msgid "Selection %d" +msgstr "Seleção %d" + +#: ../extensions/selections/gth-selections-manager.c:242 +#: ../extensions/selections/selections.extension.in.in.h:1 +msgid "Selections" +msgstr "Seleções" + +#: ../extensions/selections/selections.extension.in.in.h:2 +msgid "Advanced file selection." +msgstr "Seleção avançada de arquivos." + +#: ../extensions/slideshow/callbacks.c:56 +msgid "_Slideshow" +msgstr "_Apresentação de slides" + +#: ../extensions/slideshow/callbacks.c:57 +msgid "View as a slideshow" +msgstr "Veja em apresentação de slides" + +#: ../extensions/slideshow/callbacks.c:410 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 +#: ../extensions/slideshow/preferences.c:162 +#: ../extensions/slideshow/slideshow.extension.in.in.h:1 +msgid "Slideshow" +msgstr "Apresentação de slides" + +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:1 +msgid "_Personalize" +msgstr "_Personalizar" + +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:3 +msgid "_Transition effect:" +msgstr "Efeito de _transição:" + +#. This is the first part of the phrase "change automatically, every x seconds", where x is an input control that let the user choose a value. +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 +msgid "_Change automatically, every" +msgstr "_Alterar automaticamente, a cada" + +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 +msgid "_Restart when finished" +msgstr "_Reiniciar ao terminar" + +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:8 +msgid "R_andom order" +msgstr "_Ordem aleatória" + +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:9 +msgid "Playlist" +msgstr "Lista de reprodução" + +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:10 +msgid "Add files to the playlist" +msgstr "Adiciona arquivos à lista de reprodução" + +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:11 +msgid "Remove the selected files" +msgstr "Remove arquivos selecionados" + +#: ../extensions/slideshow/gth-slideshow.c:231 +msgid "Playing slideshow" +msgstr "Reproduzindo apresentação de slides" + +#: ../extensions/slideshow/gth-slideshow-preferences.c:184 +msgid "Choose the files to play" +msgstr "Escolha os arquivos para enviar" + +#: ../extensions/slideshow/gth-slideshow-preferences.c:193 +msgid "Audio files" +msgstr "Arquivos de áudio" + +#: ../extensions/slideshow/gth-slideshow-preferences.c:259 +msgid "Random" +msgstr "Aleatório" + +#: ../extensions/slideshow/main.c:283 +msgid "Push from right" +msgstr "Empurrar da direita" + +#: ../extensions/slideshow/main.c:289 +msgid "Push from bottom" +msgstr "Empurrar de baixo" + +#: ../extensions/slideshow/main.c:295 +msgid "Slide from right" +msgstr "Deslizar da direita" + +#: ../extensions/slideshow/main.c:301 +msgid "Slide from bottom" +msgstr "Deslizar de baixo" + +#: ../extensions/slideshow/main.c:307 +msgid "Fade in" +msgstr "Fade in" + +#: ../extensions/slideshow/main.c:313 +msgid "Flip page" +msgstr "Virar página" + +#: ../extensions/slideshow/main.c:319 +msgid "Cube from right" +msgstr "Cubo da direita" + +#: ../extensions/slideshow/main.c:325 +msgid "Cube from bottom" +msgstr "Cubo de baixo" + +#: ../extensions/slideshow/slideshow.extension.in.in.h:2 +msgid "View images as a slideshow." +msgstr "Veja imagens como em apresentação de slides." + +#: ../extensions/webalbums/callbacks.c:71 +msgid "_Web Album..." +msgstr "Álbum da _web..." + +#: ../extensions/webalbums/callbacks.c:72 +msgid "Create a static web album" +msgstr "Cria um álbum web estático" + +#: ../extensions/webalbums/data/albumthemes/text.h:26 +msgid "Click to view the image" +msgstr "Clique para ver a imagem" + +#: ../extensions/webalbums/data/albumthemes/text.h:27 +msgid "Go back to the index" +msgstr "Voltar para o índice" + +#: ../extensions/webalbums/data/albumthemes/text.h:28 +#, c-format +msgid "Image %d of %d" +msgstr "Imagem %d de %d" + +#: ../extensions/webalbums/data/albumthemes/text.h:29 +msgid "Index" +msgstr "Índice" + +#: ../extensions/webalbums/data/albumthemes/text.h:30 +#: ../gthumb/gth-browser-actions-entries.h:125 +msgid "Next" +msgstr "Próxima" + +#: ../extensions/webalbums/data/albumthemes/text.h:32 +#: ../gthumb/gth-browser-actions-entries.h:119 +msgid "Previous" +msgstr "Anterior" + +#: ../extensions/webalbums/data/albumthemes/text.h:33 +#, c-format +msgid "View page %d" +msgstr "Ver a página %d" + +#: ../extensions/webalbums/data/albumthemes/text.h:34 +msgid "View the next image" +msgstr "Veja a próxima imagem" + +#: ../extensions/webalbums/data/albumthemes/text.h:35 +msgid "View the next page" +msgstr "Veja a próxima página" + +#: ../extensions/webalbums/data/albumthemes/text.h:36 +msgid "View the previous image" +msgstr "Veja a imagem anterior" + +#: ../extensions/webalbums/data/albumthemes/text.h:37 +msgid "View the previous page" +msgstr "Veja a página anterior" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:1 +msgid "All images on a single image" +msgstr "Todas as imagens em uma única imagem" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:2 +msgid "Adapts to the window width" +msgstr "Adapta a largura da janela" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 +msgid "Web Album" +msgstr "Álbum web" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:5 +#, no-c-format +msgid "%P" +msgstr "%P" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 +msgid "_Copy originals to destination" +msgstr "_Copiar originais para o destino" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 +msgid "_Adapt to the window width " +msgstr "_Adaptar à largura da janela " + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 +msgid "Index Page" +msgstr "Página de índice" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 +msgid "Thumbnail Caption" +msgstr "Legenda da miniatura" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 +msgid "The current image number" +msgstr "O número atual de imagens" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 +msgid "The total number of images" +msgstr "O número total de imagens" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 +msgid "The file comment" +msgstr "O comentário do arquivo" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 +msgid "Image Page" +msgstr "Página de imagens" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 +msgid "Show the description, if available" +msgstr "Mostrar a descrição, se disponível" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 +msgid "Show the following attributes:" +msgstr "Mostrar os seguintes atributos:" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:39 +msgid "Image Attributes" +msgstr "Atributos das imagens" + +#: ../extensions/webalbums/gth-web-exporter.c:1800 +msgid "Could not show the destination" +msgstr "Não foi possível abrir o destino" + +#: ../extensions/webalbums/gth-web-exporter.c:1836 +msgid "The album has been created successfully." +msgstr "O álbum foi criado com sucesso." + +#: ../extensions/webalbums/gth-web-exporter.c:2104 +#: ../extensions/webalbums/gth-web-exporter.c:2132 +msgid "Saving thumbnails" +msgstr "Salvando miniaturas" + +#: ../extensions/webalbums/gth-web-exporter.c:2160 +msgid "Saving HTML pages: Images" +msgstr "Salvando páginas HTML: imagens" + +#: ../extensions/webalbums/gth-web-exporter.c:2218 +msgid "Saving HTML pages: Indexes" +msgstr "Salvando páginas HTML: índices" + +#: ../extensions/webalbums/gth-web-exporter.c:2503 +msgid "Copying original images" +msgstr "Copiando imagens originais" + +#: ../extensions/webalbums/gth-web-exporter.c:2963 +msgid "Could not find the style folder" +msgstr "Não foi possível localizar a pasta de estilos" + +#: ../extensions/webalbums/gth-web-exporter.c:3001 +msgid "Could not create a temporary folder" +msgstr "Não foi possível criar uma pasta temporária" + +#: ../extensions/webalbums/webalbums.extension.in.in.h:1 +msgid "Web Albums" +msgstr "Álbuns web" + +#: ../extensions/webalbums/webalbums.extension.in.in.h:2 +msgid "Create static web albums." +msgstr "Cria álbuns web estáticos." + +#: ../gthumb/dlg-location.c:200 ../gthumb/gth-browser.c:1396 +#: ../gthumb/gth-browser.c:1969 ../gthumb/gth-browser.c:6214 +#: ../gthumb/gth-browser.c:6233 ../gthumb/gth-browser.c:6257 +#, c-format +msgid "Could not load the position \"%s\"" +msgstr "Não foi possível carregar a posição: \"%s\"" + +#: ../gthumb/dlg-personalize-filters.c:237 +msgid "Filter" +msgstr "Filtro" + +#: ../gthumb/dlg-personalize-filters.c:315 +msgid "Could not save the filter" +msgstr "Não foi possível salvar o filtro" + +#: ../gthumb/dlg-personalize-filters.c:358 +msgid "New Filter" +msgstr "Novo filtro" + +#: ../gthumb/dlg-personalize-filters.c:387 +msgid "Edit Filter" +msgstr "Editar filtro" + +# Referente a extensões +#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:277 +msgid "All" +msgstr "Todas" + +# Referente a extensões +#: ../gthumb/dlg-preferences-extensions.c:68 +msgid "Enabled" +msgstr "Habilitadas" + +# Referente a extensões +#: ../gthumb/dlg-preferences-extensions.c:69 +msgid "Disabled" +msgstr "Desabilitadas" + +# Referente a extensões +#: ../gthumb/dlg-preferences-extensions.c:72 +msgid "Viewers" +msgstr "Visualização" + +# Referente a extensões +#: ../gthumb/dlg-preferences-extensions.c:73 +msgid "Metadata" +msgstr "Metadados" + +# Referente a extensões +#: ../gthumb/dlg-preferences-extensions.c:74 +msgid "File tools" +msgstr "Ferramentas de arquivos" + +# Referente a extensões +#: ../gthumb/dlg-preferences-extensions.c:75 +msgid "List tools" +msgstr "Ferramentas de lista" + +# Referente a extensões +#: ../gthumb/dlg-preferences-extensions.c:76 +msgid "Importers" +msgstr "Importação" + +# Referente a extensões +#: ../gthumb/dlg-preferences-extensions.c:77 +msgid "Exporters" +msgstr "Exportação" + +#: ../gthumb/dlg-preferences-extensions.c:216 +msgid "Could not activate the extension" +msgstr "Não foi possível ativar a extensão" + +#: ../gthumb/dlg-preferences-extensions.c:226 +msgid "Could not deactivate the extension" +msgstr "Não foi possível desativar a extensão" + +#. add the page to the preferences dialog +#: ../gthumb/dlg-preferences-extensions.c:772 +msgid "Extensions" +msgstr "Extensões" + +#: ../gthumb/dlg-preferences-extensions.c:819 +msgid "Restart required" +msgstr "Reinicialização necessária" + +#: ../gthumb/dlg-preferences-extensions.c:820 +msgid "You need to restart gthumb for these changes to take effect" +msgstr "" +"Você precisa reiniciar o gthumb para que essas alterações tenham efeito" + +#: ../gthumb/dlg-preferences-extensions.c:821 +msgid "_Continue" +msgstr "_Continuar" + +#: ../gthumb/dlg-preferences-extensions.c:822 +msgid "_Restart" +msgstr "_Reiniciar" + +#. For translators: This is a progress size indicator, for example: 230.4 MB of 512.8 MB +#: ../gthumb/gio-utils.c:1351 +#, c-format +msgid "%s of %s" +msgstr "%s de %s" + +#: ../gthumb/gio-utils.c:1386 +#, c-format +msgid "Moving \"%s\" to \"%s\"" +msgstr "Movendo \"%s\" para \"%s\"" + +#: ../gthumb/gio-utils.c:1388 +#, c-format +msgid "Copying \"%s\" to \"%s\"" +msgstr "Copiando \"%s\" para \"%s\"" + +#: ../gthumb/gio-utils.c:1750 +msgid "Moving files" +msgstr "Movendo arquivos" + +#: ../gthumb/gio-utils.c:1750 +msgid "Copying files" +msgstr "Copiando arquivos" + +#: ../gthumb/gio-utils.c:1751 +msgid "Getting file information" +msgstr "Obtendo informações do arquivo" + +#. hour:minutes:seconds +#. Translators: This is a time format, like "9:05:02" for 9 +#. * hours, 5 minutes, and 2 seconds. You may change ":" to +#. * the separator that your locale uses or use "%Id" instead +#. * of "%d" if your locale uses localized digits. +#. +#: ../gthumb/glib-utils.c:3068 +#, c-format +msgctxt "long time format" +msgid "%d:%02d:%02d" +msgstr "%d:%02d:%02d" + +#. minutes:seconds +#. Translators: This is a time format, like "5:02" for 5 +#. * minutes and 2 seconds. You may change ":" to the +#. * separator that your locale uses or use "%Id" instead of +#. * "%d" if your locale uses localized digits. +#. +#: ../gthumb/glib-utils.c:3077 +#, c-format +msgctxt "short time format" +msgid "%d:%02d" +msgstr "%d:%02d" + +#: ../gthumb/gth-browser-actions-callbacks.c:414 +msgid "" +"gthumb is free software; you can redistribute it and/or modify it under the " +"terms of the GNU General Public License as published by the Free Software " +"Foundation; either version 2 of the License, or (at your option) any later " +"version." +msgstr "" +"O gThumb é um software livre; você pode redistribuí-lo e/ou modificá-lo sob " +"os termos da Licença Pública Geral GNU (GNU GPL) como publicada pela Free " +"Software Foundation; tanto a versão 2 da Licença ou (a sua escolha) qualquer " +"versão posterior." + +#: ../gthumb/gth-browser-actions-callbacks.c:418 +msgid "" +"gthumb is distributed in the hope that it will be useful, but WITHOUT ANY " +"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " +"details." +msgstr "" +"O gThumb é distribuído na esperança de que será útil, mas SEM NENHUMA " +"GARANTIA; até mesmo sem a garantia implícita de COMERCIALIZAÇÃO ou ADEQUAÇÃO " +"A UM PROPÓSITO EM PARTICULAR. Veja a Licença Pública Geral GNU (GNU GPL) " +"para mais detalhes." + +#: ../gthumb/gth-browser-actions-callbacks.c:422 +msgid "" +"You should have received a copy of the GNU General Public License along with " +"gthumb. If not, see http://www.gnu.org/licenses/." +msgstr "" +"Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este " +"programa. Caso contrário, veja ." + +#: ../gthumb/gth-browser-actions-callbacks.c:441 +msgid "An image viewer and browser for GNOME." +msgstr "Um visualizador e navegador de imagens para o GNOME." + +#: ../gthumb/gth-browser-actions-callbacks.c:444 +msgid "translator_credits" +msgstr "" +"Gustavo Noronha Silva \n" +"João Paulo Gomes Vanzuita \n" +"Viviani Ap. dos Santos \n" +"Raphael Higino \n" +"Igor Pires Soares \n" +"Rafael Ferreira " + +#: ../gthumb/gth-browser-actions-entries.h:31 +msgid "_File" +msgstr "_Arquivo" + +#: ../gthumb/gth-browser-actions-entries.h:32 +msgid "_Edit" +msgstr "_Editar" + +#: ../gthumb/gth-browser-actions-entries.h:34 +msgid "_Go" +msgstr "_Ir" + +#: ../gthumb/gth-browser-actions-entries.h:35 +msgid "_Help" +msgstr "Aj_uda" + +#: ../gthumb/gth-browser-actions-entries.h:36 +msgid "Open _With" +msgstr "_Abrir com" + +#: ../gthumb/gth-browser-actions-entries.h:37 +msgid "I_mport From" +msgstr "_Importar de" + +#: ../gthumb/gth-browser-actions-entries.h:38 +msgid "E_xport To" +msgstr "E_xportar para" + +#: ../gthumb/gth-browser-actions-entries.h:41 +msgid "New _Window" +msgstr "Nova _janela" + +#: ../gthumb/gth-browser-actions-entries.h:42 +msgid "Open another window" +msgstr "Abre outra janela" + +#: ../gthumb/gth-browser-actions-entries.h:71 +msgid "Open" +msgstr "Abrir" + +#: ../gthumb/gth-browser-actions-entries.h:77 +msgid "Open in New Window" +msgstr "Abre em nova janela" + +#: ../gthumb/gth-browser-actions-entries.h:84 +msgid "Edit various preferences" +msgstr "Edita diversas preferências" + +#: ../gthumb/gth-browser-actions-entries.h:95 +msgid "_Sort By..." +msgstr "_Ordenar por..." + +#: ../gthumb/gth-browser-actions-entries.h:101 +msgid "_Filter..." +msgstr "_Filtrar..." + +#: ../gthumb/gth-browser-actions-entries.h:108 +msgid "Stop loading the current location" +msgstr "Para de carregar a localização atual" + +#: ../gthumb/gth-browser-actions-entries.h:114 +msgid "Reload the current location" +msgstr "Recarrega a localização atual" + +#: ../gthumb/gth-browser-actions-entries.h:120 +msgid "View previous image" +msgstr "Veja a imagem anterior" + +#: ../gthumb/gth-browser-actions-entries.h:126 +msgid "View next image" +msgstr "Veja a próxima imagem" + +#: ../gthumb/gth-browser-actions-entries.h:132 +msgid "Switch to fullscreen" +msgstr "Muda para tela cheia" + +#: ../gthumb/gth-browser-actions-entries.h:138 +msgid "Leave Fullscreen" +msgstr "Deixa a tela cheia" + +#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3841 +msgid "Go to the previous visited location" +msgstr "Vai para o local visitado anteriormente" + +#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3859 +msgid "Go to the next visited location" +msgstr "Vai para o próximo local visitado" + +#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3877 +msgid "Go up one level" +msgstr "Vai para um nível acima" + +#: ../gthumb/gth-browser-actions-entries.h:161 +msgid "_Location..." +msgstr "_Localização..." + +#: ../gthumb/gth-browser-actions-entries.h:162 +msgid "Specify a location to open" +msgstr "Especifique uma localização para abrir" + +#: ../gthumb/gth-browser-actions-entries.h:173 ../gthumb/gth-browser.c:721 +msgid "_Delete History" +msgstr "_Excluir histórico" + +#: ../gthumb/gth-browser-actions-entries.h:174 +msgid "Delete the list of visited locations" +msgstr "Exclui a lista de locais visitados" + +#: ../gthumb/gth-browser-actions-entries.h:180 +msgid "View the folders" +msgstr "Veja as pastas" + +#: ../gthumb/gth-browser-actions-entries.h:186 +msgid "Show information about gthumb" +msgstr "Mostra informações sobre o gThumb" + +#: ../gthumb/gth-browser-actions-entries.h:191 +msgid "Contents" +msgstr "Sumário" + +#: ../gthumb/gth-browser-actions-entries.h:192 +msgid "Display the gthumb Manual" +msgstr "Exibe o manual do gThumb" + +#: ../gthumb/gth-browser-actions-entries.h:197 +msgid "_Keyboard Shortcuts" +msgstr "Atalhos de _teclado" + +#: ../gthumb/gth-browser-actions-entries.h:203 +#: ../gthumb/gth-browser-actions-entries.h:257 +msgid "Edit" +msgstr "Editar" + +#: ../gthumb/gth-browser-actions-entries.h:204 +#: ../gthumb/gth-browser-actions-entries.h:258 +msgid "Edit file" +msgstr "Edita o arquivo" + +#: ../gthumb/gth-browser-actions-entries.h:212 +msgid "_Toolbar" +msgstr "_Barra de ferramentas" + +#: ../gthumb/gth-browser-actions-entries.h:213 +msgid "View or hide the toolbar of this window" +msgstr "Mostra ou oculta a barra de ferramentas dessa janela" + +#: ../gthumb/gth-browser-actions-entries.h:217 +msgid "_Statusbar" +msgstr "Barra de _status" + +#: ../gthumb/gth-browser-actions-entries.h:218 +msgid "View or hide the statusbar of this window" +msgstr "Mostra ou oculta a barra de status dessa janela" + +#: ../gthumb/gth-browser-actions-entries.h:222 +msgid "_Filterbar" +msgstr "Barra de _filtro" + +#: ../gthumb/gth-browser-actions-entries.h:223 +msgid "View or hide the filterbar of this window" +msgstr "Mostra ou oculta a barra de filtros desta janela" + +#: ../gthumb/gth-browser-actions-entries.h:227 +msgid "_Sidebar" +msgstr "Barra _lateral" + +#: ../gthumb/gth-browser-actions-entries.h:228 +msgid "View or hide the sidebar of this window" +msgstr "Mostra ou oculta a barra de lateral desta janela" + +#: ../gthumb/gth-browser-actions-entries.h:232 +msgid "_Thumbnail Pane" +msgstr "Painel de minia_turas" + +#: ../gthumb/gth-browser-actions-entries.h:233 +msgid "View or hide the thumbnail pane in viewer mode" +msgstr "Mostra ou oculta o painel de miniaturas no modo de visualização" + +#: ../gthumb/gth-browser-actions-entries.h:237 +msgid "_Thumbnails" +msgstr "_Miniaturas" + +#: ../gthumb/gth-browser-actions-entries.h:238 +msgid "View thumbnails" +msgstr "Veja miniaturas" + +#: ../gthumb/gth-browser-actions-entries.h:242 +msgid "_Hidden Files" +msgstr "Arq_uivos ocultos" + +#: ../gthumb/gth-browser-actions-entries.h:243 +msgid "Show hidden files and folders" +msgstr "Mostra pastas e arquivos ocultos" + +#: ../gthumb/gth-browser-actions-entries.h:248 +#: ../gthumb/gth-browser-actions-entries.h:253 +msgid "View file properties" +msgstr "Veja as propriedades do arquivo" + +#: ../gthumb/gth-browser-actions-entries.h:262 +msgid "_Fit Window to Image" +msgstr "A_justa a janela à imagem" + +#: ../gthumb/gth-browser-actions-entries.h:263 +msgid "Resize the window to the size of the image" +msgstr "Redimensiona a janela para o tamanho da imagem" + +#: ../gthumb/gth-browser.c:418 +#, c-format +msgid "Open %s" +msgstr "Abre %s" + +#: ../gthumb/gth-browser.c:558 +msgid "[modified]" +msgstr "[modificado]" + +#: ../gthumb/gth-browser.c:1117 +#, c-format +msgid "%d file selected (%s)" +msgid_plural "%d files selected (%s)" +msgstr[0] "%d arquivo selecionado (%s)" +msgstr[1] "%d arquivos selecionados (%s)" + +#: ../gthumb/gth-browser.c:1152 +#, c-format +msgid "%s of free space" +msgstr "%s de espaço livre" + +#: ../gthumb/gth-browser.c:2073 ../gthumb/gth-browser.c:2100 +#, c-format +msgid "No suitable module found for %s" +msgstr "Não foi encontrado um módulo adequado para %s" + +#: ../gthumb/gth-browser.c:2219 +#, c-format +msgid "Save changes to file '%s'?" +msgstr "Salvar alterações do arquivo \"%s\"?" + +#: ../gthumb/gth-browser.c:2224 +msgid "If you don't save, changes to the file will be permanently lost." +msgstr "Se você não salvar, as alterações serão permanentemente perdidas." + +#: ../gthumb/gth-browser.c:2225 +msgid "Do _Not Save" +msgstr "_Não salvar" + +#: ../gthumb/gth-browser.c:3020 ../gthumb/gth-source-tree.c:182 +msgid "Could not change name" +msgstr "Não foi possível alterar o nome" + +#: ../gthumb/gth-browser.c:3451 ../gthumb/gth-main-default-metadata.c:41 +msgid "Modified" +msgstr "Modificado" + +#: ../gthumb/gth-browser.c:3842 ../gthumb/gth-browser.c:3860 +msgid "View the list of visited locations" +msgstr "Veja a lista de locais visitados" + +#: ../gthumb/gth-browser.c:3878 +msgid "View the list of upper locations" +msgstr "Veja a lista de localizações acima" + +#: ../gthumb/gth-browser.c:6215 +#, c-format +msgid "File type not supported" +msgstr "Não há suporte ao tipo de arquivo" + +#: ../gthumb/gth-browser.c:6258 +#, c-format +msgid "No suitable module found" +msgstr "Não foi encontrado um módulo adequado" + +#: ../gthumb/gth-extensions.c:203 +#, c-format +msgid "Could not open the module `%s`: %s" +msgstr "Não foi possível abrir o módulo \"%s\": %s" + +#: ../gthumb/gth-extensions.c:754 +#, c-format +msgid "The extension '%1$s' is required by the extension '%2$s'" +msgstr "A extensão \"%1$s\" é necessária pela extensão \"%2$s\"" + +#: ../gthumb/gth-file-chooser-dialog.c:144 +msgid "All Supported Files" +msgstr "Todos os arquivos suportados" + +#: ../gthumb/gth-file-source-vfs.c:121 +msgid "Home Folder" +msgstr "Pasta pessoal" + +#: ../gthumb/gth-file-source-vfs.c:126 +msgid "File System" +msgstr "Sistema de arquivos" + +#: ../gthumb/gth-file-source-vfs.c:739 +msgid "" +"The files cannot be moved to the Trash. Do you want to delete them " +"permanently?" +msgstr "" +"As imagens não podem ser movidas para a lixeira. Deseja excluí-las " +"permanentemente?" + +#: ../gthumb/gth-file-source-vfs.c:750 +msgid "Could not move the files to the Trash" +msgstr "Não foi possível mover os arquivos para a lixeira" + +#: ../gthumb/gth-file-source-vfs.c:797 +#, c-format +msgid "Are you sure you want to move \"%s\" to trash?" +msgstr "Você realmente deseja mover \"%s\" para a lixeira?" + +#: ../gthumb/gth-file-source-vfs.c:801 +#, c-format +msgid "Are you sure you want to move to trash the %'d selected file?" +msgid_plural "Are you sure you want to move to trash the %'d selected files?" +msgstr[0] "Você realmente deseja mover %'d imagem selecionada para a lixeira?" +msgstr[1] "" +"Você realmente deseja mover %'d imagens selecionadas para a lixeira?" + +#: ../gthumb/gth-file-source-vfs.c:844 +#, c-format +msgid "Are you sure you want to permanently delete the %'d selected file?" +msgid_plural "" +"Are you sure you want to permanently delete the %'d selected files?" +msgstr[0] "" +"Você tem certeza que quer excluir permanentemente %'d imagem selecionada?" +msgstr[1] "" +"Você tem certeza que quer excluir permanentemente %'d imagens selecionadas?" + +#: ../gthumb/gth-filterbar.c:413 +msgid "Hide the filterbar" +msgstr "Oculta o barra de filtros" + +#: ../gthumb/gth-filter.c:43 ../gthumb/gth-filter-editor-dialog.c:178 +#: ../gthumb/gth-test-simple.c:75 +msgid "kB" +msgstr "kB" + +#: ../gthumb/gth-filter.c:44 ../gthumb/gth-filter-editor-dialog.c:179 +#: ../gthumb/gth-test-simple.c:76 +msgid "MB" +msgstr "MB" + +#: ../gthumb/gth-filter.c:45 ../gthumb/gth-filter-editor-dialog.c:180 +#: ../gthumb/gth-test-simple.c:77 +msgid "GB" +msgstr "GB" + +#. "files" label +#: ../gthumb/gth-filter.c:286 ../gthumb/gth-filter-editor-dialog.c:177 +msgid "files" +msgstr "arquivos" + +#: ../gthumb/gth-filter-editor-dialog.c:224 +msgid "ascending" +msgstr "ascendente" + +#: ../gthumb/gth-filter-editor-dialog.c:225 +msgid "descending" +msgstr "descendente" + +#: ../gthumb/gth-filter-editor-dialog.c:515 +#, c-format +msgid "No limit specified" +msgstr "Nenhum limite especificado" + +#: ../gthumb/gth-folder-tree.c:1369 +msgid "(Open Parent)" +msgstr "(Abrir pai)" + +#: ../gthumb/gth-histogram-view.c:825 +msgid "Linear scale" +msgstr "Escala linear" + +#: ../gthumb/gth-histogram-view.c:837 +msgid "Logarithmic scale" +msgstr "Escala logarítmica" + +#: ../gthumb/gth-histogram-view.c:857 +msgid "Channel:" +msgstr "Canal:" + +#: ../gthumb/gth-histogram-view.c:878 +msgid "Value" +msgstr "Valor" + +#: ../gthumb/gth-histogram-view.c:883 +msgid "Red" +msgstr "Vermelho" + +#: ../gthumb/gth-histogram-view.c:888 +msgid "Green" +msgstr "Verde" + +#: ../gthumb/gth-histogram-view.c:893 +msgid "Blue" +msgstr "Azul" + +#: ../gthumb/gth-histogram-view.c:898 +msgid "Alpha" +msgstr "Alfa" -#: ../data/glade/gthumb_crop.glade.h:9 -msgid "" -"Click and drag the mouse to \n" -"select the cropping area, or\n" -"use the dialogs below. Press \n" -"the \"Crop\" button to perform\n" -"the crop, and \"Done\" to finish." -msgstr "" -"Clique e arraste o mouse para \n" -"selecionar a área a ser aparada, ou\n" -"use as caixas de diálogo abaixo. Pressione \n" -"o botão \"Aparar\" para realizar o aparo\n" -"e \"Concluir\" para finalizar." +#: ../gthumb/gth-histogram-view.c:904 +msgid "RGB" +msgstr "RGB" -#: ../data/glade/gthumb_crop.glade.h:14 -msgid "Cr_op" -msgstr "A_parar" +#: ../gthumb/gth-image-list-task.c:141 +msgid "Could not rename the file" +msgstr "Não foi possível renomear o arquivo" -#: ../data/glade/gthumb_crop.glade.h:15 -msgid "Crop" -msgstr "Apara" +#: ../gthumb/gth-image-saver.c:39 +msgid "No options available for this file type" +msgstr "Nenhum opção disponível para esse tipo de arquivo" -#: ../data/glade/gthumb_crop.glade.h:16 ../data/glade/gthumb_print.glade.h:28 -msgid "Custom" -msgstr "Personalizado" +#: ../gthumb/gth-image-saver.c:185 +#, c-format +msgid "Could not find a suitable module to save the image as \"%s\"" +msgstr "" +"Não foi possível localizar um módulo adequado para salvar a imagem como \"%s" +"\"" -#: ../data/glade/gthumb_crop.glade.h:17 -msgid "I_nvert aspect ratio" -msgstr "I_nverter proporção" +#: ../gthumb/gth-load-file-data-task.c:108 +msgid "Reading file information" +msgstr "Lendo informações do arquivo" -#: ../data/glade/gthumb_crop.glade.h:18 -msgid "None" -msgstr "Nenhum" +#: ../gthumb/gth-main-default-metadata.c:32 +msgid "File" +msgstr "Arquivo" -#: ../data/glade/gthumb_crop.glade.h:19 -msgid "Show / hide the cropping selection area" -msgstr "Mostrar / esconder a seleção de área de aparo" +#: ../gthumb/gth-main-default-metadata.c:39 +msgid "Name" +msgstr "Nome" -#: ../data/glade/gthumb_crop.glade.h:20 -msgid "Square" -msgstr "Quadrado" +#: ../gthumb/gth-main-default-metadata.c:40 +#: ../gthumb/gth-main-default-tests.c:284 +msgid "Size" +msgstr "Tamanho" -#: ../data/glade/gthumb_crop.glade.h:22 ../data/glade/gthumb_redeye.glade.h:11 -#, no-c-format -msgid "Zoom at 100% scale" -msgstr "Zoom na escala de 100%" +#: ../gthumb/gth-main-default-metadata.c:42 +msgid "Type" +msgstr "Tipo" -#: ../data/glade/gthumb_crop.glade.h:23 ../data/glade/gthumb_redeye.glade.h:12 -msgid "Zoom in. The mousewheel can also be used to zoom in." -msgstr "Mais zoom. A roda do mouse também pode ser usada para aproximar." - -#: ../data/glade/gthumb_crop.glade.h:24 ../data/glade/gthumb_redeye.glade.h:13 -msgid "Zoom out. The mousewheel can also be used to zoom out." -msgstr "Menos zoom. A roda do mouse também pode ser usada para afastar." - -#: ../data/glade/gthumb_crop.glade.h:25 ../data/glade/gthumb_redeye.glade.h:14 -msgid "Zoom to fit" -msgstr "Ajustar à tela" - -#: ../data/glade/gthumb_crop.glade.h:26 ../data/glade/gthumb_redeye.glade.h:15 -msgid "_Done" -msgstr "_Concluir" +#: ../gthumb/gth-main-default-metadata.c:44 +msgid "Full Name" +msgstr "Nome completo" + +#: ../gthumb/gth-main-default-metadata.c:48 +msgid "Duration" +msgstr "Duração" + +#: ../gthumb/gth-main-default-sort-types.c:131 +msgid "file name" +msgstr "nome do arquivo" + +#: ../gthumb/gth-main-default-sort-types.c:132 +msgid "file path" +msgstr "caminho do arquivo" + +#: ../gthumb/gth-main-default-sort-types.c:133 +msgid "file size" +msgstr "tamanho do arquivo" + +#: ../gthumb/gth-main-default-sort-types.c:134 +msgid "file modified date" +msgstr "data de modificação do arquivo" + +#: ../gthumb/gth-main-default-sort-types.c:135 +msgid "no sorting" +msgstr "nenhuma ordem" + +#: ../gthumb/gth-main-default-sort-types.c:136 +msgid "dimensions" +msgstr "dimensões" + +#: ../gthumb/gth-main-default-tests.c:233 +msgid "All Files" +msgstr "Todos arquivos" + +#: ../gthumb/gth-main-default-tests.c:261 +msgid "Media" +msgstr "Mídia" + +#: ../gthumb/gth-main-default-tests.c:268 +msgid "Text Files" +msgstr "Arquivos de texto" -#: ../data/glade/gthumb_crop.glade.h:27 ../data/glade/gthumb_edit.glade.h:21 -#: ../data/glade/gthumb_print.glade.h:47 ../data/glade/gthumb_tools.glade.h:94 -msgid "_Height:" -msgstr "_Altura:" +#: ../gthumb/gth-main-default-tests.c:276 +msgid "Filename" +msgstr "Nome de arquivo" -#: ../data/glade/gthumb_crop.glade.h:28 ../data/glade/gthumb_edit.glade.h:31 -#: ../data/glade/gthumb_print.glade.h:53 -#: ../data/glade/gthumb_tools.glade.h:109 -msgid "_Width:" -msgstr "_Largura:" +#: ../gthumb/gth-main-default-tests.c:308 +msgid "Title (embedded)" +msgstr "Título (embutido)" -#: ../data/glade/gthumb_crop.glade.h:29 ../data/glade/gthumb_redeye.glade.h:16 -msgid "_X:" -msgstr "_X:" +#: ../gthumb/gth-main-default-tests.c:316 +msgid "Description (embedded)" +msgstr "Descrição (embutida)" -#: ../data/glade/gthumb_crop.glade.h:30 ../data/glade/gthumb_redeye.glade.h:17 -msgid "_Y:" -msgstr "_Y:" +#: ../gthumb/gth-progress-dialog.c:146 +msgid "Cancel operation" +msgstr "Cancelar operação" -#: ../data/glade/gthumb_edit.glade.h:2 -#: ../data/glade/gthumb_png_exporter.glade.h:2 -#: ../data/glade/gthumb_preferences.glade.h:2 -#: ../data/glade/gthumb_tools.glade.h:2 -#: ../data/glade/gthumb_web_exporter.glade.h:2 -msgid " " -msgstr " " +#: ../gthumb/gth-save-file-data-task.c:102 +msgid "Saving file information" +msgstr "Salvando informações do arquivo" -#: ../data/glade/gthumb_edit.glade.h:4 ../data/glade/gthumb_print.glade.h:3 -#: ../data/glade/gthumb_tools.glade.h:4 -#, no-c-format -msgid "%" -msgstr "%" +#. Translators: %s is a filename +#: ../gthumb/gth-save-image-task.c:160 +#, c-format +msgid "Saving '%s'" +msgstr "Salvando \"%s\"" -#: ../data/glade/gthumb_edit.glade.h:5 -msgid "Color levels" -msgstr "Níveis de cor" - -#: ../data/glade/gthumb_edit.glade.h:6 ../data/glade/gthumb_tools.glade.h:8 -msgid "New dimensions" -msgstr "Novas dimensões" - -#: ../data/glade/gthumb_edit.glade.h:7 -msgid "Original dimensions" -msgstr "Dimensões originais" - -#: ../data/glade/gthumb_edit.glade.h:8 -msgid "Scale ratio" -msgstr "Escala" - -#: ../data/glade/gthumb_edit.glade.h:9 -msgid "Brightness - Contrast" -msgstr "Brilho - Contrate" - -#: ../data/glade/gthumb_edit.glade.h:10 -msgid "Color Balance" -msgstr "Balanço de Cores" +#: ../gthumb/gth-tags-entry.c:390 +#, c-format +msgid "Create tag «%s»" +msgstr "Criar a etiqueta \"%s\"" -#: ../data/glade/gthumb_edit.glade.h:11 -msgid "Con_trast:" -msgstr "Con_traste:" +#: ../gthumb/gth-tags-entry.c:814 +msgid "Show all the tags" +msgstr "Mostra todas as etiquetas" -#: ../data/glade/gthumb_edit.glade.h:12 -msgid "Cyan-_Red:" -msgstr "Cia_no-vermelho:" +#: ../gthumb/gth-tags-file.c:235 +msgid "Holidays" +msgstr "Feriados" -#: ../data/glade/gthumb_edit.glade.h:13 -msgid "Height:" -msgstr "Altura:" +#: ../gthumb/gth-tags-file.c:236 +msgid "Temporary" +msgstr "Temporário" -#: ../data/glade/gthumb_edit.glade.h:14 -msgid "High _quality" -msgstr "Alta _qualidade" +#: ../gthumb/gth-tags-file.c:237 +msgid "Screenshots" +msgstr "Capturas de tela" -#: ../data/glade/gthumb_edit.glade.h:15 -msgid "Hue - Saturation" -msgstr "Matiz - Saturação" +#: ../gthumb/gth-tags-file.c:238 +msgid "Science" +msgstr "Ciência" -#: ../data/glade/gthumb_edit.glade.h:16 -msgid "Posterize" -msgstr "Posterizar" +#: ../gthumb/gth-tags-file.c:239 +msgid "Favorite" +msgstr "Favorito" -#: ../data/glade/gthumb_edit.glade.h:17 -msgid "Preserve l_uminosity" -msgstr "Preservar l_uminosidade" +#: ../gthumb/gth-tags-file.c:240 +msgid "Important" +msgstr "Importante" -#: ../data/glade/gthumb_edit.glade.h:18 -#, fuzzy -msgid "Resize Image" -msgstr "Redimensiona a imagem" +#: ../gthumb/gth-tags-file.c:241 +msgid "GNOME" +msgstr "GNOME" -#: ../data/glade/gthumb_edit.glade.h:19 -msgid "Width:" -msgstr "Largura:" - -#: ../data/glade/gthumb_edit.glade.h:20 -msgid "_Brightness:" -msgstr "_Brilho:" - -#: ../data/glade/gthumb_edit.glade.h:22 -msgid "_Hue:" -msgstr "_Matiz:" - -#: ../data/glade/gthumb_edit.glade.h:23 ../data/glade/gthumb_tools.glade.h:97 -msgid "_Keep aspect ratio" -msgstr "_Preservar proporção" - -#: ../data/glade/gthumb_edit.glade.h:24 -msgid "_Levels:" -msgstr "_Níveis:" - -#: ../data/glade/gthumb_edit.glade.h:25 -msgid "_Lightness:" -msgstr "_Luminosidade:" +#: ../gthumb/gth-tags-file.c:242 +msgid "Games" +msgstr "Jogos" -#: ../data/glade/gthumb_edit.glade.h:26 -msgid "_Magenta-Green:" -msgstr "_Magenta-Verde:" +#: ../gthumb/gth-tags-file.c:243 +msgid "Party" +msgstr "Festa" -#: ../data/glade/gthumb_edit.glade.h:27 -msgid "_Preview" -msgstr "_Visualizar" +#: ../gthumb/gth-tags-file.c:244 +msgid "Birthday" +msgstr "Aniversário" -#: ../data/glade/gthumb_edit.glade.h:28 ../data/glade/gthumb_tools.glade.h:101 -msgid "_Reset" -msgstr "_Restaurar" +#: ../gthumb/gth-tags-file.c:245 +msgid "Astronomy" +msgstr "Astronomia" -#: ../data/glade/gthumb_edit.glade.h:29 -msgid "_Saturation:" -msgstr "_Saturação:" +#: ../gthumb/gth-tags-file.c:246 +msgid "Family" +msgstr "Família" -#: ../data/glade/gthumb_edit.glade.h:30 ../data/glade/gthumb_tools.glade.h:102 -msgid "_Scale" -msgstr "_Dimensionar" +#: ../gthumb/gth-test-category.c:46 ../gthumb/gth-test-simple.c:49 +#: ../gthumb/gth-test-simple.c:64 +msgid "is" +msgstr "é" -#: ../data/glade/gthumb_edit.glade.h:32 -msgid "_Yellow-Blue:" -msgstr "_Amarelo-Azul:" +#: ../gthumb/gth-test-category.c:47 +msgid "is only" +msgstr "é apenas" -#: ../data/glade/gthumb_png_exporter.glade.h:3 -msgid "112" -msgstr "112" +#: ../gthumb/gth-test-category.c:48 ../gthumb/gth-test-simple.c:50 +#: ../gthumb/gth-test-simple.c:65 +msgid "is not" +msgstr "não é" -#: ../data/glade/gthumb_png_exporter.glade.h:4 -msgid "128" -msgstr "128" +#: ../gthumb/gth-test-category.c:407 ../gthumb/gth-test-simple.c:812 +#: ../gthumb/gth-test-simple.c:838 ../gthumb/gth-test-simple.c:859 +#: ../gthumb/gth-test-simple.c:885 +#, c-format +msgid "The test definition is incomplete" +msgstr "A definição de teste está incompleta" + +#: ../gthumb/gth-test-selector.c:252 +msgid "Add a new rule" +msgstr "Adiciona uma nova regra" + +#: ../gthumb/gth-test-selector.c:263 +msgid "Remove this rule" +msgstr "Remove esta regra" -#: ../data/glade/gthumb_png_exporter.glade.h:5 -msgid "164" -msgstr "164" +#: ../gthumb/gth-test-simple.c:46 +msgid "contains" +msgstr "contém" -#: ../data/glade/gthumb_png_exporter.glade.h:6 -msgid "200" -msgstr "200" +#: ../gthumb/gth-test-simple.c:47 +msgid "starts with" +msgstr "começa com" -#: ../data/glade/gthumb_png_exporter.glade.h:7 -msgid "256" -msgstr "256" +#: ../gthumb/gth-test-simple.c:48 +msgid "ends with" +msgstr "termina com" -#: ../data/glade/gthumb_png_exporter.glade.h:8 -msgid "48" -msgstr "48" +#: ../gthumb/gth-test-simple.c:51 +msgid "does not contain" +msgstr "não contém" -#: ../data/glade/gthumb_png_exporter.glade.h:9 -msgid "64" -msgstr "64" +#: ../gthumb/gth-test-simple.c:52 +msgid "matches" +msgstr "corresponde a" -#: ../data/glade/gthumb_png_exporter.glade.h:10 -msgid "75" -msgstr "75" +#: ../gthumb/gth-test-simple.c:56 +msgid "is lower than" +msgstr "é menor que" -#: ../data/glade/gthumb_png_exporter.glade.h:11 -msgid "85" -msgstr "85" +#: ../gthumb/gth-test-simple.c:57 +msgid "is greater than" +msgstr "é maior que" -#: ../data/glade/gthumb_png_exporter.glade.h:12 -msgid "95" -msgstr "95" +#: ../gthumb/gth-test-simple.c:58 +msgid "is equal to" +msgstr "é igual a" -#: ../data/glade/gthumb_png_exporter.glade.h:13 -msgid "Background style" -msgstr "Estilo de plano de fundo" - -#: ../data/glade/gthumb_png_exporter.glade.h:14 -msgid "Caption" -msgstr "Legenda" - -#: ../data/glade/gthumb_png_exporter.glade.h:15 -msgid "Footer" -msgstr "Rodapé" - -#: ../data/glade/gthumb_png_exporter.glade.h:16 -msgid "Header and footer" -msgstr "Cabeçalho e rodapé" - -#: ../data/glade/gthumb_png_exporter.glade.h:17 -msgid "Header" -msgstr "Cabeçalho" - -#: ../data/glade/gthumb_png_exporter.glade.h:18 -msgid "Index images" -msgstr "Imagens de índice" - -#: ../data/glade/gthumb_png_exporter.glade.h:19 -msgid "Page size" -msgstr "Tamanho da página" - -#: ../data/glade/gthumb_png_exporter.glade.h:21 -msgid "Note: # (enumerator)." -msgstr "Nota: # (enumerador)." +#: ../gthumb/gth-test-simple.c:62 +msgid "is before" +msgstr "é anterior a" -#: ../data/glade/gthumb_png_exporter.glade.h:23 -#, no-c-format -msgid "" -"Note: %p (page number), %n (total number of pages)." -msgstr "" -"Nota: %p (número da página), %n (número total de páginas)." +#: ../gthumb/gth-test-simple.c:63 +msgid "is after" +msgstr "é posterior a" -#: ../data/glade/gthumb_png_exporter.glade.h:25 -#: ../data/glade/gthumb_web_exporter.glade.h:31 -msgid "Co_mment" -msgstr "_Comentário" - -#: ../data/glade/gthumb_png_exporter.glade.h:26 -msgid "Col_umns:" -msgstr "Col_unas:" - -#: ../data/glade/gthumb_png_exporter.glade.h:27 -msgid "Colo_r:" -msgstr "Co_r:" - -#: ../data/glade/gthumb_png_exporter.glade.h:28 -msgid "Create Index Image" -msgstr "Criar Imagem de Índice" +#: ../gthumb/gth-time-selector.c:478 +msgid "Today" +msgstr "Hoje" + +#: ../gthumb/gth-time-selector.c:486 +msgid "Now" +msgstr "Agora" -#: ../data/glade/gthumb_png_exporter.glade.h:29 -msgid "Create _HTML image map" -msgstr "Criar mapa de imagens _HTML" +#: ../gthumb/gth-window-actions-entries.h:32 +msgid "Close this window" +msgstr "Fecha esta janela" -#: ../data/glade/gthumb_png_exporter.glade.h:30 -msgid "F_ooter:" -msgstr "_Rodapé:" +#: ../gthumb/gth-window-actions-entries.h:36 +msgid "Close _All Windows" +msgstr "Fechar _todas janelas" -#: ../data/glade/gthumb_png_exporter.glade.h:31 -#: ../data/glade/gthumb_web_exporter.glade.h:35 -msgid "File _name" -msgstr "_Nome do arquivo" - -#: ../data/glade/gthumb_png_exporter.glade.h:32 -msgid "File pa_th" -msgstr "C_aminho do arquivo" - -#: ../data/glade/gthumb_png_exporter.glade.h:33 -#: ../data/glade/gthumb_web_exporter.glade.h:36 -msgid "File si_ze" -msgstr "_Tamanho do arquivo" - -#: ../data/glade/gthumb_png_exporter.glade.h:34 -msgid "Frame _style:" -msgstr "E_stilo da moldura:" - -#: ../data/glade/gthumb_png_exporter.glade.h:35 -msgid "Frame co_lor:" -msgstr "C_or da moldura:" - -#: ../data/glade/gthumb_png_exporter.glade.h:36 -msgid "H_eader:" -msgstr "C_abeçalho:" - -#: ../data/glade/gthumb_png_exporter.glade.h:37 -msgid "Header/Footer" -msgstr "Cabeçalho/Rodapé" +#: ../gthumb/gtk-utils.c:490 +msgid "Could not display help" +msgstr "Não foi possível exibir a ajuda" -#: ../data/glade/gthumb_png_exporter.glade.h:38 -msgid "Hei_ght:" -msgstr "_Altura:" +#: ../gthumb/gtk-utils.c:810 ../gthumb/gtk-utils.c:817 +msgid "Could not launch the application" +msgstr "Não foi possível iniciar o aplicativo" + +#: ../gthumb/gtk-utils.c:920 +msgid "_Copy Here" +msgstr "C_opiar aqui" + +#: ../gthumb/gtk-utils.c:925 +msgid "_Move Here" +msgstr "_Mover aqui" + +#: ../gthumb/gtk-utils.c:930 +msgid "_Link Here" +msgstr "Criar _link aqui" + +#: ../gthumb/gtk-utils.c:939 +msgid "Cancel" +msgstr "Cancelar" + +#: ../gthumb/main.c:61 +msgid "Open a new window" +msgstr "Abre uma nova janela" -#: ../data/glade/gthumb_png_exporter.glade.h:39 -#: ../data/glade/gthumb_web_exporter.glade.h:39 -msgid "Image dim_ensions" -msgstr "Dim_ensões da imagem" +#: ../gthumb/main.c:65 +msgid "Start in fullscreen mode" +msgstr "Inicia em modo tela cheia" -#: ../data/glade/gthumb_png_exporter.glade.h:40 -msgid "Images" -msgstr "Imagens" +#: ../gthumb/main.c:69 +msgid "Automatically start a slideshow" +msgstr "Inicia apresentação de slides automaticamente" -#: ../data/glade/gthumb_png_exporter.glade.h:41 -msgid "Index Image Style" -msgstr "Estilo da Imagem de Índice" - -#: ../data/glade/gthumb_png_exporter.glade.h:42 -msgid "Page" -msgstr "Página" - -#: ../data/glade/gthumb_png_exporter.glade.h:43 -msgid "Pi_xels" -msgstr "Pi_xels" +#: ../gthumb/main.c:73 +msgid "Automatically import digital camera photos" +msgstr "Importa fotos de câmeras digitais automaticamente" -#: ../data/glade/gthumb_png_exporter.glade.h:44 -#: ../data/glade/gthumb_web_exporter.glade.h:40 -msgid "Re_verse order" -msgstr "Ordem re_versa" +#: ../gthumb/main.c:77 +msgid "Show version" +msgstr "Mostra a versão" -#: ../data/glade/gthumb_png_exporter.glade.h:45 -msgid "Rows a_nd columns" -msgstr "Li_nhas e colunas" +#: ../gthumb/main.c:483 +msgid "- Image browser and viewer" +msgstr "- Visualizador e navegador de imagens" -#: ../data/glade/gthumb_png_exporter.glade.h:46 -msgid "Select a color" -msgstr "Selecione uma cor" +#~ msgid "Exif DateTimeOriginal tag" +#~ msgstr "Etiqueta Exif DateTimeOriginal" -#: ../data/glade/gthumb_png_exporter.glade.h:47 -msgid "Select a font" -msgstr "Selecione uma fonte" +#~ msgid "_Resize to:" +#~ msgstr "_Redimensionar para:" -#: ../data/glade/gthumb_png_exporter.glade.h:48 -msgid "Shadow in" -msgstr "Sombra dentro" +#~ msgid "×" +#~ msgstr "×" -#: ../data/glade/gthumb_png_exporter.glade.h:49 -msgid "Shadow only" -msgstr "Sombra apenas" +#~ msgid "Desaturate" +#~ msgstr "Dessaturar" -#: ../data/glade/gthumb_png_exporter.glade.h:50 -msgid "Shadow out" -msgstr "Sombra fora" +#~ msgid "White balance correction" +#~ msgstr "Correção do balanço de branco" -#: ../data/glade/gthumb_png_exporter.glade.h:51 -msgid "Simple" -msgstr "Simples" +#~ msgid "Enhance Colors" +#~ msgstr "Realçar cores" -#: ../data/glade/gthumb_png_exporter.glade.h:52 -msgid "Simple with shadow" -msgstr "Simples com sombra" +#~ msgid "Automatic white balance correction" +#~ msgstr "Correção automática do balanço de branco" -#: ../data/glade/gthumb_png_exporter.glade.h:53 -msgid "Slide" -msgstr "Slide" +#~ msgid "_E-Mail:" +#~ msgstr "_E-mail:" -#: ../data/glade/gthumb_png_exporter.glade.h:54 -msgid "Sor_t:" -msgstr "Ord_enar:" - -#: ../data/glade/gthumb_png_exporter.glade.h:55 -msgid "Sort" -msgstr "Ordenar" - -#: ../data/glade/gthumb_png_exporter.glade.h:56 -msgid "St_yle" -msgstr "_Estilo" - -#: ../data/glade/gthumb_png_exporter.glade.h:57 -#: ../data/glade/gthumb_search.glade.h:20 -#: ../data/glade/gthumb_tools.glade.h:83 -msgid "Start _at:" -msgstr "_Iniciar em:" +#~ msgid "" +#~ "Type the characters you see in the picture below. Letters are not case-" +#~ "sensitive." +#~ msgstr "" +#~ "Digite os caracteres que você vê na imagem abaixo. Não há diferenciação " +#~ "de letras maiúsculas e minúsculas." -#: ../data/glade/gthumb_png_exporter.glade.h:58 -#: ../data/glade/gthumb_web_exporter.glade.h:42 -msgid "Style Preview" -msgstr "Visualização de Estilo" - -#: ../data/glade/gthumb_png_exporter.glade.h:59 -msgid "Wi_dth:" -msgstr "Lar_gura:" +#~ msgid "_Password:" +#~ msgstr "_Senha:" -#: ../data/glade/gthumb_png_exporter.glade.h:60 -msgid "_All pages with the same size" -msgstr "_Todas as páginas com o mesmo tamanho" +#~ msgid "Picasa Web Album" +#~ msgstr "Álbum da web do Picasa" -#: ../data/glade/gthumb_png_exporter.glade.h:62 -msgid "_Draw frame" -msgstr "_Desenhar moldura" +#~ msgid "Account" +#~ msgstr "Conta" -#: ../data/glade/gthumb_png_exporter.glade.h:63 -msgid "_Font:" -msgstr "_Fonte:" +#~ msgid "Could not load the file" +#~ msgstr "Não foi possível carregar o arquivo" -#: ../data/glade/gthumb_png_exporter.glade.h:64 -msgid "_Gradient" -msgstr "_Gradiente" +#~ msgid "Save images" +#~ msgstr "Salvar imagens" -#: ../data/glade/gthumb_png_exporter.glade.h:66 -msgid "_Image size:" -msgstr "Tamanho da _imagem:" +#~ msgid "Save images in common file formats such as JPEG, PNG and TIFF" +#~ msgstr "Salva imagens em formatos comuns de arquivos como JPEG, PNG e TIFF" -#: ../data/glade/gthumb_png_exporter.glade.h:67 -msgid "_Rows:" -msgstr "_Linhas:" +#~ msgid "File _Format: %s" +#~ msgstr "_Formato do arquivo: %s" -#: ../data/glade/gthumb_png_exporter.glade.h:68 -msgid "_Solid color" -msgstr "Cor _sólida" +#~ msgid "By Extension" +#~ msgstr "Por extensão" -#: ../data/glade/gthumb_png_exporter.glade.h:69 -#: ../data/glade/gthumb_tools.glade.h:107 -msgid "_Template:" -msgstr "_Modelo:" +#~ msgid "File Format" +#~ msgstr "Formato de arquivo" -#: ../data/glade/gthumb_png_exporter.glade.h:71 -#: ../data/glade/gthumb_tools.glade.h:110 -#: ../data/glade/gthumb_web_exporter.glade.h:62 -msgid "by name" -msgstr "por nome" - -#: ../data/glade/gthumb_png_exporter.glade.h:72 -msgid "jpeg" -msgstr "jpeg" - -#: ../data/glade/gthumb_png_exporter.glade.h:73 -msgid "png" -msgstr "png" +#~ msgid "Extension(s)" +#~ msgstr "Extensão(ões)" -#: ../data/glade/gthumb_preferences.glade.h:3 -msgid "" -"48 x 48\n" -"64 x 64\n" -"85 x 85\n" -"95 x 95\n" -"112 x 112\n" -"128 x 128\n" -"164 x 164\n" -"200 x 200\n" -"256 x 256" -msgstr "" +#~ msgid "" +#~ "The program was not able to find out the file format you want to use for `" +#~ "%s'. Please make sure to use a known extension for that file or manually " +#~ "choose a file format from the list below." +#~ msgstr "" +#~ "O programa não foi capaz de descobrir o formato de arquivo que deseja " +#~ "usar para \"%s\". Por favor, certifique-se de que você usa uma extensão " +#~ "conhecida para eque arquivo ou escolha manualmente um formato de arquivo " +#~ "na lista abaixo." -#: ../data/glade/gthumb_preferences.glade.h:12 -msgid "Direction" -msgstr "Direção" +#~ msgid "File format not recognized" +#~ msgstr "Formato de arquivo não reconhecido" -#: ../data/glade/gthumb_preferences.glade.h:13 -#, fuzzy -msgid "Extra Processing" -msgstr "Compressão" +#~ msgid "Bytes" +#~ msgstr "Bytes" -#: ../data/glade/gthumb_preferences.glade.h:14 -msgid "Interface" -msgstr "Interface" - -#: ../data/glade/gthumb_preferences.glade.h:15 -msgid "On startup:" -msgstr "Ao iniciar:" - -#: ../data/glade/gthumb_preferences.glade.h:16 -msgid "Other" -msgstr "Outros" +#~ msgid "Exposure time" +#~ msgstr "Tempo de exposição" -#: ../data/glade/gthumb_preferences.glade.h:17 -msgid "Preview Images From Cameras" -msgstr "" +#~ msgid "Exposure mode" +#~ msgstr "Modo de exposição" -#: ../data/glade/gthumb_preferences.glade.h:18 -#, fuzzy -msgid "Show / Hide" -msgstr "Tamanho" +#~ msgid "Flash" +#~ msgstr "Flash" -#: ../data/glade/gthumb_preferences.glade.h:19 -msgid "Slideshow" -msgstr "Apresentação de slides" - -#: ../data/glade/gthumb_preferences.glade.h:20 -msgid "Viewer" -msgstr "Visualizador" - -#: ../data/glade/gthumb_preferences.glade.h:21 -msgid "Zoom quality" -msgstr "Qualidade do zoom" - -#: ../data/glade/gthumb_preferences.glade.h:22 -msgid "After _loading an image:" -msgstr "Após _carregar uma imagem:" +#~ msgid "Shutter speed" +#~ msgstr "Velocidade do obturador" -#: ../data/glade/gthumb_preferences.glade.h:23 -msgid "As_k confirmation before deleting images or catalogs" -msgstr "Pedir confirmação antes de e_xcluir imagens ou catálogos" +#~ msgid "Aperture value" +#~ msgstr "Valor da abertura" -#: ../data/glade/gthumb_preferences.glade.h:24 -msgid "Ask whether to save _modified images" -msgstr "Perguntar quando for salvar imagens _modificadas" +#~ msgid "Focal length" +#~ msgstr "Distância focal" -#: ../data/glade/gthumb_preferences.glade.h:25 -msgid "Browser" -msgstr "Navegador" +#~ msgid "Camera model" +#~ msgstr "Modelo da câmera" -#: ../data/glade/gthumb_preferences.glade.h:26 -msgid "" -"By default, gThumb lists all files that are likely to be found on a digital " -"camera - photos, videos, and audio files. You can omit the audio and video " -"files by deselecting this checkbox." -msgstr "" -"Por padrão, o gThumb lista todos os arquivos que poderiam ser encontrados em " -"uma câmera digital - arquivos de fotos, vídeos e áudio. Você pode omitir os " -"arquivos de áudio e vídeo desmarcando esta caixa de seleção." - -#: ../data/glade/gthumb_preferences.glade.h:27 -msgid "C_lick policy:" -msgstr "Po_lítica de clique:" +#~ msgid " " +#~ msgstr " " -#: ../data/glade/gthumb_preferences.glade.h:28 -msgid "Choose startup folder" -msgstr "Escolha a pasta de inicial" +#~ msgid "Information on Channel:" +#~ msgstr "Informações do Canal:" -#: ../data/glade/gthumb_preferences.glade.h:29 -msgid "Co_mments" -msgstr "Co_mentários" - -#: ../data/glade/gthumb_preferences.glade.h:30 -msgid "D_elay before changing image:" -msgstr "_Esperar antes de alterar imagem:" +#, fuzzy +#~ msgid "Tags:" +#~ msgstr "Margens" -#: ../data/glade/gthumb_preferences.glade.h:31 -msgid "D_etermine image type from content (slower)" -msgstr "D_eterminar tipo de imagem pelo conteúdo (lento)" +#~ msgid "A_vailable applications:" +#~ msgstr "Aplicações disponí_veis:" -#: ../data/glade/gthumb_preferences.glade.h:32 -msgid "Do _not change folder" -msgstr "_Não mudar de pasta" +#~ msgid "Choose a Catalog" +#~ msgstr "Escolha um Catálogo" -#: ../data/glade/gthumb_preferences.glade.h:33 -msgid "" -"Follow Nautilus behaviour\n" -"Activate items with a single click\n" -"Activate items with a double click" -msgstr "" +#~ msgid "Comm_ent" +#~ msgstr "Com_entário" -# Isso é o contrário de "Reverse" → "_Voltar" -#: ../data/glade/gthumb_preferences.glade.h:36 -msgid "For_ward" -msgstr "_Avançar" +#~ msgid "Open Images" +#~ msgstr "Abrir Imagens" -#: ../data/glade/gthumb_preferences.glade.h:37 -msgid "General" -msgstr "Geral" +#~ msgid "Overwrite Image" +#~ msgstr "Sobrescrever Imagem" -#: ../data/glade/gthumb_preferences.glade.h:38 -msgid "Go to last _visited folder or catalog" -msgstr "Ir para a última pasta ou catálogo _visitado" +#~ msgid "R_ecent applications:" +#~ msgstr "Aplicações r_ecentes:" -#: ../data/glade/gthumb_preferences.glade.h:39 -msgid "Go to this _folder:" -msgstr "Ir para essa _pasta:" +#~ msgid "_Application:" +#~ msgstr "_Aplicação:" -#: ../data/glade/gthumb_preferences.glade.h:40 -msgid "H_igh" -msgstr "A_lta" +#~ msgid "_Next" +#~ msgstr "_Próximo" -#: ../data/glade/gthumb_preferences.glade.h:41 -msgid "" -"If this checkbox is enabled and the imported photo contains an Exif " -"orientation tag, the image data will be physically transformed (losslessly) " -"so that the viewed image looks the same as before but the orientation tag is " -"reset to \"top left\". If this checkbox is not enabled, the image data and " -"the orientation tag are both left unchanged. The image will be displayed " -"identically by gthumb for both possibilities, but for maximum compatibility " -"with other applications this checkbox should be enabled." -msgstr "" -"Se esta caixa de verificação estiver habilitada e a foto importada contiver " -"uma etiqueta de orientação Exif, os dados da imagem serão fisicamente " -"transformados (sem perdas) para que a imagem vista aparente ser a mesma de " -"antes, mas a etiqueta de orientação será restaurada para \"top left\". Se " -"esta caixa de verificação não estiver habilitada, os dados da imagem e a " -"etiqueta de orientação permanecerão ambos inalterados. A imagem será exibida " -"de forma identica pelo gthumb em ambas possibilidades, mas, para uma maior " -"compatibilidade com outras aplicações, esta caixa de verificação deve estar " -"habilitada." +#~ msgid "_Previous" +#~ msgstr "_Anterior" -#: ../data/glade/gthumb_preferences.glade.h:42 -#, fuzzy -msgid "Importer" -msgstr "_Importar" +#~ msgid "..." +#~ msgstr "..." -#: ../data/glade/gthumb_preferences.glade.h:43 -msgid "Include audio clips and movies in browser view" -msgstr "Incluir clipes de áudio e filmes na visão de navegador" +#~ msgid "Click \"Help\" for format code information." +#~ msgstr "" +#~ "Clique em \"Ajuda\" para informações sobre o código de formatação." +#~ "" -#: ../data/glade/gthumb_preferences.glade.h:44 -msgid "" -"Keep previous zoom\n" -"Fit to window\n" -"Fit to window if larger\n" -"Set image to actual size\n" -"Fit to width if larger" -msgstr "" +#~ msgid "Custom subfolder:" +#~ msgstr "Subpasta personalizada:" -#: ../data/glade/gthumb_preferences.glade.h:49 -msgid "Layout:" -msgstr "Disposição:" - -#: ../data/glade/gthumb_preferences.glade.h:50 -msgid "Lo_w" -msgstr "Bai_xa" +#~ msgid "Update previews" +#~ msgstr "Atualizar visualizações" -# Direção aleatória. -#: ../data/glade/gthumb_preferences.glade.h:51 -msgid "Ran_dom" -msgstr "A_leatória" +#, fuzzy +#~ msgid "A_vailable tags:" +#~ msgstr "Categorias disponí_veis:" -# Esse é o contrário de "Forward"→"Avançar" -#: ../data/glade/gthumb_preferences.glade.h:52 -msgid "Re_verse" -msgstr "_Voltar" - -#: ../data/glade/gthumb_preferences.glade.h:53 -msgid "Reset scrollbar positions after loading an image" -msgstr "Restaurar posições da barra de rolagem após carregar uma imagem" +#~ msgid "Date photo taken (from EXIF metadata)" +#~ msgstr "Data na qual a foto foi tirada (a partir dos metadados EXIF)" -#: ../data/glade/gthumb_preferences.glade.h:54 -msgid "Resta_rt when finished" -msgstr "_Reiniciar ao terminar" +#, fuzzy +#~ msgid "Remove selected tag" +#~ msgstr "Remove catálogo selecionado" -#: ../data/glade/gthumb_preferences.glade.h:55 -msgid "Set to C_urrent" -msgstr "Definir para a _atual" +#~ msgid "Compression" +#~ msgstr "Compressão" -#: ../data/glade/gthumb_preferences.glade.h:56 -msgid "Slideshow" -msgstr "Apresentação de Slides" +#~ msgid "Image type" +#~ msgstr "Tipo de imagem" -#: ../data/glade/gthumb_preferences.glade.h:57 -msgid "" -"System settings\n" -"Text below icons\n" -"Text beside icons\n" -"Icons only\n" -"Text only" -msgstr "" +#~ msgid "JPEG Options" +#~ msgstr "Opções de JPEG" -#: ../data/glade/gthumb_preferences.glade.h:62 -#: ../src/gth-window-actions-entries.h:95 -msgid "T_ags" -msgstr "" +#~ msgid "Overwrite mode:" +#~ msgstr "Modo de sobrescrita:" -#: ../data/glade/gthumb_preferences.glade.h:63 -msgid "Th_umbnail size:" -msgstr "Tamanho da miniat_ura:" +#~ msgid "R_emove original" +#~ msgstr "R_emover original" -#: ../data/glade/gthumb_preferences.glade.h:64 -msgid "" -"This makes it easier to select the correct photos to import, but the preview " -"generation process may be slow." -msgstr "" +#~ msgid "" +#~ "Skip\n" +#~ "Rename\n" +#~ "Ask\n" +#~ "Overwrite" +#~ msgstr "" +#~ "Pular\n" +#~ "Renomear\n" +#~ "Perguntar\n" +#~ "Sobrescrever" -#: ../data/glade/gthumb_preferences.glade.h:65 -msgid "Transparency _type:" -msgstr "_Tipo de transparência:" +#~ msgid "TGA Options" +#~ msgstr "Opções de TGA" -#: ../data/glade/gthumb_preferences.glade.h:66 -msgid "Viewer" -msgstr "Visualizador" +#~ msgid "TIFF Options" +#~ msgstr "Opções de TIFF" -#: ../data/glade/gthumb_preferences.glade.h:67 -msgid "" -"White\n" -"None\n" -"Black\n" -"Checked" -msgstr "" +#~ msgid "4 x 3 (Book, DVD)" +#~ msgstr "4 x 3 (Livro, DVD)" -#: ../data/glade/gthumb_preferences.glade.h:71 -msgid "_Extract preview images before importing" -msgstr "" +#~ msgid "5 x 7" +#~ msgstr "5 x 7" -#: ../data/glade/gthumb_preferences.glade.h:72 -msgid "_Filenames" -msgstr "_Nomes de arquivos" - -#: ../data/glade/gthumb_preferences.glade.h:73 -msgid "_Rotate images physically" -msgstr "_Girar imagens fisicamente" +#~ msgid "8 x 10" +#~ msgstr "8 x 10" -#: ../data/glade/gthumb_preferences.glade.h:74 -#: ../src/gth-browser-actions-entries.h:429 -msgid "_Thumbnails" -msgstr "_Miniaturas" +#~ msgid "Actions" +#~ msgstr "Ações" -#: ../data/glade/gthumb_preferences.glade.h:75 -msgid "_Toolbar style:" -msgstr "Es_tilo da barra de ferramentas:" +#~ msgid "Display" +#~ msgstr "Exibição" -#: ../data/glade/gthumb_preferences.glade.h:76 -msgid "gThumb Preferences" -msgstr "Preferências do gThumb" +#~ msgid "" +#~ "Click and drag the mouse to \n" +#~ "select the cropping area, or\n" +#~ "use the dialogs below. Press \n" +#~ "the \"Crop\" button to perform\n" +#~ "the crop, and \"Done\" to finish." +#~ msgstr "" +#~ "Clique e arraste o mouse para \n" +#~ "selecionar a área a ser aparada, ou\n" +#~ "use as caixas de diálogo abaixo. Pressione \n" +#~ "o botão \"Aparar\" para realizar o aparo\n" +#~ "e \"Concluir\" para finalizar." -#: ../data/glade/gthumb_preferences.glade.h:77 -msgid "seconds" -msgstr "segundos" +#~ msgid "Cr_op" +#~ msgstr "A_parar" -#: ../data/glade/gthumb_print.glade.h:4 -msgid "1" -msgstr "1" - -#: ../data/glade/gthumb_print.glade.h:5 -msgid "150" -msgstr "150" - -#: ../data/glade/gthumb_print.glade.h:6 -msgid "16" -msgstr "16" - -#: ../data/glade/gthumb_print.glade.h:7 -msgid "2" -msgstr "2" - -#: ../data/glade/gthumb_print.glade.h:8 -msgid "300" -msgstr "300" - -#: ../data/glade/gthumb_print.glade.h:9 -msgid "4" -msgstr "4" - -#: ../data/glade/gthumb_print.glade.h:10 -msgid "600" -msgstr "600" - -#: ../data/glade/gthumb_print.glade.h:11 -msgid "72" -msgstr "72" - -#: ../data/glade/gthumb_print.glade.h:12 -msgid "8" -msgstr "8" - -#: ../data/glade/gthumb_print.glade.h:13 -msgid "Image Sizing" -msgstr "Dimensionamento da Imagem" - -#: ../data/glade/gthumb_print.glade.h:14 -msgid "Margins" -msgstr "Margens" - -#: ../data/glade/gthumb_print.glade.h:15 -msgid "Orientation" -msgstr "Orientação" - -#: ../data/glade/gthumb_print.glade.h:17 -msgid "Size" -msgstr "Tamanho" +#~ msgid "Show / hide the cropping selection area" +#~ msgstr "Mostrar / esconder a seleção de área de aparo" -#: ../data/glade/gthumb_print.glade.h:18 -msgid "" -"Note: Drag the image to move it in the page.\n" -"Click on an image to rotate it." -msgstr "" -"Nota: Arraste a imagem para movê-la na página.\n" -"Clique em uma imagem para girá-la." +#~ msgid "Zoom at 100% scale" +#~ msgstr "Zoom na escala de 100%" -#: ../data/glade/gthumb_print.glade.h:20 -msgid "" -"Note: High-resolution images will be\n" -"down-sampled to this resolution. Increase\n" -"the resolution to get better image quality.\n" -"Decrease it to get shorter print times." -msgstr "" -"Nota: Imagens em alta resolução serão\n" -"reduzidas para esta resolução. Aumente a resolução\n" -"para obter uma melhor qualidade de imagem.\n" -"Diminua-a para obter um tempo de impressão menor." - -#: ../data/glade/gthumb_print.glade.h:24 -msgid "A4" -msgstr "A4" - -#: ../data/glade/gthumb_print.glade.h:25 -msgid "Automatic sizing" -msgstr "Dimensionamento automático" - -#: ../data/glade/gthumb_print.glade.h:26 -msgid "Center _on Page" -msgstr "Centralizar _na Página" - -#: ../data/glade/gthumb_print.glade.h:27 -msgid "Comment _font:" -msgstr "_Fonte do comentário:" - -#: ../data/glade/gthumb_print.glade.h:29 -msgid "Executive" -msgstr "Executivo" - -#: ../data/glade/gthumb_print.glade.h:30 -msgid "I_nclude comment" -msgstr "I_ncluir comentário" +#~ msgid "Zoom in. The mousewheel can also be used to zoom in." +#~ msgstr "Mais zoom. A roda do mouse também pode ser usada para aproximar." -#: ../data/glade/gthumb_print.glade.h:31 -msgid "Images per page:" -msgstr "Imagens por página:" +#~ msgid "Zoom out. The mousewheel can also be used to zoom out." +#~ msgstr "Menos zoom. A roda do mouse também pode ser usada para afastar." -#: ../data/glade/gthumb_print.glade.h:32 -msgid "Inches" -msgstr "Polegadas" +#~ msgid "Zoom to fit" +#~ msgstr "Ajustar à tela" -#: ../data/glade/gthumb_print.glade.h:33 -#, fuzzy -msgid "Include file name" -msgstr "Incluir nome de arquivo" +#~ msgid "_Done" +#~ msgstr "_Concluir" -#: ../data/glade/gthumb_print.glade.h:34 -#, fuzzy -msgid "Include folder name" -msgstr "Incluir nome de arquivo" +#~ msgid " " +#~ msgstr " " -#: ../data/glade/gthumb_print.glade.h:35 -msgid "Lan_dscape" -msgstr "_Paisagem" +#~ msgid "Scale ratio" +#~ msgstr "Escala" -#: ../data/glade/gthumb_print.glade.h:36 -msgid "Layout" -msgstr "Disposição" +#~ msgid "Brightness - Contrast" +#~ msgstr "Brilho - Contrate" -#: ../data/glade/gthumb_print.glade.h:37 -msgid "Legal" -msgstr "Legal" - -#: ../data/glade/gthumb_print.glade.h:38 -msgid "Letter" -msgstr "Carta" - -#: ../data/glade/gthumb_print.glade.h:39 -msgid "Millimeters" -msgstr "Milímetros" - -#: ../data/glade/gthumb_print.glade.h:40 -msgid "P_ortrait" -msgstr "_Retrato" - -#: ../data/glade/gthumb_print.glade.h:41 -msgid "Paper Details" -msgstr "Detalhes do Papel" - -#: ../data/glade/gthumb_print.glade.h:42 -msgid "Postcard" -msgstr "Cartão Postal" +#~ msgid "Color Balance" +#~ msgstr "Balanço de Cores" -#. -#: ../data/glade/gthumb_print.glade.h:43 ../libgthumb/print-callbacks.c:2762 -#: ../src/gth-window-actions-entries.h:70 -msgid "Print" -msgstr "Imprimir" +#~ msgid "Hue - Saturation" +#~ msgstr "Matiz - Saturação" -#: ../data/glade/gthumb_print.glade.h:44 -msgid "Scale to this size" -msgstr "Dimensionar para este tamanho" - -#: ../data/glade/gthumb_print.glade.h:45 -msgid "Tabloid" -msgstr "Tablóide" - -#: ../data/glade/gthumb_print.glade.h:46 -msgid "_Bottom:" -msgstr "_Inferior:" - -#: ../data/glade/gthumb_print.glade.h:48 -msgid "_Left:" -msgstr "_Esquerda:" - -#: ../data/glade/gthumb_print.glade.h:49 -msgid "_Right:" -msgstr "_Direita:" - -#: ../data/glade/gthumb_print.glade.h:50 -msgid "_Scale:" -msgstr "Es_cala:" - -#: ../data/glade/gthumb_print.glade.h:51 -msgid "_Top:" -msgstr "_Superior:" - -#: ../data/glade/gthumb_print.glade.h:52 -msgid "_Unit:" -msgstr "_Unidade:" - -#: ../data/glade/gthumb_redeye.glade.h:1 -msgid "Other Actions" -msgstr "Outras Ações" - -#: ../data/glade/gthumb_redeye.glade.h:2 -msgid "Position" -msgstr "Posição" - -#: ../data/glade/gthumb_redeye.glade.h:3 -msgid "Zoom" -msgstr "Zoom" +#~ msgid "Posterize" +#~ msgstr "Posterizar" -#: ../data/glade/gthumb_redeye.glade.h:4 -msgid "" -"Move the cursor over the\n" -"red eye and click on it. You\n" -"can use the mousewheel to\n" -"zoom in and out, or use the\n" -"zoom buttons below." -msgstr "" -"Mova o cursor sobre o\n" -"olho vermelho e clique nele. Você\n" -"pode usar a roda do mouse para\n" -"aproximar ou afastar, ou use os\n" -"botões de zoom abaixo." - -#: ../data/glade/gthumb_redeye.glade.h:9 -msgid "Red-Eye Removal" -msgstr "Remoção de Olhos Vermelhos" - -#: ../data/glade/gthumb_search.glade.h:2 -msgid "Search criteria" -msgstr "Critérios da pesquisa" - -#: ../data/glade/gthumb_search.glade.h:3 -msgid "Search scope" -msgstr "Escopo da pesquisa" +#~ msgid "Preserve l_uminosity" +#~ msgstr "Preservar l_uminosidade" -#: ../data/glade/gthumb_search.glade.h:5 -msgid "" -"Any\n" -"Before\n" -"Equal to\n" -"After" -msgstr "" +#~ msgid "Width:" +#~ msgstr "Largura:" -#: ../data/glade/gthumb_search.glade.h:9 -#, fuzzy -msgid "Choose tags from the saved list" -msgstr "Escolha categorias a partir da lista salva" +#~ msgid "_Hue:" +#~ msgstr "_Matiz:" -#: ../data/glade/gthumb_search.glade.h:11 -msgid "File _name:" -msgstr "_Nome do arquivo:" +#~ msgid "_Levels:" +#~ msgstr "_Níveis:" -#: ../data/glade/gthumb_search.glade.h:12 -msgid "Found images:" -msgstr "Imagens encontradas:" +#~ msgid "_Lightness:" +#~ msgstr "_Luminosidade:" -#: ../data/glade/gthumb_search.glade.h:13 -#, fuzzy -msgid "Match a_ll selected tags" -msgstr "Igualar a _todas as categorias selecionadas" +#~ msgid "_Scale" +#~ msgstr "_Dimensionar" -#: ../data/glade/gthumb_search.glade.h:14 -#, fuzzy -msgid "Match a_ny selected tag" -msgstr "Igualar a _qualquer categoria selecionada" +#~ msgid "Caption" +#~ msgstr "Legenda" -#: ../data/glade/gthumb_search.glade.h:15 -msgid "New _Search..." -msgstr "Nova _Pesquisa..." - -#: ../data/glade/gthumb_search.glade.h:16 ../src/dlg-photo-importer.c:931 -#: ../src/dlg-photo-importer.c:1448 -msgid "No images found" -msgstr "Nenhuma imagem encontrada" +#~ msgid "Footer" +#~ msgstr "Rodapé" -#: ../data/glade/gthumb_search.glade.h:17 -#: ../src/gth-browser-actions-entries.h:364 -msgid "Search" -msgstr "Pesquisar" +#~ msgid "Header and footer" +#~ msgstr "Cabeçalho e rodapé" -#: ../data/glade/gthumb_search.glade.h:18 -msgid "Search Progress" -msgstr "Progresso da Pesquisa" - -#: ../data/glade/gthumb_search.glade.h:19 -#: ../data/glade/gthumb_tools.glade.h:78 -msgid "Searching in:" -msgstr "Procurando em:" - -#: ../data/glade/gthumb_search.glade.h:23 -msgid "_Edit Search" -msgstr "_Editar Pesquisa" +#~ msgid "Header" +#~ msgstr "Cabeçalho" -#: ../data/glade/gthumb_search.glade.h:24 -#: ../data/glade/gthumb_tools.glade.h:95 -msgid "_Include sub-folders" -msgstr "_Incluir subpastas" +#~ msgid "Index images" +#~ msgstr "Imagens de índice" -#: ../data/glade/gthumb_search.glade.h:26 -msgid "_Save" -msgstr "_Salvar" - -#: ../data/glade/gthumb_search.glade.h:27 -#: ../data/glade/gthumb_tools.glade.h:103 -msgid "_Search" -msgstr "_Pesquisar" - -#: ../data/glade/gthumb_search.glade.h:30 -#: ../data/glade/gthumb_tools.glade.h:108 -#: ../src/gth-browser-actions-entries.h:41 -#: ../src/gth-viewer-actions-entries.h:37 -msgid "_View" -msgstr "_Ver" +#~ msgid "Page size" +#~ msgstr "Tamanho da página" -#: ../data/glade/gthumb_tools.glade.h:5 -msgid "Change the following values:" -msgstr "Alterar os seguintes valores:" - -#: ../data/glade/gthumb_tools.glade.h:6 -msgid "Change to:" -msgstr "Alterar para:" - -#: ../data/glade/gthumb_tools.glade.h:10 -msgid "Write to CD" -msgstr "Gravar em CD" +#~ msgid "Note: # (enumerator)." +#~ msgstr "Nota: # (enumerador)." -#: ../data/glade/gthumb_tools.glade.h:11 -msgid "" -"Note: JPEG transformations are normally lossless.\n" -"When viewing images, you can use the [ and ] shortcut\n" -"keys to rotate and save losslessly, bypassing this dialog." -msgstr "" -"Nota:: Transformações JPEG são em geral sem perdas.\n" -"Ao ver as imagens, você pode usar as teclas de atalho [ e ] para girá-las\n" -"e salvá-las sem perdas, evitando este diálogo." +#~ msgid "" +#~ "Note: %p (page number), %n (total number of pages)." +#~ msgstr "" +#~ "Nota: %p (número da página), %n (número total de " +#~ "páginas)." -#: ../data/glade/gthumb_tools.glade.h:15 -#, no-c-format -msgid "" -"Special characters: # (new enumerator digit),\n" -"%f (original filename), %e (original extension),\n" -"%d (image date), %s (image size), \n" -"%n (original enumerator)." -msgstr "" -"Caracteres especiais: # (novo dígito enumerador),\n" -"%f (nome de arquivo original), %e (extensão original),\n" -"%d (data da imagem), %s (tamanho da imagem),\n" -"%n (enumerador original)." - -#: ../data/glade/gthumb_tools.glade.h:19 -msgid "A_djust timezone:" -msgstr "Ajustar _fuso horário:" - -#: ../data/glade/gthumb_tools.glade.h:20 -msgid "Add New Script" -msgstr "Adicionar Novo Script" - -#: ../data/glade/gthumb_tools.glade.h:21 -msgid "Apply physical _transform" -msgstr "Aplicar _transformação física" - -#: ../data/glade/gthumb_tools.glade.h:22 -msgid "Apply to all _images" -msgstr "Aplicar a todas as _imagens" - -#: ../data/glade/gthumb_tools.glade.h:23 -msgid "C_urrent date" -msgstr "Data _atual" - -#: ../data/glade/gthumb_tools.glade.h:24 -#: ../src/gth-browser-actions-entries.h:38 -#: ../src/gth-browser-actions-entries.h:39 -msgid "Ca_talog" -msgstr "Ca_tálogo" +#~ msgid "Co_mment" +#~ msgstr "_Comentário" -#. Translators: this is the text case (upper or lower case). -#: ../data/glade/gthumb_tools.glade.h:26 -msgid "Cas_e:" -msgstr "Maiúsculas/Minúsculas:" +#~ msgid "Colo_r:" +#~ msgstr "Co_r:" -#: ../data/glade/gthumb_tools.glade.h:27 -msgid "Change Date" -msgstr "Alterar Data" +#~ msgid "F_ooter:" +#~ msgstr "_Rodapé:" -#: ../data/glade/gthumb_tools.glade.h:28 -msgid "Check _All" -msgstr "Verificar _Todas" +#~ msgid "Frame co_lor:" +#~ msgstr "C_or da moldura:" -#: ../data/glade/gthumb_tools.glade.h:29 -msgid "Check _None" -msgstr "Verificar _Nenhuma" +#~ msgid "H_eader:" +#~ msgstr "C_abeçalho:" -#: ../data/glade/gthumb_tools.glade.h:30 -msgid "Checking image:" -msgstr "Verificando imagem:" +#~ msgid "Header/Footer" +#~ msgstr "Cabeçalho/Rodapé" -#: ../data/glade/gthumb_tools.glade.h:32 -msgid "" -"Click OK to reset the Exif orientation tag for the selected images to Top-" -"Left." -msgstr "" -"Clique em OK para restaurar a etiqueta de orientação Exif das imagens " -"selecionadas para \"Top-Left\"." +#~ msgid "Hei_ght:" +#~ msgstr "_Altura:" -#: ../data/glade/gthumb_tools.glade.h:34 -#, no-c-format -msgid "" -"Click inside the name or script fields to edit them.\n" -"\n" -"Special characters:\n" -"%F = all selected filenames on one line, space delimited\n" -"%f = a single filename, including path\n" -"%b = a single filename, excluding path\n" -"%n = a single filename, including path, with no extension\n" -"%m = a single filename, excluding path, with no extension\n" -"%e = a single extension (starting with a period)\n" -"%p = the parent folder of the single file\n" -"[text] = a user prompt, refreshed for each iteration\n" -"[TEXT] = a user prompt, used for all iterations\n" -"{..code..} = a strftime date format code\n" -"{TEXT} = a user prompt used for all iterations matching previous date\n" -"Scripts with the %F code will be executed just once, regardless of the " -"number of files selected. All other scripts will be executed once per " -"selected file.\n" -"The default scripts are explained in the Help file." -msgstr "" -"Clique dentro dos campos de nome ou scripts para editá-los.\n" -"\n" -"Caracteres especiais:\n" -"%F = todos os nomes de arquivos selecionados em uma linha, delimitados por " -"espaços\n" -"%f = um único nome de arquivo, incluindo o caminho\n" -"%b = um único nome de arquivo, excluindo o caminho\n" -"%n = um único nome de arquivo, incluindo o caminho, sem a extensão\n" -"%m = um único nome de arquivo, excluindo o caminho, sem a extensão\n" -"%e = uma única extensão (iniciando com um ponto final)\n" -"%p = a pasta mãe de um único arquivo\n" -"[text] = uma janela para o usuário, atualizada a cada iteração\n" -"[TEXT] = uma janela para o usuário, usada para todas as iterações\n" -"{..code..} = um código no formato de data da strftime\n" -"{TEXT} = uma janela para o usuário, usada para todas as iterações que " -"coincidam com a data anterior\n" -"Scripts com o código %F serão executados apenas uma vez, independente do " -"número de arquivos selecionados. Todos os outros scripts serão executados " -"uma vez por arquivo selecionado.\n" -"Os scripts padrão estão explicados no arquivo de Ajuda." +#~ msgid "Image dim_ensions" +#~ msgstr "Dim_ensões da imagem" -#: ../data/glade/gthumb_tools.glade.h:50 -msgid "Co_mment date" -msgstr "Data do c_omentário" +#~ msgid "Page" +#~ msgstr "Página" -#: ../data/glade/gthumb_tools.glade.h:51 -msgid "Current _Folder" -msgstr "_Pasta Atual" - -#: ../data/glade/gthumb_tools.glade.h:52 -msgid "Date p_hoto taken (from EXIF metadata)" -msgstr "_Data na qual a foto foi tirada (usando metadados EXIF)" - -#: ../data/glade/gthumb_tools.glade.h:53 -msgid "Define External Scripts" -msgstr "Definir Scripts Externos" +#~ msgid "Rows a_nd columns" +#~ msgstr "Li_nhas e colunas" -#: ../data/glade/gthumb_tools.glade.h:54 -msgid "" -"Do not change\n" -"Convert to lower-case\n" -"Convert to upper-case" -msgstr "" -"Não alterar\n" -"Converter para minúsculas\n" -"Converter para maiúsculas" - -#: ../data/glade/gthumb_tools.glade.h:57 -msgid "Equal images:" -msgstr "Imagens iguais:" - -#: ../data/glade/gthumb_tools.glade.h:58 -msgid "Exif DateTime tag" -msgstr "Etiqueta EXIF DateTime" - -#: ../data/glade/gthumb_tools.glade.h:59 -msgid "Exif DateTimeDigitized tag" -msgstr "Etiqueta EXIF DateTimeDigitized" - -#: ../data/glade/gthumb_tools.glade.h:60 -msgid "Exif DateTimeOriginal tag" -msgstr "Etiqueta EXIF DateTimeOriginal" - -#: ../data/glade/gthumb_tools.glade.h:61 -msgid "Found duplicates:" -msgstr "Duplicadas encontradas:" - -#: ../data/glade/gthumb_tools.glade.h:62 -msgid "Image c_reation date" -msgstr "Data de c_riação da imagem" - -#: ../data/glade/gthumb_tools.glade.h:63 -msgid "Mirror image horizontally (left-right)" -msgstr "Espelha imagem horizontalmente (esquerda-direita)" - -#: ../data/glade/gthumb_tools.glade.h:64 -msgid "Mirror image vertically (top-bottom)" -msgstr "Espelha imagem verticalmente (cima-baixo)" - -#: ../data/glade/gthumb_tools.glade.h:65 -#: ../src/gth-browser-actions-entries.h:84 -#: ../src/gth-browser-actions-entries.h:109 -#: ../src/gth-browser-actions-entries.h:229 -#: ../src/gth-browser-actions-entries.h:259 -msgid "Move to _Trash" -msgstr "Mover para _Lixeira" - -#: ../data/glade/gthumb_tools.glade.h:66 -msgid "New names _preview:" -msgstr "_Visualização de novos nomes:" +#~ msgid "Shadow in" +#~ msgstr "Sombra dentro" -#: ../data/glade/gthumb_tools.glade.h:69 -msgid "Re_verse Order" -msgstr "Ordem Re_versa" +#~ msgid "Shadow out" +#~ msgstr "Sombra fora" -#: ../data/glade/gthumb_tools.glade.h:70 -msgid "Remove Script" -msgstr "Remover Script" +#~ msgid "Sor_t:" +#~ msgstr "Ord_enar:" -#: ../data/glade/gthumb_tools.glade.h:72 -msgid "Reset Exif Orientation Tags" -msgstr "Restaurar Etiquetas de Orientação Exif" +#~ msgid "St_yle" +#~ msgstr "_Estilo" -#: ../data/glade/gthumb_tools.glade.h:73 -msgid "Rotate Images" -msgstr "Gira Imagens" +#~ msgid "Wi_dth:" +#~ msgstr "Lar_gura:" -#: ../data/glade/gthumb_tools.glade.h:74 -msgid "Rotate image 90 degrees clockwise" -msgstr "Gira imagem 90 graus no sentido horário" +#~ msgid "_Draw frame" +#~ msgstr "_Desenhar moldura" -#: ../data/glade/gthumb_tools.glade.h:75 -msgid "Rotate image 90 degrees counter-clockwise" -msgstr "Gira imagem 90 graus em sentido anti-horário" +#~ msgid "by name" +#~ msgstr "por nome" -#: ../data/glade/gthumb_tools.glade.h:76 -msgid "Search for Duplicates" -msgstr "Pesquisar Duplicadas" +#~ msgid "jpeg" +#~ msgstr "jpeg" -#: ../data/glade/gthumb_tools.glade.h:77 -msgid "Search terminated, no duplicates found." -msgstr "Pesquisa finalizada, nenhuma duplicata encontrada." +#~ msgid "png" +#~ msgstr "png" -#: ../data/glade/gthumb_tools.glade.h:84 -msgid "Swap height and width for best _fit" -msgstr "" +#~ msgid "Direction" +#~ msgstr "Direção" -#: ../data/glade/gthumb_tools.glade.h:86 -msgid "The _following date:" -msgstr "_Esta data:" +#, fuzzy +#~ msgid "Extra Processing" +#~ msgstr "Compressão" -#: ../data/glade/gthumb_tools.glade.h:87 -msgid "" -"The number keys on the numeric keypad can be associated with scripts 0-9.\n" -"All scripts can be launched from the Scripts menu." -msgstr "" -"As teclas numéricas do teclado numérico podem ser associadas aos scripts 0-" -"9.\n" -"Todos os scripts podem ser iniciados a partir do menu Scripts." +#~ msgid "Interface" +#~ msgstr "Interface" -#: ../data/glade/gthumb_tools.glade.h:89 -msgid "" -"This checkbox governs the rotation method used for JPEG images that contain " -"Exif orientation tags. If this checkbox is enabled, the rotation will be " -"performed using a physical transform, and the Exif orientation tag will be " -"reset to the default \"top left\" value. If it is not enabled, the rotation " -"will be performed by changing the Exif orientation tag only. For maximum " -"compatibility with other applications, this checkbox should be enabled." -msgstr "" -"Esta caixa de verificação controla o método de rotação usado pelas imagens " -"JPEG que contêm etiquetas de orientação Exif. Se a caixa de verificação " -"estiver habilitada, a rotação será realizada através de uma transformação " -"física e a etiqueta de orientação Exif será restaurada para o valor padrão " -"\"top left\". Se ela não estiver habilitada, a rotação será realizada " -"modificando apenas a etiqueta de orientação Exif. Para uma maior " -"compatibilidade com outras aplicações, esta caixa de verificação deve estar " -"habilitada." - -#: ../data/glade/gthumb_tools.glade.h:90 -msgid "User-Defined Script Parameter" -msgstr "Parâmetros de script definidos pelo usuário" - -#: ../data/glade/gthumb_tools.glade.h:91 -msgid "Write To CD" -msgstr "Gravar em CD" - -#: ../data/glade/gthumb_tools.glade.h:92 -msgid "Your script requires this user-defined parameter:" -msgstr "O seu script requer estes parâmetros definidos pelo usuário:" +#~ msgid "Other" +#~ msgstr "Outros" -#: ../data/glade/gthumb_tools.glade.h:98 -msgid "_Last modified date" -msgstr "Data da última _modificação" +#, fuzzy +#~ msgid "Show / Hide" +#~ msgstr "Tamanho" -#: ../data/glade/gthumb_tools.glade.h:100 -#: ../src/gth-browser-actions-callbacks.c:465 -#: ../src/gth-browser-actions-callbacks.c:922 -msgid "_Rename" -msgstr "_Renomear" +#~ msgid "Slideshow" +#~ msgstr "Apresentação de slides" -#: ../data/glade/gthumb_tools.glade.h:104 -msgid "_Selected Images" -msgstr "Imagens _Selecionadas" +#~ msgid "Viewer" +#~ msgstr "Visualizador" -#: ../data/glade/gthumb_tools.glade.h:105 -msgid "_Sort:" -msgstr "_Ordenar:" +#~ msgid "" +#~ "By default, gThumb lists all files that are likely to be found on a " +#~ "digital camera - photos, videos, and audio files. You can omit the audio " +#~ "and video files by deselecting this checkbox." +#~ msgstr "" +#~ "Por padrão, o gThumb lista todos os arquivos que poderiam ser encontrados " +#~ "em uma câmera digital - arquivos de fotos, vídeos e áudio. Você pode " +#~ "omitir os arquivos de áudio e vídeo desmarcando esta caixa de seleção." -#: ../data/glade/gthumb_tools.glade.h:111 -msgid "hours" -msgstr "horas" +#~ msgid "C_lick policy:" +#~ msgstr "Po_lítica de clique:" -#: ../data/glade/gthumb_tools.glade.h:113 -msgid "prompt" -msgstr "janela de script" - -#. Translators: This is a dialog window title. A different translation may be required than for the identical tooltip string used elsewhere, depending on your language's grammar. Do not translate the prefix. -#: ../data/glade/gthumb_tools.glade.h:115 -msgid "title|Scale Images" -msgstr "title|Redimensionar Imagens" +#~ msgid "Co_mments" +#~ msgstr "Co_mentários" -#: ../data/glade/gthumb_web_exporter.glade.h:4 -msgid "1024 x 1024" -msgstr "1024 x 1024" +#~ msgid "D_elay before changing image:" +#~ msgstr "_Esperar antes de alterar imagem:" -#: ../data/glade/gthumb_web_exporter.glade.h:5 -msgid "1024 x 768" -msgstr "1024 x 768" +#~ msgid "Do _not change folder" +#~ msgstr "_Não mudar de pasta" -#: ../data/glade/gthumb_web_exporter.glade.h:6 -msgid "1280 x 1280" -msgstr "1280 x 1280" +# Isso é o contrário de "Reverse" → "_Voltar" +#~ msgid "For_ward" +#~ msgstr "_Avançar" -#: ../data/glade/gthumb_web_exporter.glade.h:7 -msgid "1280 x 960" -msgstr "1280 x 960" - -#: ../data/glade/gthumb_web_exporter.glade.h:8 -msgid "320 x 200" -msgstr "320 x 200" - -#: ../data/glade/gthumb_web_exporter.glade.h:9 -msgid "320 x 320" -msgstr "320 x 320" - -#: ../data/glade/gthumb_web_exporter.glade.h:10 -msgid "640 x 480" -msgstr "640 x 480" - -#: ../data/glade/gthumb_web_exporter.glade.h:11 -msgid "640 x 640" -msgstr "640 x 640" - -#: ../data/glade/gthumb_web_exporter.glade.h:12 -msgid "800 x 600" -msgstr "800 x 600" - -#: ../data/glade/gthumb_web_exporter.glade.h:13 -msgid "800 x 800" -msgstr "800 x 800" - -#: ../data/glade/gthumb_web_exporter.glade.h:14 -msgid "Album Style" -msgstr "Estilo do Álbum" - -#: ../data/glade/gthumb_web_exporter.glade.h:15 -msgid "Basic Information" -msgstr "Informações Básicas" - -#: ../data/glade/gthumb_web_exporter.glade.h:16 -msgid "Camera Data" -msgstr "Dados da Câmera" - -#: ../data/glade/gthumb_web_exporter.glade.h:17 -msgid "Comments" -msgstr "Comentários" - -#: ../data/glade/gthumb_web_exporter.glade.h:18 -msgid "Index Page Layout" -msgstr "Disposição do Índice" - -#: ../data/glade/gthumb_web_exporter.glade.h:19 -msgid "Personalize theme" -msgstr "Personalizar tema" - -#: ../data/glade/gthumb_web_exporter.glade.h:21 -msgid "Theme" -msgstr "Tema" +#~ msgid "Go to last _visited folder or catalog" +#~ msgstr "Ir para a última pasta ou catálogo _visitado" -#: ../data/glade/gthumb_web_exporter.glade.h:23 -#, no-c-format -msgid "Note: %d (current date)." -msgstr "Nota: %d (data atual)." +#~ msgid "H_igh" +#~ msgstr "A_lta" -#: ../data/glade/gthumb_web_exporter.glade.h:24 -msgid "" -"Note: Some themes may auto-adjust the\n" -"number of rows and columns, but keep the total \n" -"number of images per page constant." -msgstr "" -"Nota: Alguns temas podem auto-ajustar\n" -"o número de linhas e colunas, mas mantendo\n" -"constante o número total de imagens por página." +#~ msgid "" +#~ "If this checkbox is enabled and the imported photo contains an Exif " +#~ "orientation tag, the image data will be physically transformed " +#~ "(losslessly) so that the viewed image looks the same as before but the " +#~ "orientation tag is reset to \"top left\". If this checkbox is not " +#~ "enabled, the image data and the orientation tag are both left unchanged. " +#~ "The image will be displayed identically by gthumb for both possibilities, " +#~ "but for maximum compatibility with other applications this checkbox " +#~ "should be enabled." +#~ msgstr "" +#~ "Se esta caixa de verificação estiver habilitada e a foto importada " +#~ "contiver uma etiqueta de orientação Exif, os dados da imagem serão " +#~ "fisicamente transformados (sem perdas) para que a imagem vista aparente " +#~ "ser a mesma de antes, mas a etiqueta de orientação será restaurada para " +#~ "\"top left\". Se esta caixa de verificação não estiver habilitada, os " +#~ "dados da imagem e a etiqueta de orientação permanecerão ambos " +#~ "inalterados. A imagem será exibida de forma identica pelo gthumb em ambas " +#~ "possibilidades, mas, para uma maior compatibilidade com outras " +#~ "aplicações, esta caixa de verificação deve estar habilitada." -#: ../data/glade/gthumb_web_exporter.glade.h:27 -#, fuzzy -msgid "Note: click to customize." -msgstr "Nota: %d (data atual)." +#~ msgid "Include audio clips and movies in browser view" +#~ msgstr "Incluir clipes de áudio e filmes na visão de navegador" -#: ../data/glade/gthumb_web_exporter.glade.h:28 -msgid "Came_ra Model" -msgstr "Modelo da Câme_ra" +#~ msgid "Layout:" +#~ msgstr "Disposição:" -#: ../data/glade/gthumb_web_exporter.glade.h:29 -msgid "Caption" -msgstr "Legenda" +# Direção aleatória. +#~ msgid "Ran_dom" +#~ msgstr "A_leatória" -#: ../data/glade/gthumb_web_exporter.glade.h:32 -msgid "Da_te and Time" -msgstr "Data e _Hora" - -#: ../data/glade/gthumb_web_exporter.glade.h:33 -msgid "E_xposure mode" -msgstr "Modo de e_xposição" - -#: ../data/glade/gthumb_web_exporter.glade.h:34 -msgid "Exposure _time" -msgstr "_Tempo de exposição" - -#: ../data/glade/gthumb_web_exporter.glade.h:37 -msgid "Focal _length" -msgstr "Di_stância focal" - -#: ../data/glade/gthumb_web_exporter.glade.h:38 -msgid "I_mage Caption..." -msgstr "Legenda da I_magem..." +# Esse é o contrário de "Forward"→"Avançar" +#~ msgid "Re_verse" +#~ msgstr "_Voltar" -#: ../data/glade/gthumb_web_exporter.glade.h:41 -msgid "S_ort:" -msgstr "_Ordenar:" +#~ msgid "_Filenames" +#~ msgstr "_Nomes de arquivos" -#: ../data/glade/gthumb_web_exporter.glade.h:43 -msgid "Use subfolders to organize files" -msgstr "Use subpastas para organizar arquivos" +#~ msgid "1" +#~ msgstr "1" -#: ../data/glade/gthumb_web_exporter.glade.h:44 -msgid "Web Album" -msgstr "Álbum Web" +#~ msgid "150" +#~ msgstr "150" -#: ../data/glade/gthumb_web_exporter.glade.h:45 -msgid "Web Album Theme" -msgstr "Tema de Álbum Web" +#~ msgid "16" +#~ msgstr "16" -#: ../data/glade/gthumb_web_exporter.glade.h:46 -msgid "_Aperture value" -msgstr "Valor de _abertura" +#~ msgid "300" +#~ msgstr "300" -#: ../data/glade/gthumb_web_exporter.glade.h:47 -msgid "_Copy originals to destination" -msgstr "_Copiar originais para o destino" +#~ msgid "4" +#~ msgstr "4" -#: ../data/glade/gthumb_web_exporter.glade.h:48 -msgid "_Date and Time" -msgstr "_Data e Hora" - -#: ../data/glade/gthumb_web_exporter.glade.h:50 -msgid "_Flash" -msgstr "_Flash" +#~ msgid "600" +#~ msgstr "600" -#: ../data/glade/gthumb_web_exporter.glade.h:51 -msgid "_Footer:" -msgstr "_Rodapé:" +#~ msgid "72" +#~ msgstr "72" -#: ../data/glade/gthumb_web_exporter.glade.h:52 -msgid "_Go to Theme Folder" -msgstr "Ir para a _Pasta de Temas" +#~ msgid "8" +#~ msgstr "8" -#: ../data/glade/gthumb_web_exporter.glade.h:53 -msgid "_Header:" -msgstr "Cabeçal_ho:" +#~ msgid "Image Sizing" +#~ msgstr "Dimensionamento da Imagem" -#: ../data/glade/gthumb_web_exporter.glade.h:54 -msgid "_Install Theme..." -msgstr "_Instalar Tema..." - -#: ../data/glade/gthumb_web_exporter.glade.h:55 -msgid "_Place" -msgstr "_Lugar" +#~ msgid "Margins" +#~ msgstr "Margens" -#: ../data/glade/gthumb_web_exporter.glade.h:56 -msgid "_Resize if larger than:" -msgstr "_Redimensionar se for maior que:" +#~ msgid "Orientation" +#~ msgstr "Orientação" -#: ../data/glade/gthumb_web_exporter.glade.h:57 -msgid "_Select" -msgstr "_Selecionar" - -#: ../data/glade/gthumb_web_exporter.glade.h:58 -msgid "_Shutter speed" -msgstr "Velocidade do _obturador" - -#: ../data/glade/gthumb_web_exporter.glade.h:59 -msgid "_Size :" -msgstr "Ta_manho :" - -#: ../data/glade/gthumb_web_exporter.glade.h:60 -msgid "_Theme:" -msgstr "_Tema:" - -#: ../data/glade/gthumb_web_exporter.glade.h:61 -msgid "_Thumbnail Caption..." -msgstr "Legenda da Minia_tura..." - -#: ../data/glade/gthumb_web_exporter.glade.h:63 -msgid "columns, by" -msgstr "por colunas" - -#: ../data/glade/gthumb_web_exporter.glade.h:64 -msgid "or _use a single index page" -msgstr "ou _usar uma página de índice individual" - -#: ../data/glade/gthumb_web_exporter.glade.h:65 -msgid "rows per page," -msgstr "linhas por página," +#~ msgid "Size" +#~ msgstr "Tamanho" -#: ../data/gthumb.desktop.in.h:1 -msgid "Image Viewer" -msgstr "Visualizador de Imagens" +#~ msgid "" +#~ "Note: Drag the image to move it in the page.\n" +#~ "Click on an image to rotate it." +#~ msgstr "" +#~ "Nota: Arraste a imagem para movê-la na página.\n" +#~ "Clique em uma imagem para girá-la." -#: ../data/gthumb.desktop.in.h:2 ../src/main.c:726 -msgid "View and organize your images" -msgstr "Veja e organize as suas imagens" +#~ msgid "" +#~ "Note: High-resolution images will be\n" +#~ "down-sampled to this resolution. Increase\n" +#~ "the resolution to get better image quality.\n" +#~ "Decrease it to get shorter print times." +#~ msgstr "" +#~ "Nota: Imagens em alta resolução serão\n" +#~ "reduzidas para esta resolução. Aumente a resolução\n" +#~ "para obter uma melhor qualidade de imagem.\n" +#~ "Diminua-a para obter um tempo de impressão menor." + +#~ msgid "A4" +#~ msgstr "A4" -#: ../data/gthumb.desktop.in.h:3 -msgid "gThumb Image Viewer" -msgstr "Visualizador de Imagens gThumb" +#~ msgid "Automatic sizing" +#~ msgstr "Dimensionamento automático" -#: ../data/gthumb-import.desktop.in.h:1 -#, fuzzy -msgid "Import the photos on your camera card" -msgstr "Importa fotos de uma câmera digital" +#~ msgid "Comment _font:" +#~ msgstr "_Fonte do comentário:" -#: ../data/gthumb-import.desktop.in.h:2 -#, fuzzy -msgid "Photo Import Tool" -msgstr "Importar Fotos" +#~ msgid "Executive" +#~ msgstr "Executivo" -#: ../data/gthumb-import.desktop.in.h:3 -msgid "gThumb Photo Import Tool" -msgstr "" +#, fuzzy +#~ msgid "Include folder name" +#~ msgstr "Incluir nome de arquivo" -#: ../data/gthumb.schemas.in.h:1 -msgid "" -"Images over this size (in bytes) will not be thumbnailed. Use 0 if you want " -"to generate thumbnails for all images." -msgstr "" -"Imagens além deste tamanho (em bytes) não terão miniaturas. Use 0 se você " -"quiser gerar miniaturas para todas as imagens." +#~ msgid "Lan_dscape" +#~ msgstr "_Paisagem" -#: ../data/gthumb.schemas.in.h:2 -msgid "" -"Possible values are 0 (portrait), 1 (landscape), 2 (reverse portrait), 3 " -"(reverse landscape)" -msgstr "" -"Valores possíveis são 0 (retrato), 1 (paisagem), 2 (retrato reverso), 3 " -"(paisagem reversa)" +#~ msgid "Legal" +#~ msgstr "Legal" -#: ../data/gthumb.schemas.in.h:3 -msgid "Possible values are: 1, 2, 3, 4." -msgstr "Valores possíveis são: 1, 2, 3, 4." - -#: ../data/gthumb.schemas.in.h:4 -msgid "Possible values are: 72, 150, 300, 600." -msgstr "São valores possíveis: 72, 150, 300, 600." +#~ msgid "Letter" +#~ msgstr "Carta" -#: ../data/gthumb.schemas.in.h:5 -msgid "" -"Possible values are: actual_size, fit, keep_prev, fit_if_larger, " -"fit_width_if_larger." -msgstr "" -"Valores possíveis são: actual_size, fit, keep_prev, fit_if_larger, " -"fit_width_if_larger." +#~ msgid "P_ortrait" +#~ msgstr "_Retrato" -#: ../data/gthumb.schemas.in.h:6 -msgid "Possible values are: ascending, descending." -msgstr "Valores possíveis são: ascending, descending." - -#: ../data/gthumb.schemas.in.h:7 -msgid "Possible values are: forward, backward, random." -msgstr "Possíveis valores são: forward, backward, random." - -#: ../data/gthumb.schemas.in.h:8 -msgid "Possible values are: high, low." -msgstr "Valores possíveis são: high, low." - -#: ../data/gthumb.schemas.in.h:9 -msgid "Possible values are: image, data, comment." -msgstr "Valores possíveis são: image, data, comment." - -#: ../data/gthumb.schemas.in.h:10 -msgid "Possible values are: jpeg, png, tga, tiff." -msgstr "Valores possíveis são: jpeg, png, tga, tiff." - -#: ../data/gthumb.schemas.in.h:11 -msgid "Possible values are: light, midtone, dark." -msgstr "Valores possíveis são: light, midtone, dark." - -#: ../data/gthumb.schemas.in.h:12 -msgid "Possible values are: list, thumbnails." -msgstr "Valores possíveis são: list, thumbnails." - -#: ../data/gthumb.schemas.in.h:13 -msgid "Possible values are: manual, auto." -msgstr "São valores possíveis: manual, auto." - -#: ../data/gthumb.schemas.in.h:14 -msgid "Possible values are: mm, in." -msgstr "Valores possíveis são: mm, in." - -#: ../data/gthumb.schemas.in.h:15 -msgid "Possible values are: nautilus, single, double." -msgstr "Valores possíveis são: nautilus, single, double." - -#: ../data/gthumb.schemas.in.h:16 -msgid "Possible values are: none, day, month, now, custom" -msgstr "Valores possíveis são: none, day, month, now, custom" - -#: ../data/gthumb.schemas.in.h:17 -msgid "Possible values are: none, deflate, jpeg." -msgstr "Valores possíveis são: none, deflate, jpeg." +#~ msgid "Paper Details" +#~ msgstr "Detalhes do Papel" -#: ../data/gthumb.schemas.in.h:18 -msgid "Possible values are: none, name, path, size, time, exifdate, comment." -msgstr "" -"Valores possíveis são: none, name, path, size, time, exifdate, comment." +#~ msgid "Postcard" +#~ msgstr "Cartão Postal" -#: ../data/gthumb.schemas.in.h:19 -msgid "" -"Possible values are: none, simple, simple_with_shadow, shadow, slide, " -"shadow_in, shadow_out." -msgstr "" -"Valores possíveis são: none, simple, simple_with_shadow, shadow, slide, " -"shadow_in, shadow_out." +#~ msgid "Scale to this size" +#~ msgstr "Dimensionar para este tamanho" -#: ../data/gthumb.schemas.in.h:20 -msgid "" -"Possible values are: none, square, image, display, 4x3, 4x6, 5x7, 8x10, " -"custom." -msgstr "" -"Valores possíveis são: none, square, image, display, 4x3, 4x6, 5x7, 8x10, " -"custom." +#~ msgid "Tabloid" +#~ msgstr "Tablóide" -#: ../data/gthumb.schemas.in.h:21 -msgid "Possible values are: original, lower, upper." -msgstr "Valores possíveis: original, minúscula, maiúscula." - -#: ../data/gthumb.schemas.in.h:22 -msgid "Possible values are: pixels, percentage." -msgstr "Valores possíveis são: pixels, percentage." - -#: ../data/gthumb.schemas.in.h:23 -msgid "Possible values are: png, jpeg." -msgstr "Valores possíveis são: png, jpeg." - -#: ../data/gthumb.schemas.in.h:24 -msgid "Possible values are: skip, rename, ask, overwrite." -msgstr "Valores possíveis são: skip, rename, ask, overwrite." - -#: ../data/gthumb.schemas.in.h:25 -msgid "Possible values are: small, medium, large." -msgstr "Valores possíveis são: small, medium, large." +#~ msgid "_Bottom:" +#~ msgstr "_Inferior:" -#: ../data/gthumb.schemas.in.h:26 -msgid "" -"Possible values are: system, text_below, text_beside, text_only, icons_only." -msgstr "" -"Valores possíveis são: system, text_below, text_beside, text_only, " -"icons_only." +#~ msgid "_Right:" +#~ msgstr "_Direita:" -#: ../data/gthumb.schemas.in.h:27 -msgid "Possible values are: white, black, checked, none." -msgstr "Valores possíveis são: white, black, checked, none." +#~ msgid "Other Actions" +#~ msgstr "Outras Ações" -#: ../data/gthumb.schemas.in.h:28 -msgid "Whether to always use a black background." -msgstr "Sempre usar fundo preto." +#~ msgid "Zoom" +#~ msgstr "Zoom" -#: ../data/gthumb.schemas.in.h:29 -msgid "Whether to reset the scrollbar positions after changing image" -msgstr "Restaurar as posições da barra de rolagem após modificar a imagem" +#~ msgid "" +#~ "Move the cursor over the\n" +#~ "red eye and click on it. You\n" +#~ "can use the mousewheel to\n" +#~ "zoom in and out, or use the\n" +#~ "zoom buttons below." +#~ msgstr "" +#~ "Mova o cursor sobre o\n" +#~ "olho vermelho e clique nele. Você\n" +#~ "pode usar a roda do mouse para\n" +#~ "aproximar ou afastar, ou use os\n" +#~ "botões de zoom abaixo." -#: ../libgthumb/comments.c:837 ../src/catalog-web-exporter.c:157 -msgid "%d %B %Y" -msgstr "%d de %B de %Y" - -#: ../libgthumb/comments.c:839 ../src/catalog-web-exporter.c:56 -#: ../src/catalog-web-exporter.c:159 ../src/dlg-duplicates.c:556 -#: ../src/dlg-image-prop.c:445 ../src/gth-browser.c:459 -#: ../src/gth-exif-data-viewer.c:328 ../src/gth-fullscreen.c:825 -#: ../src/gth-viewer.c:579 -msgid "%d %B %Y, %H:%M" -msgstr "%d de %B de %Y, %H:%M" - -#: ../libgthumb/comments.c:849 -msgid "(No Comment)" -msgstr "(Sem Comentários)" - -#: ../libgthumb/dlg-save-image.c:58 -msgid "Determine by extension" -msgstr "Determinar pela extensão" +#~ msgid "Search criteria" +#~ msgstr "Critérios da pesquisa" -#: ../libgthumb/dlg-save-image.c:155 ../src/rotation-utils.c:263 -#, c-format -msgid "Image type not supported: %s" -msgstr "Tipo de imagem não suportado: %s" +#~ msgid "Search scope" +#~ msgstr "Escopo da pesquisa" -#: ../libgthumb/dlg-save-image.c:268 -msgid "Save Image" -msgstr "Salvar Imagem" +#, fuzzy +#~ msgid "Choose tags from the saved list" +#~ msgstr "Escolha categorias a partir da lista salva" -#: ../libgthumb/dlg-save-image.c:288 -msgid "Image type:" -msgstr "Tipo da imagem:" +#~ msgid "Found images:" +#~ msgstr "Imagens encontradas:" -#: ../libgthumb/file-utils.c:1112 ../src/gth-location.c:702 -msgid "Catalogs" -msgstr "Catálogos" +#, fuzzy +#~ msgid "Match a_ny selected tag" +#~ msgstr "Igualar a _qualquer categoria selecionada" -#: ../libgthumb/file-utils.c:1115 ../src/gth-location.c:708 -msgid "File System" -msgstr "Sistema de arquivos" +#~ msgid "New _Search..." +#~ msgstr "Nova _Pesquisa..." -#: ../libgthumb/file-utils.c:1144 ../src/gth-location.c:715 -msgid "Home" -msgstr "Pessoal" - -#: ../libgthumb/gth-image-list.c:3589 ../src/gth-browser.c:700 -#: ../src/gth-browser.c:4366 ../src/gth-viewer.c:688 -msgid "No image" -msgstr "Sem imagem" +#~ msgid "Search Progress" +#~ msgstr "Progresso da Pesquisa" -#: ../libgthumb/gth-utils.c:51 -msgid "Could not display help" -msgstr "Não foi possível exibir a ajuda" +#~ msgid "_Edit Search" +#~ msgstr "_Editar Pesquisa" -#: ../libgthumb/gthumb-stock.c:78 ../src/gth-window-actions-entries.h:270 -msgid "Ro_tate Images" -msgstr "Gi_rar imagens" +#~ msgid "_Search" +#~ msgstr "_Pesquisar" -#: ../libgthumb/print-callbacks.c:834 -#, c-format -msgid "Page %d of %d" -msgstr "Página %d de %d" +#~ msgid "Change to:" +#~ msgstr "Alterar para:" -#: ../libgthumb/print-callbacks.c:2264 ../src/catalog-png-exporter.c:1366 -#, c-format -msgid "Loading image: %s" -msgstr "Carregando imagem: %s" +#~ msgid "Write to CD" +#~ msgstr "Gravar em CD" -#: ../src/bookmark-list.c:157 ../src/gth-browser.c:1286 -#: ../src/gth-browser.c:1290 ../src/gth-browser.c:1302 -msgid "(Invalid Name)" -msgstr "(Nome Inválido)" +#~ msgid "" +#~ "Note: JPEG transformations are normally lossless.\n" +#~ "When viewing images, you can use the [ and ] shortcut\n" +#~ "keys to rotate and save losslessly, bypassing this dialog." +#~ msgstr "" +#~ "Nota:: Transformações JPEG são em geral sem perdas.\n" +#~ "Ao ver as imagens, você pode usar as teclas de atalho [ e ] para girá-" +#~ "las\n" +#~ "e salvá-las sem perdas, evitando este diálogo." -#: ../src/catalog-png-exporter.c:840 ../src/dlg-image-prop.c:426 -#: ../src/gth-browser.c:462 ../src/gth-exif-data-viewer.c:324 -#: ../src/gth-fullscreen.c:817 ../src/gth-viewer.c:582 -#, c-format -msgid "%d x %d pixels" -msgstr "%d x %d pixels" +#~ msgid "" +#~ "Special characters: # (new enumerator digit),\n" +#~ "%f (original filename), %e (original extension),\n" +#~ "%d (image date), %s (image size), \n" +#~ "%n (original enumerator)." +#~ msgstr "" +#~ "Caracteres especiais: # (novo dígito enumerador),\n" +#~ "%f (nome de arquivo original), %e (extensão original),\n" +#~ "%d (data da imagem), %s (tamanho da imagem),\n" +#~ "%n (enumerador original)." -#: ../src/catalog-png-exporter.c:1589 -#, c-format -msgid "Creating image: %s.%s" -msgstr "Criando imagem: %s.%s" +#~ msgid "A_djust timezone:" +#~ msgstr "Ajustar _fuso horário:" -#: ../src/catalog-web-exporter.c:2293 -msgid "Saving thumbnails" -msgstr "Salvando miniaturas" +#~ msgid "Add New Script" +#~ msgstr "Adicionar Novo Script" -#: ../src/catalog-web-exporter.c:2358 -msgid "Saving HTML pages: Images" -msgstr "Salvando páginas HTML: Imagens" +#~ msgid "Apply physical _transform" +#~ msgstr "Aplicar _transformação física" -#: ../src/catalog-web-exporter.c:2419 -msgid "Saving HTML pages: Indexes" -msgstr "Salvando páginas HTML: Índices" +#~ msgid "Apply to all _images" +#~ msgstr "Aplicar a todas as _imagens" -#: ../src/catalog-web-exporter.c:2553 ../src/catalog-web-exporter.c:2766 -msgid "Saving images" -msgstr "Salvando imagens" +#~ msgid "C_urrent date" +#~ msgstr "Data _atual" -#. This function is used when "Copy originals to destination" is -#. enabled, and resizing is NOT enabled. This allows us to use a -#. lossless copy (and rotate). When resizing is enabled, a lossy -#. save has to be used. -#: ../src/catalog-web-exporter.c:2595 -msgid "Copying original images" -msgstr "Copiando imagens originais" +#~ msgid "Ca_talog" +#~ msgstr "Ca_tálogo" -#: ../src/catalog-web-exporter.c:2997 -#, fuzzy -msgid "Could not find the style folder" -msgstr "Não foi possível excluir a pasta \"%s\": %s" +#~ msgid "Check _All" +#~ msgstr "Verificar _Todas" -#: ../src/catalog-web-exporter.c:3020 -#: ../src/gth-window-actions-callbacks.c:214 ../src/rotation-utils.c:156 -msgid "Could not create a temporary folder" -msgstr "Não foi possível criar uma pasta temporária" +#~ msgid "Check _None" +#~ msgstr "Verificar _Nenhuma" -#. Load thumbnails. -#: ../src/catalog-web-exporter.c:3078 -msgid "Loading images" -msgstr "Carregando imagens" +#~ msgid "Checking image:" +#~ msgstr "Verificando imagem:" -#: ../src/dlg-catalog.c:88 ../src/gth-browser-actions-callbacks.c:658 -msgid "Enter the catalog name: " -msgstr "Digite o nome do catálogo: " - -#: ../src/dlg-catalog.c:92 ../src/dlg-catalog.c:139 -#: ../src/dlg-file-utils.c:136 ../src/dlg-tags.c:237 -#: ../src/gth-browser-actions-callbacks.c:730 -msgid "C_reate" -msgstr "C_riar" +#~ msgid "" +#~ "Click OK to reset the Exif orientation tag for the selected images to Top-" +#~ "Left." +#~ msgstr "" +#~ "Clique em OK para restaurar a etiqueta de orientação Exif das imagens " +#~ "selecionadas para \"Top-Left\"." -#: ../src/dlg-catalog.c:135 ../src/gth-browser-actions-callbacks.c:770 -msgid "Enter the library name: " -msgstr "Digite o nome da biblioteca: " +#~ msgid "" +#~ "Click inside the name or script fields to edit them.\n" +#~ "\n" +#~ "Special characters:\n" +#~ "%F = all selected filenames on one line, space delimited\n" +#~ "%f = a single filename, including path\n" +#~ "%b = a single filename, excluding path\n" +#~ "%n = a single filename, including path, with no extension\n" +#~ "%m = a single filename, excluding path, with no extension\n" +#~ "%e = a single extension (starting with a period)\n" +#~ "%p = the parent folder of the single file\n" +#~ "[text] = a user prompt, refreshed for each iteration\n" +#~ "[TEXT] = a user prompt, used for all iterations\n" +#~ "{..code..} = a strftime date format code\n" +#~ "{TEXT} = a user prompt used for all iterations matching previous date\n" +#~ "Scripts with the %F code will be executed just once, regardless of the " +#~ "number of files selected. All other scripts will be executed once per " +#~ "selected file.\n" +#~ "The default scripts are explained in the Help file." +#~ msgstr "" +#~ "Clique dentro dos campos de nome ou scripts para editá-los.\n" +#~ "\n" +#~ "Caracteres especiais:\n" +#~ "%F = todos os nomes de arquivos selecionados em uma linha, delimitados " +#~ "por espaços\n" +#~ "%f = um único nome de arquivo, incluindo o caminho\n" +#~ "%b = um único nome de arquivo, excluindo o caminho\n" +#~ "%n = um único nome de arquivo, incluindo o caminho, sem a extensão\n" +#~ "%m = um único nome de arquivo, excluindo o caminho, sem a extensão\n" +#~ "%e = uma única extensão (iniciando com um ponto final)\n" +#~ "%p = a pasta mãe de um único arquivo\n" +#~ "[text] = uma janela para o usuário, atualizada a cada iteração\n" +#~ "[TEXT] = uma janela para o usuário, usada para todas as iterações\n" +#~ "{..code..} = um código no formato de data da strftime\n" +#~ "{TEXT} = uma janela para o usuário, usada para todas as iterações que " +#~ "coincidam com a data anterior\n" +#~ "Scripts com o código %F serão executados apenas uma vez, independente do " +#~ "número de arquivos selecionados. Todos os outros scripts serão executados " +#~ "uma vez por arquivo selecionado.\n" +#~ "Os scripts padrão estão explicados no arquivo de Ajuda." -#: ../src/dlg-catalog.c:495 -msgid "Move Catalog to..." -msgstr "Mover catálogo para..." +#~ msgid "Date p_hoto taken (from EXIF metadata)" +#~ msgstr "_Data na qual a foto foi tirada (usando metadados EXIF)" -#: ../src/dlg-convert.c:173 ../src/gth-batch-op.c:398 -#, c-format -msgid "Converting image: %s" -msgstr "Convertendo imagem: %s" +#~ msgid "Define External Scripts" +#~ msgstr "Definir Scripts Externos" -#: ../src/dlg-convert.c:196 ../src/gth-batch-op.c:421 -#, c-format -msgid "" -"An image named \"%s\" is already present. Please specify a different name." -msgstr "" -"Já existe uma imagem com o nome \"%s\". Por favor, escolha um nome diferente." +#~ msgid "" +#~ "Do not change\n" +#~ "Convert to lower-case\n" +#~ "Convert to upper-case" +#~ msgstr "" +#~ "Não alterar\n" +#~ "Converter para minúsculas\n" +#~ "Converter para maiúsculas" -#: ../src/dlg-convert.c:342 ../src/gth-batch-op.c:577 -#, c-format -msgid "An image named \"%s\" is already present. Do you want to overwrite it?" -msgstr "Uma imagem chamada \"%s\" já está existe. Deseja sobrescrever?" +#~ msgid "Equal images:" +#~ msgstr "Imagens iguais:" -#: ../src/dlg-convert.c:347 ../src/gth-batch-op.c:582 -msgid "Skip" -msgstr "Pular" +#~ msgid "Exif DateTime tag" +#~ msgstr "Etiqueta EXIF DateTime" -#: ../src/dlg-convert.c:348 ../src/gth-batch-op.c:583 -msgid "_Overwrite" -msgstr "_Sobrescrever" +#~ msgid "Exif DateTimeDigitized tag" +#~ msgstr "Etiqueta EXIF DateTimeDigitized" -#: ../src/dlg-crop.c:553 -#, c-format -msgid "%d x %d (Image)" -msgstr "%d x %d (Imagem)" +#~ msgid "Mirror image vertically (top-bottom)" +#~ msgstr "Espelha imagem verticalmente (cima-baixo)" -#: ../src/dlg-crop.c:561 -#, c-format -msgid "%d x %d (Screen)" -msgstr "%d x %d (Tela)" +#~ msgid "Remove Script" +#~ msgstr "Remover Script" -#: ../src/dlg-duplicates.c:283 ../src/dlg-duplicates.c:657 -msgid "Duplicates" -msgstr "Duplicadas" +#~ msgid "Reset Exif Orientation Tags" +#~ msgstr "Restaurar Etiquetas de Orientação Exif" -#: ../src/dlg-duplicates.c:298 -msgid "Duplicates Size" -msgstr "Tamanho das Duplicadas" +#~ msgid "Rotate Images" +#~ msgstr "Gira Imagens" -#. -#: ../src/dlg-duplicates.c:376 ../src/dlg-image-prop.c:598 -#: ../src/gth-exif-data-viewer.c:339 -msgid "Name" -msgstr "Nome" +#~ msgid "Search terminated, no duplicates found." +#~ msgstr "Pesquisa finalizada, nenhuma duplicata encontrada." -#: ../src/dlg-duplicates.c:405 -msgid "Last modified" -msgstr "Última modificação" - -#: ../src/dlg-duplicates.c:420 ../src/dlg-image-prop.c:618 -msgid "Location" -msgstr "Localização" +#~ msgid "" +#~ "The number keys on the numeric keypad can be associated with scripts " +#~ "0-9.\n" +#~ "All scripts can be launched from the Scripts menu." +#~ msgstr "" +#~ "As teclas numéricas do teclado numérico podem ser associadas aos scripts " +#~ "0-9.\n" +#~ "Todos os scripts podem ser iniciados a partir do menu Scripts." -#: ../src/dlg-duplicates.c:762 -msgid "Checked images will be moved to the Trash, are you sure?" -msgstr "" -"As imagens selecionadas serão movidas para a Lixeira, você tem certeza?" +#~ msgid "" +#~ "This checkbox governs the rotation method used for JPEG images that " +#~ "contain Exif orientation tags. If this checkbox is enabled, the rotation " +#~ "will be performed using a physical transform, and the Exif orientation " +#~ "tag will be reset to the default \"top left\" value. If it is not " +#~ "enabled, the rotation will be performed by changing the Exif orientation " +#~ "tag only. For maximum compatibility with other applications, this " +#~ "checkbox should be enabled." +#~ msgstr "" +#~ "Esta caixa de verificação controla o método de rotação usado pelas " +#~ "imagens JPEG que contêm etiquetas de orientação Exif. Se a caixa de " +#~ "verificação estiver habilitada, a rotação será realizada através de uma " +#~ "transformação física e a etiqueta de orientação Exif será restaurada para " +#~ "o valor padrão \"top left\". Se ela não estiver habilitada, a rotação " +#~ "será realizada modificando apenas a etiqueta de orientação Exif. Para uma " +#~ "maior compatibilidade com outras aplicações, esta caixa de verificação " +#~ "deve estar habilitada." -#: ../src/dlg-file-utils.c:90 ../src/dlg-file-utils.c:1152 -#, c-format -msgid "Operation interrupted" -msgstr "" +#~ msgid "User-Defined Script Parameter" +#~ msgstr "Parâmetros de script definidos pelo usuário" -#: ../src/dlg-file-utils.c:97 -#, c-format -msgid "File not found" -msgstr "" +#~ msgid "Your script requires this user-defined parameter:" +#~ msgstr "O seu script requer estes parâmetros definidos pelo usuário:" -#: ../src/dlg-file-utils.c:104 ../src/dlg-file-utils.c:2297 -#, fuzzy, c-format -msgid "Invalid argument" -msgstr "(Nome Inválido)" +#~ msgid "prompt" +#~ msgstr "janela de script" -#: ../src/dlg-file-utils.c:111 -#, c-format -msgid "Operation failed" -msgstr "" +#~ msgid "title|Scale Images" +#~ msgstr "title|Redimensionar Imagens" -#: ../src/dlg-file-utils.c:134 -msgid "The destination folder does not exist. Do you want to create it?" -msgstr "A pasta de destino não existe. Você deseja criá-la?" +#~ msgid "1024 x 768" +#~ msgstr "1024 x 768" -#: ../src/dlg-file-utils.c:150 -#, c-format -msgid "Could not create folder \"%s\": %s." -msgstr "Não foi possível criar a pasta \"%s\": %s." +#~ msgid "1280 x 960" +#~ msgstr "1280 x 960" -#: ../src/dlg-file-utils.c:233 -msgid "Could not delete the images:" -msgstr "Não foi possível excluir as imagens:" +#~ msgid "320 x 320" +#~ msgstr "320 x 320" -#: ../src/dlg-file-utils.c:256 -msgid "" -"The images cannot be moved to the Trash. Do you want to delete them " -"permanently?" -msgstr "" -"As imagens não podem ser movidas para a Lixeira. Deseja excluí-las " -"permanentemente?" +#~ msgid "640 x 640" +#~ msgstr "640 x 640" -#: ../src/dlg-file-utils.c:259 ../src/gth-browser-actions-callbacks.c:1052 -#: ../src/gth-browser.c:1765 ../src/gth-viewer.c:876 -#: ../src/rotation-utils.c:121 -msgid "_Do not display this message again" -msgstr "_Não mostrar essa mensagem novamente" - -#: ../src/dlg-file-utils.c:313 ../src/gth-browser-actions-callbacks.c:1090 -msgid "_Move" -msgstr "_Mover" +#~ msgid "800 x 800" +#~ msgstr "800 x 800" -#: ../src/dlg-file-utils.c:410 -#, fuzzy -msgid "File move - choose destination folder" -msgstr "Escolher pasta de destino" +#~ msgid "Album Style" +#~ msgstr "Estilo do Álbum" -#: ../src/dlg-file-utils.c:510 -#, fuzzy -msgid "File copy - choose the destination folder" -msgstr "Escolha a pasta de destino" +#~ msgid "Basic Information" +#~ msgstr "Informações Básicas" -#: ../src/dlg-file-utils.c:571 -msgid "%d %b %Y, %H:%M" -msgstr "%d de %b de %Y, %H:%M" - -#: ../src/dlg-file-utils.c:801 ../src/dlg-file-utils.c:902 -msgid "You didn't enter the new name" -msgstr "Você não digitou o novo nome" +#~ msgid "Camera Data" +#~ msgstr "Dados da Câmera" -#: ../src/dlg-file-utils.c:813 ../src/dlg-file-utils.c:914 -#, c-format -msgid "" -"The name \"%s\" is already used in this folder. Please use a different name." -msgstr "" -"O nome \"%s\" já está em uso nesta pasta. Por favor, use um nome diferente." +#~ msgid "Comments" +#~ msgstr "Comentários" -#: ../src/dlg-file-utils.c:947 -msgid "Unknown error" -msgstr "" +#~ msgid "Index Page Layout" +#~ msgstr "Disposição do Índice" -#: ../src/dlg-file-utils.c:1034 -msgid "Could not rename the image:" -msgstr "Não foi possível renomear a imagem:" - -#: ../src/dlg-file-utils.c:1036 -msgid "Could not rename the following images:" -msgstr "Não foi possível renomear as seguintes imagens:" - -#: ../src/dlg-file-utils.c:1177 -msgid "Could not move the image:" -msgstr "Não foi possível mover a imagem:" - -#: ../src/dlg-file-utils.c:1179 -msgid "Could not copy the image:" -msgstr "Não foi possível copiar a imagem:" - -#: ../src/dlg-file-utils.c:1203 ../src/dlg-file-utils.c:2500 -msgid "_Abort" -msgstr "C_ancelar" +#~ msgid "Theme" +#~ msgstr "Tema" -#: ../src/dlg-file-utils.c:1204 ../src/dlg-file-utils.c:2501 -msgid "_Continue" -msgstr "_Continuar" +#~ msgid "Note: %d (current date)." +#~ msgstr "Nota: %d (data atual)." -#: ../src/dlg-file-utils.c:1386 -#, c-format -msgid "Copying file %d of %d" -msgstr "Copiando arquivo %d de %d" +#~ msgid "" +#~ "Note: Some themes may auto-adjust the\n" +#~ "number of rows and columns, but keep the total \n" +#~ "number of images per page constant." +#~ msgstr "" +#~ "Nota: Alguns temas podem auto-ajustar\n" +#~ "o número de linhas e colunas, mas mantendo\n" +#~ "constante o número total de imagens por página." -#: ../src/dlg-file-utils.c:1707 ../src/dlg-file-utils.c:2371 -#, fuzzy, c-format -msgid "Could not find the trash folder" -msgstr "Não foi possível criar uma pasta temporária" +#, fuzzy +#~ msgid "Note: click to customize." +#~ msgstr "Nota: %d (data atual)." -#: ../src/dlg-file-utils.c:1807 ../src/dlg-file-utils.c:2042 -msgid "Collecting images info" -msgstr "Coletando informações das imagens" +#~ msgid "Came_ra Model" +#~ msgstr "Modelo da Câme_ra" -#: ../src/dlg-file-utils.c:1810 ../src/dlg-file-utils.c:2055 -#, c-format -msgid "Deleting file %ld of %ld" -msgstr "Excluindo arquivo %ld de %ld" +#~ msgid "Exposure _time" +#~ msgstr "_Tempo de exposição" -#: ../src/dlg-file-utils.c:2045 -#, c-format -msgid "Copying file %ld of %ld" -msgstr "Copiando arquivo %ld de %ld" +#~ msgid "Focal _length" +#~ msgstr "Di_stância focal" -#: ../src/dlg-file-utils.c:2050 -#, c-format -msgid "Moving file %ld of %ld" -msgstr "Movendo arquivo %ld de %ld" +#~ msgid "Use subfolders to organize files" +#~ msgstr "Use subpastas para organizar arquivos" -#: ../src/dlg-file-utils.c:2477 ../src/dlg-file-utils.c:2479 -#: ../src/gth-browser-actions-callbacks.c:1200 -#, c-format -msgid "Could not move the folder \"%s\": %s" -msgstr "Não foi possível mover a pasta \"%s\": %s" +#~ msgid "Web Album Theme" +#~ msgstr "Tema de Álbum Web" -#: ../src/dlg-image-prop.c:603 ../src/gth-exif-data-viewer.c:352 -#: ../src/gth-filter-bar.c:209 -msgid "Size" -msgstr "Tamanho" +#~ msgid "_Aperture value" +#~ msgstr "Valor de _abertura" -#: ../src/dlg-image-prop.c:608 ../src/gth-exif-data-viewer.c:354 -msgid "Type" -msgstr "Tipo" +#~ msgid "_Date and Time" +#~ msgstr "_Data e Hora" -#: ../src/dlg-image-prop.c:623 ../src/gth-browser.c:474 -#: ../src/gth-exif-data-viewer.c:353 ../src/gth-viewer.c:594 -msgid "Modified" -msgstr "Modificado" +#~ msgid "_Flash" +#~ msgstr "_Flash" -#: ../src/dlg-image-prop.c:628 -msgid "Information on Channel" -msgstr "Informações do Canal" +#~ msgid "_Go to Theme Folder" +#~ msgstr "Ir para a _Pasta de Temas" -#: ../src/dlg-image-prop.c:737 -#, c-format -msgid "%s Properties" -msgstr "Propriedades de %s" +#~ msgid "_Install Theme..." +#~ msgstr "_Instalar Tema..." -#: ../src/dlg-photo-importer.c:640 -msgid "" -"Could not find the requested directory, scanning for attached devices instead" -msgstr "" +#~ msgid "_Place" +#~ msgstr "_Lugar" -#: ../src/dlg-photo-importer.c:655 -msgid "No DCIM camera folders found, scanning for attached devices instead" -msgstr "" +#~ msgid "_Shutter speed" +#~ msgstr "Velocidade do _obturador" -#: ../src/dlg-photo-importer.c:657 -msgid "No folders found, scanning for attached devices instead" -msgstr "" +#~ msgid "columns, by" +#~ msgstr "por colunas" -#: ../src/dlg-photo-importer.c:878 -#, c-format -msgid "Getting preview of '%s' from camera." -msgstr "" +#~ msgid "or _use a single index page" +#~ msgstr "ou _usar uma página de índice individual" -#: ../src/dlg-photo-importer.c:1090 -#, c-format -msgid "Adjusting orientation of '%s'." -msgstr "Ajustando a orientação de \"%s\"." +#~ msgid "rows per page," +#~ msgstr "linhas por página," -#: ../src/dlg-photo-importer.c:1175 -#, c-format -msgid "Moving '%s' from camera." -msgstr "" +#~ msgid "" +#~ "Possible values are 0 (portrait), 1 (landscape), 2 (reverse portrait), 3 " +#~ "(reverse landscape)" +#~ msgstr "" +#~ "Valores possíveis são 0 (retrato), 1 (paisagem), 2 (retrato reverso), 3 " +#~ "(paisagem reversa)" -#: ../src/dlg-photo-importer.c:1177 -#, c-format -msgid "Copying '%s' from camera." -msgstr "" +#~ msgid "Possible values are: 1, 2, 3, 4." +#~ msgstr "Valores possíveis são: 1, 2, 3, 4." -#: ../src/dlg-photo-importer.c:1210 ../src/dlg-photo-importer.c:1285 -#, fuzzy -msgid "Import failed" -msgstr "Importante" +#~ msgid "Possible values are: 72, 150, 300, 600." +#~ msgstr "São valores possíveis: 72, 150, 300, 600." -#: ../src/dlg-photo-importer.c:1310 -#, fuzzy -msgid "Could not delete one or more of the photos" -msgstr "Não foi possível importar fotos" +#~ msgid "" +#~ "Possible values are: actual_size, fit, keep_prev, fit_if_larger, " +#~ "fit_width_if_larger." +#~ msgstr "" +#~ "Valores possíveis são: actual_size, fit, keep_prev, fit_if_larger, " +#~ "fit_width_if_larger." -#: ../src/dlg-photo-importer.c:1447 ../src/dlg-photo-importer.c:1458 -#: ../src/dlg-photo-importer.c:1476 -msgid "Could not import photos" -msgstr "Não foi possível importar fotos" +#~ msgid "Possible values are: ascending, descending." +#~ msgstr "Valores possíveis são: ascending, descending." -#: ../src/dlg-photo-importer.c:1455 -#, c-format -msgid "Could not create the folder \"%s\": %s" -msgstr "Não foi possível criar a pasta \"%s\": %s" +#~ msgid "Possible values are: forward, backward, random." +#~ msgstr "Possíveis valores são: forward, backward, random." -#: ../src/dlg-photo-importer.c:1477 -msgid "Not enough free space left on disk" -msgstr "Não há espaço livre suficiente no disco" +#~ msgid "Possible values are: high, low." +#~ msgstr "Valores possíveis são: high, low." -#: ../src/dlg-photo-importer.c:1563 -msgid "Put name or format code here" -msgstr "Insira o nome ou o código de formatação aqui" +#~ msgid "Possible values are: image, data, comment." +#~ msgstr "Valores possíveis são: image, data, comment." -#: ../src/dlg-photo-importer.c:1599 -msgid "File delete failed" -msgstr "" +#~ msgid "Possible values are: jpeg, png, tga, tiff." +#~ msgstr "Valores possíveis são: jpeg, png, tga, tiff." -#: ../src/dlg-photo-importer.c:1754 -msgid "No grouping" -msgstr "Sem agrupamento" - -#: ../src/dlg-photo-importer.c:1756 -msgid "By day photo taken" -msgstr "Pelo dia em que as fotos foram tiradas" - -#: ../src/dlg-photo-importer.c:1758 -msgid "By month photo taken" -msgstr "Pelo mês em que as fotos foram tiradas" - -#: ../src/dlg-photo-importer.c:1760 -msgid "By current date and time" -msgstr "Pela data e hora atuais" - -#: ../src/dlg-photo-importer.c:1762 -msgid "Custom subfolder" -msgstr "Subpasta personalizada" - -#: ../src/dlg-png-exporter.c:907 -msgid "Image Caption" -msgstr "Legenda da imagem" +#~ msgid "Possible values are: light, midtone, dark." +#~ msgstr "Valores possíveis são: light, midtone, dark." -#: ../src/dlg-png-exporter.c:961 -msgid "Header" -msgstr "Cabeçalho" +#~ msgid "Possible values are: list, thumbnails." +#~ msgstr "Valores possíveis são: list, thumbnails." -#: ../src/dlg-png-exporter.c:974 ../src/dlg-png-exporter.c:980 -msgid "Footer" -msgstr "Rodapé" +#~ msgid "Possible values are: manual, auto." +#~ msgstr "São valores possíveis: manual, auto." -#: ../src/dlg-png-exporter.c:1569 ../src/dlg-rename-series.c:551 -#: ../src/dlg-web-exporter.c:467 -msgid "by path" -msgstr "por caminho" - -#: ../src/dlg-png-exporter.c:1571 ../src/dlg-rename-series.c:553 -#: ../src/dlg-web-exporter.c:469 -msgid "by size" -msgstr "por tamanho" - -#: ../src/dlg-png-exporter.c:1573 ../src/dlg-rename-series.c:555 -#: ../src/dlg-web-exporter.c:471 -msgid "by file modified time" -msgstr "por data de modificação do arquivo" - -#: ../src/dlg-png-exporter.c:1575 ../src/dlg-rename-series.c:557 -#: ../src/dlg-web-exporter.c:473 -msgid "by Exif DateTime tag" -msgstr "pela etiqueta Exif DateTime" - -#: ../src/dlg-png-exporter.c:1577 ../src/dlg-rename-series.c:559 -#: ../src/dlg-web-exporter.c:475 -msgid "by comment" -msgstr "por comentário" - -#: ../src/dlg-png-exporter.c:1582 ../src/dlg-rename-series.c:562 -#: ../src/dlg-web-exporter.c:478 -msgid "manual order" -msgstr "ordem manual" - -#: ../src/dlg-rename-series.c:118 ../src/gth-browser-actions-callbacks.c:475 -#: ../src/gth-browser-actions-callbacks.c:668 -#: ../src/gth-browser-actions-callbacks.c:737 -#: ../src/gth-browser-actions-callbacks.c:930 -#, c-format -msgid "" -"The name \"%s\" is not valid because it contains the character \"/\". Please " -"use a different name." -msgstr "" -"O nome \"%s\" não é válido porque contém o caracter \"/\". Por favor use um " -"nome diferente." +#~ msgid "Possible values are: nautilus, single, double." +#~ msgstr "Valores possíveis são: nautilus, single, double." -#: ../src/dlg-rename-series.c:535 -msgid "Old Name" -msgstr "Nome antigo" +#~ msgid "Possible values are: none, day, month, now, custom" +#~ msgstr "Valores possíveis são: none, day, month, now, custom" -#: ../src/dlg-rename-series.c:543 -msgid "New Name" -msgstr "Novo nome" +#~ msgid "Possible values are: none, deflate, jpeg." +#~ msgstr "Valores possíveis são: none, deflate, jpeg." -#: ../src/dlg-search.c:368 -msgid "Search Result" -msgstr "Resultado da Pesquisa" +#~ msgid "" +#~ "Possible values are: none, name, path, size, time, exifdate, comment." +#~ msgstr "" +#~ "Valores possíveis são: none, name, path, size, time, exifdate, comment." -#: ../src/dlg-scripts.c:89 -msgid "Edit with GIMP" -msgstr "Editar com o GIMP" +#~ msgid "" +#~ "Possible values are: none, simple, simple_with_shadow, shadow, slide, " +#~ "shadow_in, shadow_out." +#~ msgstr "" +#~ "Valores possíveis são: none, simple, simple_with_shadow, shadow, slide, " +#~ "shadow_in, shadow_out." -#: ../src/dlg-scripts.c:90 -msgid "Add copyright" -msgstr "Adicionar copyright" +#~ msgid "" +#~ "Possible values are: none, square, image, display, 4x3, 4x6, 5x7, 8x10, " +#~ "custom." +#~ msgstr "" +#~ "Valores possíveis são: none, square, image, display, 4x3, 4x6, 5x7, 8x10, " +#~ "custom." -#: ../src/dlg-scripts.c:91 -msgid "Copy to \"approved\" folder" -msgstr "Copiar para a pasta \"aprovadas\"" +#~ msgid "Possible values are: original, lower, upper." +#~ msgstr "Valores possíveis: original, minúscula, maiúscula." -#: ../src/dlg-scripts.c:92 -msgid "Send by email" -msgstr "Enviar por e-mail" +#~ msgid "Possible values are: pixels, percentage." +#~ msgstr "Valores possíveis são: pixels, percentage." -#: ../src/dlg-scripts.c:93 -msgid "Make a zip file" -msgstr "Criar um arquivo zip" +#~ msgid "Possible values are: skip, rename, ask, overwrite." +#~ msgstr "Valores possíveis são: skip, rename, ask, overwrite." -#: ../src/dlg-scripts.c:94 -msgid "Make a zip file and email it" -msgstr "Criar um arquivo zip e enviá-lo por e-mail" +#~ msgid "Possible values are: small, medium, large." +#~ msgstr "Valores possíveis são: small, medium, large." -#: ../src/dlg-scripts.c:95 -#, fuzzy -msgid "Upload files to Flickr" -msgstr "Envia as imagens selecionadas ao Flickr" +#~ msgid "" +#~ "Possible values are: system, text_below, text_beside, text_only, " +#~ "icons_only." +#~ msgstr "" +#~ "Valores possíveis são: system, text_below, text_beside, text_only, " +#~ "icons_only." -#: ../src/dlg-scripts.c:526 ../src/dlg-scripts.c:528 -msgid "Script Progress" -msgstr "Progresso do Script" +#~ msgid "%d %B %Y" +#~ msgstr "%d de %B de %Y" -#: ../src/dlg-scripts.c:609 -#, c-format -msgid "Scripts using the %%F code can not be cancelled. Sorry!" -msgstr "" -"Scripts que estejam usando o código %%F não podem ser cancelados. Desculpe!" +#~ msgid "%d %B %Y, %H:%M" +#~ msgstr "%d de %B de %Y, %H:%M" -#: ../src/dlg-scripts.c:734 -#, c-format -msgid "Script %d" -msgstr "Script %d" +#~ msgid "(No Comment)" +#~ msgstr "(Sem Comentários)" -#: ../src/dlg-scripts.c:918 -msgid "Number" -msgstr "Número" +#~ msgid "Image type:" +#~ msgstr "Tipo da imagem:" -#: ../src/dlg-scripts.c:930 -msgid "Short Name" -msgstr "Nome Curto" +#~ msgid "Home" +#~ msgstr "Pessoal" -#: ../src/dlg-scripts.c:941 -msgid "Script" -msgstr "Script" +#~ msgid "No image" +#~ msgstr "Sem imagem" -#: ../src/dlg-tags.c:233 -#, fuzzy -msgid "Enter the new tag name" -msgstr "Digite o nome da nova categoria" +#~ msgid "Ro_tate Images" +#~ msgstr "Gi_rar imagens" -#: ../src/dlg-tags.c:244 -#, c-format -msgid "" -"The name \"%s\" is not valid because it contains the character \",\". Please " -"use a different name." -msgstr "" -"O nome \"%s\" não é válido porque contém o caracter \",\". Por favor use um " -"nome diferente." +#~ msgid "Loading image: %s" +#~ msgstr "Carregando imagem: %s" -#: ../src/dlg-tags.c:249 -#, fuzzy, c-format -msgid "The tag \"%s\" is already present. Please use a different name." -msgstr "A categoria \"%s\" já existe. Por favor, use um nome diferente." - -#: ../src/dlg-web-exporter.c:815 -msgid "Select Album Theme" -msgstr "Selecionar o Tema do Álbum" - -#: ../src/dlg-write-to-cd.c:78 ../src/gth-browser.c:3717 -msgid "Could not move the items:" -msgstr "Não foi possível mover os itens:" - -#: ../src/gth-browser-actions-callbacks.c:163 ../src/gth-fullscreen.c:1110 -msgid "The image will be moved to the Trash, are you sure?" -msgstr "A imagem será movida para o Lixeira, você tem certeza?" - -#: ../src/gth-browser-actions-callbacks.c:262 -#, c-format -msgid "Could not duplicate the image \"%s\": %s" -msgstr "Não foi possível duplicar a imagem \"%s\": %s" - -#: ../src/gth-browser-actions-callbacks.c:270 -#: ../src/gth-fullscreen-actions-entries.h:42 -msgid "Stop" -msgstr "Parar" - -#: ../src/gth-browser-actions-callbacks.c:271 -msgid "Continue" -msgstr "Continuar" +#~ msgid "(Invalid Name)" +#~ msgstr "(Nome Inválido)" -#: ../src/gth-browser-actions-callbacks.c:326 -msgid "The selected images will be moved to the Trash, are you sure?" -msgstr "" -"As imagens selecionadas serão movidas para a Lixeira, você tem certeza?" +#~ msgid "%d x %d pixels" +#~ msgstr "%d x %d pixels" -#: ../src/gth-browser-actions-callbacks.c:461 -#: ../src/gth-browser-actions-callbacks.c:918 -msgid "Enter the new name: " -msgstr "Digite o novo nome: " - -#: ../src/gth-browser-actions-callbacks.c:495 -#: ../src/gth-browser-actions-callbacks.c:684 -#: ../src/gth-browser-actions-callbacks.c:750 -#: ../src/gth-browser-actions-callbacks.c:954 -#, c-format -msgid "The name \"%s\" is already used. Please use a different name." -msgstr "O nome \"%s\" já está em uso. Por favor use um nome diferente." - -#: ../src/gth-browser-actions-callbacks.c:502 -#, fuzzy, c-format -msgid "Could not rename the library \"%s\"" -msgstr "Não foi possível renomear a biblioteca \"%s\": %s" - -#: ../src/gth-browser-actions-callbacks.c:502 -#, fuzzy, c-format -msgid "Could not rename the catalog \"%s\"" -msgstr "Não foi possível renomear o catálogo \"%s\": %s" - -#: ../src/gth-browser-actions-callbacks.c:565 -msgid "The selected library will be removed, are you sure?" -msgstr "A biblioteca selecionada será removida, você tem certeza?" - -#: ../src/gth-browser-actions-callbacks.c:567 -msgid "The selected catalog will be removed, are you sure?" -msgstr "O catálogo selecionado será removido, você tem certeza?" +#~ msgid "Move Catalog to..." +#~ msgstr "Mover catálogo para..." -#: ../src/gth-browser-actions-callbacks.c:659 -msgid "New Catalog" -msgstr "Novo catálogo" +#~ msgid "" +#~ "An image named \"%s\" is already present. Please specify a different name." +#~ msgstr "" +#~ "Já existe uma imagem com o nome \"%s\". Por favor, escolha um nome " +#~ "diferente." -#: ../src/gth-browser-actions-callbacks.c:691 -#, c-format -msgid "Could not create the catalog \"%s\": %s" -msgstr "Não foi possível criar o catálogo \"%s\": %s" +#~ msgid "Duplicates Size" +#~ msgstr "Tamanho das Duplicadas" -#: ../src/gth-browser-actions-callbacks.c:769 -msgid "New Library" -msgstr "Nova Biblioteca" +#~ msgid "Checked images will be moved to the Trash, are you sure?" +#~ msgstr "" +#~ "As imagens selecionadas serão movidas para a Lixeira, você tem certeza?" -#: ../src/gth-browser-actions-callbacks.c:771 -#, fuzzy, c-format -msgid "Could not create the library \"%s\"" -msgstr "Não foi possível criar a biblioteca \"%s\": %s" +#~ msgid "The destination folder does not exist. Do you want to create it?" +#~ msgstr "A pasta de destino não existe. Você deseja criá-la?" -#: ../src/gth-browser-actions-callbacks.c:948 -#, c-format -msgid "Could not rename the folder \"%s\": %s" -msgstr "Não foi possível renomear a pasta \"%s\": %s" +#~ msgid "Could not create folder \"%s\": %s." +#~ msgstr "Não foi possível criar a pasta \"%s\": %s." -#: ../src/gth-browser-actions-callbacks.c:950 -#: ../src/gth-browser-actions-callbacks.c:1206 -msgid "source and destination are the same" -msgstr "origem e destino são o mesmo" +#~ msgid "_Do not display this message again" +#~ msgstr "_Não mostrar essa mensagem novamente" -#: ../src/gth-browser-actions-callbacks.c:967 -#, fuzzy, c-format -msgid "Could not rename the folder \"%s\"" -msgstr "Não foi possível renomear a pasta \"%s\": %s" +#, fuzzy +#~ msgid "File move - choose destination folder" +#~ msgstr "Escolher pasta de destino" -#: ../src/gth-browser-actions-callbacks.c:1013 -#, c-format -msgid "Could not delete the folder \"%s\": %s" -msgstr "Não foi possível excluir a pasta \"%s\": %s" +#, fuzzy +#~ msgid "File copy - choose the destination folder" +#~ msgstr "Escolha a pasta de destino" -#: ../src/gth-browser-actions-callbacks.c:1044 -#, c-format -msgid "" -"\"%s\" cannot be moved to the Trash. Do you want to delete it permanently?" -msgstr "" -"\"%s\" não pode ser movido para a Lixeira. Deseja excluí-lo permanentemente?" +#~ msgid "%d %b %Y, %H:%M" +#~ msgstr "%d de %b de %Y, %H:%M" -#: ../src/gth-browser-actions-callbacks.c:1088 -msgid "The selected folder will be moved to the Trash, are you sure?" -msgstr "A pasta selecionada será movida para a Lixeira, você tem certeza?" +#~ msgid "You didn't enter the new name" +#~ msgstr "Você não digitou o novo nome" -#: ../src/gth-browser-actions-callbacks.c:1141 -#: ../src/gth-browser-actions-callbacks.c:1200 -#, c-format -msgid "Could not copy the folder \"%s\": %s" -msgstr "Não foi possível copiar a pasta \"%s\": %s" +#~ msgid "" +#~ "The name \"%s\" is already used in this folder. Please use a different " +#~ "name." +#~ msgstr "" +#~ "O nome \"%s\" já está em uso nesta pasta. Por favor, use um nome " +#~ "diferente." -#: ../src/gth-browser-actions-callbacks.c:1212 -msgid "source contains destination" -msgstr "origem contém o destino" +#~ msgid "Could not rename the following images:" +#~ msgstr "Não foi possível renomear as seguintes imagens:" -#: ../src/gth-browser-actions-callbacks.c:1218 -msgid "a folder with that name is already present." -msgstr "uma pasta com esse nome já existe." +#~ msgid "_Abort" +#~ msgstr "C_ancelar" -#: ../src/gth-browser-actions-callbacks.c:1304 #, fuzzy -msgid "Folder move - choose the destination folder" -msgstr "Escolha a pasta de destino" +#~ msgid "Could not find the trash folder" +#~ msgstr "Não foi possível criar uma pasta temporária" -#: ../src/gth-browser-actions-callbacks.c:1306 -#, fuzzy -msgid "Folder copy - choose the destination folder" -msgstr "Escolha a pasta de destino" +#~ msgid "Collecting images info" +#~ msgstr "Coletando informações das imagens" -#: ../src/gth-browser-actions-callbacks.c:1518 -msgid "New Folder" -msgstr "Nova Pasta" - -#: ../src/gth-browser-actions-callbacks.c:1519 -msgid "Enter the folder name: " -msgstr "Digite o nome da pasta: " - -#: ../src/gth-browser-actions-callbacks.c:1520 -#, fuzzy, c-format -msgid "Could not create the folder \"%s\"" -msgstr "Não foi possível criar a pasta \"%s\": %s" - -#: ../src/gth-browser-actions-callbacks.c:1649 ../src/gth-location.c:203 -msgid "Open Location" -msgstr "Abrir Localização" +#~ msgid "Copying file %ld of %ld" +#~ msgstr "Copiando arquivo %ld de %ld" -#: ../src/gth-browser-actions-entries.h:36 -#: ../src/gth-viewer-actions-entries.h:35 -msgid "_File" -msgstr "_Arquivo" +#~ msgid "Information on Channel" +#~ msgstr "Informações do Canal" -#: ../src/gth-browser-actions-entries.h:37 -msgid "_Folder" -msgstr "Pas_ta" +#~ msgid "Adjusting orientation of '%s'." +#~ msgstr "Ajustando a orientação de \"%s\"." -#: ../src/gth-browser-actions-entries.h:40 -#: ../src/gth-viewer-actions-entries.h:36 -msgid "_Edit" -msgstr "_Editar" +#, fuzzy +#~ msgid "Could not delete one or more of the photos" +#~ msgstr "Não foi possível importar fotos" + +#~ msgid "Could not create the folder \"%s\": %s" +#~ msgstr "Não foi possível criar a pasta \"%s\": %s" -#: ../src/gth-browser-actions-entries.h:42 -#: ../src/gth-viewer-actions-entries.h:38 -msgid "Show/_Hide" -msgstr "Mostrar/_Esconder" - -#: ../src/gth-browser-actions-entries.h:43 -msgid "S_ort Images" -msgstr "_Ordenar Imagens" - -#: ../src/gth-browser-actions-entries.h:44 -#: ../src/gth-viewer-actions-entries.h:39 -msgid "_Zoom" -msgstr "_Zoom" +#~ msgid "Not enough free space left on disk" +#~ msgstr "Não há espaço livre suficiente no disco" -#: ../src/gth-browser-actions-entries.h:45 -msgid "_Go" -msgstr "_Ir" +#~ msgid "Put name or format code here" +#~ msgstr "Insira o nome ou o código de formatação aqui" -#: ../src/gth-browser-actions-entries.h:46 -#: ../src/gth-browser-actions-entries.h:506 -#: ../src/gth-viewer-actions-entries.h:40 -msgid "_Image" -msgstr "I_magem" +#~ msgid "No grouping" +#~ msgstr "Sem agrupamento" -#: ../src/gth-browser-actions-entries.h:47 -msgid "_Bookmarks" -msgstr "Ma_rcadores" +#~ msgid "By month photo taken" +#~ msgstr "Pelo mês em que as fotos foram tiradas" -#: ../src/gth-browser-actions-entries.h:48 -#: ../src/gth-viewer-actions-entries.h:41 -msgid "_Tools" -msgstr "_Ferramentas" - -#: ../src/gth-browser-actions-entries.h:49 -#: ../src/gth-viewer-actions-entries.h:42 -msgid "Set Image as _Wallpaper" -msgstr "Usar imagem como _Papel de Parede" +#~ msgid "by path" +#~ msgstr "por caminho" -#: ../src/gth-browser-actions-entries.h:50 -#: ../src/gth-viewer-actions-entries.h:43 -#, fuzzy -msgid "Scri_pts" -msgstr "_Scripts" +#~ msgid "by size" +#~ msgstr "por tamanho" -#: ../src/gth-browser-actions-entries.h:51 -#: ../src/gth-viewer-actions-entries.h:44 -msgid "_Help" -msgstr "Aj_uda" +#~ msgid "by Exif DateTime tag" +#~ msgstr "pela etiqueta Exif DateTime" -#: ../src/gth-browser-actions-entries.h:54 -#: ../src/gth-viewer-actions-entries.h:47 -msgid "New _Window" -msgstr "Nova _Janela" +#~ msgid "by comment" +#~ msgstr "por comentário" -#: ../src/gth-browser-actions-entries.h:55 -#: ../src/gth-viewer-actions-entries.h:48 -msgid "Create a new window" -msgstr "Cria uma nova janela" - -#: ../src/gth-browser-actions-entries.h:60 -msgid "Open the selected image in a new window" -msgstr "Abre a imagem selecionada em uma nova janela" - -#: ../src/gth-browser-actions-entries.h:65 -#: ../src/gth-browser-actions-entries.h:440 -#: ../src/gth-viewer-actions-entries.h:88 -msgid "View image properties" -msgstr "Vê as propriedades da imagem" - -#: ../src/gth-browser-actions-entries.h:69 -msgid "_Import Photos..." -msgstr "Importar F_otos..." - -#: ../src/gth-browser-actions-entries.h:70 -msgid "Import photos from a digital camera" -msgstr "Importa fotos de uma câmera digital" - -#: ../src/gth-browser-actions-entries.h:74 -msgid "_Write To CD..." -msgstr "_Gravar em CD..." - -#: ../src/gth-browser-actions-entries.h:75 -msgid "Write selection to CD" -msgstr "Grava a seleção em um CD" - -#: ../src/gth-browser-actions-entries.h:79 -#: ../src/gth-browser-actions-entries.h:99 -#: ../src/gth-browser-actions-entries.h:149 -#: ../src/gth-browser-actions-entries.h:184 -#: ../src/gth-browser-actions-entries.h:224 -#: ../src/gth-browser-actions-entries.h:254 -msgid "_Rename..." -msgstr "Re_nomear..." - -#: ../src/gth-browser-actions-entries.h:80 -msgid "Rename this image" -msgstr "Renomear essa imagem" - -#: ../src/gth-browser-actions-entries.h:85 -msgid "Move this image to the Trash" -msgstr "Move essa imagem para a Lixeira" - -#: ../src/gth-browser-actions-entries.h:89 -#: ../src/gth-browser-actions-entries.h:114 -#: ../src/gth-browser-actions-entries.h:234 -#: ../src/gth-browser-actions-entries.h:264 -msgid "_Copy..." -msgstr "_Copiar..." - -#: ../src/gth-browser-actions-entries.h:90 -msgid "Copy this image to another location" -msgstr "Copia essa imagem para outro local" - -#: ../src/gth-browser-actions-entries.h:94 -#: ../src/gth-browser-actions-entries.h:119 -#: ../src/gth-browser-actions-entries.h:159 -#: ../src/gth-browser-actions-entries.h:194 -#: ../src/gth-browser-actions-entries.h:239 -#: ../src/gth-browser-actions-entries.h:269 -msgid "_Move..." -msgstr "_Mover..." - -#: ../src/gth-browser-actions-entries.h:95 -msgid "Move this image to another location" -msgstr "Move essa imagem para outro local" - -#: ../src/gth-browser-actions-entries.h:100 -msgid "Rename selected images" -msgstr "Renomeia imagens selecionadas" +#~ msgid "" +#~ "The name \"%s\" is not valid because it contains the character \"/\". " +#~ "Please use a different name." +#~ msgstr "" +#~ "O nome \"%s\" não é válido porque contém o caracter \"/\". Por favor use " +#~ "um nome diferente." -#: ../src/gth-browser-actions-entries.h:104 -msgid "D_uplicate" -msgstr "D_uplicar" +#~ msgid "Edit with GIMP" +#~ msgstr "Editar com o GIMP" -#: ../src/gth-browser-actions-entries.h:105 -msgid "Duplicate selected images" -msgstr "Duplica imagens selecionadas" - -#: ../src/gth-browser-actions-entries.h:110 -msgid "Move the selected images to the Trash" -msgstr "Move as imagens selecionadas para a Lixeira" - -#: ../src/gth-browser-actions-entries.h:115 -msgid "Copy selected images to another location" -msgstr "Copia as imagens selecionadas para outro local" - -#: ../src/gth-browser-actions-entries.h:120 -msgid "Move selected images to another location" -msgstr "Move as imagens selecionadas para outro local" - -#: ../src/gth-browser-actions-entries.h:124 -msgid "_Select All" -msgstr "Selec_ionar Todos" - -#: ../src/gth-browser-actions-entries.h:125 -msgid "Select all images" -msgstr "Seleciona todas as imagens" +#~ msgid "Copy to \"approved\" folder" +#~ msgstr "Copiar para a pasta \"aprovadas\"" -#: ../src/gth-browser-actions-entries.h:129 -#: ../src/gth-viewer-actions-entries.h:57 -msgid "_Add to Catalog..." -msgstr "_Adicionar ao Catálogo..." +#~ msgid "Send by email" +#~ msgstr "Enviar por e-mail" -#: ../src/gth-browser-actions-entries.h:130 -#: ../src/gth-viewer-actions-entries.h:58 -msgid "Add selected images to a catalog" -msgstr "Adiciona as imagens selecionadas a um catálogo" +#~ msgid "Make a zip file" +#~ msgstr "Criar um arquivo zip" -#: ../src/gth-browser-actions-entries.h:134 -msgid "Remo_ve from Catalog" -msgstr "Remo_ver do Catálogo" +#~ msgid "Make a zip file and email it" +#~ msgstr "Criar um arquivo zip e enviá-lo por e-mail" -#: ../src/gth-browser-actions-entries.h:135 -msgid "Remove selected images from the catalog" -msgstr "Remove as imagens selecionadas do catálogo" +#~ msgid "Script Progress" +#~ msgstr "Progresso do Script" -#: ../src/gth-browser-actions-entries.h:139 -#: ../src/gth-browser-actions-entries.h:209 -msgid "Open" -msgstr "Abrir" +#~ msgid "Scripts using the %%F code can not be cancelled. Sorry!" +#~ msgstr "" +#~ "Scripts que estejam usando o código %%F não podem ser cancelados. " +#~ "Desculpe!" -#: ../src/gth-browser-actions-entries.h:140 -msgid "Open the selected catalog" -msgstr "Abre o catálogo selecionado" +#~ msgid "Script %d" +#~ msgstr "Script %d" -#: ../src/gth-browser-actions-entries.h:144 -#: ../src/gth-browser-actions-entries.h:214 -msgid "Open in New Window" -msgstr "Abrir em Nova Janela" +#~ msgid "Number" +#~ msgstr "Número" -#: ../src/gth-browser-actions-entries.h:145 -msgid "Open the selected catalog in a new window" -msgstr "Abre o catálogo selecionado em uma nova janela" - -#: ../src/gth-browser-actions-entries.h:150 -msgid "Rename selected catalog" -msgstr "Renomeia catálogo selecionado" - -#: ../src/gth-browser-actions-entries.h:154 -#: ../src/gth-browser-actions-entries.h:189 -msgid "Rem_ove" -msgstr "Rem_over" - -#: ../src/gth-browser-actions-entries.h:155 -msgid "Remove selected catalog" -msgstr "Remove catálogo selecionado" - -#: ../src/gth-browser-actions-entries.h:160 -msgid "Move selected catalog to another location" -msgstr "Move catálogo selecionado para outro local" - -#: ../src/gth-browser-actions-entries.h:164 -#: ../src/gth-browser-actions-entries.h:199 -msgid "_Edit Search..." -msgstr "_Editar Pesquisa..." - -#: ../src/gth-browser-actions-entries.h:165 -#: ../src/gth-browser-actions-entries.h:200 -msgid "Modify search criteria" -msgstr "Altera critérios da pesquisa" - -#: ../src/gth-browser-actions-entries.h:169 -#: ../src/gth-browser-actions-entries.h:204 -msgid "Redo _Search" -msgstr "Refazer _Pesquisa" - -#: ../src/gth-browser-actions-entries.h:170 -#: ../src/gth-browser-actions-entries.h:205 -msgid "Redo the search" -msgstr "Refaz a pesquisa" - -#: ../src/gth-browser-actions-entries.h:174 -msgid "_New Catalog..." -msgstr "_Novo Catálogo..." - -#: ../src/gth-browser-actions-entries.h:175 -msgid "Create a new catalog" -msgstr "Cria novo catálogo" - -#: ../src/gth-browser-actions-entries.h:179 -msgid "New _Library..." -msgstr "Nova _Biblioteca..." - -#: ../src/gth-browser-actions-entries.h:180 -msgid "Create a new catalog library" -msgstr "Cria nova biblioteca de catálogos" - -#: ../src/gth-browser-actions-entries.h:185 -msgid "Rename current catalog" -msgstr "Renomear catálogo atual" - -#: ../src/gth-browser-actions-entries.h:190 -msgid "Remove current catalog" -msgstr "Remover catálogo atual" - -#: ../src/gth-browser-actions-entries.h:195 -msgid "Move current catalog to another location" -msgstr "Move o catálogo atual para outro local" - -#: ../src/gth-browser-actions-entries.h:210 -msgid "Open the selected folder" -msgstr "Abrir a pasta selecionada" - -#: ../src/gth-browser-actions-entries.h:215 -msgid "Open the selected folder in a new window" -msgstr "Abre a pasta selecionada em uma nova janela" +#~ msgid "Short Name" +#~ msgstr "Nome Curto" -#: ../src/gth-browser-actions-entries.h:219 -#: ../src/gth-browser-actions-entries.h:249 -msgid "Open with the _File Manager" -msgstr "Abrir com o _Gerenciador de Arquivos" +#, fuzzy +#~ msgid "Enter the new tag name" +#~ msgstr "Digite o nome da nova categoria" -#: ../src/gth-browser-actions-entries.h:220 -msgid "Open the selected folder with the Nautilus file manager" -msgstr "Abre a pasta selecionada com o gerenciador de arquivos Nautilus" - -#: ../src/gth-browser-actions-entries.h:225 -msgid "Rename selected folder" -msgstr "Renomear pasta selecionada" - -#: ../src/gth-browser-actions-entries.h:230 -msgid "Move the selected folder to the Trash" -msgstr "Mover pasta selecionada para a Lixeira" - -#: ../src/gth-browser-actions-entries.h:235 -msgid "Copy selected folder" -msgstr "Copiar pasta selecionada" - -#: ../src/gth-browser-actions-entries.h:240 -msgid "Move selected folder" -msgstr "Mover pasta selecionada" - -#: ../src/gth-browser-actions-entries.h:244 -#: ../src/gth-browser-actions-entries.h:274 -#: ../src/gth-window-actions-entries.h:90 -msgid "T_ags..." -msgstr "" +#~ msgid "" +#~ "The name \"%s\" is not valid because it contains the character \",\". " +#~ "Please use a different name." +#~ msgstr "" +#~ "O nome \"%s\" não é válido porque contém o caracter \",\". Por favor use " +#~ "um nome diferente." -#: ../src/gth-browser-actions-entries.h:245 -msgid "Assign tags to the selected folder" -msgstr "Atribui etiquetas à pasta selecionada" - -#: ../src/gth-browser-actions-entries.h:250 -msgid "Open current folder with the Nautilus file manager" -msgstr "Abre pasta atual com o Gerenciador de arquivos do Nautilus" - -#: ../src/gth-browser-actions-entries.h:255 -msgid "Rename current folder" -msgstr "Renomeia pasta atual" - -#: ../src/gth-browser-actions-entries.h:260 -msgid "Move the current folder to the Trash" -msgstr "Move pasta atual para a Lixeira" - -#: ../src/gth-browser-actions-entries.h:265 -msgid "Copy current folder" -msgstr "Copia pasta atual" - -#: ../src/gth-browser-actions-entries.h:270 -msgid "Move current folder" -msgstr "Move pasta atual" - -#: ../src/gth-browser-actions-entries.h:275 -msgid "Assign tags to the current folder" -msgstr "Atribui etiquetas à pasta atual" - -#: ../src/gth-browser-actions-entries.h:279 -msgid "_New Folder..." -msgstr "_Nova Pasta..." - -#: ../src/gth-browser-actions-entries.h:280 -msgid "Create a new folder" -msgstr "Cria uma nova pasta" +#, fuzzy +#~ msgid "The tag \"%s\" is already present. Please use a different name." +#~ msgstr "A categoria \"%s\" já existe. Por favor, use um nome diferente." -#: ../src/gth-browser-actions-entries.h:285 -#: ../src/gth-fullscreen-actions-entries.h:48 -msgid "View next image" -msgstr "Vê a próxima imagem" +#~ msgid "Select Album Theme" +#~ msgstr "Selecionar o Tema do Álbum" -#: ../src/gth-browser-actions-entries.h:290 -#: ../src/gth-fullscreen-actions-entries.h:53 -msgid "View previous image" -msgstr "Vê a imagem anterior" +#~ msgid "The image will be moved to the Trash, are you sure?" +#~ msgstr "A imagem será movida para o Lixeira, você tem certeza?" -#: ../src/gth-browser-actions-entries.h:300 -msgid "Go to the previous visited location" -msgstr "Vai para o local visitado anteriormente" +#~ msgid "Stop" +#~ msgstr "Parar" -#: ../src/gth-browser-actions-entries.h:305 -msgid "Go to the next visited location" -msgstr "Vai para o próximo local visitado" +#~ msgid "The selected images will be moved to the Trash, are you sure?" +#~ msgstr "" +#~ "As imagens selecionadas serão movidas para a Lixeira, você tem certeza?" -#: ../src/gth-browser-actions-entries.h:310 -msgid "Go up one level" -msgstr "Vai para um nível acima" +#~ msgid "Enter the new name: " +#~ msgstr "Digite o novo nome: " -#: ../src/gth-browser-actions-entries.h:314 -#: ../src/gth-viewer-actions-entries.h:62 -msgid "_Reload" -msgstr "_Recarregar" +#~ msgid "The name \"%s\" is already used. Please use a different name." +#~ msgstr "O nome \"%s\" já está em uso. Por favor use um nome diferente." -#: ../src/gth-browser-actions-entries.h:315 -#: ../src/gth-viewer-actions-entries.h:63 -msgid "Reload the current location" -msgstr "Recarrega a localização atual" +#, fuzzy +#~ msgid "Could not rename the library \"%s\"" +#~ msgstr "Não foi possível renomear a biblioteca \"%s\": %s" -#: ../src/gth-browser-actions-entries.h:320 -msgid "Stop loading current location" -msgstr "Pára de carregar a localização atual" - -#: ../src/gth-browser-actions-entries.h:325 -msgid "Go to the home folder" -msgstr "Vai para a pasta pessoal" - -#: ../src/gth-browser-actions-entries.h:329 -#: ../src/gth-viewer-actions-entries.h:52 -msgid "_Go to the Image Folder" -msgstr "Ir para a _Pasta de Imagens" - -#: ../src/gth-browser-actions-entries.h:330 -#: ../src/gth-viewer-actions-entries.h:53 -msgid "Go to the folder that contains the selected image" -msgstr "Vai para a pasta que contém a imagem selecionada" +#~ msgid "The selected library will be removed, are you sure?" +#~ msgstr "A biblioteca selecionada será removida, você tem certeza?" -#: ../src/gth-browser-actions-entries.h:334 -msgid "_Delete History" -msgstr "_Excluir Histórico" +#~ msgid "The selected catalog will be removed, are you sure?" +#~ msgstr "O catálogo selecionado será removido, você tem certeza?" -#: ../src/gth-browser-actions-entries.h:335 -msgid "Delete the list of visited locations" -msgstr "Exclui a lista de locais visitados" +#~ msgid "Could not rename the folder \"%s\": %s" +#~ msgstr "Não foi possível renomear a pasta \"%s\": %s" -#: ../src/gth-browser-actions-entries.h:339 -msgid "_Location..." -msgstr "_Localização..." +#~ msgid "source and destination are the same" +#~ msgstr "origem e destino são o mesmo" -#: ../src/gth-browser-actions-entries.h:340 -msgid "Specify a location to visit" -msgstr "Especifica um local para visitar" +#, fuzzy +#~ msgid "Could not rename the folder \"%s\"" +#~ msgstr "Não foi possível renomear a pasta \"%s\": %s" -#: ../src/gth-browser-actions-entries.h:344 -msgid "_Add Bookmark" -msgstr "_Adicionar Marcador" +#~ msgid "" +#~ "\"%s\" cannot be moved to the Trash. Do you want to delete it permanently?" +#~ msgstr "" +#~ "\"%s\" não pode ser movido para a Lixeira. Deseja excluí-lo " +#~ "permanentemente?" -#: ../src/gth-browser-actions-entries.h:345 -msgid "Add current location to bookmarks" -msgstr "Adiciona a localização atual aos marcadores" +#~ msgid "The selected folder will be moved to the Trash, are you sure?" +#~ msgstr "A pasta selecionada será movida para a Lixeira, você tem certeza?" -#: ../src/gth-browser-actions-entries.h:349 -msgid "_Edit Bookmarks..." -msgstr "_Editar Marcadores..." +#~ msgid "a folder with that name is already present." +#~ msgstr "uma pasta com esse nome já existe." -#: ../src/gth-browser-actions-entries.h:350 -msgid "Edit bookmarks" -msgstr "Edita os marcadores" +#, fuzzy +#~ msgid "Folder move - choose the destination folder" +#~ msgstr "Escolha a pasta de destino" -#: ../src/gth-browser-actions-entries.h:354 -msgid "_Slideshow" -msgstr "_Apresentação de Slides" +#, fuzzy +#~ msgid "Folder copy - choose the destination folder" +#~ msgstr "Escolha a pasta de destino" -#: ../src/gth-browser-actions-entries.h:355 -msgid "View as a slideshow" -msgstr "Vê como uma apresentação de slides" +#, fuzzy +#~ msgid "Could not create the folder \"%s\"" +#~ msgstr "Não foi possível criar a pasta \"%s\": %s" -#: ../src/gth-browser-actions-entries.h:359 -msgid "_Search..." -msgstr "Pe_squisar..." +#~ msgid "Open Location" +#~ msgstr "Abrir Localização" -#: ../src/gth-browser-actions-entries.h:369 -msgid "Create _Index Image..." -msgstr "Criar _Imagem de Índice..." +#~ msgid "_Folder" +#~ msgstr "Pas_ta" -#: ../src/gth-browser-actions-entries.h:374 -msgid "Create _Web Album..." -msgstr "Criar Álbum na _Web..." +#~ msgid "Show/_Hide" +#~ msgstr "Mostrar/_Esconder" -#: ../src/gth-browser-actions-entries.h:379 -msgid "Convert F_ormat..." -msgstr "Converter F_ormato..." +#~ msgid "S_ort Images" +#~ msgstr "_Ordenar Imagens" -#: ../src/gth-browser-actions-entries.h:380 -msgid "Convert image format" -msgstr "Converte formato da imagem" +#~ msgid "_Zoom" +#~ msgstr "_Zoom" -#: ../src/gth-browser-actions-entries.h:384 -msgid "Search for _Duplicates..." -msgstr "Pesquisar _Duplicadas..." +#~ msgid "_Image" +#~ msgstr "I_magem" -#: ../src/gth-browser-actions-entries.h:389 -msgid "_Preferences..." -msgstr "_Preferências..." +#~ msgid "Set Image as _Wallpaper" +#~ msgstr "Usar imagem como _Papel de Parede" -#: ../src/gth-browser-actions-entries.h:390 -msgid "Edit various preferences" -msgstr "Edita diversas preferências" +#, fuzzy +#~ msgid "Scri_pts" +#~ msgstr "_Scripts" -#: ../src/gth-browser-actions-entries.h:394 -msgid "Scale Images..." -msgstr "Redimensionar Imagens..." - -#. Translators: This is a tooltip. A different translation -#. may be required than for the identical string used as a -#. dialog window title used elsewhere, depending on your -#. language's grammar. -#: ../src/gth-browser-actions-entries.h:399 -msgid "Scale Images" -msgstr "Redimensiona Imagens" - -#: ../src/gth-browser-actions-entries.h:403 -#: ../src/gth-viewer-actions-entries.h:67 -msgid "_Edit Scripts" -msgstr "_Editar Scripts" - -#: ../src/gth-browser-actions-entries.h:404 -#: ../src/gth-viewer-actions-entries.h:68 -msgid "Edit external scripts" -msgstr "Edita scripts externos" +#~ msgid "Create a new window" +#~ msgstr "Cria uma nova janela" -#: ../src/gth-browser-actions-entries.h:413 -#: ../src/gth-viewer-actions-entries.h:77 -msgid "_Toolbar" -msgstr "_Barra de Ferramentas" +#~ msgid "Open the selected image in a new window" +#~ msgstr "Abre a imagem selecionada em uma nova janela" -#: ../src/gth-browser-actions-entries.h:414 -#: ../src/gth-viewer-actions-entries.h:78 -msgid "View or hide the toolbar of this window" -msgstr "Mostra ou oculta a barra de ferramentas dessa janela" +#~ msgid "_Import Photos..." +#~ msgstr "Importar F_otos..." -#: ../src/gth-browser-actions-entries.h:418 -#: ../src/gth-viewer-actions-entries.h:82 -msgid "_Statusbar" -msgstr "Barra de _Status" +#~ msgid "_Write To CD..." +#~ msgstr "_Gravar em CD..." -#: ../src/gth-browser-actions-entries.h:419 -#: ../src/gth-viewer-actions-entries.h:83 -msgid "View or hide the statusbar of this window" -msgstr "Mostra ou oculta a barra de status dessa janela" +#~ msgid "Write selection to CD" +#~ msgstr "Grava a seleção em um CD" -#: ../src/gth-browser-actions-entries.h:423 -msgid "_Filter" -msgstr "_Filtro" +#~ msgid "Move this image to the Trash" +#~ msgstr "Move essa imagem para a Lixeira" -#: ../src/gth-browser-actions-entries.h:424 -msgid "View or hide the filterbar of this window" -msgstr "Mostra ou oculta a barra de filtros desta janela" +#~ msgid "Move this image to another location" +#~ msgstr "Move essa imagem para outro local" -#: ../src/gth-browser-actions-entries.h:430 -msgid "View thumbnails" -msgstr "Ver miniaturas" +#~ msgid "Move selected images to another location" +#~ msgstr "Move as imagens selecionadas para outro local" -#: ../src/gth-browser-actions-entries.h:434 -msgid "_Image Preview" -msgstr "Visualização da _Imagem" - -#: ../src/gth-browser-actions-entries.h:435 -#: ../src/gth-browser-actions-entries.h:507 -msgid "View the image" -msgstr "Vê a imagem" - -#: ../src/gth-browser-actions-entries.h:445 -msgid "Show _Hidden Files" -msgstr "_Mostrar Arquivos Ocultos" +#~ msgid "Select all images" +#~ msgstr "Seleciona todas as imagens" -#: ../src/gth-browser-actions-entries.h:446 -msgid "Show hidden files and folders" -msgstr "Mostra pastas e arquivos ocultos" +#~ msgid "Open the selected catalog" +#~ msgstr "Abre o catálogo selecionado" -#: ../src/gth-browser-actions-entries.h:451 -msgid "_Reversed Order" -msgstr "Ordem _Reversa" - -#: ../src/gth-browser-actions-entries.h:452 -msgid "Reverse images order" -msgstr "Inverte a ordem das imagens" - -#: ../src/gth-browser-actions-entries.h:461 -msgid "by _Name" -msgstr "por _Nome" - -#: ../src/gth-browser-actions-entries.h:462 -msgid "Sort images by name" -msgstr "Ordena as imagens por nome" - -#: ../src/gth-browser-actions-entries.h:464 -msgid "by _Path" -msgstr "por _Caminho" - -#: ../src/gth-browser-actions-entries.h:465 -msgid "Sort images by path" -msgstr "Ordena as imagens por caminho" - -#: ../src/gth-browser-actions-entries.h:467 -msgid "by _Size" -msgstr "por _Tamanho" - -#: ../src/gth-browser-actions-entries.h:468 -msgid "Sort images by file size" -msgstr "Ordena as imagens por tamanho de arquivo" - -#: ../src/gth-browser-actions-entries.h:470 -msgid "by Modification _Time" -msgstr "por _Data de Modificação" - -#: ../src/gth-browser-actions-entries.h:471 -msgid "Sort images by file modification time" -msgstr "Ordena imagens por data de modificação do arquivo" - -#: ../src/gth-browser-actions-entries.h:473 -msgid "by _Exif Time" -msgstr "por Data no _Exif" - -#: ../src/gth-browser-actions-entries.h:474 -msgid "Sort images by Exif DateTime tag" -msgstr "Ordena imagens pela etiqueta Exif DateTime" - -#: ../src/gth-browser-actions-entries.h:476 -msgid "by _Comment" -msgstr "por _Comentário" - -#: ../src/gth-browser-actions-entries.h:477 -msgid "Sort images by comment" -msgstr "Ordena imagens por comentário" - -#: ../src/gth-browser-actions-entries.h:479 -msgid "_Manual Order" -msgstr "Ordem _Manual" - -#: ../src/gth-browser-actions-entries.h:480 -msgid "Sort images manually" -msgstr "Ordena imagens manualmente" - -#: ../src/gth-browser-actions-entries.h:487 -msgid "View As Sli_des" -msgstr "Ver Como Sli_des" - -#: ../src/gth-browser-actions-entries.h:488 -msgid "View As Slides" -msgstr "Vê como slides" - -#: ../src/gth-browser-actions-entries.h:490 -msgid "View As _List" -msgstr "Ver Como _Lista" - -#: ../src/gth-browser-actions-entries.h:491 -msgid "View As List" -msgstr "Vê como lista" - -#: ../src/gth-browser-actions-entries.h:500 -msgid "_Folders" -msgstr "Pas_tas" +#~ msgid "Open the selected catalog in a new window" +#~ msgstr "Abre o catálogo selecionado em uma nova janela" -#: ../src/gth-browser-actions-entries.h:501 -msgid "View the folders" -msgstr "Vê as pastas" +#~ msgid "Rename selected catalog" +#~ msgstr "Renomeia catálogo selecionado" -#: ../src/gth-browser-actions-entries.h:503 -msgid "_Catalogs" -msgstr "_Catálogos" +#~ msgid "Rem_ove" +#~ msgstr "Rem_over" -#: ../src/gth-browser-actions-entries.h:504 -msgid "View the catalogs" -msgstr "Vê os catálogos" +#~ msgid "Remove selected catalog" +#~ msgstr "Remove catálogo selecionado" -#: ../src/gth-browser.c:509 ../src/gth-viewer.c:629 -msgid "[Press 'c' to add a comment]" -msgstr "[Pressione \"c\" para adicionar um comentário]" +#~ msgid "Move selected catalog to another location" +#~ msgstr "Move catálogo selecionado para outro local" -#: ../src/gth-browser.c:584 ../src/gth-browser.c:600 ../src/gth-viewer.c:685 -msgid "[modified]" -msgstr "[modificado]" +#~ msgid "_Edit Search..." +#~ msgstr "_Editar Pesquisa..." -#: ../src/gth-browser.c:626 ../src/main.c:439 ../src/main.c:735 -msgid "gThumb" -msgstr "gThumb" +#~ msgid "Modify search criteria" +#~ msgstr "Altera critérios da pesquisa" -#: ../src/gth-browser.c:702 -#, c-format -msgid "1 image (%s)" -msgstr "1 imagem (%s)" +#~ msgid "Redo _Search" +#~ msgstr "Refazer _Pesquisa" -#: ../src/gth-browser.c:705 -#, c-format -msgid "%d images (%s)" -msgstr "%d imagens (%s)" +#~ msgid "_New Catalog..." +#~ msgstr "_Novo Catálogo..." -#: ../src/gth-browser.c:712 -#, c-format -msgid "1 selected (%s)" -msgstr "1 selecionada (%s)" +#~ msgid "New _Library..." +#~ msgstr "Nova _Biblioteca..." -#: ../src/gth-browser.c:715 -#, c-format -msgid "%d selected (%s)" -msgstr "%d selecionadas (%s)" +#~ msgid "Create a new catalog library" +#~ msgstr "Cria nova biblioteca de catálogos" -#: ../src/gth-browser.c:1762 ../src/gth-viewer.c:873 -msgid "The current image has been modified, do you want to save it?" -msgstr "A imagem atual foi modificada, você quer salvá-la?" +#~ msgid "Rename current catalog" +#~ msgstr "Renomear catálogo atual" -#: ../src/gth-browser.c:1763 ../src/gth-viewer.c:874 -#, fuzzy -msgid "Do _Not Save" -msgstr "Não Salvar" +#~ msgid "Remove current catalog" +#~ msgstr "Remover catálogo atual" -#: ../src/gth-browser.c:3476 -msgid "Dragged Images" -msgstr "Imagens Arrastadas" - -#: ../src/gth-browser.c:5274 ../src/gth-browser.c:5275 -#: ../src/gth-window-actions-entries.h:271 -#: ../src/gth-window-actions-entries.h:276 -#: ../src/gth-window-actions-entries.h:281 -msgid "Rotate images without loss of quality" -msgstr "Gira imagens sem perda de qualidade" +#~ msgid "Move current catalog to another location" +#~ msgstr "Move o catálogo atual para outro local" -#: ../src/gth-browser.c:6164 -msgid "Getting folder listing..." -msgstr "Obtendo listagem do diretório..." +#~ msgid "Open the selected folder in a new window" +#~ msgstr "Abre a pasta selecionada em uma nova janela" -#: ../src/gth-browser.c:6186 -#, c-format -msgid "Cannot load folder \"%s\": %s\n" -msgstr "Não foi possível carregar pasta \"%s\": %s\n" +#~ msgid "Open the selected folder with the Nautilus file manager" +#~ msgstr "Abre a pasta selecionada com o gerenciador de arquivos Nautilus" -#: ../src/gth-browser.c:6733 ../src/gth-filter-bar.c:532 -msgid "Close" -msgstr "Fechar" +#~ msgid "Copy selected folder" +#~ msgstr "Copiar pasta selecionada" -#: ../src/gth-browser.c:6745 ../src/gth-viewer.c:1513 -msgid "Image comment" -msgstr "Comentário da imagem" +#~ msgid "Move selected folder" +#~ msgstr "Mover pasta selecionada" -#: ../src/gth-browser.c:6757 -msgid "Image data" -msgstr "Dados da imagem" +#~ msgid "Open current folder with the Nautilus file manager" +#~ msgstr "Abre pasta atual com o Gerenciador de arquivos do Nautilus" -#: ../src/gth-browser.c:6769 -msgid "Image preview" -msgstr "Visualização da imagem" +#~ msgid "Rename current folder" +#~ msgstr "Renomeia pasta atual" -#: ../src/gth-browser.c:7827 -msgid "The specified catalog does not exist." -msgstr "O catálogo especificado não existe." +#~ msgid "Move the current folder to the Trash" +#~ msgstr "Move pasta atual para a Lixeira" -#: ../src/gth-browser.c:8460 ../src/gth-viewer.c:1960 -msgid "Wait please..." -msgstr "Aguarde por favor..." +#~ msgid "Copy current folder" +#~ msgstr "Copia pasta atual" -#: ../src/gth-exif-data-viewer.c:43 -msgid "Filesystem" -msgstr "Sistema de arquivos" +#~ msgid "Assign tags to the current folder" +#~ msgstr "Atribui etiquetas à pasta atual" -#: ../src/gth-exif-data-viewer.c:44 -msgid "Exif General" -msgstr "Exif Geral" +#~ msgid "_Reload" +#~ msgstr "_Recarregar" -#: ../src/gth-exif-data-viewer.c:45 -msgid "Exif Conditions" -msgstr "Condições Exif" +#~ msgid "Go to the home folder" +#~ msgstr "Vai para a pasta pessoal" -#: ../src/gth-exif-data-viewer.c:46 -msgid "Exif Structure" -msgstr "Estrutura Exif" +#~ msgid "_Go to the Image Folder" +#~ msgstr "Ir para a _Pasta de Imagens" -#: ../src/gth-exif-data-viewer.c:47 -msgid "Exif Thumbnail" -msgstr "Miniatura Exif" +#~ msgid "Create _Index Image..." +#~ msgstr "Criar _Imagem de Índice..." -#: ../src/gth-exif-data-viewer.c:48 -msgid "Exif GPS" -msgstr "Exif GPS" +#~ msgid "Search for _Duplicates..." +#~ msgstr "Pesquisar _Duplicadas..." -#: ../src/gth-exif-data-viewer.c:49 -msgid "Exif Maker Notes" -msgstr "Editor de Notas Exif" +#~ msgid "Scale Images..." +#~ msgstr "Redimensionar Imagens..." -#: ../src/gth-exif-data-viewer.c:50 -msgid "Exif Versions" -msgstr "Versões Exif" +#~ msgid "Scale Images" +#~ msgstr "Redimensiona Imagens" -#: ../src/gth-exif-data-viewer.c:51 -msgid "IPTC" -msgstr "IPTC" +#~ msgid "Edit external scripts" +#~ msgstr "Edita scripts externos" -#: ../src/gth-exif-data-viewer.c:52 -msgid "XMP Embedded" -msgstr "XMP Embutido" +#~ msgid "_Image Preview" +#~ msgstr "Visualização da _Imagem" -#: ../src/gth-exif-data-viewer.c:53 -msgid "XMP Sidecar" -msgstr "XMP Sidecar" +#~ msgid "_Reversed Order" +#~ msgstr "Ordem _Reversa" -#: ../src/gth-exif-data-viewer.c:54 -msgid "Audio / Video" -msgstr "Áudio / Vídeo" +#~ msgid "Reverse images order" +#~ msgstr "Inverte a ordem das imagens" -#: ../src/gth-exif-data-viewer.c:55 -msgid "Other" -msgstr "Outros" +#~ msgid "by _Name" +#~ msgstr "por _Nome" -#: ../src/gth-exif-data-viewer.c:341 -msgid "Path" -msgstr "Caminho" +#~ msgid "Sort images by name" +#~ msgstr "Ordena as imagens por nome" -#: ../src/gth-exif-data-viewer.c:345 -msgid "Mounted at" -msgstr "" +#~ msgid "by _Path" +#~ msgstr "por _Caminho" -#: ../src/gth-filter-bar.c:174 -msgid "contains" -msgstr "contém" +#~ msgid "Sort images by path" +#~ msgstr "Ordena as imagens por caminho" -#: ../src/gth-filter-bar.c:175 -msgid "starts with" -msgstr "começa com" +#~ msgid "by _Size" +#~ msgstr "por _Tamanho" -#: ../src/gth-filter-bar.c:176 -msgid "ends with" -msgstr "termina com" +#~ msgid "Sort images by file modification time" +#~ msgstr "Ordena imagens por data de modificação do arquivo" -#: ../src/gth-filter-bar.c:177 ../src/gth-filter-bar.c:192 -msgid "is" -msgstr "é" +#~ msgid "by _Exif Time" +#~ msgstr "por Data no _Exif" -#: ../src/gth-filter-bar.c:178 ../src/gth-filter-bar.c:193 -msgid "is not" -msgstr "não é" +#~ msgid "Sort images by Exif DateTime tag" +#~ msgstr "Ordena imagens pela etiqueta Exif DateTime" -#: ../src/gth-filter-bar.c:179 -msgid "does not contain" -msgstr "não contém" +#~ msgid "by _Comment" +#~ msgstr "por _Comentário" -#: ../src/gth-filter-bar.c:182 ../src/gth-filter-bar.c:187 -msgid "is equal to" -msgstr "é igual a" +#~ msgid "Sort images by comment" +#~ msgstr "Ordena imagens por comentário" -#: ../src/gth-filter-bar.c:183 -msgid "is lower than" -msgstr "é menor que" +#~ msgid "_Manual Order" +#~ msgstr "Ordem _Manual" -#: ../src/gth-filter-bar.c:184 -msgid "is greater than" -msgstr "é maior que" +#~ msgid "Sort images manually" +#~ msgstr "Ordena imagens manualmente" -#: ../src/gth-filter-bar.c:188 -msgid "is before" -msgstr "é anterior a" +#~ msgid "View As Sli_des" +#~ msgstr "Ver Como Sli_des" -#: ../src/gth-filter-bar.c:189 -msgid "is after" -msgstr "é posterior a" +#~ msgid "View As Slides" +#~ msgstr "Vê como slides" -#: ../src/gth-filter-bar.c:198 -msgid "KB" -msgstr "KB" +#~ msgid "View As _List" +#~ msgstr "Ver Como _Lista" -#: ../src/gth-filter-bar.c:199 -msgid "MB" -msgstr "MB" +#~ msgid "View As List" +#~ msgstr "Vê como lista" -#: ../src/gth-filter-bar.c:205 -msgid "Filename" -msgstr "Nome de arquivo" +#~ msgid "_Catalogs" +#~ msgstr "_Catálogos" -#: ../src/gth-filter-bar.c:207 -msgid "Place" -msgstr "Lugar" +#~ msgid "View the catalogs" +#~ msgstr "Vê os catálogos" -#: ../src/gth-filter-bar.c:210 -msgid "Tag" -msgstr "" +#~ msgid "[Press 'c' to add a comment]" +#~ msgstr "[Pressione \"c\" para adicionar um comentário]" -#: ../src/gth-filter-bar.c:211 -msgid "Text contains" -msgstr "Texto contém" +#~ msgid "1 image (%s)" +#~ msgstr "1 imagem (%s)" -#: ../src/gth-filter-bar.c:490 -msgid "All" -msgstr "Todas" +#~ msgid "The current image has been modified, do you want to save it?" +#~ msgstr "A imagem atual foi modificada, você quer salvá-la?" -#. view label -#: ../src/gth-filter-bar.c:540 -msgid "Sh_ow:" -msgstr "M_ostrar:" - -#: ../src/gth-folder-selection-dialog.c:283 -msgid "_Folder" -msgstr "_Pasta" - -#: ../src/gth-folder-selection-dialog.c:301 -msgid "_Browse..." -msgstr "_Navegar..." - -#. Go to destination -#: ../src/gth-folder-selection-dialog.c:306 -msgid "_Go to the destination folder" -msgstr "_Ir à pasta de destino" - -#: ../src/gth-folder-selection-dialog.c:319 -msgid "_Recent folders:" -msgstr "Pastas _recentes:" +#~ msgid "Dragged Images" +#~ msgstr "Imagens Arrastadas" -#: ../src/gth-fullscreen-actions-entries.h:43 -#, fuzzy -msgid "Stop slideshow" -msgstr "Apresentação de Slides" +#~ msgid "Cannot load folder \"%s\": %s\n" +#~ msgstr "Não foi possível carregar pasta \"%s\": %s\n" -#: ../src/gth-fullscreen-actions-entries.h:62 -msgid "Proper_ties" -msgstr "_Propriedades" +#~ msgid "Close" +#~ msgstr "Fechar" -#: ../src/gth-fullscreen-actions-entries.h:68 -#, fuzzy -msgid "Pause slideshow" -msgstr "Vê como uma apresentação de slides" +#~ msgid "The specified catalog does not exist." +#~ msgstr "O catálogo especificado não existe." -#: ../src/gth-location.c:378 -msgid "Other..." -msgstr "Outras..." +#~ msgid "Wait please..." +#~ msgstr "Aguarde por favor..." -#: ../src/gth-viewer-actions-entries.h:92 -msgid "_Single Window" -msgstr "Janela I_ndividual" - -#: ../src/gth-viewer-actions-entries.h:93 -msgid "Reuse this window to view other images" -msgstr "Reutiliza esta janela para ver outras imagens" - -#: ../src/gth-viewer.c:775 -msgid "_None" -msgstr "_Nenhum" - -#: ../src/gth-viewer.c:1308 ../src/gth-window-actions-entries.h:75 -msgid "_Open With" -msgstr "_Abrir Com" - -#: ../src/gth-viewer.c:1314 ../src/gth-viewer.c:1315 -#: ../src/gth-window-actions-entries.h:46 -msgid "Open selected images with an application" -msgstr "Abre as imagens selecionadas com uma aplicação" +#~ msgid "Filesystem" +#~ msgstr "Sistema de arquivos" -#: ../src/gth-window-actions-callbacks.c:891 -msgid "An image viewer and browser for GNOME." -msgstr "Um visualizador e navegador de imagens para o GNOME." +#~ msgid "Path" +#~ msgstr "Caminho" -#: ../src/gth-window-actions-callbacks.c:894 -msgid "translator_credits" -msgstr "" -"Gustavo Noronha Silva \n" -"João Paulo Gomes Vanzuita \n" -"Viviani Ap. dos Santos \n" -"Raphael Higino \n" -"Igor Pires Soares " +#~ msgid "KB" +#~ msgstr "KB" -#: ../src/gth-window-actions-entries.h:35 -msgid "_Transform" -msgstr "_Transformar" +#~ msgid "Text contains" +#~ msgstr "Texto contém" -#: ../src/gth-window-actions-entries.h:36 -msgid "Auto" -msgstr "Auto" +#~ msgid "Sh_ow:" +#~ msgstr "M_ostrar:" -#: ../src/gth-window-actions-entries.h:37 -msgid "Reduce Colors" -msgstr "Reduzir Cores" +#~ msgid "_Folder" +#~ msgstr "_Pasta" -#: ../src/gth-window-actions-entries.h:41 -msgid "Close this window" -msgstr "Fecha esta janela" +#~ msgid "_Browse..." +#~ msgstr "_Navegar..." -#: ../src/gth-window-actions-entries.h:45 -msgid "_Open With..." -msgstr "_Abrir Com..." - -#: ../src/gth-window-actions-entries.h:51 -#: ../src/gth-window-actions-entries.h:56 -msgid "Save current image" -msgstr "Salva a imagem atual" - -#: ../src/gth-window-actions-entries.h:55 -msgid "Save _As..." -msgstr "Salvar _Como..." - -#: ../src/gth-window-actions-entries.h:61 -msgid "Revert to saved image" -msgstr "Reverte para a imagem salva" - -#: ../src/gth-window-actions-entries.h:65 -msgid "Print..." -msgstr "Imprimir..." - -#: ../src/gth-window-actions-entries.h:66 -#: ../src/gth-window-actions-entries.h:71 -msgid "Print the current image" -msgstr "Imprime a imagem atual" - -#: ../src/gth-window-actions-entries.h:76 -msgid "Open this image with an application" -msgstr "Abrir essa imagem com uma aplicação" - -#: ../src/gth-window-actions-entries.h:80 -msgid "Comm_ent..." -msgstr "Com_entário..." - -#: ../src/gth-window-actions-entries.h:81 -#: ../src/gth-window-actions-entries.h:86 -msgid "Add a comment to selected images" -msgstr "Adiciona um comentário nas imagens selecionadas" - -#: ../src/gth-window-actions-entries.h:91 -#: ../src/gth-window-actions-entries.h:96 -msgid "Assign tags to selected images" -msgstr "Atribui etiquetas às imagens selecionadas" - -#: ../src/gth-window-actions-entries.h:110 -#: ../src/gth-window-actions-entries.h:280 -msgid "Rotate Ri_ght" -msgstr "Girar à Di_reita" - -#: ../src/gth-window-actions-entries.h:111 -msgid "View the image rotated clockwise" -msgstr "Vê a imagem girada no sentido horário" - -#: ../src/gth-window-actions-entries.h:115 -#: ../src/gth-window-actions-entries.h:275 -msgid "Rotate _Left" -msgstr "Girar à Es_querda" - -#: ../src/gth-window-actions-entries.h:116 -msgid "View the image rotated counter-clockwise" -msgstr "Vê a imagem girada no sentido anti-horário" - -#: ../src/gth-window-actions-entries.h:120 -msgid "_Flip" -msgstr "_Virar" - -#: ../src/gth-window-actions-entries.h:121 -msgid "View the image flipped" -msgstr "Ver a imagem virada" - -#: ../src/gth-window-actions-entries.h:125 -msgid "_Mirror" -msgstr "_Espelhar" - -#: ../src/gth-window-actions-entries.h:126 -msgid "View the image mirrored" -msgstr "Ver a imagem espelhada" - -#: ../src/gth-window-actions-entries.h:130 -msgid "_Desaturate" -msgstr "_Dessaturar" - -#: ../src/gth-window-actions-entries.h:131 -msgid "View the image in black and white" -msgstr "Vê a imagem em preto e branco" - -#: ../src/gth-window-actions-entries.h:135 -msgid "_Negative" -msgstr "_Negativo" - -#: ../src/gth-window-actions-entries.h:136 -msgid "View the image with negative colors" -msgstr "Vê a imagem com cores negativas" - -#: ../src/gth-window-actions-entries.h:140 -msgid "_Enhance" -msgstr "_Realce" - -#: ../src/gth-window-actions-entries.h:141 -msgid "Automatically adjust the color levels" -msgstr "Ajusta os níveis de cor automaticamente" - -#: ../src/gth-window-actions-entries.h:145 -msgid "_Equalize" -msgstr "_Equalizar" - -#: ../src/gth-window-actions-entries.h:146 -msgid "Automatically equalize the image histogram" -msgstr "Equaliza automaticamente o histograma da imagem" - -#: ../src/gth-window-actions-entries.h:150 -msgid "_Posterize..." -msgstr "_Posterização..." - -#: ../src/gth-window-actions-entries.h:151 -#: ../src/gth-window-actions-entries.h:186 -#: ../src/gth-window-actions-entries.h:191 -msgid "Reduce the number of colors" -msgstr "Reduz o número de cores" - -#: ../src/gth-window-actions-entries.h:155 -msgid "_Brightness-Contrast..." -msgstr "_Brilho-contraste..." - -#: ../src/gth-window-actions-entries.h:156 -msgid "Adjust brightness and contrast" -msgstr "Ajusta o brilho e o contraste" - -#: ../src/gth-window-actions-entries.h:160 -msgid "_Hue-Saturation..." -msgstr "_Matiz-saturação..." - -#: ../src/gth-window-actions-entries.h:161 -msgid "Adjust hue and saturation" -msgstr "Ajusta a matiz e a saturação" - -#: ../src/gth-window-actions-entries.h:165 -msgid "_Redeye Removal..." -msgstr "Remover de _olhos vermelhos..." - -#: ../src/gth-window-actions-entries.h:166 -msgid "Redeye Removal Tool" -msgstr "Ferramenta para Remoção de Olhos Vermelhos" - -#: ../src/gth-window-actions-entries.h:170 -msgid "_Color Balance..." -msgstr "Balanço de _Cores..." - -#: ../src/gth-window-actions-entries.h:171 -msgid "Adjust color balance" -msgstr "Ajusta o balanço de cores" - -#: ../src/gth-window-actions-entries.h:175 -msgid "_Resize..." -msgstr "Redimen_sionar..." - -#: ../src/gth-window-actions-entries.h:176 -msgid "Resize image" -msgstr "Redimensiona a imagem" - -#: ../src/gth-window-actions-entries.h:180 -msgid "_Crop..." -msgstr "_Aparar..." - -#: ../src/gth-window-actions-entries.h:181 -msgid "Crop image" -msgstr "Apara a imagem" - -#: ../src/gth-window-actions-entries.h:185 -msgid "Black and White" -msgstr "Preto e Branco" - -#: ../src/gth-window-actions-entries.h:190 -msgid "Web Palette" -msgstr "Paleta Web" +#~ msgid "_Recent folders:" +#~ msgstr "Pastas _recentes:" -#: ../src/gth-window-actions-entries.h:195 -#: ../src/gth-window-actions-entries.h:302 -msgid "In" -msgstr "Aproximar" +#, fuzzy +#~ msgid "Stop slideshow" +#~ msgstr "Apresentação de Slides" -#: ../src/gth-window-actions-entries.h:196 -msgid "Zoom in" -msgstr "Mais Zoom" +#~ msgid "_Single Window" +#~ msgstr "Janela I_ndividual" -#: ../src/gth-window-actions-entries.h:200 -msgid "Out" -msgstr "Afastar" +#~ msgid "_None" +#~ msgstr "_Nenhum" -#: ../src/gth-window-actions-entries.h:201 -msgid "Zoom out" -msgstr "Menos Zoom" +#~ msgid "Open selected images with an application" +#~ msgstr "Abre as imagens selecionadas com uma aplicação" -#: ../src/gth-window-actions-entries.h:205 -msgid "1:1" -msgstr "1:1" +#~ msgid "_Transform" +#~ msgstr "_Transformar" -#: ../src/gth-window-actions-entries.h:206 -msgid "Actual size" -msgstr "Tamanho real" +#~ msgid "Auto" +#~ msgstr "Auto" -#: ../src/gth-window-actions-entries.h:210 -msgid "Fit" -msgstr "Ajustar" +#~ msgid "_Open With..." +#~ msgstr "_Abrir Com..." -#: ../src/gth-window-actions-entries.h:211 -msgid "Zoom to fit window" -msgstr "Zoom para ajustar à janela" +#~ msgid "Revert to saved image" +#~ msgstr "Reverte para a imagem salva" -#: ../src/gth-window-actions-entries.h:215 -msgid "Width" -msgstr "Largura" +#~ msgid "Print..." +#~ msgstr "Imprimir..." -#: ../src/gth-window-actions-entries.h:216 -msgid "Zoom to fit width" -msgstr "Zoom para ajustar à largura" +#~ msgid "Print the current image" +#~ msgstr "Imprime a imagem atual" -#: ../src/gth-window-actions-entries.h:220 -msgid "Step A_nimation" -msgstr "A_nimação Passo-a-Passo" - -#: ../src/gth-window-actions-entries.h:221 -msgid "View next animation frame" -msgstr "Ver o próximo quadro de animação" - -#: ../src/gth-window-actions-entries.h:235 -msgid "_Centered" -msgstr "_Centralizado" - -#: ../src/gth-window-actions-entries.h:236 -msgid "Set the image as desktop background (centered)" -msgstr "Usa a imagem como plano de fundo (centralizado)" - -#: ../src/gth-window-actions-entries.h:240 -msgid "_Tiled" -msgstr "_Lado a lado" - -#: ../src/gth-window-actions-entries.h:241 -msgid "Set the image as desktop background (tiled)" -msgstr "Usa a imagem como plano de fundo (lado a lado)" - -#: ../src/gth-window-actions-entries.h:245 -msgid "_Scaled" -msgstr "_Redimensionado" - -#: ../src/gth-window-actions-entries.h:246 -msgid "Set the image as desktop background (scaled keeping aspect ratio)" -msgstr "Usa a imagem como plano de fundo (em escala, mantendo proporção)" - -#: ../src/gth-window-actions-entries.h:250 -msgid "Str_etched" -msgstr "_Esticado" - -#: ../src/gth-window-actions-entries.h:251 -msgid "Set the image as desktop background (stretched)" -msgstr "Usa a imagem como plano de fundo (esticada)" +#~ msgid "Open this image with an application" +#~ msgstr "Abrir essa imagem com uma aplicação" -#: ../src/gth-window-actions-entries.h:255 -msgid "_Restore" -msgstr "_Restaurar" +#~ msgid "Comm_ent..." +#~ msgstr "Com_entário..." -#: ../src/gth-window-actions-entries.h:256 -msgid "Restore the original desktop wallpaper" -msgstr "Restaura o papel de parede original" +#~ msgid "Add a comment to selected images" +#~ msgstr "Adiciona um comentário nas imagens selecionadas" -#: ../src/gth-window-actions-entries.h:260 -msgid "Change _Date..." -msgstr "Alterar _Data..." +#~ msgid "Assign tags to selected images" +#~ msgstr "Atribui etiquetas às imagens selecionadas" -#: ../src/gth-window-actions-entries.h:261 -msgid "Change images last modified date" -msgstr "Altera data da última modificação das imagens" +#~ msgid "View the image rotated clockwise" +#~ msgstr "Vê a imagem girada no sentido horário" -#: ../src/gth-window-actions-entries.h:265 -msgid "Reset _Exif Orientation" -msgstr "Restaurar Orientação _Exif" - -#: ../src/gth-window-actions-entries.h:266 -msgid "Reset Exif orientation to top-left" -msgstr "Restaura orientação Exif para top-left" +#~ msgid "View the image rotated counter-clockwise" +#~ msgstr "Vê a imagem girada no sentido anti-horário" -#: ../src/gth-window-actions-entries.h:286 -msgid "Show information about gThumb" -msgstr "Mostra informações sobre o gThumb" +#~ msgid "View the image flipped" +#~ msgstr "Ver a imagem virada" -#: ../src/gth-window-actions-entries.h:290 -msgid "Contents" -msgstr "Conteúdo" +#~ msgid "View the image mirrored" +#~ msgstr "Ver a imagem espelhada" -#: ../src/gth-window-actions-entries.h:291 -msgid "Display the gThumb Manual" -msgstr "" +#~ msgid "View the image in black and white" +#~ msgstr "Vê a imagem em preto e branco" -#: ../src/gth-window-actions-entries.h:295 -msgid "_Keyboard Shortcuts" -msgstr "Atalhos de _Teclado" +#~ msgid "View the image with negative colors" +#~ msgstr "Vê a imagem com cores negativas" -#: ../src/gth-window-actions-entries.h:311 -msgid "Play _Animation" -msgstr "Iniciar _Animação" +#~ msgid "Automatically adjust the color levels" +#~ msgstr "Ajusta os níveis de cor automaticamente" -#: ../src/gth-window-actions-entries.h:312 -msgid "Start or stop current animation" -msgstr "Inicia ou pára a animação atual" +#~ msgid "_Brightness-Contrast..." +#~ msgstr "_Brilho-contraste..." -#: ../src/main.c:91 -msgid "Start in fullscreen mode" -msgstr "Iniciar em modo tela cheia" +#~ msgid "Adjust brightness and contrast" +#~ msgstr "Ajusta o brilho e o contraste" -#: ../src/main.c:95 -msgid "Automatically start a slideshow" -msgstr "Iniciar apresentação de slides automaticamente" +#~ msgid "_Hue-Saturation..." +#~ msgstr "_Matiz-saturação..." -#: ../src/main.c:99 -msgid "Automatically import digital camera photos" -msgstr "Importar fotos de câmeras digitais automaticamente" +#~ msgid "Adjust hue and saturation" +#~ msgstr "Ajusta a matiz e a saturação" -#: ../src/main.c:103 -msgid "Use the viewer mode to view single images" -msgstr "Usar o modo visualizador para ver imagens avulsas" +#~ msgid "Redeye Removal Tool" +#~ msgstr "Ferramenta para Remoção de Olhos Vermelhos" -#: ../src/main.c:148 -msgid "Holidays" -msgstr "Feriados" +#~ msgid "_Color Balance..." +#~ msgstr "Balanço de _Cores..." -#: ../src/main.c:149 -msgid "Temporary" -msgstr "Temporário" +#~ msgid "Adjust color balance" +#~ msgstr "Ajusta o balanço de cores" -#: ../src/main.c:150 -msgid "Screenshots" -msgstr "Capturas de Tela" +#~ msgid "Black and White" +#~ msgstr "Preto e Branco" -#: ../src/main.c:151 -msgid "Science" -msgstr "Ciência" +#~ msgid "Web Palette" +#~ msgstr "Paleta Web" -#: ../src/main.c:152 -msgid "Favourite" -msgstr "Favorito" +#~ msgid "Step A_nimation" +#~ msgstr "A_nimação Passo-a-Passo" -#: ../src/main.c:153 -msgid "Important" -msgstr "Importante" +#~ msgid "View next animation frame" +#~ msgstr "Ver o próximo quadro de animação" -#: ../src/main.c:154 -msgid "GNOME" -msgstr "GNOME" +#~ msgid "Set the image as desktop background (centered)" +#~ msgstr "Usa a imagem como plano de fundo (centralizado)" -#: ../src/main.c:155 -msgid "Games" -msgstr "Jogos" +#~ msgid "_Tiled" +#~ msgstr "_Lado a lado" -#: ../src/main.c:156 -msgid "Party" -msgstr "Festa" +#~ msgid "_Scaled" +#~ msgstr "_Redimensionado" -#: ../src/main.c:157 -msgid "Birthday" -msgstr "Aniversário" +#~ msgid "Set the image as desktop background (scaled keeping aspect ratio)" +#~ msgstr "Usa a imagem como plano de fundo (em escala, mantendo proporção)" -#: ../src/main.c:158 -msgid "Astronomy" -msgstr "Astronomia" +#~ msgid "Str_etched" +#~ msgstr "_Esticado" -#: ../src/main.c:159 -msgid "Family" -msgstr "Família" +#~ msgid "Set the image as desktop background (stretched)" +#~ msgstr "Usa a imagem como plano de fundo (esticada)" -#: ../src/main.c:381 -msgid "Command Line" -msgstr "Linha de Comando" +#~ msgid "Reset Exif orientation to top-left" +#~ msgstr "Restaura orientação Exif para top-left" -#: ../src/rotation-utils.c:109 -#, c-format -msgid "Problem transforming the image: %s" -msgstr "Problema ao transformar a imagem: %s" +#~ msgid "Play _Animation" +#~ msgstr "Iniciar _Animação" -#: ../src/rotation-utils.c:114 -msgid "" -"This transformation may introduce small image distortions along one or more " -"edges, because the image dimensions are not multiples of 8.\n" -"\n" -"The distortion is reversible, however. If the resulting image is " -"unacceptable, simply apply the reverse transformation to return to the " -"original image.\n" -"\n" -"You can also choose to discard (or trim) any untransformable edge pixels. " -"For practical use, this mode gives the best looking results, but the " -"transformation is not strictly lossless anymore." -msgstr "" -"Essa transformação pode introduzir pequenas distorções na imagem em uma ou " -"mais extremidades, porque as dimensões dela não são múltiplas de 8.\n" -"\n" -"A distorção é reversível, entretanto. Se a imagem resultante for " -"inaceitável, basta aplicar a transformação reversa para retornar à imagem " -"original.\n" -"\n" -"Você também pode escolher descartar (ou aparar) quaisquer pixels não " -"transformáveis nas extremidades. Por praticidade, esse modo oferece os " -"melhores resultados visuais, mas a transformação não é mais estritamente sem " -"perdas." +#~ msgid "Start or stop current animation" +#~ msgstr "Inicia ou pára a animação atual" -#: ../src/rotation-utils.c:122 -msgid "_Trim" -msgstr "_Aparar" +#~ msgid "Use the viewer mode to view single images" +#~ msgstr "Usar o modo visualizador para ver imagens avulsas" -#: ../src/rotation-utils.c:205 -msgid "" -"Could not move temporary file to local destination. Check folder permissions." -msgstr "" -"Não foi possível mover o arquivo temporário para o destino local. Verifique " -"as permissões da pasta." +#~ msgid "" +#~ "Could not move temporary file to local destination. Check folder " +#~ "permissions." +#~ msgstr "" +#~ "Não foi possível mover o arquivo temporário para o destino local. " +#~ "Verifique as permissões da pasta." #~ msgid "Categories:" #~ msgstr "Categorias:" -#~ msgid "C_hoose from the catalog" -#~ msgstr "Escol_ha a partir do catálogo" - #~ msgid "Ca_tegories:" #~ msgstr "Ca_tegorias:" #~ msgid "Camera Model" #~ msgstr "Modelo da Câmera" -#~ msgid "No camera detected" -#~ msgstr "Nenhuma câmera detectada" - #~ msgid "Select a camera model" #~ msgstr "Selecione um modelo de câmera" -#~ msgid "_Keep original filenames" -#~ msgstr "_Conservar nomes de arquivos originais" - #~ msgid "_Model:" #~ msgstr "_Modelo:" @@ -4444,9 +7217,6 @@ #~ msgid "256 x 256" #~ msgstr "256 x 256" -#~ msgid "48 x 48" -#~ msgstr "48 x 48" - #~ msgid "64 x 64" #~ msgstr "64 x 64" @@ -4465,51 +7235,12 @@ #~ msgid "Activate items with a single click" #~ msgstr "Ativar itens com clique único" -#~ msgid "Black" -#~ msgstr "Preto" - -#~ msgid "Checked" -#~ msgstr "Verificado" - -#~ msgid "Fit to width if larger" -#~ msgstr "Ajustar à largura caso seja maior" - -#~ msgid "Fit to window" -#~ msgstr "Ajustar à janela" - -#~ msgid "Fit to window if larger" -#~ msgstr "Ajusta à janela se for maior que ela" - #~ msgid "Follow Nautilus behaviour" #~ msgstr "Seguir comportamento do Nautilus" -#~ msgid "Icons only" -#~ msgstr "Apenas ícones" - -#~ msgid "Keep previous zoom" -#~ msgstr "Manter zoom anterior" - -#~ msgid "Set image to actual size" -#~ msgstr "Configura a imagem para o tamanho real" - -#~ msgid "System settings" -#~ msgstr "Configurações do sistema" - -#~ msgid "Text below icons" -#~ msgstr "Texto abaixo dos ícones" - -#~ msgid "Text beside icons" -#~ msgstr "Texto ao lado dos ícones" - -#~ msgid "Text only" -#~ msgstr "Apenas texto" - #~ msgid "Use a _fading effect when changing image" #~ msgstr "Usar e_feito de desaparecimento ao mudar a imagem" -#~ msgid "White" -#~ msgstr "Branco" - #~ msgid "After" #~ msgstr "Depois de" @@ -4569,15 +7300,9 @@ #~ msgstr "" #~ "O pacote do software \"Postr\" deve estar instalado para usar essa função." -#~ msgid "_Upload" -#~ msgstr "_Enviar" - #~ msgid "Ca_tegories..." #~ msgstr "Ca_tegorias..." -#~ msgid "To _Flickr" -#~ msgstr "Para o _Flickr" - #~ msgid "Category" #~ msgstr "Categoria" diff -Nru gthumb-3.0.2/po/ru.po gthumb-3.2.3/po/ru.po --- gthumb-3.0.2/po/ru.po 2012-08-14 16:25:43.000000000 +0000 +++ gthumb-3.2.3/po/ru.po 2013-06-18 17:24:15.000000000 +0000 @@ -10,15 +10,19 @@ msgid "" msgstr "" "Project-Id-Version: gthumb trunk\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gthumb&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-12-13 18:49+0000\n" -"PO-Revision-Date: 2012-04-29 12:11+0300\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=gthumb&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-04-04 09:38+0000\n" +"PO-Revision-Date: 2013-05-15 18:13+0300\n" "Last-Translator: Yuri Myasoedov \n" "Language-Team: Russian \n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Poedit 1.5.4\n" #: ../copy-n-paste/eggdesktopfile.c:165 #, c-format @@ -88,65 +92,62 @@ msgid "Show session management options" msgstr "Показать параметры управления сеансом" -#: ../data/gthumb.desktop.in.in.h:1 -msgid "Image Viewer" -msgstr "Просмотр изображений" - -#: ../data/gthumb.desktop.in.in.h:2 -msgid "View and organize your images" -msgstr "Просмотр изображений и ведение альбомов" - #. manually set name and icon -#: ../data/gthumb.desktop.in.in.h:3 -#: ../gthumb/gth-browser.c:529 -#: ../gthumb/gth-progress-dialog.c:386 -#: ../gthumb/main.c:313 +#: ../data/gthumb.desktop.in.in.h:1 ../gthumb/gth-browser.c:578 +#: ../gthumb/gth-progress-dialog.c:390 ../gthumb/main.c:315 msgid "gThumb" msgstr "gThumb" -#: ../data/gthumb.desktop.in.in.h:4 +#: ../data/gthumb.desktop.in.in.h:2 +msgid "Image Viewer" +msgstr "Просмотр изображений" + +#: ../data/gthumb.desktop.in.in.h:3 msgid "gThumb Image Viewer" msgstr "Просмотр изображений gThumb" -#: ../data/gthumb-import.desktop.in.in.h:1 -msgid "Import the photos on your camera card" -msgstr "Импортировать фотографии с цифровой камеры" +#: ../data/gthumb.desktop.in.in.h:4 +msgid "View and organize your images" +msgstr "Просмотр изображений и ведение альбомов" -#: ../data/gthumb-import.desktop.in.in.h:2 +#: ../data/gthumb-import.desktop.in.in.h:1 msgid "Import with gThumb" msgstr "Импортировать с помощью gThumb" -#: ../data/gthumb-import.desktop.in.in.h:3 +#: ../data/gthumb-import.desktop.in.in.h:2 msgid "Photo Import Tool" msgstr "Инструмент импортирования фотографий" -#: ../data/gthumb-import.desktop.in.in.h:4 +#: ../data/gthumb-import.desktop.in.in.h:3 msgid "gThumb Photo Import Tool" msgstr "Инструмент импортирования фотографий gThumb" +#: ../data/gthumb-import.desktop.in.in.h:4 +msgid "Import the photos on your camera card" +msgstr "Импортировать фотографии с цифровой камеры" + #: ../data/org.gnome.gthumb.gschema.xml.in.h:1 -msgid "Images over this size (in bytes) will not be thumbnailed. Use 0 if you want to generate thumbnails for all images." -msgstr "Для изображений больше указанного размера не будут создаваться миниатюры. Если установлено значение 0, миниатюры будут создаваться для всех изображений." +msgid "" +"Images over this size (in bytes) will not be thumbnailed. Use 0 if you want " +"to generate thumbnails for all images." +msgstr "" +"Для изображений больше указанного размера не будут создаваться миниатюры. " +"Если установлено значение 0, миниатюры будут создаваться для всех " +"изображений." #: ../data/org.gnome.gthumb.gschema.xml.in.h:2 -#| msgid "Open another window" -msgid "Open files in the active window" -msgstr "Открывать файлы в текущем окне" - -#: ../data/org.gnome.gthumb.gschema.xml.in.h:3 msgid "Whether to resize the window to fit the size of the image" msgstr "Изменять ли размер окна, чтобы подогнать размер изображения" +#: ../data/org.gnome.gthumb.gschema.xml.in.h:3 +msgid "Open files in the active window" +msgstr "Открывать файлы в текущем окне" + #: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:1 msgid "Possible values are: white, black, checked, none." msgstr "Возможные значения: white, black, checked, none." #: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:2 -msgid "Whether to always use a black background." -msgstr "Всегда ли использовать чёрный фон." - -#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:3 -#| msgid "Whether to reset the scrollbar positions after changing image" msgid "Whether to reset the scrollbars position after changing image" msgstr "Сбрасывать ли положение полос прокрутки после изменения изображения" @@ -159,37 +160,40 @@ msgstr "Возможные значения: tiff, tif." #: ../data/org.gnome.gthumb.rename-series.gschema.xml.in.h:1 -msgid "Possible values include: general::unsorted, file::name, file::size, file::mtime, exif::photo::datetimeoriginal" -msgstr "Возможные значения: general::unsorted, file::name, file::size, file::mtime, exif::photo::datetimeoriginal" +msgid "" +"Possible values include: general::unsorted, file::name, file::size, file::" +"mtime, exif::photo::datetimeoriginal" +msgstr "" +"Возможные значения: general::unsorted, file::name, file::size, file::mtime, " +"exif::photo::datetimeoriginal" #: ../data/ui/extensions-preferences.ui.h:1 +msgid "_Extensions:" +msgstr "_Расширения:" + +#: ../data/ui/extensions-preferences.ui.h:2 msgid "More extensions..." msgstr "Дополнительные расширения…" -#: ../data/ui/extensions-preferences.ui.h:2 +#: ../data/ui/extensions-preferences.ui.h:3 msgid "Some extensions are configurable." msgstr "Некоторые расширения можно настраивать." -#: ../data/ui/extensions-preferences.ui.h:3 -msgid "_Extensions:" -msgstr "_Расширения:" - #: ../data/ui/filter-editor.ui.h:1 msgid "Filter _Name:" msgstr "Название _фильтра:" -#. limit label #: ../data/ui/filter-editor.ui.h:2 -#: ../gthumb/gth-filter.c:268 -#: ../gthumb/gth-filter.c:340 -msgid "_Limit to" -msgstr "_Ограничить до" - -#: ../data/ui/filter-editor.ui.h:3 #: ../extensions/search/data/ui/search-editor.ui.h:3 msgid "_Match" msgstr "_Совпадение" +#. limit label +#: ../data/ui/filter-editor.ui.h:3 ../gthumb/gth-filter.c:269 +#: ../gthumb/gth-filter.c:337 +msgid "_Limit to" +msgstr "_Ограничить до" + #: ../data/ui/filter-editor.ui.h:4 msgid "selected by" msgstr "выбрано с помощью" @@ -198,69 +202,72 @@ msgid "Mean:" msgstr "Среднее:" -#: ../data/ui/histogram-info.ui.h:2 +#. Short for "Standard deviation". Try to keep it under the 12 characters in the translation or it will be ellipsizied at the end. +#: ../data/ui/histogram-info.ui.h:3 +msgid "Std dev:" +msgstr "Станд. отклон.:" + +#: ../data/ui/histogram-info.ui.h:4 msgid "Median:" msgstr "Медиана:" +#. After the colon there is the total number of pixels +#: ../data/ui/histogram-info.ui.h:6 +msgid "Pixels:" +msgstr "Пикселов:" + #. After the colon there is a percentile. -#: ../data/ui/histogram-info.ui.h:4 +#: ../data/ui/histogram-info.ui.h:8 msgctxt "Pixels" msgid "Max:" msgstr "Макс.:" #. After the colon there is the percentile of selected pixels. -#: ../data/ui/histogram-info.ui.h:6 +#: ../data/ui/histogram-info.ui.h:10 msgctxt "Pixels" msgid "Selected:" msgstr "Выделено:" -#. After the colon there is the total number of pixels -#: ../data/ui/histogram-info.ui.h:8 -msgid "Pixels:" -msgstr "Пикселов:" - -#. Short for "Standard deviation". Try to keep it short in the translation. -#: ../data/ui/histogram-info.ui.h:10 -msgid "Std dev:" -msgstr "Станд. отклон.:" +#: ../data/ui/location.ui.h:1 +msgid "_Location:" +msgstr "_Местоположение:" #: ../data/ui/overwrite-dialog.ui.h:1 -msgid "Do not overwrite _the old file" -msgstr "Не перезаписывать _старый файл" +msgid "Overwrite the old file with the new one?" +msgstr "Заменить старый файл новым?" #: ../data/ui/overwrite-dialog.ui.h:2 +msgid "Old File:" +msgstr "Старый файл:" + +#: ../data/ui/overwrite-dialog.ui.h:3 msgid "Filename:" msgstr "Имя файла:" -#: ../data/ui/overwrite-dialog.ui.h:3 +#: ../data/ui/overwrite-dialog.ui.h:4 +#: ../extensions/image_print/data/ui/print-layout.ui.h:23 +msgid "Size:" +msgstr "Размер:" + +#: ../data/ui/overwrite-dialog.ui.h:5 msgid "Modified:" msgstr "Изменено:" -#: ../data/ui/overwrite-dialog.ui.h:4 +#: ../data/ui/overwrite-dialog.ui.h:6 msgid "New File:" msgstr "Новый файл:" -#: ../data/ui/overwrite-dialog.ui.h:5 -msgid "Old File:" -msgstr "Старый файл:" - -#: ../data/ui/overwrite-dialog.ui.h:6 +#: ../data/ui/overwrite-dialog.ui.h:7 msgid "Over_write the old file" msgstr "_Перезаписать старый файл" -#: ../data/ui/overwrite-dialog.ui.h:7 -msgid "Overwrite _all files" -msgstr "Перезаписать _все файлы" - #: ../data/ui/overwrite-dialog.ui.h:8 -msgid "Overwrite the old file with the new one?" -msgstr "Заменить старый файл новым?" +msgid "Do not overwrite _the old file" +msgstr "Не перезаписывать _старый файл" #: ../data/ui/overwrite-dialog.ui.h:9 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:9 -#: ../extensions/image_print/data/ui/print-layout.ui.h:16 -msgid "Size:" -msgstr "Размер:" +msgid "Overwrite _all files" +msgstr "Перезаписать _все файлы" #: ../data/ui/overwrite-dialog.ui.h:10 msgid "_Do not overwrite any file" @@ -283,121 +290,186 @@ msgstr "_Другие фильтры:" #: ../data/ui/preferences.ui.h:1 -msgid "Appearance" -msgstr "Внешний вид" +msgid "below the folder list" +msgstr "под списком папок" #: ../data/ui/preferences.ui.h:2 -msgid "As_k confirmation before deleting files or catalogs" -msgstr "Запрашивать _подтверждение перед удалением файлов или каталогов" +msgid "on the right" +msgstr "справа" #: ../data/ui/preferences.ui.h:3 -msgid "Ask whether to save _modified files" -msgstr "Запрашивать подтверждение для сохранения _изменённых файлов" +msgid "gThumb Preferences" +msgstr "Настройки gThumb" #: ../data/ui/preferences.ui.h:4 -#: ../gthumb/dlg-preferences-extensions.c:71 -#: ../gthumb/gth-browser-actions-entries.h:173 -msgid "Browser" -msgstr "Обозреватель" +msgid "_Toolbar style:" +msgstr "Стиль панели _инструментов:" #: ../data/ui/preferences.ui.h:5 -#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 -#: ../extensions/image_print/data/ui/print-layout.ui.h:4 -msgid "Caption" -msgstr "Подпись" +msgid "T_humbnails in viewer:" +msgstr "Миниатюры при просмотре:" #: ../data/ui/preferences.ui.h:6 -msgid "Choose startup folder" -msgstr "Выберите начальную папку" +msgid "System settings" +msgstr "Системные параметры" #: ../data/ui/preferences.ui.h:7 -msgid "D_etermine image type from content (slower)" -msgstr "Определять тип изображения по содер_жимому (медленнее)" +msgid "Text below icons" +msgstr "Текст под значками" #: ../data/ui/preferences.ui.h:8 -msgid "File _properties in browser:" -msgstr "_Свойства файла в браузере:" +msgid "Text beside icons" +msgstr "Текст рядом со значками" #: ../data/ui/preferences.ui.h:9 -#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 -#: ../extensions/edit_metadata/gth-edit-general-page.c:404 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 -#: ../gthumb/gth-main-default-metadata.c:33 -msgid "General" -msgstr "Общие" +#| msgid "is only" +msgid "Icons only" +msgstr "Только значки" #: ../data/ui/preferences.ui.h:10 -msgid "Go to last _visited location" -msgstr "Перейти к _месту последнего посещения" +#| msgid "Text Files" +msgid "Text only" +msgstr "Только текст" #: ../data/ui/preferences.ui.h:11 -msgid "Go to this _folder:" -msgstr "Перейти в указанную _папку:" +#| msgid "on the right" +msgid "on the bottom" +msgstr "внизу" #: ../data/ui/preferences.ui.h:12 -msgid "On startup:" -msgstr "При запуске:" +#| msgid "on the right" +msgid "on the side" +msgstr "сбоку" #: ../data/ui/preferences.ui.h:13 -#: ../extensions/exiv2_tools/gth-edit-iptc-page.c:198 -#: ../extensions/gstreamer_tools/main.c:33 -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:2 -msgid "Other" -msgstr "Другое" +msgid "File _properties in browser:" +msgstr "_Свойства файла в браузере:" #: ../data/ui/preferences.ui.h:14 -msgid "Set to C_urrent" -msgstr "Сделать _текущим" +msgid "Appearance" +msgstr "Внешний вид" #: ../data/ui/preferences.ui.h:15 -msgid "T_humbnails in viewer:" -msgstr "Миниатюры при просмотре:" +msgid "Go to last _visited location" +msgstr "Перейти к _месту последнего посещения" #: ../data/ui/preferences.ui.h:16 -msgid "Thumbnail _size:" -msgstr "Размер _миниатюр:" +msgid "Go to this _folder:" +msgstr "Перейти в указанную _папку:" #: ../data/ui/preferences.ui.h:17 -#| msgid "Resize the window to the size of the image" -msgid "_Reuse the active window to open files" -msgstr "_Повторно использовать текущее окно для открытия файлов" +msgid "Choose startup folder" +msgstr "Выберите начальную папку" #: ../data/ui/preferences.ui.h:18 -msgid "_Store metadata inside files if possible" -msgstr "_Хранить метаданные внутри файлов, если это возможно" +msgid "Set to C_urrent" +msgstr "Сделать _текущим" #: ../data/ui/preferences.ui.h:19 -msgid "_Toolbar style:" -msgstr "Стиль панели _инструментов:" +msgid "_Reuse the active window to open files" +msgstr "_Повторно использовать текущее окно для открытия файлов" #: ../data/ui/preferences.ui.h:20 -#| msgid "View the folders" -msgid "below the folder list" -msgstr "под списком папок" +msgid "On startup:" +msgstr "При запуске:" #: ../data/ui/preferences.ui.h:21 -msgid "gThumb Preferences" -msgstr "Настройки gThumb" +msgid "As_k confirmation before deleting files or catalogs" +msgstr "Запрашивать _подтверждение перед удалением файлов или каталогов" #: ../data/ui/preferences.ui.h:22 -#| msgid "Rotate Right" -msgid "on the right" -msgstr "справа" +msgid "Ask whether to save _modified files" +msgstr "Запрашивать подтверждение для сохранения _изменённых файлов" + +#: ../data/ui/preferences.ui.h:23 +msgid "_Store metadata inside files if possible" +msgstr "_Хранить метаданные внутри файлов, если это возможно" + +#: ../data/ui/preferences.ui.h:24 +#: ../extensions/exiv2_tools/gth-edit-iptc-page.c:198 +#: ../extensions/gstreamer_tools/main.c:33 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:17 +msgid "Other" +msgstr "Другое" + +#: ../data/ui/preferences.ui.h:25 +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 +#: ../extensions/edit_metadata/gth-edit-general-page.c:481 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 +#: ../gthumb/gth-main-default-metadata.c:33 +msgid "General" +msgstr "Общие" + +#: ../data/ui/preferences.ui.h:26 +#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 +#: ../extensions/image_print/data/ui/print-layout.ui.h:18 +msgid "Caption" +msgstr "Подпись" + +#: ../data/ui/preferences.ui.h:27 +msgid "Thumbnail _size:" +msgstr "Размер _миниатюр:" + +#: ../data/ui/preferences.ui.h:28 +msgid "48" +msgstr "48" + +#: ../data/ui/preferences.ui.h:29 +msgid "64" +msgstr "64" + +#: ../data/ui/preferences.ui.h:30 +msgid "85" +msgstr "85" + +#: ../data/ui/preferences.ui.h:31 +msgid "95" +msgstr "95" + +#: ../data/ui/preferences.ui.h:32 +#| msgid "1:1" +msgid "112" +msgstr "112" + +#: ../data/ui/preferences.ui.h:33 +msgid "128" +msgstr "128" + +#: ../data/ui/preferences.ui.h:34 +msgid "164" +msgstr "164" + +#: ../data/ui/preferences.ui.h:35 +msgid "200" +msgstr "200" + +#: ../data/ui/preferences.ui.h:36 +msgid "256" +msgstr "256" + +#: ../data/ui/preferences.ui.h:37 +msgid "D_etermine image type from content (slower)" +msgstr "Определять тип изображения по содер_жимому (медленнее)" + +#: ../data/ui/preferences.ui.h:38 ../gthumb/dlg-preferences-extensions.c:71 +#: ../gthumb/gth-browser-actions-entries.h:179 +msgid "Browser" +msgstr "Обозреватель" #: ../data/ui/sort-order.ui.h:1 msgid "Sort By" msgstr "Сортировать по" #: ../data/ui/sort-order.ui.h:2 -msgid "_Inverse order" -msgstr "В _обратном порядке" - -#: ../data/ui/sort-order.ui.h:3 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:4 msgid "_Sort by:" msgstr "_Сортировать по:" +#: ../data/ui/sort-order.ui.h:3 +msgid "_Inverse order" +msgstr "В _обратном порядке" + #: ../extensions/23hq/23hq.extension.in.in.h:1 msgid "23" msgstr "23" @@ -415,14 +487,14 @@ msgstr "Загрузить снимки на 23" #: ../extensions/bookmarks/bookmarks.extension.in.in.h:1 -msgid "Add bookmarks support." -msgstr "Добавить поддержку закладок." - -#: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:1 msgid "Bookmarks" msgstr "Закладки" +#: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 +msgid "Add bookmarks support." +msgstr "Добавить поддержку закладок." + #: ../extensions/bookmarks/bookmarks.extension.in.in.h:3 #: ../extensions/burn_disc/burn_disc.extension.in.in.h:3 #: ../extensions/catalogs/catalogs.extension.in.in.h:3 @@ -442,12 +514,12 @@ #: ../extensions/image_viewer/image_viewer.extension.in.in.h:3 #: ../extensions/list_tools/list_tools.extension.in.in.h:3 #: ../extensions/photo_importer/photo_importer.extension.in.in.h:3 -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:3 #: ../extensions/raw_files/raw_files.extension.in.in.h:3 #: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:3 #: ../extensions/rename_series/rename_series.extension.in.in.h:3 #: ../extensions/resize_images/resize_images.extension.in.in.h:3 #: ../extensions/search/search.extension.in.in.h:3 +#: ../extensions/selections/selections.extension.in.in.h:3 #: ../extensions/slideshow/slideshow.extension.in.in.h:3 #: ../extensions/webalbums/webalbums.extension.in.in.h:3 msgid "gthumb development team" @@ -482,14 +554,14 @@ msgstr "_Закладки:" #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:3 -msgid "_Location" -msgstr "_Местоположение" - -#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:4 msgid "_Name" msgstr "_Имя" -#: ../extensions/bookmarks/dlg-bookmarks.c:70 +#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:4 +msgid "_Location" +msgstr "_Местоположение" + +#: ../extensions/bookmarks/dlg-bookmarks.c:70 msgid "Could not remove the bookmark" msgstr "Не удалось удалить закладку" @@ -522,55 +594,164 @@ msgstr "Текущая папка с _вложенными подпапками" #: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:3 -msgid "Source" -msgstr "Источник" - -#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:4 msgid "_Selected files" msgstr "_Выбранные файлы" +#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:4 +msgid "Source" +msgstr "Источник" + #: ../extensions/burn_disc/gth-burn-task.c:238 #: ../extensions/burn_disc/gth-burn-task.c:259 #: ../extensions/burn_disc/gth-burn-task.c:397 msgid "Write to Disc" msgstr "Записать на диск" -#: ../extensions/cairo_io/cairo-io-jpeg.c:62 +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:62 #, c-format msgid "Error interpreting JPEG image file: %s" msgstr "Ошибка интерпретации изображения в формате JPEG: %s" -#: ../extensions/cairo_io/cairo-io-jpeg.c:482 +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:483 #, c-format msgid "Unknown JPEG color space (%d)" msgstr "Неизвестное цветовое пространство JPEG (%d)" -#: ../extensions/catalogs/actions.c:92 -#: ../extensions/catalogs/actions.c:213 +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:1 +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:1 +msgid "_Default extension:" +msgstr "_Расширение по умолчанию:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:2 +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:1 +msgid "_Quality:" +msgstr "_Качество:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:3 +msgid "_Smoothing:" +msgstr "С_глаживание:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:4 +msgid "Opti_mize" +msgstr "_Оптимизировать" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:5 +msgid "_Progressive" +msgstr "_Постепенная прорисовка" + +#: ../extensions/cairo_io/data/ui/png-options.ui.h:1 +msgid "Compression _level:" +msgstr "Степень с_жатия:" + +#: ../extensions/cairo_io/data/ui/save-options-preferences.ui.h:1 +msgid "Default options:" +msgstr "Параметры по умолчанию:" + +#: ../extensions/cairo_io/data/ui/tga-options.ui.h:1 +msgid "_RLE compression" +msgstr "Сжатие _RLE" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:2 +msgid "Compression" +msgstr "Сжатие" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:3 +msgid "_No compression" +msgstr "_Без сжатия" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:4 +msgid "No_rmal (Deflate)" +msgstr "_Обычное (низкое)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:5 +msgid "_Loss compression (JPEG)" +msgstr "Сжатие с по_терями (JPEG)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:6 +msgid "Resolution" +msgstr "Разрешение" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:7 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 +msgid "_Horizontal:" +msgstr "По _горизонтали:" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:8 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 +msgid "_Vertical:" +msgstr "По в_ертикали:" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:9 +msgid "dpi" +msgstr "точек/дюйм" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:2 +msgid "_Method:" +msgstr "_Метод:" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:3 +msgid "_Lossless" +msgstr "_Без потерь качества" + +#: ../extensions/cairo_io/gth-image-saver-jpeg.c:516 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:140 +msgid "JPEG" +msgstr "JPEG" + +#: ../extensions/cairo_io/gth-image-saver-png.c:353 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:110 +msgid "PNG" +msgstr "PNG" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:257 +#: ../extensions/cairo_io/gth-image-saver-tiff.c:435 +#: ../gthumb/gth-buffer-data.c:84 +msgid "Insufficient memory" +msgstr "Недостаточно памяти" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:344 +msgid "TGA" +msgstr "TGA" + +#: ../extensions/cairo_io/gth-image-saver-tiff.c:559 +msgid "TIFF" +msgstr "TIFF" + +#: ../extensions/cairo_io/gth-image-saver-webp.c:382 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:165 +msgid "WebP" +msgstr "WebP" + +#: ../extensions/cairo_io/preferences.c:134 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 +msgid "Saving" +msgstr "Сохранение" + +#: ../extensions/catalogs/actions.c:92 ../extensions/catalogs/actions.c:213 #: ../extensions/catalogs/dlg-add-to-catalog.c:274 #: ../extensions/catalogs/dlg-add-to-catalog.c:394 -#: ../extensions/file_manager/actions.c:65 +#: ../extensions/file_manager/actions.c:68 #: ../extensions/list_tools/gth-script-editor-dialog.c:290 #: ../gthumb/gth-filter-editor-dialog.c:461 #, c-format msgid "No name specified" msgstr "Не указано имя" -#: ../extensions/catalogs/actions.c:99 -#: ../extensions/catalogs/actions.c:220 +#: ../extensions/catalogs/actions.c:99 ../extensions/catalogs/actions.c:220 #: ../extensions/catalogs/dlg-add-to-catalog.c:281 #: ../extensions/catalogs/dlg-add-to-catalog.c:401 -#: ../extensions/file_manager/actions.c:72 +#: ../extensions/file_manager/actions.c:75 #, c-format msgid "Invalid name. The following characters are not allowed: %s" msgstr "Недопустимое имя. Следующие символы запрещены к использованию: %s." -#: ../extensions/catalogs/actions.c:155 -#: ../extensions/catalogs/actions.c:267 +#: ../extensions/catalogs/actions.c:155 ../extensions/catalogs/actions.c:267 #: ../extensions/catalogs/dlg-add-to-catalog.c:338 #: ../extensions/catalogs/dlg-add-to-catalog.c:448 -#: ../extensions/catalogs/gth-file-source-catalogs.c:503 -#: ../extensions/file_manager/actions.c:103 +#: ../extensions/catalogs/gth-file-source-catalogs.c:508 +#: ../extensions/file_manager/actions.c:106 msgid "Name already used" msgstr "Это имя уже используется" @@ -584,11 +765,10 @@ msgid "Enter the catalog name:" msgstr "Введите название каталога: " -#: ../extensions/catalogs/actions.c:181 -#: ../extensions/catalogs/actions.c:293 +#: ../extensions/catalogs/actions.c:181 ../extensions/catalogs/actions.c:293 #: ../extensions/catalogs/dlg-add-to-catalog.c:362 #: ../extensions/catalogs/dlg-add-to-catalog.c:474 -#: ../extensions/file_manager/actions.c:133 +#: ../extensions/file_manager/actions.c:136 msgid "C_reate" msgstr "_Создать" @@ -616,15 +796,16 @@ msgstr "Добавить в к_аталог" #: ../extensions/catalogs/callbacks.c:105 +#: ../extensions/selections/callbacks.c:80 msgid "Open _Folder" msgstr "Открыть _папку" #: ../extensions/catalogs/callbacks.c:106 +#: ../extensions/selections/callbacks.c:81 msgid "Go to the folder that contains the selected file" msgstr "Перейти в каталог, который содержит выбранный файл" #: ../extensions/catalogs/callbacks.c:110 -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:85 msgid "Other..." msgstr "Другой…" @@ -660,37 +841,36 @@ msgid "Rena_me" msgstr "Пере_именовать" -#: ../extensions/catalogs/callbacks.c:279 -#: ../extensions/catalogs/callbacks.c:282 +#: ../extensions/catalogs/callbacks.c:281 +#: ../extensions/catalogs/callbacks.c:284 msgid "Command Line" msgstr "Командная строка" -#: ../extensions/catalogs/callbacks.c:497 -#: ../extensions/catalogs/callbacks.c:502 +#: ../extensions/catalogs/callbacks.c:496 +#: ../extensions/catalogs/callbacks.c:501 #: ../extensions/photo_importer/dlg-photo-importer.c:364 #: ../extensions/photo_importer/dlg-photo-importer.c:404 -#: ../gthumb/gth-file-list.c:43 -#: ../gthumb/gth-folder-tree.c:883 +#: ../gthumb/gth-file-list.c:43 ../gthumb/gth-folder-tree.c:1093 msgid "(Empty)" msgstr "(Пусто)" -#: ../extensions/catalogs/callbacks.c:697 +#: ../extensions/catalogs/callbacks.c:700 msgid "Catalog Properties" msgstr "Свойства каталога" -#: ../extensions/catalogs/callbacks.c:711 +#: ../extensions/catalogs/callbacks.c:714 msgid "Organize" msgstr "Упорядочить" -#: ../extensions/catalogs/callbacks.c:712 +#: ../extensions/catalogs/callbacks.c:715 msgid "Automatically organize files by date" msgstr "Автоматически упорядочивать файлы по дате" #: ../extensions/catalogs/catalogs.extension.in.in.h:1 #: ../extensions/catalogs/gth-catalog.c:611 -#: ../extensions/catalogs/gth-catalog.c:660 +#: ../extensions/catalogs/gth-catalog.c:662 +#: ../extensions/catalogs/gth-catalog.c:1016 #: ../extensions/catalogs/gth-catalog.c:1017 -#: ../extensions/catalogs/gth-catalog.c:1018 msgid "Catalogs" msgstr "Каталоги" @@ -707,114 +887,114 @@ msgstr "К_аталоги:" #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:3 -msgid "New _Library" -msgstr "_Новая коллекция" - -#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:4 msgid "_New Catalog" msgstr "Н_овый каталог" +#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:4 +msgid "New _Library" +msgstr "_Новая коллекция" + #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:5 -#: ../extensions/file_manager/actions.c:929 -#: ../extensions/webalbums/gth-web-exporter.c:1842 +#: ../extensions/file_manager/actions.c:945 +#: ../extensions/webalbums/gth-web-exporter.c:1840 msgid "_View the destination" msgstr "_Просмотреть место назначения" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:1 -msgid "Catalog" -msgstr "Каталог" - -#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 -#: ../gthumb/gth-file-properties.c:212 +#: ../gthumb/gth-file-properties.c:209 msgid "Properties" msgstr "Свойства" +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:1 +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:1 +msgid "_Name:" +msgstr "_Имя:" + #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:4 -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:3 +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:2 msgid "_Date:" msgstr "_Дата:" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:5 -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 -#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 -msgid "_Name:" -msgstr "_Имя:" +msgid "Catalog" +msgstr "Каталог" #: ../extensions/catalogs/data/ui/organize-files-task.ui.h:1 -msgid "Catalog _Preview:" -msgstr "_Предпросмотр каталога:" - -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:2 -msgid "Organization:" -msgstr "Упорядочивание:" - -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 -#: ../extensions/catalogs/data/ui/organize-files.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 msgid "Organize Files" msgstr "Упорядочить файлы" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:2 msgid "Organizing files" msgstr "Упорядочивание файлов" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 +msgid "Organization:" +msgstr "Упорядочивание:" + +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:4 msgid "Select All" msgstr "Выбрать всё" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 msgid "Select None" msgstr "Ничего не выбирать" +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 +msgid "Catalog _Preview:" +msgstr "_Предпросмотр каталога:" + #: ../extensions/catalogs/data/ui/organize-files.ui.h:1 -#: ../extensions/edit_metadata/gth-edit-general-page.c:480 -#: ../gthumb/gth-main-default-tests.c:264 +#: ../extensions/edit_metadata/gth-edit-general-page.c:558 +#: ../gthumb/gth-main-default-tests.c:300 msgid "Date photo was taken" msgstr "Дата получения фотографии" #: ../extensions/catalogs/data/ui/organize-files.ui.h:2 -#: ../gthumb/gth-main-default-tests.c:256 +#: ../gthumb/gth-main-default-tests.c:292 msgid "File modified date" msgstr "Дата изменения файла" #: ../extensions/catalogs/data/ui/organize-files.ui.h:3 -msgid "Ignore catalogs with a single file" -msgstr "Игнорировать каталоги с одним файлом" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:5 -msgid "Put single files in the catalog:" -msgstr "Поместить одиночные файлы в каталог:" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 -msgid "Singles" -msgstr "Одиночные" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:7 -#: ../extensions/comments/main.c:280 +#: ../extensions/comments/main.c:182 msgid "Tag" msgstr "Метка" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:8 -#: ../gthumb/gth-main-default-tests.c:284 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:4 +msgid "tag" +msgstr "метка" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:5 +#: ../gthumb/gth-main-default-tests.c:324 msgid "Tag (embedded)" msgstr "Метка (встроенная)" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:9 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:7 msgid "_Group files by:" msgstr "_Группировать файлы по:" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:10 -#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:8 +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 #: ../extensions/search/data/ui/search-editor.ui.h:2 msgid "_Include sub-folders" msgstr "_Включать вложенные каталоги" +#: ../extensions/catalogs/data/ui/organize-files.ui.h:9 +msgid "Ignore catalogs with a single file" +msgstr "Игнорировать каталоги с одним файлом" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:10 +msgid "Put single files in the catalog:" +msgstr "Поместить одиночные файлы в каталог:" + #: ../extensions/catalogs/data/ui/organize-files.ui.h:11 -msgid "tag" -msgstr "метка" +msgid "Singles" +msgstr "Одиночные" #: ../extensions/catalogs/dlg-add-to-catalog.c:105 #: ../extensions/catalogs/dlg-add-to-catalog.c:136 @@ -836,55 +1016,55 @@ #: ../extensions/catalogs/dlg-organize-files.c:120 msgid "Files will be organized in catalogs. No file will be moved on disk." -msgstr "Файлы будут помещены в каталоги. Ни один файл не будет перемещён на диск." +msgstr "" +"Файлы будут помещены в каталоги. Ни один файл не будет перемещён на диск." -#: ../extensions/catalogs/gth-catalog.c:1115 -#: ../extensions/comments/main.c:43 +#: ../extensions/catalogs/gth-catalog.c:1114 ../extensions/comments/main.c:45 #: ../extensions/edit_metadata/callbacks.c:106 #: ../gthumb/gth-main-default-metadata.c:53 msgid "Tags" msgstr "Метки" -#: ../extensions/catalogs/gth-file-source-catalogs.c:948 +#: ../extensions/catalogs/gth-file-source-catalogs.c:953 #, c-format msgid "The catalog '%s' already exists, do you want to overwrite it?" msgstr "Каталог «%s» уже существует, хотите его перезаписать?" -#: ../extensions/catalogs/gth-file-source-catalogs.c:950 +#: ../extensions/catalogs/gth-file-source-catalogs.c:955 #, c-format msgid "The library '%s' already exists, do you want to overwrite it?" msgstr "Коллекция «%s» уже существует, хотите её перезаписать?" -#: ../extensions/catalogs/gth-file-source-catalogs.c:958 +#: ../extensions/catalogs/gth-file-source-catalogs.c:963 msgid "Over_write" msgstr "_Перезаписать" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1076 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1081 msgid "Cannot move the files" msgstr "Не удалось переместить файлы" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1078 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1083 msgid "Cannot copy the files" msgstr "Не удалось скопировать файлы" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1083 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1088 msgid "Invalid destination." msgstr "Неправильное место назначения." -#: ../extensions/catalogs/gth-file-source-catalogs.c:1130 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1135 #, c-format msgid "Copying files to '%s'" msgstr "Копирование файлов в «%s»" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1383 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1322 msgid "Could not remove the files from the catalog" msgstr "Не удалось удалить файлы из каталога" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1441 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:674 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:683 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:712 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:1215 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1380 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:746 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:755 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:785 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:1320 #: ../extensions/search/gth-search.c:265 msgid "Invalid file format" msgstr "Неверный формат файла" @@ -919,70 +1099,74 @@ msgstr "-" #: ../extensions/change_date/data/ui/change-date.ui.h:3 -msgid "A_djust by" -msgstr "По_догнать по" - -#: ../extensions/change_date/data/ui/change-date.ui.h:4 msgid "Change Date" msgstr "Изменить дату" -#: ../extensions/change_date/data/ui/change-date.ui.h:5 +#: ../extensions/change_date/data/ui/change-date.ui.h:4 msgid "Change the following values:" msgstr "Изменить следующие значения:" -#: ../extensions/change_date/data/ui/change-date.ui.h:6 -msgid "Change to:" -msgstr "Измененить на:" +#: ../extensions/change_date/data/ui/change-date.ui.h:5 +msgid "_Last modified date" +msgstr "_Дата последнего изменения" -#: ../extensions/change_date/data/ui/change-date.ui.h:7 +#: ../extensions/change_date/data/ui/change-date.ui.h:6 msgid "Co_mment date" msgstr "Дата ко_мментария" +#: ../extensions/change_date/data/ui/change-date.ui.h:7 +msgid "Change to:" +msgstr "Измененить на:" + #: ../extensions/change_date/data/ui/change-date.ui.h:8 -msgid "Date p_hoto was taken" -msgstr "Дата получения _фотографии" +msgid "The _following date:" +msgstr "_Следующая дата:" #: ../extensions/change_date/data/ui/change-date.ui.h:9 -msgid "Exif DateTimeOriginal tag" -msgstr "Тег EXIF DateTimeOriginal" - -#: ../extensions/change_date/data/ui/change-date.ui.h:10 msgid "File _modified date" msgstr "Дата _изменения" -#: ../extensions/change_date/data/ui/change-date.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:10 msgid "File c_reation date" msgstr "Дата со_здания файла" +#: ../extensions/change_date/data/ui/change-date.ui.h:11 +msgid "Date p_hoto was taken" +msgstr "Дата получения _фотографии" + #: ../extensions/change_date/data/ui/change-date.ui.h:12 -msgid "The _following date:" -msgstr "_Следующая дата:" +msgid "A_djust by" +msgstr "По_догнать по" #: ../extensions/change_date/data/ui/change-date.ui.h:13 -msgid "_Last modified date" -msgstr "_Дата последнего изменения" - -#: ../extensions/change_date/data/ui/change-date.ui.h:14 msgid "hours" msgstr "час." -#: ../extensions/change_date/data/ui/change-date.ui.h:15 +#: ../extensions/change_date/data/ui/change-date.ui.h:14 msgid "minutes" msgstr "мин." -#: ../extensions/change_date/data/ui/change-date.ui.h:16 -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:15 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:6 msgid "seconds" msgstr "сек." -#: ../extensions/comments/comments.extension.in.in.h:1 -msgid "Add comments and tags to any file type." -msgstr "Добавить комментарии и метки к любому типу файла." +#: ../extensions/comments/callbacks.c:46 +msgid "Import Embedded Metadata" +msgstr "Импортировать встроенные метаданные" + +#: ../extensions/comments/callbacks.c:47 +msgid "Import the metadata stored inside files into the gThumb comment system" +msgstr "Импортировать метаданные из файлов в систему комментариев gThumb" -#: ../extensions/comments/comments.extension.in.in.h:2 +#: ../extensions/comments/comments.extension.in.in.h:1 msgid "Comments and tags" msgstr "Комментарии и метки" +#: ../extensions/comments/comments.extension.in.in.h:2 +msgid "Add comments and tags to any file type." +msgstr "Добавить комментарии и метки к любому типу файла." + #: ../extensions/comments/data/ui/comments-preferences.ui.h:1 #: ../extensions/importer/gth-import-preferences-dialog.c:318 msgid "Preferences" @@ -992,42 +1176,37 @@ msgid "_Synchronize with the embedded metadata" msgstr "_Синхронизировать со встроенными метаданными" -#: ../extensions/comments/main.c:33 +#: ../extensions/comments/main.c:35 #: ../extensions/edit_metadata/callbacks.c:100 msgid "Comment" msgstr "Добавить комментарий" -#: ../extensions/comments/main.c:39 -#: ../gthumb/gth-main-default-metadata.c:46 +#: ../extensions/comments/main.c:41 ../gthumb/gth-main-default-metadata.c:46 msgid "Title" msgstr "Заголовок" -#: ../extensions/comments/main.c:40 -#: ../extensions/comments/main.c:264 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 +#: ../extensions/comments/main.c:42 ../extensions/comments/main.c:166 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 #: ../extensions/image_print/data/ui/print-layout.ui.h:8 -#: ../extensions/importer/data/ui/import-preferences.ui.h:1 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:16 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:13 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 +#: ../extensions/importer/data/ui/import-preferences.ui.h:6 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 #: ../gthumb/gth-main-default-metadata.c:52 msgid "Description" msgstr "Описание" -#: ../extensions/comments/main.c:41 -#: ../extensions/comments/main.c:272 +#: ../extensions/comments/main.c:43 ../extensions/comments/main.c:174 #: ../gthumb/gth-main-default-metadata.c:50 msgid "Place" msgstr "Место" -#: ../extensions/comments/main.c:42 -#: ../gthumb/gth-main-default-metadata.c:51 +#: ../extensions/comments/main.c:44 ../gthumb/gth-main-default-metadata.c:51 msgid "Date" msgstr "Дата" -#: ../extensions/comments/main.c:44 -#: ../gthumb/gth-main-default-metadata.c:54 +#: ../extensions/comments/main.c:46 ../gthumb/gth-main-default-metadata.c:54 msgid "Rating" msgstr "Рейтинг" @@ -1052,7 +1231,7 @@ msgstr "Создать галерею" #: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:1 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:8 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:1 msgid "Contact Sheet" msgstr "Контактный лист" @@ -1061,276 +1240,261 @@ msgstr "Создать изображение, показывающее миниатюры выбранных файлов." #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:1 -msgid "Background" -msgstr "Фон" +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:446 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 +#: ../extensions/file_tools/gth-file-tool-rotate.c:397 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:14 +#: ../extensions/slideshow/main.c:277 +msgid "None" +msgstr "Отсутствует" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:2 -msgid "C_olor:" -msgstr "_Цвет:" +msgid "Simple" +msgstr "Простой" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:3 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 -msgid "Caption:" -msgstr "Заголовок:" +msgid "Simple with shadow" +msgstr "Простой с тенью" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:4 -msgid "Frame" -msgstr "Рамка" +msgid "Shadow only" +msgstr "Только тень" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:5 -msgid "Inward Shadow" -msgstr "Внутренняя тень" +msgid "Slide" +msgstr "Слайд" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:6 -#: ../extensions/file_tools/gth-file-tool-crop.c:424 -#: ../extensions/file_tools/gth-file-tool-crop.c:454 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 -#: ../extensions/file_tools/gth-file-tool-rotate.c:415 -#: ../extensions/slideshow/main.c:277 -msgid "None" -msgstr "Отсутствует" +msgid "Inward Shadow" +msgstr "Внутренняя тень" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:7 msgid "Outward Shadow" msgstr "Внешняя тень" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 -msgid "Select a color" -msgstr "Выберите цвет" - #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:9 -msgid "Select a font" -msgstr "Выберите шрифт" +msgid "Background" +msgstr "Фон" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:10 -msgid "Shadow only" -msgstr "Только тень" +msgid "_Solid color" +msgstr "_Сплошной цвет" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:11 -msgid "Simple" -msgstr "Простой" - -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 -msgid "Simple with shadow" -msgstr "Простой с тенью" - -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 -msgid "Slide" -msgstr "Слайд" +msgid "_Gradient" +msgstr "_Градиент" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:14 -#: ../extensions/rename_series/dlg-rename-series.c:57 -msgid "Text" -msgstr "Текст" +msgid "Select a color" +msgstr "Выберите цвет" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:15 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 -#: ../extensions/image_print/data/ui/print-layout.ui.h:26 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 -msgid "_Footer:" -msgstr "Ни_жний колонтитул:" +msgid "Frame" +msgstr "Рамка" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:16 -msgid "_Gradient" -msgstr "_Градиент" +msgid "_Style:" +msgstr "_Стиль:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:17 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 -#: ../extensions/image_print/data/ui/print-layout.ui.h:27 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 -msgid "_Header:" -msgstr "_Верхний колонтитул:" +msgid "C_olor:" +msgstr "_Цвет:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:18 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 -msgid "_Horizontal:" -msgstr "По _горизонтали:" +#: ../extensions/rename_series/dlg-rename-series.c:57 +msgid "Text" +msgstr "Текст" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 +#: ../extensions/image_print/data/ui/print-layout.ui.h:3 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 +msgid "_Header:" +msgstr "_Верхний колонтитул:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:20 -msgid "_Solid color" -msgstr "_Сплошной цвет" +msgid "Select a font" +msgstr "Выберите шрифт" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:21 -msgid "_Style:" -msgstr "_Стиль:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 +#: ../extensions/image_print/data/ui/print-layout.ui.h:4 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 +msgid "_Footer:" +msgstr "Ни_жний колонтитул:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:22 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 -msgid "_Vertical:" -msgstr "По в_ертикали:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 +msgid "Caption:" +msgstr "Заголовок:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:2 +#: ../extensions/image_print/data/ui/print-layout.ui.h:5 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:6 +msgid "The current page number" +msgstr "Номер текущей страницы" -#. translate only the text in the curly brackets #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:3 -#: ../extensions/image_print/data/ui/print-layout.ui.h:3 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 -#, no-c-format -msgid "%D{ format }" -msgstr "%D{ формат }" +#: ../extensions/image_print/data/ui/print-layout.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 +msgid "The total number of pages" +msgstr "Всего страниц" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:4 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 -msgid "All images on a single page" -msgstr "Все изображения на одной странице" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:6 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 -#: ../extensions/convert_format/data/ui/convert-format.ui.h:1 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:10 -msgid "Choose destination folder" -msgstr "Выберите папку назначения" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 +#: ../extensions/image_print/data/ui/print-layout.ui.h:7 +#: ../extensions/importer/data/ui/import-preferences.ui.h:5 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:8 +msgid "Special code" +msgstr "Специальный код" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:7 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:3 -#: ../extensions/image_print/data/ui/print-layout.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:11 -msgid "Columns:" -msgstr "Столбцы:" +#. translate only the text in the curly brackets +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:8 +#: ../extensions/image_print/data/ui/print-layout.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 +#, no-c-format +msgid "%D{ format }" +msgstr "%D{ формат }" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:9 -msgid "Create _HTML image map" -msgstr "Создать _карту HTML с изображением" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 -msgid "Create a new theme" -msgstr "Создать новую тему" +#: ../extensions/image_print/data/ui/print-layout.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 +msgid "The current date" +msgstr "Текущая дата" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 -msgid "Delete the selected theme" -msgstr "Удалить выбранную тему" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:6 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 +msgid "_Destination:" +msgstr "_Назначение:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:13 -msgid "Edit the selected theme" -msgstr "Изменить выбранную тему" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:3 +#: ../extensions/convert_format/data/ui/convert-format.ui.h:4 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 +msgid "Choose destination folder" +msgstr "Выберите папку назначения" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:14 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 msgid "File_name:" msgstr "_Имя файла:" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:16 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 -msgid "Images per page:" -msgstr "Изображений на страницу:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:8 +msgid "New enumerator digit" +msgstr "Новый цифровой счётчик" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 -#: ../extensions/image_print/data/ui/print-layout.ui.h:11 -msgid "Layout" -msgstr "Макет" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:16 +msgid "Create _HTML image map" +msgstr "Создать _карту HTML с изображением" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:15 -msgid "New enumerator digit" -msgstr "Новый цифровой счётчик" +msgid "Create a new theme" +msgstr "Создать новую тему" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:19 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:10 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 -msgid "Re_verse order" -msgstr "В _обратном порядке" +msgid "Edit the selected theme" +msgstr "Изменить выбранную тему" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:20 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:11 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 -msgid "S_ort:" -msgstr "_Сортировать:" +msgid "Delete the selected theme" +msgstr "Удалить выбранную тему" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:21 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 -#: ../extensions/pixbuf_savers/preferences.c:134 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 -msgid "Saving" -msgstr "Сохранение" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:13 -#: ../extensions/image_print/data/ui/print-layout.ui.h:17 -#: ../extensions/importer/data/ui/import-preferences.ui.h:2 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:20 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:18 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 -msgid "Special code" -msgstr "Специальный код" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 +msgid "Theme" +msgstr "Тема" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:23 -msgid "Sq_uared" -msgstr "_Квадрат" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:16 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 +msgid "Columns:" +msgstr "Столбцы:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:24 -#: ../extensions/image_print/data/ui/print-layout.ui.h:18 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 -msgid "The current date" -msgstr "Текущая дата" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:10 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 +msgid "Images per page:" +msgstr "Изображений на страницу:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:25 -#: ../extensions/image_print/data/ui/print-layout.ui.h:19 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 -msgid "The current page number" -msgstr "Номер текущей страницы" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 +msgid "All images on a single page" +msgstr "Все изображения на одной странице" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:26 -#: ../extensions/image_print/data/ui/print-layout.ui.h:22 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 -msgid "The total number of pages" -msgstr "Всего страниц" +msgid "_All pages with the same size" +msgstr "_Все страницы с таким же размером" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:27 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 -msgid "Theme" -msgstr "Тема" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:15 +msgid "Layout" +msgstr "Макет" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:28 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:14 -msgid "Thumbnails" -msgstr "Миниатюры" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:13 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 +msgid "S_ort:" +msgstr "_Сортировать:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:29 -msgid "_All pages with the same size" -msgstr "_Все страницы с таким же размером" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:14 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 +msgid "Re_verse order" +msgstr "В _обратном порядке" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:30 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:15 -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:9 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 -msgid "_Destination:" -msgstr "_Назначение:" +msgid "_Size:" +msgstr "_Размер:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 +msgid "Sq_uared" +msgstr "_Квадрат" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:33 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:16 -msgid "_Size:" -msgstr "_Размер:" +msgid "Thumbnails" +msgstr "Миниатюры" -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 msgid "Image Wall" msgstr "Галерея изобржений" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:486 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:498 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:512 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:481 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:492 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:506 msgid "Could not save the theme" msgstr "Не удалось сохранить тему" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:657 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:651 msgid "Could not delete the theme" msgstr "Не удалось удалить тему" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:248 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:247 msgid "Creating images" msgstr "Создание изображений" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:897 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:896 msgid "Generating thumbnails" msgstr "Формирование миниатюр" @@ -1370,34 +1534,34 @@ msgid "Save images in a different format" msgstr "Сохранить изображения в другом формате" -#: ../extensions/convert_format/data/ui/convert-format.ui.h:2 +#: ../extensions/convert_format/data/ui/convert-format.ui.h:1 msgid "Convert Format" msgstr "Формат преобразования" +#: ../extensions/convert_format/data/ui/convert-format.ui.h:2 +msgid "New format" +msgstr "Новый формат" + #: ../extensions/convert_format/data/ui/convert-format.ui.h:3 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:4 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 msgid "Destination" msgstr "Назначение" -#: ../extensions/convert_format/data/ui/convert-format.ui.h:4 -msgid "New format" -msgstr "Новый формат" - #: ../extensions/convert_format/data/ui/convert-format.ui.h:5 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 msgid "_Use the original image folder" msgstr "_Использовать папку исходного изображения" -#: ../extensions/convert_format/dlg-convert-format.c:93 +#: ../extensions/convert_format/dlg-convert-format.c:95 msgid "Converting images" msgstr "Преобразование изображений" -#: ../extensions/desktop_background/actions.c:162 +#: ../extensions/desktop_background/actions.c:194 msgid "Could not show the desktop background properties" msgstr "Не удалось показать свойства фона рабочего стола" -#: ../extensions/desktop_background/actions.c:228 -#: ../extensions/desktop_background/actions.c:246 +#: ../extensions/desktop_background/actions.c:259 +#: ../extensions/desktop_background/actions.c:277 msgid "Could not set the desktop background" msgstr "Не удалось установить фон рабочего стола" @@ -1415,7 +1579,9 @@ msgstr "Фон рабочего стола" #: ../extensions/edit_metadata/actions.c:66 -msgid "Are you sure you want to permanently delete the metadata of the selected files?" +msgid "" +"Are you sure you want to permanently delete the metadata of the selected " +"files?" msgstr "Действительно безвозвратно удалить метаданные выделенных файлов?" #: ../extensions/edit_metadata/actions.c:73 @@ -1431,7 +1597,6 @@ msgstr "Изменить комментарий и другую информацию в выделенных файлах" #: ../extensions/edit_metadata/callbacks.c:107 -#| msgid "Delete the selected files" msgid "Set the tags of the selected files" msgstr "Установить метки выделенным файлам" @@ -1444,20 +1609,20 @@ msgstr "Удалить комментарий и встроенные метаданные выделенных файлов" #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:1 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:1 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 msgid "D_escription:" msgstr "_Описание:" -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:2 +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:3 +msgid "_Place:" +msgstr "_Место:" + +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 #: ../extensions/edit_metadata/data/ui/tag-chooser.ui.h:1 msgid "T_ags:" msgstr "_Теги:" -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 -msgid "_Place:" -msgstr "_Место:" - #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:5 msgid "_Rating:" msgstr "_Оценка:" @@ -1476,13 +1641,13 @@ msgstr "Не удалось прочитать информацию о файле" #: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:1 -msgid "Allow to edit files metadata." -msgstr "Разрешить изменение метаданных." - -#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 msgid "Edit metadata" msgstr "Изменить метаданные" +#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 +msgid "Allow to edit files metadata." +msgstr "Разрешить изменение метаданных." + #. Translators: the %s symbol in the string is a file name #: ../extensions/edit_metadata/gth-edit-comment-dialog.c:63 #, c-format @@ -1490,8 +1655,9 @@ msgstr "Метаданные %s" #: ../extensions/edit_metadata/gth-edit-comment-dialog.c:66 -#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:97 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:335 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:83 +#: ../extensions/facebook/dlg-import-from-facebook.c:319 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:324 #, c-format msgid "%d file" msgid_plural "%d files" @@ -1500,7 +1666,7 @@ msgstr[2] "%d файлов" #: ../extensions/edit_metadata/gth-edit-comment-dialog.c:144 -#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:263 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:197 msgid "Sa_ve and Close" msgstr "Со_хранить и закрыть" @@ -1508,52 +1674,51 @@ msgid "Save only cha_nged fields" msgstr "Сохранить только _изменённые поля" -#: ../extensions/edit_metadata/gth-edit-general-page.c:477 +#: ../extensions/edit_metadata/gth-edit-general-page.c:555 msgid "No date" msgstr "Без даты" -#: ../extensions/edit_metadata/gth-edit-general-page.c:478 +#: ../extensions/edit_metadata/gth-edit-general-page.c:556 msgid "The following date" msgstr "Следующая дата" -#: ../extensions/edit_metadata/gth-edit-general-page.c:479 +#: ../extensions/edit_metadata/gth-edit-general-page.c:557 #: ../extensions/importer/gth-import-preferences-dialog.c:331 msgid "Current date" msgstr "Текущая дата" -#: ../extensions/edit_metadata/gth-edit-general-page.c:481 +#: ../extensions/edit_metadata/gth-edit-general-page.c:559 msgid "Last modified date" msgstr "Дата последнего изменения" -#: ../extensions/edit_metadata/gth-edit-general-page.c:482 +#: ../extensions/edit_metadata/gth-edit-general-page.c:560 msgid "File creation date" msgstr "Дата создания файла" -#: ../extensions/edit_metadata/gth-edit-general-page.c:483 +#: ../extensions/edit_metadata/gth-edit-general-page.c:561 msgid "Do not modify" msgstr "Не изменять" #. Translators: the %s symbol in the string is a file name -#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:94 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:80 #, c-format -#| msgid "Tags" msgid "%s Tags" msgstr "Метки %s" -#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:255 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:189 msgid "Assign Tags" msgstr "Назначить метки" -#: ../extensions/edit_metadata/gth-tag-task.c:115 -#: ../extensions/edit_metadata/gth-tag-task.c:132 +#: ../extensions/edit_metadata/gth-tag-task.c:119 +#: ../extensions/edit_metadata/gth-tag-task.c:136 msgid "Assigning tags to the selected files" msgstr "Назначение меток для выделенных файлов" -#: ../extensions/edit_metadata/gth-tag-task.c:115 +#: ../extensions/edit_metadata/gth-tag-task.c:119 msgid "Writing files" msgstr "Запись файлов" -#: ../extensions/edit_metadata/gth-tag-task.c:132 +#: ../extensions/edit_metadata/gth-tag-task.c:136 msgid "Reading files" msgstr "Чтение файлов" @@ -1566,53 +1731,53 @@ msgstr "Пример расширения." #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:1 -msgid "Byline _Title:" -msgstr "_Подпись:" - -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 msgid "C_opyright:" msgstr "_Авторские права:" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:3 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 msgid "Co_untry:" msgstr "_Страна:" +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:3 +msgid "_Code:" +msgstr "_Код:" + #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:4 msgid "Cr_edit:" msgstr "_Участник:" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 -msgid "State/Province:" -msgstr "Область/район:" - #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:6 -msgid "_Byline:" -msgstr "_Отметка автора:" +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 +msgid "_Source:" +msgstr "_Источник:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:7 -msgid "_City:" -msgstr "_Город:" +msgid "_Urgency:" +msgstr "_Важность:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:8 -msgid "_Code:" -msgstr "_Код:" +msgid "_Object Name:" +msgstr "_Название объекта:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:9 +msgid "Byline _Title:" +msgstr "_Подпись:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:10 -msgid "_Language:" -msgstr "_Язык:" +msgid "_Byline:" +msgstr "_Отметка автора:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:11 -msgid "_Object Name:" -msgstr "_Название объекта:" +msgid "_City:" +msgstr "_Город:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:12 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 -msgid "_Source:" -msgstr "_Источник:" +msgid "_Language:" +msgstr "_Язык:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:13 -msgid "_Urgency:" -msgstr "_Важность:" +msgid "State/Province:" +msgstr "Область/район:" #: ../extensions/exiv2_tools/exiv2_tools.extension.in.in.h:1 msgid "EXIF, IPTC, XMP support" @@ -1666,7 +1831,7 @@ msgid "XMP Attached" msgstr "Прикреплённый XMP" -#: ../extensions/exiv2_tools/main.c:255 +#: ../extensions/exiv2_tools/main.c:272 msgid "date photo was taken" msgstr "дата получения снимка" @@ -1674,138 +1839,107 @@ msgid "Share" msgstr "Поделиться" -#: ../extensions/facebook/callbacks.c:54 +#: ../extensions/facebook/callbacks.c:59 ../extensions/facebook/callbacks.c:64 msgid "Face_book..." msgstr "Face_book…" -#: ../extensions/facebook/callbacks.c:55 +#: ../extensions/facebook/callbacks.c:60 +#| msgid "Download photos from Flickr" +msgid "Download photos from Facebook" +msgstr "Загрузить фотографии с Facebook" + +#: ../extensions/facebook/callbacks.c:65 msgid "Upload photos to Facebook" msgstr "Отправить фотографии в Facebook" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:1 -msgid "1024 x 1024" -msgstr "1024 x 1024" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 +msgid "Export to Flickr" +msgstr "Экспортировать на Flickr" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:2 -msgid "1280 x 1280" -msgstr "1280 x 1280" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 +msgid "_Upload" +msgstr "_Отправить" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:3 -msgid "1600 x 1600" -msgstr "1600 x 1600" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 +msgid "_Account:" +msgstr "_Учётная запись:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:4 -msgid "2048 x 2048" -msgstr "2048 x 2048" +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:3 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 +msgid "Edit accounts" +msgstr "_Изменить учётные записи" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 -msgid "720 x 720" -msgstr "720 x 720" - -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 msgid "A_lbum:" msgstr "_Альбом:" -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 msgid "Add a new album" msgstr "Добавить новый альбом" +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 +msgid "Resize the images if larger than this size" +msgstr "Масштабировать изображения, если их размер превышает" + #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:8 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 -msgid "Edit accounts" -msgstr "_Изменить учётные записи" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 +msgid "_Resize if larger than:" +msgstr "Мас_штабировать, если больше, чем:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:9 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 -msgid "Export to Flickr" -msgstr "Экспортировать на Flickr" +msgid "720 x 720" +msgstr "720 x 720" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:10 -msgid "Resize the images if larger than this size" -msgstr "Масштабировать изображения, если их размер превышает" +msgid "1024 x 1024" +msgstr "1024 x 1024" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:11 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 -msgid "_Account:" -msgstr "_Учётная запись:" +msgid "1280 x 1280" +msgstr "1280 x 1280" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:12 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 -msgid "_Resize to:" -msgstr "_Изменить размер на:" +msgid "1600 x 1600" +msgstr "1600 x 1600" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:13 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 -msgid "_Upload" -msgstr "_Отправить" - -#: ../extensions/facebook/data/ui/facebook-account-chooser.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-account-chooser.ui.h:1 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 -#: ../extensions/picasaweb/data/ui/picasa-web-account-chooser.ui.h:1 -msgid "A_ccount:" -msgstr "_Учётная запись:" - -#: ../extensions/facebook/data/ui/facebook-account-manager.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-account-manager.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-account-manager.ui.h:1 -#: ../extensions/picasaweb/data/ui/picasa-web-account-manager.ui.h:1 -msgid "A_ccounts:" -msgstr "_Учётные записи:" - -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 -msgid "Private" -msgstr "Личное" - -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 -msgid "Private photos, visible to friends" -msgstr "Личные фотографии, доступные друзьям" +msgid "2048 x 2048" +msgstr "2048 x 2048" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 msgid "Public photos" msgstr "Общедоступные фотографии" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:5 -msgid "_Location:" -msgstr "_Местоположение:" +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 +msgid "Private photos, visible to friends" +msgstr "Личные фотографии, доступные друзьям" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 #: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:5 -msgid "_Visibility:" -msgstr "_Видимость:" - -#: ../extensions/facebook/data/ui/facebook-ask-authorization.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-ask-authorization.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-ask-authorization.ui.h:1 -msgid "_Authorize..." -msgstr "_Авторизовать…" - -#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-complete-authorization.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-complete-authorization.ui.h:1 -msgid "C_ontinue" -msgstr "Пр_одолжить" +msgid "Private" +msgstr "Личное" -#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 -#: ../extensions/facebook/facebook-authentication.c:472 -#: ../extensions/flicker_utils/flickr-authentication.c:408 -#: ../extensions/oauth/oauth-authentication.c:423 -msgid "Once you're done, click the 'Continue' button below." -msgstr "По завершению нажмите кнопку «Продолжить»." +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:5 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 +msgid "_Visibility:" +msgstr "_Видимость:" #: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:1 @@ -1818,70 +1952,92 @@ #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:2 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:2 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:2 -#: ../extensions/webalbums/gth-web-exporter.c:1841 +#: ../extensions/webalbums/gth-web-exporter.c:1839 msgid "_Open in the Browser" msgstr "_Открыть в веб-браузере" -#: ../extensions/facebook/dlg-export-to-facebook.c:130 -#: ../extensions/facebook/dlg-export-to-facebook.c:335 -#: ../extensions/facebook/facebook-authentication.c:192 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 +msgid "Import from Picasa Web Album" +msgstr "Импортировать из веб-альбома Picasa" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:2 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 +msgid "_Import" +msgstr "_Импортировать" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:4 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 +#: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 +msgid "A_ccount:" +msgstr "_Учётная запись:" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:5 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 +msgid "_Album:" +msgstr "_Альбом:" + +#: ../extensions/facebook/dlg-export-to-facebook.c:123 +#: ../extensions/facebook/dlg-export-to-facebook.c:326 +#: ../extensions/facebook/dlg-import-from-facebook.c:226 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:138 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:399 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:237 -#: ../extensions/flicker_utils/flickr-authentication.c:191 -#: ../extensions/oauth/oauth-authentication.c:187 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:414 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:231 +#: ../extensions/oauth/web-service.c:380 #: ../extensions/photobucket/dlg-export-to-photobucket.c:131 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:376 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:139 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:424 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:380 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:375 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:124 msgid "Could not connect to the server" msgstr "Не удалось соединиться с сервером" -#: ../extensions/facebook/dlg-export-to-facebook.c:182 +#: ../extensions/facebook/dlg-export-to-facebook.c:175 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:246 #: ../extensions/photobucket/dlg-export-to-photobucket.c:182 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:192 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:176 msgid "Could not upload the files" msgstr "Не удалось отправить файлы" -#: ../extensions/facebook/dlg-export-to-facebook.c:412 +#: ../extensions/facebook/dlg-export-to-facebook.c:397 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:188 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:223 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:462 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:717 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:457 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:309 msgid "Could not create the album" msgstr "Не удалось создать альбом" -#: ../extensions/facebook/dlg-export-to-facebook.c:481 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:534 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:783 +#: ../extensions/facebook/dlg-export-to-facebook.c:465 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:528 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:375 msgid "New Album" msgstr "Новый альбом" -#: ../extensions/facebook/dlg-export-to-facebook.c:561 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:557 -#: ../extensions/image_print/gth-image-print-job.c:1789 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:614 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1002 +#: ../extensions/facebook/dlg-export-to-facebook.c:557 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:583 +#: ../extensions/image_print/gth-image-print-job.c:1739 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:607 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:597 msgid "No valid file selected." msgstr "Не выбрано ни одного допустимого файла." -#: ../extensions/facebook/dlg-export-to-facebook.c:562 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:558 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:615 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1003 +#: ../extensions/facebook/dlg-export-to-facebook.c:558 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:584 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:608 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:598 msgid "Could not export the files" msgstr "Не удалось экспортировать файлы" -#: ../extensions/facebook/dlg-export-to-facebook.c:570 -#: ../extensions/find_duplicates/gth-find-duplicates.c:255 -#: ../extensions/find_duplicates/gth-find-duplicates.c:347 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:566 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:623 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1010 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:803 -#: ../gthumb/gth-browser.c:995 +#: ../extensions/facebook/dlg-export-to-facebook.c:566 +#: ../extensions/find_duplicates/gth-find-duplicates.c:277 +#: ../extensions/find_duplicates/gth-find-duplicates.c:470 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:592 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:616 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:605 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:254 +#: ../gthumb/gth-browser.c:1116 #, c-format msgid "%d file (%s)" msgid_plural "%d files (%s)" @@ -1889,92 +2045,35 @@ msgstr[1] "%d файла (%s)" msgstr[2] "%d файлов (%s)" -#: ../extensions/facebook/dlg-export-to-facebook.c:591 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:589 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:642 +#: ../extensions/facebook/dlg-export-to-facebook.c:587 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:615 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:635 #, c-format msgid "Export to %s" msgstr "Экспортировать в %s" -#: ../extensions/facebook/facebook-account-chooser-dialog.c:200 -#: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:200 -#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 -msgid "New authentication..." -msgstr "Новая аутентификация…" +#: ../extensions/facebook/dlg-import-from-facebook.c:344 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:349 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:279 +msgid "Could not get the photo list" +msgstr "Не удалось получить список фотографий" -#: ../extensions/facebook/facebook-authentication.c:194 -#: ../extensions/flicker_utils/flickr-authentication.c:193 -#: ../extensions/oauth/oauth-authentication.c:189 -msgid "Choose _Account..." -msgstr "Выбрать _учётную запись…" +#: ../extensions/facebook/dlg-import-from-facebook.c:378 +#: ../extensions/facebook/dlg-import-from-facebook.c:533 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:386 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:551 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:313 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:586 +msgid "No album selected" +msgstr "Не выбран альбом" -#: ../extensions/facebook/facebook-authentication.c:471 -#: ../extensions/flicker_utils/flickr-authentication.c:407 -#: ../extensions/oauth/oauth-authentication.c:422 +#: ../extensions/facebook/dlg-import-from-facebook.c:551 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:569 #, c-format -msgid "Return to this window when you have finished the authorization process on %s" -msgstr "Вернуться к этому окну, когда завершится процесс авторизации для %s" - -#: ../extensions/facebook/facebook-authentication.c:556 -#: ../extensions/flicker_utils/flickr-authentication.c:487 -#: ../extensions/oauth/oauth-authentication.c:502 -#, c-format -msgid "gthumb requires your authorization to upload the photos to %s" -msgstr "Для отправки фотографий на %s необходима авторизация" - -#: ../extensions/facebook/facebook-authentication.c:557 -#: ../extensions/flicker_utils/flickr-authentication.c:488 -#: ../extensions/oauth/oauth-authentication.c:503 -#, c-format -msgid "Click 'Authorize' to open your web browser and authorize gthumb to upload photos to %s. When you're finished, return to this window to complete the authorization." -msgstr "Нжмите «Авторизовать», чтобы открыть веб-браузер и авторизовать gthumb для отправки фотографий в %s. По завершению вернитесь к этому окну, чтобы завершить авторизацию." - -#: ../extensions/facebook/facebook-authentication.c:652 -#: ../extensions/flicker_utils/flickr-authentication.c:588 -#: ../extensions/oauth/oauth-authentication.c:605 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:820 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:684 -msgid "Choose Account" -msgstr "Выбрать учётную запись" - -#: ../extensions/facebook/facebook-authentication.c:761 -#: ../extensions/flicker_utils/flickr-authentication.c:697 -#: ../extensions/oauth/oauth-authentication.c:714 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:881 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:745 -msgid "Edit Accounts" -msgstr "Изменить учётные записи" - -#: ../extensions/facebook/facebook-connection.c:275 -#: ../extensions/facebook/facebook-connection.c:435 -#: ../extensions/facebook/facebook-service.c:162 -#: ../extensions/facebook/facebook-service.c:265 -#: ../extensions/facebook/facebook-service.c:468 -#: ../extensions/flicker_utils/flickr-connection.c:266 -#: ../extensions/flicker_utils/flickr-connection.c:413 -#: ../extensions/flicker_utils/flickr-service.c:195 -#: ../extensions/flicker_utils/flickr-service.c:398 -#: ../extensions/photobucket/photobucket-consumer.c:74 -#: ../extensions/photobucket/photobucket-consumer.c:79 -#: ../extensions/photobucket/photobucket-consumer.c:115 -#: ../extensions/photobucket/photobucket-consumer.c:170 -msgid "Unknown error" -msgstr "Неизвестная ошибка" - -#: ../extensions/facebook/facebook-connection.c:310 -#: ../extensions/facebook/facebook-connection.c:461 -#: ../extensions/facebook/facebook-service.c:188 -#: ../extensions/facebook/facebook-service.c:290 -#: ../extensions/flicker_utils/flickr-connection.c:292 -#: ../extensions/flicker_utils/flickr-connection.c:439 -#: ../extensions/flicker_utils/flickr-service.c:219 -#: ../extensions/oauth/oauth-connection.c:356 -#: ../extensions/oauth/oauth-connection.c:431 -#: ../extensions/oauth/oauth-connection.c:535 -#: ../extensions/picasaweb/google-connection.c:344 -msgid "Connecting to the server" -msgstr "Соединение с сервером" +msgid "Import from %s" +msgstr "Импортировать из %s" +#: ../extensions/facebook/dlg-import-from-facebook.c:551 #: ../extensions/facebook/facebook.extension.in.in.h:1 msgid "Facebook" msgstr "Facebook" @@ -1983,125 +2082,124 @@ msgid "Upload images to Facebook" msgstr "Отправить изображения в Facebook" -#: ../extensions/facebook/facebook-service.c:188 -#: ../extensions/facebook/facebook-service.c:290 -#: ../extensions/flicker_utils/flickr-service.c:219 -#: ../extensions/oauth/oauth-connection.c:356 -#: ../extensions/oauth/oauth-connection.c:431 -#: ../extensions/oauth/oauth-connection.c:535 -msgid "Getting account information" -msgstr "Получение сведений об учётной записи" - -#: ../extensions/facebook/facebook-service.c:396 -#: ../extensions/flicker_utils/flickr-service.c:323 -#: ../extensions/photobucket/photobucket-service.c:207 -#: ../extensions/picasaweb/picasa-web-service.c:209 +#: ../extensions/facebook/facebook-service.c:494 +#: ../extensions/flicker_utils/flickr-service.c:863 +#: ../extensions/photobucket/photobucket-service.c:310 +#: ../extensions/picasaweb/picasa-web-service.c:711 msgid "Getting the album list" msgstr "Получение списка альбомов" -#: ../extensions/facebook/facebook-service.c:525 -#: ../extensions/flicker_utils/flickr-service.c:426 -#: ../extensions/flicker_utils/flickr-service.c:546 -#: ../extensions/flicker_utils/flickr-service.c:584 -#: ../extensions/photobucket/photobucket-service.c:316 -#: ../extensions/picasaweb/picasa-web-service.c:300 +#: ../extensions/facebook/facebook-service.c:616 +#: ../extensions/flicker_utils/flickr-service.c:965 +#: ../extensions/flicker_utils/flickr-service.c:1087 +#: ../extensions/flicker_utils/flickr-service.c:1126 +#: ../extensions/photobucket/photobucket-service.c:423 +#: ../extensions/picasaweb/picasa-web-service.c:805 msgid "Creating the new album" msgstr "Создание нового альбома" -#: ../extensions/facebook/facebook-service.c:584 -#: ../extensions/flicker_utils/flickr-service.c:634 -#: ../extensions/photobucket/photobucket-service.c:373 -#: ../extensions/picasaweb/picasa-web-service.c:357 +#: ../extensions/facebook/facebook-service.c:677 +#: ../extensions/flicker_utils/flickr-service.c:1176 +#: ../extensions/photobucket/photobucket-service.c:485 +#: ../extensions/picasaweb/picasa-web-service.c:860 #, c-format msgid "Could not upload '%s': %s" msgstr "Не удалось отправить «%s»: %s" #. Translators: %s is a filename -#: ../extensions/facebook/facebook-service.c:670 -#: ../extensions/flicker_utils/flickr-service.c:745 -#: ../extensions/photobucket/photobucket-service.c:430 -#: ../extensions/picasaweb/picasa-web-service.c:412 +#: ../extensions/facebook/facebook-service.c:742 +#: ../extensions/flicker_utils/flickr-service.c:1287 +#: ../extensions/photobucket/photobucket-service.c:542 +#: ../extensions/picasaweb/picasa-web-service.c:917 #, c-format msgid "Uploading '%s'" msgstr "Отправка «%s»" -#: ../extensions/facebook/facebook-service.c:886 -#: ../extensions/flicker_utils/flickr-service.c:914 -#: ../extensions/photobucket/photobucket-service.c:599 -#: ../extensions/picasaweb/picasa-web-service.c:605 +#: ../extensions/facebook/facebook-service.c:955 +#: ../extensions/flicker_utils/flickr-service.c:1482 +#: ../extensions/photobucket/photobucket-service.c:714 +#: ../extensions/picasaweb/picasa-web-service.c:1138 msgid "Uploading the files to the server" msgstr "Отправка файлов на сервер" -#: ../extensions/facebook/facebook-service.c:1003 -#: ../extensions/flicker_utils/flickr-service.c:1077 -#: ../extensions/picasaweb/picasa-web-service.c:718 +#: ../extensions/facebook/facebook-service.c:1054 +#: ../extensions/flicker_utils/flickr-service.c:1651 +#: ../extensions/picasaweb/picasa-web-service.c:1257 msgid "Getting the photo list" msgstr "Получение списка фотографий" -#: ../extensions/file_manager/actions.c:130 +#: ../extensions/file_manager/actions.c:133 msgid "New folder" msgstr "Новая папка" -#: ../extensions/file_manager/actions.c:131 +#: ../extensions/file_manager/actions.c:134 msgid "Enter the folder name:" msgstr "Введите имя папки: " -#: ../extensions/file_manager/actions.c:397 +#: ../extensions/file_manager/actions.c:400 #: ../extensions/file_manager/callbacks.c:380 -#: ../extensions/file_manager/callbacks.c:842 +#: ../extensions/file_manager/callbacks.c:838 msgid "Could not move the files" msgstr "Не удалось переместить файлы" -#: ../extensions/file_manager/actions.c:398 +#: ../extensions/file_manager/actions.c:401 #: ../extensions/file_manager/callbacks.c:381 -#: ../extensions/file_manager/callbacks.c:843 -msgid "Files cannot be moved to the current location, as alternative you can choose to copy them." -msgstr "Файлы не могут быть перемещены в текущее местоположение, можно попробовать скопировать их." +#: ../extensions/file_manager/callbacks.c:839 +msgid "" +"Files cannot be moved to the current location, as alternative you can choose " +"to copy them." +msgstr "" +"Файлы не могут быть перемещены в текущее местоположение, можно попробовать " +"скопировать их." -#: ../extensions/file_manager/actions.c:555 +#: ../extensions/file_manager/actions.c:563 msgid "Could not open the location" msgstr "Не удалось открыть местоположение" -#: ../extensions/file_manager/actions.c:688 -msgid "The folder is not empty, do you want to delete the folder and its content permanently?" +#: ../extensions/file_manager/actions.c:696 +msgid "" +"The folder is not empty, do you want to delete the folder and its content " +"permanently?" msgstr "Папка не пуста. Удалить эту папку вместе со всем содержимым навсегда?" -#: ../extensions/file_manager/actions.c:704 +#: ../extensions/file_manager/actions.c:712 msgid "Could not delete the folder" msgstr "Не удалось удалить папку" -#: ../extensions/file_manager/actions.c:765 -msgid "The folder cannot be moved to the Trash. Do you want to delete it permanently?" +#: ../extensions/file_manager/actions.c:773 +msgid "" +"The folder cannot be moved to the Trash. Do you want to delete it " +"permanently?" msgstr "Папка не может быть перемещена в корзину. Удалить её навсегда?" -#: ../extensions/file_manager/actions.c:772 +#: ../extensions/file_manager/actions.c:780 msgid "Could not move the folder to the Trash" msgstr "Не удалось переместить папку в корзину" -#: ../extensions/file_manager/actions.c:808 -#: ../gthumb/gth-file-source-vfs.c:837 +#: ../extensions/file_manager/actions.c:816 +#: ../gthumb/gth-file-source-vfs.c:841 #, c-format msgid "Are you sure you want to permanently delete \"%s\"?" msgstr "Действительно окончательно удалить «%s»?" -#: ../extensions/file_manager/actions.c:818 -#: ../gthumb/gth-file-source-vfs.c:850 +#: ../extensions/file_manager/actions.c:826 +#: ../gthumb/gth-file-source-vfs.c:854 msgid "If you delete a file, it will be permanently lost." msgstr "Если удалить файл, он будет навсегда потерян." -#: ../extensions/file_manager/actions.c:910 +#: ../extensions/file_manager/actions.c:920 msgid "Move To" msgstr "Переместить в" -#: ../extensions/file_manager/actions.c:910 +#: ../extensions/file_manager/actions.c:920 msgid "Copy To" msgstr "Копировать в" -#: ../extensions/file_manager/actions.c:914 +#: ../extensions/file_manager/actions.c:924 msgid "Move" msgstr "Переместить" -#: ../extensions/file_manager/actions.c:914 +#: ../extensions/file_manager/actions.c:924 msgid "Copy" msgstr "Копировать" @@ -2125,7 +2223,7 @@ #: ../extensions/file_manager/callbacks.c:183 #: ../extensions/file_manager/callbacks.c:219 -#: ../gthumb/gth-file-source-vfs.c:809 +#: ../gthumb/gth-file-source-vfs.c:813 msgid "Mo_ve to Trash" msgstr "_Переместить в корзину" @@ -2136,6 +2234,7 @@ #: ../extensions/file_manager/callbacks.c:187 #: ../extensions/file_manager/callbacks.c:223 #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:5 +#: ../gthumb/gth-tags-entry.c:871 msgid "_Delete" msgstr "_Удалить" @@ -2145,7 +2244,7 @@ #: ../extensions/file_manager/callbacks.c:191 #: ../extensions/file_manager/callbacks.c:203 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:2 msgid "_Rename" msgstr "_Переименовать" @@ -2187,10 +2286,10 @@ msgid "Move the selected files to another folder" msgstr "Переместить выделенные файлы в другую папку" -#: ../extensions/file_manager/callbacks.c:1003 -#: ../extensions/find_duplicates/gth-find-duplicates.c:581 -#: ../gthumb/gth-browser.c:4916 -#: ../gthumb/gth-browser.c:4950 +#: ../extensions/file_manager/callbacks.c:999 +#: ../extensions/find_duplicates/gth-find-duplicates.c:766 +#: ../gthumb/gth-browser.c:5234 ../gthumb/gth-browser.c:5268 +#: ../gthumb/gth-progress-dialog.c:406 msgid "Could not perform the operation" msgstr "Не удалось выполнить операцию" @@ -2207,381 +2306,396 @@ msgstr "Удаление файлов" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:1 -msgid "B_rightness:" -msgstr "_Яркость:" +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:5 +msgid "_Preview" +msgstr "_Просмотр" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:2 -msgid "Color Levels" -msgstr "Уровни цвета" +msgid "B_rightness:" +msgstr "_Яркость:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:3 msgid "Con_trast:" msgstr "Кон_траст:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:4 -msgid "Cyan-_Red:" -msgstr "Бирюзовый-_Красный:" +msgid "_Saturation:" +msgstr "_Насыщенность:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:5 msgid "G_amma:" msgstr "_Гамма:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:6 -msgid "_Magenta-Green:" -msgstr "_Малиновый-Зелёный:" +msgid "Cyan-_Red:" +msgstr "Бирюзовый-_Красный:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:7 -msgid "_Preview" -msgstr "_Просмотр" +msgid "_Magenta-Green:" +msgstr "_Малиновый-Зелёный:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:8 -#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:5 -msgid "_Reset" -msgstr "_Сброс" +msgid "_Yellow-Blue:" +msgstr "_Жёлтый-Синий:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:9 -msgid "_Saturation:" -msgstr "_Насыщенность:" +msgid "Color Levels" +msgstr "Уровни цвета" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:10 -msgid "_Yellow-Blue:" -msgstr "_Жёлтый-Синий:" +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:5 +msgid "_Reset" +msgstr "_Сброс" #: ../extensions/file_tools/data/ui/crop-options.ui.h:1 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 -msgid "Aspect ratio" -msgstr "Соотношение сторон" +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +msgid "Selection" +msgstr "Выделение" #: ../extensions/file_tools/data/ui/crop-options.ui.h:2 -msgid "C_rop" -msgstr "_Кадрировать" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 +msgid "_Width:" +msgstr "_Ширина:" #: ../extensions/file_tools/data/ui/crop-options.ui.h:3 -msgid "Center" -msgstr "По центру" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 +msgid "Heigh_t:" +msgstr "_Высота:" #: ../extensions/file_tools/data/ui/crop-options.ui.h:4 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 -msgid "I_nvert aspect ratio" -msgstr "_Инвертировать соотношение сторон" +msgid "_Position:" +msgstr "_Положение:" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:5 +msgid "Maximize" +msgstr "Максимизировать" -#. after the colon there is a control to select the size in pixels #: ../extensions/file_tools/data/ui/crop-options.ui.h:6 -msgid "M_ultiple of:" -msgstr "_Несколько:" +msgid "Center" +msgstr "По центру" #: ../extensions/file_tools/data/ui/crop-options.ui.h:7 -msgid "Maximize" -msgstr "Максимизировать" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:5 +msgid "Aspect ratio" +msgstr "Соотношение сторон" #: ../extensions/file_tools/data/ui/crop-options.ui.h:8 -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 -msgid "Selection" -msgstr "Выделение" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 +msgid "I_nvert aspect ratio" +msgstr "_Инвертировать соотношение сторон" +#. after the colon there is a control to select the size in pixels #: ../extensions/file_tools/data/ui/crop-options.ui.h:10 -msgid "_Grid:" -msgstr "_Сетка:" - -#: ../extensions/file_tools/data/ui/crop-options.ui.h:11 -msgid "_Position:" -msgstr "_Положение:" +msgid "M_ultiple of:" +msgstr "_Несколько:" #. abbreviation of pixel -#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:12 msgid "px" msgstr "пиксел" -#. this is used to separate the dimensions, for example: 120 × 250 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 +#: ../gthumb/gth-file-chooser-dialog.c:252 +msgid "Options" +msgstr "Параметры" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:14 +msgid "_Grid:" +msgstr "_Сетка:" + #: ../extensions/file_tools/data/ui/crop-options.ui.h:15 -msgid "×" -msgstr "×" +msgid "C_rop" +msgstr "_Кадрировать" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:2 -#, no-c-format -msgid "%" -msgstr "%" +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:1 +msgid "Method" +msgstr "Метод" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:2 +#| msgid "B_rightness:" +msgid "_Brightness" +msgstr "_Яркость" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:3 +#| msgid "_Saturation:" +msgid "_Saturation" +msgstr "_Насыщенность" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:4 +msgid "_Average" +msgstr "" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 #: ../gthumb/gth-main-default-metadata.c:47 msgid "Dimensions" msgstr "Размеры" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:5 -msgid "Heigh_t:" -msgstr "_Высота:" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +msgid "Set the image size to this value" +msgstr "Привести размер изображения к этому значению" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:8 msgid "High _quality" msgstr "_Высокое качество" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:8 -msgid "New dimensions:" -msgstr "Новые размеры:" - #: ../extensions/file_tools/data/ui/resize-options.ui.h:9 -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 -msgid "Options" -msgstr "Параметры" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 msgid "Original dimensions:" msgstr "Исходные размеры:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 msgid "Scale factor:" msgstr "_Масштаб:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 -msgid "Set the image size to this value" -msgstr "Привести размер изображения к этому значению" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:13 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:11 -msgid "_Width:" -msgstr "_Ширина:" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 +msgid "New dimensions:" +msgstr "Новые размеры:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:14 -#: ../extensions/image_print/data/ui/print-layout.ui.h:31 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:29 msgid "pixels" msgstr "пикселы" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:14 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:12 +#, no-c-format +msgid "%" +msgstr "%" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:1 -msgid "Align" -msgstr "Выровнять" +msgid "Angle" +msgstr "Угол" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 -msgid "Alignment" -msgstr "Выравнивание" +msgid "Align" +msgstr "Выровнять" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 -msgid "Angle" -msgstr "Угол" +msgid "Image size" +msgstr "Размер изображения" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 -msgid "Bounding box" -msgstr "Ограничивающая рамка" +msgid "Point 1:" +msgstr "Точка 1:" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 -msgid "Crop borders" -msgstr "Убирать границы" +msgid "Point 2:" +msgstr "Точка 2:" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 -msgid "" -"Draw a line on the image \n" -"to set the alignment." -msgstr "" -"Нарисуйте линию на изображении\n" -"чтобы установить выравнивание." +msgid "Keep aspect ratio" +msgstr "Сохранять соотношение сторон" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 msgid "Grid:" msgstr "Сетка:" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 -msgid "Image size" -msgstr "Размер изображения" +msgid "_Background:" +msgstr "_Фон:" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 -msgid "Keep aspect ratio" -msgstr "Сохранять соотношение сторон" +msgid "Pick a background color" +msgstr "Взять цвет фона" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 +msgid "_Transparent" +msgstr "_Прозрачность" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:12 -msgid "Original size" -msgstr "Исходный размер" +msgid "Reset" +msgstr "Сброс" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:13 -msgid "Parallel" -msgstr "Параллельное" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:14 -msgid "Perpendicular" -msgstr "Перпендикулярное" +msgid "" +"Draw a line on the image \n" +"to set the alignment." +msgstr "" +"Нарисуйте линию на изображении\n" +"чтобы установить выравнивание." #: ../extensions/file_tools/data/ui/rotate-options.ui.h:15 -msgid "Pick a background color" -msgstr "Взять цвет фона" +msgid "Parallel" +msgstr "Параллельное" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:16 -msgid "Point 1:" -msgstr "Точка 1:" +msgid "Perpendicular" +msgstr "Перпендикулярное" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:17 -msgid "Point 2:" -msgstr "Точка 2:" +msgid "Alignment" +msgstr "Выравнивание" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:18 -msgid "Reset" -msgstr "Сброс" +msgid "Original size" +msgstr "Исходный размер" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:19 -msgid "_Background:" -msgstr "_Фон:" +msgid "Bounding box" +msgstr "Ограничивающая рамка" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:20 -msgid "_Transparent" -msgstr "_Прозрачность" +msgid "Crop borders" +msgstr "Убирать границы" #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:1 -msgid "Amount:" -msgstr "Величина:" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 +msgid "_Preview:" +msgstr "_Предварительный просмотр:" #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:2 -msgid "Radius:" -msgstr "Радиус:" - -#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:3 msgid "Threshold:" msgstr "Порог:" +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:3 +msgid "Radius:" +msgstr "Радиус:" + #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:4 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 -msgid "_Preview:" -msgstr "_Предварительный просмотр:" +msgid "Amount:" +msgstr "Величина:" #: ../extensions/file_tools/file_tools.extension.in.in.h:1 +msgid "Image tools" +msgstr "Инструменты для изображений" + +#: ../extensions/file_tools/file_tools.extension.in.in.h:2 msgid "Basic tools to modify images." msgstr "Основные инструменты для изменения изображений." -#: ../extensions/file_tools/file_tools.extension.in.in.h:2 -msgid "Image tools" -msgstr "Инструменты для изображений" +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:372 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:272 +#: ../extensions/file_tools/gth-file-tool-grayscale.c:248 +#: ../extensions/file_tools/gth-file-tool-negative.c:68 +msgid "Applying changes" +msgstr "Применение изменений" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:527 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 msgid "Adjust Colors..." msgstr "Изменение цветов…" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:527 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 msgid "Adjust Colors" msgstr "Изменение цветов" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:528 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:619 msgid "Change brightness, contrast, saturation and gamma level of the image" -msgstr "Изменить яркость, контраст, насыщенность и уровень гамма коррекции изображения" +msgstr "" +"Изменить яркость, контраст, насыщенность и уровень гамма коррекции " +"изображения" -#: ../extensions/file_tools/gth-file-tool-crop.c:424 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:304 +#| msgid "Adjust Colors" +msgid "Adjust Contrast" +msgstr "Изменить контрастность" + +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:305 +msgid "Automatic contrast adjustment" +msgstr "Автоматическая настройка контрастности" + +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 msgid "Square" msgstr "Квадрат" -#: ../extensions/file_tools/gth-file-tool-crop.c:425 -#: ../extensions/file_tools/gth-file-tool-resize.c:499 +#: ../extensions/file_tools/gth-file-tool-crop.c:417 +#: ../extensions/file_tools/gth-file-tool-resize.c:590 #, c-format msgid "%d x %d (Image)" msgstr "%d x %d (Изображение)" -#: ../extensions/file_tools/gth-file-tool-crop.c:428 -#: ../extensions/file_tools/gth-file-tool-resize.c:503 +#: ../extensions/file_tools/gth-file-tool-crop.c:420 +#: ../extensions/file_tools/gth-file-tool-resize.c:594 #, c-format msgid "%d x %d (Screen)" msgstr "%d x %d (Экран)" -#: ../extensions/file_tools/gth-file-tool-crop.c:432 -#: ../extensions/file_tools/gth-file-tool-resize.c:508 +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-resize.c:599 msgid "5:4" msgstr "5:4" -#: ../extensions/file_tools/gth-file-tool-crop.c:433 -#: ../extensions/file_tools/gth-file-tool-resize.c:509 +#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-resize.c:600 msgid "4:3 (DVD, Book)" msgstr "4:3 (DVD, книга)" -#: ../extensions/file_tools/gth-file-tool-crop.c:434 -#: ../extensions/file_tools/gth-file-tool-resize.c:510 +#: ../extensions/file_tools/gth-file-tool-crop.c:426 +#: ../extensions/file_tools/gth-file-tool-resize.c:601 msgid "7:5" msgstr "7:5" -#: ../extensions/file_tools/gth-file-tool-crop.c:435 -#: ../extensions/file_tools/gth-file-tool-resize.c:511 +#: ../extensions/file_tools/gth-file-tool-crop.c:427 +#: ../extensions/file_tools/gth-file-tool-resize.c:602 msgid "3:2 (Postcard)" msgstr "4:2 (Открытка)" -#: ../extensions/file_tools/gth-file-tool-crop.c:436 -#: ../extensions/file_tools/gth-file-tool-resize.c:512 +#: ../extensions/file_tools/gth-file-tool-crop.c:428 +#: ../extensions/file_tools/gth-file-tool-resize.c:603 msgid "16:10" msgstr "16:10" -#: ../extensions/file_tools/gth-file-tool-crop.c:437 -#: ../extensions/file_tools/gth-file-tool-resize.c:513 +#: ../extensions/file_tools/gth-file-tool-crop.c:429 +#: ../extensions/file_tools/gth-file-tool-resize.c:604 msgid "16:9 (DVD)" msgstr "16:9 (DVD)" -#: ../extensions/file_tools/gth-file-tool-crop.c:438 -#: ../extensions/file_tools/gth-file-tool-resize.c:514 +#: ../extensions/file_tools/gth-file-tool-crop.c:430 +#: ../extensions/file_tools/gth-file-tool-resize.c:605 msgid "1.85:1" msgstr "1:85:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:439 -#: ../extensions/file_tools/gth-file-tool-resize.c:515 +#: ../extensions/file_tools/gth-file-tool-crop.c:431 +#: ../extensions/file_tools/gth-file-tool-resize.c:606 msgid "2.39:1" msgstr "2.39:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:440 -#: ../extensions/file_tools/gth-file-tool-resize.c:516 -#: ../extensions/image_print/data/ui/print-layout.ui.h:7 -#: ../extensions/rename_series/gth-template-selector.c:232 +#: ../extensions/file_tools/gth-file-tool-crop.c:432 +#: ../extensions/file_tools/gth-file-tool-resize.c:607 +#: ../extensions/image_print/data/ui/print-layout.ui.h:2 +#: ../extensions/rename_series/gth-template-selector.c:234 msgid "Custom" msgstr "Другое" -#: ../extensions/file_tools/gth-file-tool-crop.c:455 -#: ../extensions/file_tools/gth-file-tool-rotate.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:447 +#: ../extensions/file_tools/gth-file-tool-rotate.c:398 msgid "Rule of Thirds" msgstr "Правило третей" -#: ../extensions/file_tools/gth-file-tool-crop.c:456 -#: ../extensions/file_tools/gth-file-tool-rotate.c:417 +#: ../extensions/file_tools/gth-file-tool-crop.c:448 +#: ../extensions/file_tools/gth-file-tool-rotate.c:399 msgid "Golden Sections" msgstr "Золотые сечения" -#: ../extensions/file_tools/gth-file-tool-crop.c:457 -#: ../extensions/file_tools/gth-file-tool-rotate.c:418 +#: ../extensions/file_tools/gth-file-tool-crop.c:449 +#: ../extensions/file_tools/gth-file-tool-rotate.c:400 msgid "Center Lines" msgstr "Центральные линии" -#: ../extensions/file_tools/gth-file-tool-crop.c:458 -#: ../extensions/file_tools/gth-file-tool-rotate.c:419 +#: ../extensions/file_tools/gth-file-tool-crop.c:450 +#: ../extensions/file_tools/gth-file-tool-rotate.c:401 msgid "Uniform" msgstr "Единообразие" -#: ../extensions/file_tools/gth-file-tool-crop.c:614 +#: ../extensions/file_tools/gth-file-tool-crop.c:608 msgid "Crop..." msgstr "Кадрировать…" -#: ../extensions/file_tools/gth-file-tool-crop.c:614 +#: ../extensions/file_tools/gth-file-tool-crop.c:608 msgid "Crop" msgstr "Кадрировать" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:68 -#: ../extensions/file_tools/gth-file-tool-negative.c:68 -msgid "Applying changes" -msgstr "Применение изменений" - -#: ../extensions/file_tools/gth-file-tool-desaturate.c:203 -msgid "Desaturate" -msgstr "Обесцветить" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:119 -msgid "White balance correction" -msgstr "Коррекция баланса белого" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:342 -msgid "Enhance Colors" -msgstr "Улучшить цветопередачу" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:343 -msgid "Automatic white balance correction" -msgstr "Автоматическая коррекция баланса белого" - -#: ../extensions/file_tools/gth-file-tool-equalize.c:86 +#: ../extensions/file_tools/gth-file-tool-equalize.c:45 msgid "Equalizing image histogram" msgstr "Выравнивание гистограммы изображения" -#: ../extensions/file_tools/gth-file-tool-equalize.c:275 +#: ../extensions/file_tools/gth-file-tool-equalize.c:230 msgid "Equalize" msgstr "Выровнить" -#: ../extensions/file_tools/gth-file-tool-equalize.c:276 +#: ../extensions/file_tools/gth-file-tool-equalize.c:231 msgid "Equalize image histogram" msgstr "Выровнить гистограмму изображения" @@ -2593,6 +2707,15 @@ msgid "Flip the image vertically" msgstr "Перевернуть изображение по вертикали" +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +#| msgid "Personalize..." +msgid "Grayscale..." +msgstr "Оттенки серого…" + +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale" +msgstr "Оттенки серого" + #: ../extensions/file_tools/gth-file-tool-mirror.c:87 msgid "Mirror" msgstr "Зеркальное отображение" @@ -2609,23 +2732,28 @@ msgid "Redo" msgstr "Повторить" -#: ../extensions/file_tools/gth-file-tool-resize.c:680 +#: ../extensions/file_tools/gth-file-tool-resize.c:214 +#: ../extensions/resize_images/dlg-resize-images.c:180 +msgid "Resizing images" +msgstr "Изменение размера изображений" + +#: ../extensions/file_tools/gth-file-tool-resize.c:808 msgid "Resize..." msgstr "Изменить размер…" -#: ../extensions/file_tools/gth-file-tool-resize.c:680 +#: ../extensions/file_tools/gth-file-tool-resize.c:808 msgid "Resize" msgstr "Изменить размер" -#: ../extensions/file_tools/gth-file-tool-rotate.c:636 +#: ../extensions/file_tools/gth-file-tool-rotate.c:628 msgid "Rotate..." msgstr "Повернуть…" -#: ../extensions/file_tools/gth-file-tool-rotate.c:636 +#: ../extensions/file_tools/gth-file-tool-rotate.c:628 msgid "Rotate" msgstr "Повернуть" -#: ../extensions/file_tools/gth-file-tool-rotate.c:637 +#: ../extensions/file_tools/gth-file-tool-rotate.c:629 msgid "Freely rotate the image" msgstr "Произвольный поворот изображения" @@ -2655,15 +2783,15 @@ msgid "Save" msgstr "Сохранить" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:100 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:101 msgid "Sharpening image" msgstr "Увеличение резкости" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 msgid "Enhance Focus..." msgstr "Усилить фокус…" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 msgid "Enhance Focus" msgstr "Усилить фокус" @@ -2684,38 +2812,38 @@ msgstr "_Папки:" #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:1 +msgid "Search for Duplicates" +msgstr "Поиск дубликатов" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 msgid "Duplicates:" msgstr "Дубликаты:" -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 msgid "Files:" msgstr "Файлы:" -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 -msgid "No duplicates found." -msgstr "Дубликаты не найдены." - #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:4 -msgid "Search for Duplicates" -msgstr "Поиск дубликатов" - -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 #: ../gthumb/gth-browser-actions-entries.h:33 msgid "_View" msgstr "_Вид" +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 +msgid "No duplicates found." +msgstr "Дубликаты не найдены." + #: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:1 #: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:1 msgid "Find Duplicates" msgstr "Найти дубликаты" #: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:2 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:19 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 #: ../extensions/search/data/ui/search-editor.ui.h:1 msgid "Start _at:" msgstr "_Начиная с:" -#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 msgid "_Filter:" msgstr "_Фильтр:" @@ -2723,28 +2851,28 @@ msgid "Find duplicated files." msgstr "Найти дублирующиеся файлы." -#: ../extensions/find_duplicates/gth-find-duplicates.c:53 +#: ../extensions/find_duplicates/gth-find-duplicates.c:65 msgid "leave the newest duplicates" msgstr "оставить новейшие дубликаты" -#: ../extensions/find_duplicates/gth-find-duplicates.c:54 +#: ../extensions/find_duplicates/gth-find-duplicates.c:66 msgid "leave the oldest duplicates" msgstr "оставить старейшие дубликаты" -#: ../extensions/find_duplicates/gth-find-duplicates.c:55 +#: ../extensions/find_duplicates/gth-find-duplicates.c:67 msgid "by folder..." msgstr "по папке…" -#: ../extensions/find_duplicates/gth-find-duplicates.c:56 +#: ../extensions/find_duplicates/gth-find-duplicates.c:68 msgid "all files" msgstr "все файлы" -#: ../extensions/find_duplicates/gth-find-duplicates.c:57 +#: ../extensions/find_duplicates/gth-find-duplicates.c:69 msgid "no file" msgstr "ни одного файла" -#: ../extensions/find_duplicates/gth-find-duplicates.c:397 -#: ../extensions/find_duplicates/gth-find-duplicates.c:492 +#: ../extensions/find_duplicates/gth-find-duplicates.c:560 +#: ../extensions/find_duplicates/gth-find-duplicates.c:668 #, c-format msgid "%d duplicate" msgid_plural "%d duplicates" @@ -2752,15 +2880,15 @@ msgstr[1] "%d дубликата" msgstr[2] "%d дубликатов" -#: ../extensions/find_duplicates/gth-find-duplicates.c:536 +#: ../extensions/find_duplicates/gth-find-duplicates.c:712 msgid "Search completed" msgstr "Поиск завершён" -#: ../extensions/find_duplicates/gth-find-duplicates.c:548 +#: ../extensions/find_duplicates/gth-find-duplicates.c:725 msgid "Searching for duplicates" msgstr "Поиск дубликатов" -#: ../extensions/find_duplicates/gth-find-duplicates.c:551 +#: ../extensions/find_duplicates/gth-find-duplicates.c:728 #: ../gthumb/gth-load-file-data-task.c:106 #: ../gthumb/gth-save-file-data-task.c:100 #, c-format @@ -2770,20 +2898,19 @@ msgstr[1] "Осталось %d файла" msgstr[2] "Осталось %d файлов" -#: ../extensions/find_duplicates/gth-find-duplicates.c:634 +#: ../extensions/find_duplicates/gth-find-duplicates.c:830 msgid "Getting the file list" msgstr "Получение списка файлов" -#: ../extensions/find_duplicates/gth-find-duplicates.c:740 +#: ../extensions/find_duplicates/gth-find-duplicates.c:1016 msgid "Duplicates" msgstr "Дубликаты" -#: ../extensions/find_duplicates/gth-find-duplicates.c:997 +#: ../extensions/find_duplicates/gth-find-duplicates.c:1306 msgid "Select" msgstr "Выбрать" -#: ../extensions/flicker/callbacks.c:59 -#: ../extensions/flicker/callbacks.c:64 +#: ../extensions/flicker/callbacks.c:59 ../extensions/flicker/callbacks.c:64 msgid "_Flickr..." msgstr "_Flickr…" @@ -2803,126 +2930,151 @@ msgid "Upload images to Flickr" msgstr "Отправить изображения на Flickr" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 msgid "Free space:" msgstr "Доступно:" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 -msgid "Hi_de from public searches" -msgstr "_Сделать невидимым для поиска" - -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 -msgid "Moderate content" -msgstr "Модерировать содержимое" - #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:5 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 msgid "Ph_otoset:" msgstr "_Набор снимков:" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:6 -msgid "Private photos" -msgstr "Личные фотографии" +msgid "_Privacy:" +msgstr "_Личное:" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:7 -msgid "Private photos, visible to family" -msgstr "Личные фотографии, доступные для членов семьи" +msgid "Hi_de from public searches" +msgstr "_Сделать невидимым для поиска" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:8 +msgid "_Safety:" +msgstr "_Безопасное:" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 msgid "Private photos, visible to family and friends" msgstr "Личные фотографии, доступные для членов семьи и друзьям" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 -msgid "Restricted content" -msgstr "Содержимое с ограниченным доступом" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 +msgid "Private photos, visible to family" +msgstr "Личные фотографии, доступные для членов семьи" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 +msgid "Private photos" +msgstr "Личные фотографии" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 msgid "Safe content" msgstr "Безопасное содежимое" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 -msgid "_Privacy:" -msgstr "_Личное:" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 +msgid "Moderate content" +msgstr "Модерировать содержимое" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 -msgid "_Safety:" -msgstr "_Безопасное:" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:17 +msgid "Restricted content" +msgstr "Содержимое с ограниченным доступом" -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 -msgid "_Import" -msgstr "_Импортировать" +#: ../extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui.h:1 +msgid "C_ontinue" +msgstr "Пр_одолжить" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:360 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:830 -msgid "Could not get the photo list" -msgstr "Не удалось получить список фотографий" +#: ../extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui.h:2 +msgid "_Authorize..." +msgstr "_Авторизовать…" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:397 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:561 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:864 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1026 -msgid "No album selected" -msgstr "Не выбран альбом" +#: ../extensions/flicker_utils/flickr-consumer.c:124 +#: ../extensions/flicker_utils/flickr-service.c:237 +#: ../extensions/flicker_utils/flickr-service.c:348 +#: ../extensions/flicker_utils/flickr-service.c:672 +#: ../extensions/flicker_utils/flickr-service.c:937 +#: ../extensions/oauth/oauth-service.c:154 +#: ../extensions/photobucket/photobucket-consumer.c:74 +#: ../extensions/photobucket/photobucket-consumer.c:82 +#: ../extensions/photobucket/photobucket-consumer.c:149 +#: ../extensions/photobucket/photobucket-service.c:132 +msgid "Unknown error" +msgstr "Неизвестная ошибка" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:579 +#: ../extensions/flicker_utils/flickr-service.c:502 #, c-format -msgid "Import from %s" -msgstr "Импортировать из %s" +msgid "" +"Return to this window when you have finished the authorization process on %s" +msgstr "Вернуться к этому окну, когда завершится процесс авторизации для %s" + +#: ../extensions/flicker_utils/flickr-service.c:503 +msgid "Once you're done, click the 'Continue' button below." +msgstr "По завершению нажмите кнопку «Продолжить»." + +#: ../extensions/flicker_utils/flickr-service.c:571 +#, c-format +#| msgid "gthumb requires your authorization to upload the photos to %s" +msgid "gThumb requires your authorization to upload the photos to %s" +msgstr "Для отправки фотографий на %s требуется авторизация" + +#: ../extensions/flicker_utils/flickr-service.c:572 +#, c-format +msgid "" +"Click 'Authorize' to open your web browser and authorize gthumb to upload " +"photos to %s. When you're finished, return to this window to complete the " +"authorization." +msgstr "" +"Нжмите «Авторизовать», чтобы открыть веб-браузер и авторизовать gthumb для " +"отправки фотографий в %s. По завершению вернитесь к этому окну, чтобы " +"завершить авторизацию." #: ../extensions/gstreamer_tools/actions.c:66 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1075 -#: ../gthumb/gth-browser.c:1998 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1042 +#: ../gthumb/gth-browser.c:2175 msgid "Could not save the file" msgstr "Не удалось сохранить файл" -#: ../extensions/gstreamer_tools/actions.c:126 +#: ../extensions/gstreamer_tools/actions.c:130 msgid "Could not take a screenshot" msgstr "Не удалось сделать снимок экрана" -#: ../extensions/gstreamer_tools/actions.c:132 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1223 +#: ../extensions/gstreamer_tools/actions.c:136 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1215 msgid "Save Image" msgstr "Сохранить изображение" -#: ../extensions/gstreamer_tools/actions.c:152 +#: ../extensions/gstreamer_tools/actions.c:156 msgctxt "Filename" msgid "Screenshot" msgstr "Снимок экрана" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:1 -msgid "--:--" -msgstr "--:--" +msgid "Slower" +msgstr "Медленнее" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 -msgid "Change volume level" -msgstr "Изменить уровень громкости" +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:699 +msgid "Play" +msgstr "Воспроизвести" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:3 msgid "Faster" msgstr "Быстрее" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:686 -msgid "Play" -msgstr "Воспроизвести" +msgid "Time:" +msgstr "Время:" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 -msgid "Slower" -msgstr "Медленнее" +msgid "--:--" +msgstr "--:--" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 -msgid "Time:" -msgstr "Время:" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 msgid "Toggle volume" msgstr "Вкл/выкл громкость звука" -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 +msgid "Change volume level" +msgstr "Изменить уровень громкости" + +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 #: ../extensions/photo_importer/actions.c:67 #: ../extensions/photo_importer/dlg-photo-importer.c:620 msgid "Choose a folder" @@ -2944,21 +3096,21 @@ msgid "Take a screenshot" msgstr "Сделать снимок экрана" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:663 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 msgid "Playing video" msgstr "Воспроизведение видео" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:689 msgid "Pause" msgstr "Пауза" #: ../extensions/gstreamer_tools/main.c:31 -#: ../gthumb/gth-main-default-tests.c:211 +#: ../gthumb/gth-main-default-tests.c:247 msgid "Video" msgstr "Видео" #: ../extensions/gstreamer_tools/main.c:32 -#: ../gthumb/gth-main-default-tests.c:218 +#: ../gthumb/gth-main-default-tests.c:254 msgid "Audio" msgstr "Аудио" @@ -2967,7 +3119,7 @@ msgstr "Исполнитель" #: ../extensions/gstreamer_tools/main.c:40 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 msgid "Album" msgstr "Альбом" @@ -2989,13 +3141,13 @@ msgstr "Кадр/с" #: ../extensions/gstreamer_tools/main.c:46 -#: ../extensions/image_print/data/ui/print-layout.ui.h:25 +#: ../extensions/image_print/data/ui/print-layout.ui.h:24 #: ../extensions/image_viewer/gth-image-viewer-page.c:209 msgid "Width" msgstr "Ширина" #: ../extensions/gstreamer_tools/main.c:47 -#: ../extensions/image_print/data/ui/print-layout.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:25 msgid "Height" msgstr "Высота" @@ -3007,20 +3159,19 @@ msgid "Sample rate" msgstr "Частота дискретизации" -#: ../extensions/gstreamer_utils/gstreamer-utils.c:363 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:368 msgid "Stereo" msgstr "Стерео" -#: ../extensions/gstreamer_utils/gstreamer-utils.c:363 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:368 msgid "Mono" msgstr "Моно" #. Translators: this is an image size, such as 1024 × 768 -#: ../extensions/gstreamer_utils/gstreamer-utils.c:396 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1278 -#: ../extensions/image_viewer/gth-metadata-provider-image.c:190 -#: ../extensions/webalbums/dlg-web-exporter.c:442 -#: ../extensions/webalbums/gth-web-exporter.c:2446 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:401 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1270 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:243 +#: ../extensions/webalbums/gth-web-exporter.c:2446 ../gthumb/gtk-utils.c:1037 #, c-format msgid "%d × %d" msgstr "%d x %d" @@ -3029,99 +3180,99 @@ msgid "Could not print the selected files" msgstr "Не удалось вывести на печать выделенные файлы" -#: ../extensions/image_print/callbacks.c:54 +#: ../extensions/image_print/callbacks.c:65 msgid "Print the selected images" msgstr "Печать выделенных изображений" -#: ../extensions/image_print/data/ui/print-layout.ui.h:5 +#: ../extensions/image_print/data/ui/print-layout.ui.h:1 msgid "Centered" msgstr "По центру" -#: ../extensions/image_print/data/ui/print-layout.ui.h:10 -msgid "Image" -msgstr "Изображение" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:12 -msgid "Left" -msgstr "Слева" - #: ../extensions/image_print/data/ui/print-layout.ui.h:13 -msgid "Position:" -msgstr "Положение:" +msgid "The total number of files" +msgstr "Общее число файлов" #: ../extensions/image_print/data/ui/print-layout.ui.h:14 -msgid "Preview" -msgstr "Предварительный просмотр" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:15 -msgid "Rotation:" -msgstr "Поворот:" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:20 #: ../extensions/importer/data/ui/import-preferences.ui.h:4 msgid "The event description" msgstr "Описание события" +#: ../extensions/image_print/data/ui/print-layout.ui.h:17 +msgid "_Rows:" +msgstr "С_троки:" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:19 +msgid "Image" +msgstr "Изображение" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:20 +msgid "Position:" +msgstr "Положение:" + #: ../extensions/image_print/data/ui/print-layout.ui.h:21 -msgid "The total number of files" -msgstr "Общее число файлов" +msgid "Left" +msgstr "Слева" -#: ../extensions/image_print/data/ui/print-layout.ui.h:23 +#: ../extensions/image_print/data/ui/print-layout.ui.h:22 msgid "Top" msgstr "Верх" -#: ../extensions/image_print/data/ui/print-layout.ui.h:24 +#: ../extensions/image_print/data/ui/print-layout.ui.h:26 +msgid "Rotation:" +msgstr "Поворот:" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:27 msgid "Unit:" msgstr "Единица:" -#: ../extensions/image_print/data/ui/print-layout.ui.h:28 -msgid "_Rows:" -msgstr "С_троки:" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:29 -msgid "inches" -msgstr "дюймы" - +#: ../extensions/image_print/data/ui/print-layout.ui.h:28 +msgid "Preview" +msgstr "Предварительный просмотр" + #: ../extensions/image_print/data/ui/print-layout.ui.h:30 msgid "millimeters" msgstr "миллиметры" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 -msgid "Fonts" -msgstr "Шрифты" +#: ../extensions/image_print/data/ui/print-layout.ui.h:31 +msgid "inches" +msgstr "дюймы" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:4 msgid "Select Caption Font" msgstr "Выбрать шрифт заголовка" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:4 -msgid "Select Footer Font" -msgstr "Выберите шрифт нижнего колонтитула" - #: ../extensions/image_print/data/ui/print-preferences.ui.h:5 msgid "Select Header Font" msgstr "Выберите шрифт верхнего колонтитула" -#: ../extensions/image_print/gth-image-print-job.c:971 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 +msgid "Select Footer Font" +msgstr "Выберите шрифт нижнего колонтитула" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 +msgid "Fonts" +msgstr "Шрифты" + +#: ../extensions/image_print/gth-image-print-job.c:914 #: ../extensions/webalbums/data/albumthemes/text.h:31 #, c-format msgid "Page %d of %d" msgstr "Страница %d из %d" -#: ../extensions/image_print/gth-image-print-job.c:1734 -#: ../extensions/image_print/gth-image-print-job.c:1861 -#: ../extensions/image_print/gth-image-print-job.c:1898 +#: ../extensions/image_print/gth-image-print-job.c:1680 +#: ../extensions/image_print/gth-image-print-job.c:1845 +#: ../extensions/image_print/gth-image-print-job.c:1888 msgid "Could not print" msgstr "Не удалось вывести на печать" -#: ../extensions/image_print/gth-image-print-job.c:1796 -#: ../gthumb/gth-main-default-tests.c:204 +#: ../extensions/image_print/gth-image-print-job.c:1746 +#: ../gthumb/gth-main-default-tests.c:240 msgid "Images" msgstr "Изображения" -#: ../extensions/image_print/gth-image-print-job.c:1863 -#: ../gthumb/gth-image-loader.c:204 -#: ../gthumb/gth-image-loader.c:277 +#: ../extensions/image_print/gth-image-print-job.c:1847 +#: ../gthumb/gth-image-loader.c:197 ../gthumb/gth-image-loader.c:304 +#: ../gthumb/gth-image-utils.c:131 ../gthumb/gth-image-utils.c:137 msgid "No suitable loader available for this file type" msgstr "Для этого типа файла подходящий загрузчик отсутствует" @@ -3132,18 +3283,18 @@ msgstr "Загрузка «%s»" #: ../extensions/image_print/gth-load-image-info-task.c:166 -#: ../extensions/webalbums/gth-web-exporter.c:2685 +#: ../extensions/webalbums/gth-web-exporter.c:2719 msgid "Loading images" msgstr "Загрузка изображений" #: ../extensions/image_print/image_print.extension.in.in.h:1 -msgid "Allow to print images choosing the page layout." -msgstr "Разрешить пачать изображения, выбрав макет страницы." - -#: ../extensions/image_print/image_print.extension.in.in.h:2 msgid "Image print" msgstr "Печать изображений" +#: ../extensions/image_print/image_print.extension.in.in.h:2 +msgid "Allow to print images choosing the page layout." +msgstr "Разрешить пачать изображения, выбрав макет страницы." + #: ../extensions/image_print/preferences.c:79 msgid "Print" msgstr "Печать" @@ -3162,7 +3313,8 @@ #: ../extensions/image_rotation/callbacks.c:62 msgid "Rotate the selected images according to the embedded orientation" -msgstr "Повернуть выбранные изображения в соответствии со встроенной ориентации" +msgstr "" +"Повернуть выбранные изображения в соответствии со встроенной ориентации" #: ../extensions/image_rotation/callbacks.c:67 msgid "Reset the EXIF Orientation" @@ -3174,7 +3326,7 @@ #: ../extensions/image_rotation/gth-reset-orientation-task.c:111 #: ../extensions/image_rotation/gth-transform-task.c:141 -#: ../extensions/webalbums/gth-web-exporter.c:2339 +#: ../extensions/webalbums/gth-web-exporter.c:2338 #: ../extensions/webalbums/gth-web-exporter.c:2423 msgid "Saving images" msgstr "Сохранение изображений" @@ -3194,17 +3346,27 @@ #: ../extensions/image_rotation/rotation-utils.c:122 msgid "" -"This transformation may introduce small image distortions along one or more edges, because the image dimensions are not multiples of 8.\n" +"This transformation may introduce small image distortions along one or more " +"edges, because the image dimensions are not multiples of 8.\n" "\n" -"The distortion is reversible, however. If the resulting image is unacceptable, simply apply the reverse transformation to return to the original image.\n" +"The distortion is reversible, however. If the resulting image is " +"unacceptable, simply apply the reverse transformation to return to the " +"original image.\n" "\n" -"You can also choose to discard (or trim) any untransformable edge pixels. For practical use, this mode gives the best looking results, but the transformation is not strictly lossless anymore." +"You can also choose to discard (or trim) any untransformable edge pixels. " +"For practical use, this mode gives the best looking results, but the " +"transformation is not strictly lossless anymore." msgstr "" -"Это преобразование может внести небольшие помехи по одному или нескольким краям изображения, потому что размеры изображения не кратны 8.\n" +"Это преобразование может внести небольшие помехи по одному или нескольким " +"краям изображения, потому что размеры изображения не кратны 8.\n" "\n" -"Однако, эти помехи обратимы. Если результат неудовлетворительный, просто примените обратное преобразование, чтобы вернуться к первоначальному изображению.\n" +"Однако, эти помехи обратимы. Если результат неудовлетворительный, просто " +"примените обратное преобразование, чтобы вернуться к первоначальному " +"изображению.\n" "\n" -"Можно также отбросить (или обрезать) все точки по краям, которые не поддаются преобразованию. На практике этот режим даёт лучшие результаты, но преобразование при этом перестаёт быть обратимым без последствий." +"Можно также отбросить (или обрезать) все точки по краям, которые не " +"поддаются преобразованию. На практике этот режим даёт лучшие результаты, но " +"преобразование при этом перестаёт быть обратимым без последствий." #: ../extensions/image_rotation/rotation-utils.c:128 msgid "_Trim" @@ -3215,21 +3377,72 @@ msgstr "_Допустить помехи" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:1 -msgid "After loading an image:" -msgstr "После загрузки изображения:" +#| msgid "Actual size" +msgid "Set to actual size" +msgstr "Не использовать масштабирование" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:2 +#| msgid "View previous image" +msgid "Keep previous zoom" +msgstr "Использовать предыдущий масштаб" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:3 -msgid "Reset scrollbar positions" -msgstr "Сбросить позиции полос прокрутки" +#| msgid "Zoom to fit window" +msgid "Fit to window" +msgstr "Подогнать под размеры окна" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 -msgid "Transparency _type:" -msgstr "Тип _прозрачности:" +#| msgid "_Fit Window to Image" +msgid "Fit to window if larger" +msgstr "Подогнать под размеры окна, если больше" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:5 +#| msgid "Zoom to fit width" +msgid "Fit to width" +msgstr "Подогнать по ширине" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:6 +msgid "Fit to width if larger" +msgstr "Подогнать по ширине, если больше" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:7 +msgid "Reset scrollbar positions" +msgstr "Сбросить позиции полос прокрутки" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:8 +msgid "After loading an image:" +msgstr "После загрузки изображения:" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:9 msgid "_Zoom quality:" msgstr "_Качество масштабирования:" +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:10 +msgid "Transparency _type:" +msgstr "Тип _прозрачности:" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:11 +msgid "High" +msgstr "" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:12 +#, fuzzy +#| msgid "Now" +msgid "Low" +msgstr "Теперь" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:13 +msgid "White" +msgstr "Белый" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:15 +msgid "Black" +msgstr "Чёрный" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:16 +msgid "Checked" +msgstr "" + #: ../extensions/image_viewer/gth-image-histogram.c:84 msgid "Histogram" msgstr "Гистограмма" @@ -3287,52 +3500,52 @@ msgstr "Масштабировать, чтобы подогнать по ширине" #: ../extensions/image_viewer/image_viewer.extension.in.in.h:1 -msgid "Basic image viewing." -msgstr "Базовый просмотр изображения." - -#: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 msgid "Image viewer" msgstr "Просмотр изображений" +#: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 +msgid "Basic image viewing." +msgstr "Базовый просмотр изображения." + #: ../extensions/image_viewer/preferences.c:125 msgid "Viewer" msgstr "Просмотрщик" -#: ../extensions/importer/data/ui/import-preferences.ui.h:3 -msgid "The day of the month" -msgstr "День месяца" +#: ../extensions/importer/data/ui/import-preferences.ui.h:1 +msgid "_Destination" +msgstr "_Место назначения" -#: ../extensions/importer/data/ui/import-preferences.ui.h:5 -msgid "The hour" -msgstr "Час" +#: ../extensions/importer/data/ui/import-preferences.ui.h:2 +msgid "_Automatic subfolder" +msgstr "_Автоматическая подпапка" -#: ../extensions/importer/data/ui/import-preferences.ui.h:6 -msgid "The minutes" -msgstr "Минуты" +#: ../extensions/importer/data/ui/import-preferences.ui.h:3 +msgid "as _single subfolder" +msgstr "как _одиночная подпапка" #: ../extensions/importer/data/ui/import-preferences.ui.h:7 -msgid "The month" -msgstr "Месяц" +msgid "The year" +msgstr "Год" #: ../extensions/importer/data/ui/import-preferences.ui.h:8 -msgid "The seconds" -msgstr "Секунды" +msgid "The month" +msgstr "Месяц" #: ../extensions/importer/data/ui/import-preferences.ui.h:9 -msgid "The year" -msgstr "Год" +msgid "The day of the month" +msgstr "День месяца" #: ../extensions/importer/data/ui/import-preferences.ui.h:10 -msgid "_Automatic subfolder" -msgstr "_Автоматическая подпапка" +msgid "The hour" +msgstr "Час" #: ../extensions/importer/data/ui/import-preferences.ui.h:11 -msgid "_Destination" -msgstr "_Место назначения" +msgid "The minutes" +msgstr "Минуты" #: ../extensions/importer/data/ui/import-preferences.ui.h:12 -msgid "as _single subfolder" -msgstr "как _одиночная подпапка" +msgid "The seconds" +msgstr "Секунды" #: ../extensions/importer/gth-import-destination-button.c:183 msgid "Invalid Destination" @@ -3366,39 +3579,39 @@ msgid "custom format" msgstr "другой формат" -#: ../extensions/importer/gth-import-task.c:442 -#: ../extensions/importer/gth-import-task.c:477 -#: ../extensions/importer/gth-import-task.c:648 +#: ../extensions/importer/gth-import-task.c:426 +#: ../extensions/importer/gth-import-task.c:461 +#: ../extensions/importer/gth-import-task.c:671 msgid "Importing files" msgstr "Импортирование файлов" -#: ../extensions/importer/gth-import-task.c:598 +#: ../extensions/importer/gth-import-task.c:620 msgid "No file imported" msgstr "Файлы не импортированы" -#: ../extensions/importer/gth-import-task.c:599 +#: ../extensions/importer/gth-import-task.c:621 msgid "The selected files are already present in the destination." msgstr "Выделенные файлы уже присутствуют в указанном месте." -#: ../extensions/importer/gth-import-task.c:622 -#: ../gthumb/gth-file-source-vfs.c:690 +#: ../extensions/importer/gth-import-task.c:644 +#: ../gthumb/gth-file-source-vfs.c:694 msgid "Could not delete the files" msgstr "Не удалось удалить файлы" -#: ../extensions/importer/gth-import-task.c:623 +#: ../extensions/importer/gth-import-task.c:645 msgid "Delete operation not supported." msgstr "Операция удаления не поддерживается." -#: ../extensions/importer/gth-import-task.c:709 +#: ../extensions/importer/gth-import-task.c:732 msgid "Last imported" msgstr "Импортировано в последний раз" -#: ../extensions/importer/gth-import-task.c:815 +#: ../extensions/importer/gth-import-task.c:838 msgid "No file specified." msgstr "Не указан файл." #. Translators: For example: Not enough free space in '/home/user/Images'.\n1.3 GB of space is required but only 300 MB is available. -#: ../extensions/importer/gth-import-task.c:852 +#: ../extensions/importer/gth-import-task.c:875 #, c-format msgid "" "Not enough free space in '%s'.\n" @@ -3407,16 +3620,15 @@ "Недостаточно свободного места в «%s».\n" "Необходимо %s, но доступно только %s" -#: ../extensions/list_tools/callbacks.c:75 -#: ../gthumb/gth-filterbar.c:303 +#: ../extensions/list_tools/callbacks.c:76 ../gthumb/gth-filterbar.c:311 msgid "Personalize..." msgstr "Персонализировать…" -#: ../extensions/list_tools/callbacks.c:319 +#: ../extensions/list_tools/callbacks.c:320 msgid "Tools" msgstr "Инструменты" -#: ../extensions/list_tools/callbacks.c:320 +#: ../extensions/list_tools/callbacks.c:321 msgid "Batch tools for multiple files" msgstr "Инструменты для массовой обработки файлов" @@ -3425,97 +3637,97 @@ msgstr "Пропу_стить" #: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:1 -msgid "Co_mmands:" -msgstr "_Команды:" - -#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:2 msgid "Commands" msgstr "Команды" +#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:2 +msgid "Co_mmands:" +msgstr "_Команды:" + #: ../extensions/list_tools/data/ui/script-editor.ui.h:2 -#, no-c-format -msgid "%E" -msgstr "%E" +msgid "_Wait for the command to finish" +msgstr "_Ожидать завершения команды" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:3 +msgid "E_xecute command once for every file" +msgstr "В_ыполнить одну команду для каждого файла" #: ../extensions/list_tools/data/ui/script-editor.ui.h:4 -#, no-c-format -msgid "%N" -msgstr "%N" +msgid "_Terminal command (shell script)" +msgstr "_Терминальная команда (сценарий оболочки)" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:5 +msgid "Sh_ortcut:" +msgstr "_Горячая клавиша:" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:6 +msgid "The file uri" +msgstr "Адрес (URI) файла" -#. Translate only 'message' and 'default_value'. #: ../extensions/list_tools/data/ui/script-editor.ui.h:7 -#, no-c-format -msgid "%ask{ message }{ default value }" -msgstr "%ask{ сообщение }{ значение по умолчанию }" +msgid "The file path" +msgstr "Путь к файлу" -#. Translate only 'attribute name' -#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 -#, no-c-format -msgid "%attr{ attribute name }" -msgstr "%attr{ имя атрибута }" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:8 +msgid "The file basename" +msgstr "Базовое имя файла" -#. Translate only 'text'. -#: ../extensions/list_tools/data/ui/script-editor.ui.h:13 -#, no-c-format -msgid "%quote{ text }" -msgstr "%quote{ текст }" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:9 +msgid "The parent folder path" +msgstr "Путь к родительской папке" +#. Translate only 'message' and 'default_value'. #: ../extensions/list_tools/data/ui/script-editor.ui.h:14 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 -msgid "A file attribute" -msgstr "Атрибут файла" +#, no-c-format +msgid "%ask{ message }{ default value }" +msgstr "%ask{ сообщение }{ значение по умолчанию }" #: ../extensions/list_tools/data/ui/script-editor.ui.h:15 msgid "Ask an input value" msgstr "Запросить вводимое значение" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:17 -msgid "E_xecute command once for every file" -msgstr "В_ыполнить одну команду для каждого файла" - +#. Translate only 'attribute name' #: ../extensions/list_tools/data/ui/script-editor.ui.h:18 -msgid "Quote the text " -msgstr "Цитировать текст " +#, no-c-format +msgid "%attr{ attribute name }" +msgstr "%attr{ имя атрибута }" #: ../extensions/list_tools/data/ui/script-editor.ui.h:19 -msgid "Sh_ortcut:" -msgstr "_Горячая клавиша:" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 +msgid "A file attribute" +msgstr "Атрибут файла" #: ../extensions/list_tools/data/ui/script-editor.ui.h:21 -msgid "The file basename" -msgstr "Базовое имя файла" +#, no-c-format +msgid "%N" +msgstr "%N" #: ../extensions/list_tools/data/ui/script-editor.ui.h:22 msgid "The file basename without extension" msgstr "Базовое имя файла без расширения" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:23 -msgid "The file extension" -msgstr "Расширение файла" - #: ../extensions/list_tools/data/ui/script-editor.ui.h:24 -msgid "The file path" -msgstr "Путь к файлу" +#, no-c-format +msgid "%E" +msgstr "%E" #: ../extensions/list_tools/data/ui/script-editor.ui.h:25 -msgid "The file uri" -msgstr "Адрес (URI) файла" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:26 -msgid "The parent folder path" -msgstr "Путь к родительской папке" +msgid "The file extension" +msgstr "Расширение файла" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:27 -msgid "_Command:" -msgstr "_Команда:" +#. Translate only 'text'. +#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 +#, no-c-format +msgid "%quote{ text }" +msgstr "%quote{ текст }" #: ../extensions/list_tools/data/ui/script-editor.ui.h:29 -msgid "_Terminal command (shell script)" -msgstr "_Терминальная команда (сценарий оболочки)" +msgid "Quote the text " +msgstr "Цитировать текст " #: ../extensions/list_tools/data/ui/script-editor.ui.h:30 -msgid "_Wait for the command to finish" -msgstr "_Ожидать завершения команды" +msgid "_Command:" +msgstr "_Команда:" #: ../extensions/list_tools/dlg-personalize-scripts.c:257 msgid "Script" @@ -3551,9 +3763,9 @@ msgstr "Введите значение:" #: ../extensions/list_tools/gth-script.c:745 -#: ../extensions/webalbums/gth-web-exporter.c:560 -#: ../extensions/webalbums/gth-web-exporter.c:572 -#: ../extensions/webalbums/gth-web-exporter.c:580 +#: ../extensions/webalbums/gth-web-exporter.c:558 +#: ../extensions/webalbums/gth-web-exporter.c:570 +#: ../extensions/webalbums/gth-web-exporter.c:578 msgid "Malformed command" msgstr "Неправильная команда" @@ -3610,84 +3822,126 @@ msgstr "Карта" #. No GPS label -#: ../extensions/map_view/gth-map-view.c:273 +#: ../extensions/map_view/gth-map-view.c:276 msgid "The geographical position information is not available for this image." -msgstr "Информация о географическом положении недоступна для этого изображения." +msgstr "" +"Информация о географическом положении недоступна для этого изображения." #: ../extensions/map_view/map_view.extension.in.in.h:2 msgid "View the photo position on the map" msgstr "Показать место снимка на карте" +#: ../extensions/oauth/data/ui/oauth-account-manager.ui.h:1 +msgid "A_ccounts:" +msgstr "_Учётные записи:" + +#: ../extensions/oauth/data/ui/oauth-ask-authorization.ui.h:1 +#: ../gthumb/gth-folder-tree.c:1067 +msgid "Loading..." +msgstr "Загрузка…" + +#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 +msgid "New authentication..." +msgstr "Новая аутентификация…" + +#: ../extensions/oauth/oauth-ask-authorization-dialog.c:191 +msgid "Authorization Required" +msgstr "Требуется авторизация" + +#: ../extensions/oauth/web-service.c:382 +msgid "Choose _Account..." +msgstr "Выбрать _учётную запись…" + +#: ../extensions/oauth/web-service.c:660 +msgid "Choose Account" +msgstr "Выбрать учётную запись" + +#: ../extensions/oauth/web-service.c:777 +msgid "Edit Accounts" +msgstr "Изменить учётные записи" + +#: ../extensions/oauth/web-service.c:795 ../extensions/oauth/web-service.c:812 +msgid "Connecting to the server" +msgstr "Соединение с сервером" + +#: ../extensions/oauth/web-service.c:796 +msgid "Asking authorization" +msgstr "Запрос авторизации" + +#: ../extensions/oauth/web-service.c:813 +msgid "Getting account information" +msgstr "Получение сведений об учётной записи" + #: ../extensions/photobucket/callbacks.c:54 msgid "Photobucket..." msgstr "Photobucket…" #: ../extensions/photobucket/callbacks.c:55 msgid "Upload photos to Photobucket" -msgstr "Отправить фотографии в Photobucket" - -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 -msgid "1 megabyte file size" -msgstr "1 мегабайтный размер файла" - -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 -msgid "15ʺ screen ( 800 x 600 )" -msgstr "15ʺ экран ( 800 x 600 )" - -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 -msgid "17ʺ screen ( 1024 x 768 )" -msgstr "17ʺ экран ( 1024 x 768 )" +msgstr "Отправить фотографии в Photobucket" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 -msgid "Large ( 640 x 480 )" -msgstr "Большой 640 x 480" +msgid "_Scramble filenames" +msgstr "_Шифровать имена файлов" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 -msgid "Medium ( 320 x 240 )" -msgstr "Средний ( 320 x 240 )" +msgid "Tiny ( 100 x 75 )" +msgstr "Крошечный ( 100 x 75 )" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 msgid "Small ( 160 x 120 )" msgstr "Маленький ( 160 x 120 )" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 -msgid "Tiny ( 100 x 75 )" -msgstr "Крошечный ( 100 x 75 )" +msgid "Medium ( 320 x 240 )" +msgstr "Средний ( 320 x 240 )" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 +msgid "Large ( 640 x 480 )" +msgstr "Большой 640 x 480" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 +msgid "15ʺ screen ( 800 x 600 )" +msgstr "15ʺ экран ( 800 x 600 )" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 -msgid "_Scramble filenames" -msgstr "_Шифровать имена файлов" +msgid "17ʺ screen ( 1024 x 768 )" +msgstr "17ʺ экран ( 1024 x 768 )" -#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 +msgid "1 megabyte file size" +msgstr "1 мегабайтный размер файла" + +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 msgid "_Container:" msgstr "_Контейнер:" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:290 msgid "Tiny ( 100 × 75 )" msgstr "Крошечный ( 100 x 75 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 msgid "Small ( 160 × 120 )" msgstr "Маленький ( 160 x 120 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 msgid "Medium ( 320 × 240 )" msgstr "Средний ( 320 x 240 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 msgid "Large ( 640 × 480 )" msgstr "Большой 640 x 480" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 msgid "15ʺ screen ( 800 × 600 )" msgstr "15ʺ экран ( 800 x 600 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 msgid "17ʺ screen ( 1024 × 768 )" msgstr "17ʺ экран ( 1024 x 768 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:304 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:303 msgid "2 megabyte file size" msgstr "2-х мегабайтный размер файла" @@ -3720,33 +3974,33 @@ msgstr "Импортировать фотографии и другие файлы из папки" #: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:1 -msgid "After importing from a device:" -msgstr "После импортирования из устройства:" - -#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 msgid "_Rotate the images physically" msgstr "_Повернуть изображения физически" +#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 +msgid "After importing from a device:" +msgstr "После импортирования из устройства:" + #. view label -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 -#: ../gthumb/gth-filterbar.c:413 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 +#: ../gthumb/gth-filterbar.c:421 msgid "S_how:" msgstr "По_казать:" -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 -msgid "_Delete the imported files from the source" -msgstr "_Удалить импортированные файлы из источника импортирования" - #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:4 +msgid "_Tags:" +msgstr "_Метки:" + +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 msgid "_Event:" msgstr "_Событие:" #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:7 -msgid "_Tags:" -msgstr "_Метки:" +msgid "_Delete the imported files from the source" +msgstr "_Удалить импортированные файлы из источника импортирования" #: ../extensions/photo_importer/dlg-photo-importer.c:227 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:174 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:149 msgid "Could not import the files" msgstr "Не удалось импортировать файлы" @@ -3761,7 +4015,7 @@ msgstr "Не удалось загрузить папку" #: ../extensions/photo_importer/dlg-photo-importer.c:369 -#: ../gthumb/gth-browser.c:1911 +#: ../gthumb/gth-browser.c:2089 msgid "Getting folder listing..." msgstr "Получение списка папок…" @@ -3798,57 +4052,23 @@ msgid "Upload photos to Picasa Web Album" msgstr "Отправить фотографии в веб-альбом Picasa" -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 msgid "Export to Picasa Web Albums" msgstr "Экспортировать в веб-альбом Picasa" -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 msgid "_Albums:" msgstr "_Альбомы:" -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 -msgid "Import from Picasa Web Album" -msgstr "Импортировать из веб-альбома Picasa" - -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 -msgid "_Album:" -msgstr "_Альбом:" - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:1 -msgid "Type the characters you see in the picture below. Letters are not case-sensitive." -msgstr "Введите символы, которые видите на картинке ниже. Буквы вводятся без учёта регистра." - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 -msgid "_E-Mail:" -msgstr "_Эл. почта:" - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:3 -msgid "_Password:" -msgstr "_Пароль:" - -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 msgid "Public" msgstr "Открытый" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:354 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:310 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:458 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:469 msgid "Could not get the album list" msgstr "Не удалось получить список альбомов" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:438 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:394 -msgid "Picasa Web Album" -msgstr "Веб-альбом Picasa" - -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:525 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:481 -msgid "Account" -msgstr "Учётная запись" - -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:104 -msgid "Could not load the file" -msgstr "Не удалось загрузить файл" - #: ../extensions/picasaweb/picasaweb.extension.in.in.h:1 msgid "Picasa Web Albums" msgstr "Веб-альбомы Picasa" @@ -3857,100 +4077,14 @@ msgid "Upload images to Picasa Web Albums" msgstr "Отправить изображения в веб-альбомы Picasa" -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:1 -msgid "Opti_mize" -msgstr "_Оптимизировать" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:2 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 -msgid "_Default extension:" -msgstr "_Расширение по умолчанию:" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 -msgid "_Progressive" -msgstr "_Постепенная прорисовка" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 -msgid "_Quality:" -msgstr "_Качество:" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:5 -msgid "_Smoothing:" -msgstr "С_глаживание:" - -#: ../extensions/pixbuf_savers/data/ui/png-options.ui.h:1 -msgid "Compression _level:" -msgstr "Степень с_жатия:" - -#: ../extensions/pixbuf_savers/data/ui/save-options-preferences.ui.h:1 -msgid "Default options:" -msgstr "Параметры по умолчанию:" - -#: ../extensions/pixbuf_savers/data/ui/tga-options.ui.h:1 -msgid "_RLE compression" -msgstr "Сжатие _RLE" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:1 -msgid "Compression" -msgstr "Сжатие" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:2 -msgid "No_rmal (Deflate)" -msgstr "_Обычное (низкое)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:3 -msgid "Resolution" -msgstr "Разрешение" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 -msgid "_Loss compression (JPEG)" -msgstr "Сжатие с по_терями (JPEG)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 -msgid "_No compression" -msgstr "_Без сжатия" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:9 -msgid "dpi" -msgstr "точек/дюйм" - -#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:519 -msgid "JPEG" -msgstr "JPEG" - -#: ../extensions/pixbuf_savers/gth-png-saver.c:140 -msgid "PNG" -msgstr "PNG" - -#: ../extensions/pixbuf_savers/gth-tga-saver.c:286 -#: ../gthumb/gth-buffer-data.c:84 -msgid "Insufficient memory" -msgstr "Недостаточно памяти" - -#: ../extensions/pixbuf_savers/gth-tga-saver.c:373 -msgid "TGA" -msgstr "TGA" - -#: ../extensions/pixbuf_savers/gth-tiff-saver.c:537 -msgid "TIFF" -msgstr "TIFF" - -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:1 -msgid "Save images" -msgstr "Сохранить изображения" - -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:2 -msgid "Save images in common file formats such as JPEG, PNG and TIFF" -msgstr "Сохранить изображения в распространённых форматах таких, как JPEG, PNG и TIFF" - #: ../extensions/raw_files/raw_files.extension.in.in.h:1 -msgid "Allow to load raw format images." -msgstr "Разрешить загрузку изображений в формате RAW" - -#: ../extensions/raw_files/raw_files.extension.in.in.h:2 msgid "Raw format support" msgstr "Поддержка формата RAW" +#: ../extensions/raw_files/raw_files.extension.in.in.h:2 +msgid "Allow to load raw format images." +msgstr "Разрешить загрузку изображений в формате RAW" + #: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 msgid "_X:" msgstr "_X:" @@ -3980,75 +4114,75 @@ msgstr "Инструмент для удаления эффекта «красных глаз»." #: ../extensions/rename_series/data/ui/code-selector.ui.h:1 -msgid "add" -msgstr "добавить" - -#: ../extensions/rename_series/data/ui/code-selector.ui.h:2 msgid "digits" msgstr "цифры" -#: ../extensions/rename_series/data/ui/code-selector.ui.h:3 +#: ../extensions/rename_series/data/ui/code-selector.ui.h:2 msgid "format:" msgstr "формат:" -#: ../extensions/rename_series/data/ui/code-selector.ui.h:4 +#: ../extensions/rename_series/data/ui/code-selector.ui.h:3 msgid "remove" msgstr "удалить" -#. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 -#, no-c-format -msgid "%A{ identifier }" -msgstr "%A{ идентификатор }" +#: ../extensions/rename_series/data/ui/code-selector.ui.h:4 +msgid "add" +msgstr "добавить" -#. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 -#, no-c-format -msgid "%M{ format }" -msgstr "%M{ формат }" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:1 +msgid "Rename" +msgstr "Переименовать" #. Translators: this is the text case (upper or lower case). -#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 msgid "Cas_e:" msgstr "Рег_истр:" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:14 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:7 msgid "Edit template" msgstr "Изменить шаблон" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 -msgid "Re_verse Order" -msgstr "В _обратном порядке" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 +msgid "The original filename" +msgstr "Исходное имя файла" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 -msgid "Rename" -msgstr "Переименовать" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 +msgid "The original extension" +msgstr "Исходное расширение" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 -msgid "The digitalization date" -msgstr "Дата оцифровки" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:13 +msgid "The original enumerator" +msgstr "Исходный счётчик" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:21 +#. translate only the text in the curly brackets +#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 +#, no-c-format +msgid "%M{ format }" +msgstr "%M{ формат }" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 msgid "The modification date" msgstr "Дата изменения" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:22 -msgid "The original enumerator" -msgstr "Исходный счётчик" - -#: ../extensions/rename_series/data/ui/rename-series.ui.h:23 -msgid "The original extension" -msgstr "Исходное расширение" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:21 +msgid "The digitalization date" +msgstr "Дата оцифровки" +#. translate only the text in the curly brackets #: ../extensions/rename_series/data/ui/rename-series.ui.h:24 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 -msgid "The original filename" -msgstr "Исходное имя файла" +#, no-c-format +msgid "%A{ identifier }" +msgstr "%A{ идентификатор }" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 msgid "_Template:" msgstr "_Шаблон:" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +msgid "Re_verse Order" +msgstr "В _обратном порядке" + #: ../extensions/rename_series/dlg-rename-series.c:58 msgid "Enumerator" msgstr "Счётчик" @@ -4077,36 +4211,36 @@ msgid "File attribute" msgstr "Атрибут файла" -#: ../extensions/rename_series/dlg-rename-series.c:552 -#: ../extensions/rename_series/dlg-rename-series.c:683 +#: ../extensions/rename_series/dlg-rename-series.c:558 +#: ../extensions/rename_series/dlg-rename-series.c:689 msgid "Could not rename the files" msgstr "Не удалось переименовать файлы" -#: ../extensions/rename_series/dlg-rename-series.c:780 +#: ../extensions/rename_series/dlg-rename-series.c:786 msgid "Could not save the template" msgstr "Не удалось сохранить шаблон" -#: ../extensions/rename_series/dlg-rename-series.c:798 +#: ../extensions/rename_series/dlg-rename-series.c:804 msgid "Edit Template" msgstr "Изменить шаблон" -#: ../extensions/rename_series/dlg-rename-series.c:856 +#: ../extensions/rename_series/dlg-rename-series.c:862 msgid "Old Name" msgstr "Старое имя" -#: ../extensions/rename_series/dlg-rename-series.c:867 +#: ../extensions/rename_series/dlg-rename-series.c:873 msgid "New Name" msgstr "Новое имя" -#: ../extensions/rename_series/dlg-rename-series.c:944 +#: ../extensions/rename_series/dlg-rename-series.c:950 msgid "Keep original case" msgstr "Сохранять исходный регистр букв" -#: ../extensions/rename_series/dlg-rename-series.c:945 +#: ../extensions/rename_series/dlg-rename-series.c:951 msgid "Convert to lower-case" msgstr "Преобразовать в нижний регистр" -#: ../extensions/rename_series/dlg-rename-series.c:946 +#: ../extensions/rename_series/dlg-rename-series.c:952 msgid "Convert to upper-case" msgstr "Преобразовать в верхний регистр" @@ -4130,36 +4264,32 @@ msgid "Resize the selected images" msgstr "Изменить размер выделенных изображений" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:5 -#: ../gthumb/gth-main-default-metadata.c:49 -msgid "Format" -msgstr "Формат" +#: ../extensions/resize_images/data/ui/resize-images.ui.h:1 +msgid "Resize Images" +msgstr "Изменить размер изображений" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:2 msgid "New dimensions" msgstr "Новый размер" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 -msgid "Resize Images" -msgstr "Изменить размер изображений" - -#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:4 msgid "_Height:" msgstr "_Высота:" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:5 msgid "_Preserve original aspect ratios" msgstr "Сохранить соотношение сторон" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:12 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 +#: ../gthumb/gth-main-default-metadata.c:49 +msgid "Format" +msgstr "Формат" + +#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 msgid "pixel" msgstr "пиксел" -#: ../extensions/resize_images/dlg-resize-images.c:168 -msgid "Resizing images" -msgstr "Изменение размера изображений" - -#: ../extensions/resize_images/dlg-resize-images.c:412 +#: ../extensions/resize_images/dlg-resize-images.c:423 msgid "Keep the original format" msgstr "Сохранять исходный формат" @@ -4171,8 +4301,7 @@ msgid "Resize series of images." msgstr "Изменить размер группы изображений." -#: ../extensions/search/actions.c:49 -#: ../extensions/search/actions.c:117 +#: ../extensions/search/actions.c:49 ../extensions/search/actions.c:117 #: ../extensions/search/actions.c:123 msgid "Could not perform the search" msgstr "Не удалось выполнить поиск" @@ -4195,16 +4324,16 @@ #. Translators: This is not a verb, it's a name as in "the search properties". #: ../extensions/search/callbacks.c:174 -#: ../extensions/search/search.extension.in.in.h:2 +#: ../extensions/search/search.extension.in.in.h:1 msgid "Search" msgstr "Поиск" -#: ../extensions/search/gth-search-editor.c:108 +#: ../extensions/search/gth-search-editor.c:112 #: ../gthumb/gth-filter-editor-dialog.c:165 msgid "all the following rules" msgstr "все следующие правила" -#: ../extensions/search/gth-search-editor.c:109 +#: ../extensions/search/gth-search-editor.c:113 #: ../gthumb/gth-filter-editor-dialog.c:166 msgid "any of the following rules" msgstr "любое из следующих правил" @@ -4222,10 +4351,53 @@ msgid "Cancel the operation" msgstr "Отменить операцию" -#: ../extensions/search/search.extension.in.in.h:1 +#: ../extensions/search/search.extension.in.in.h:2 msgid "File search tool." msgstr "Инструмент поиска файлов." +#: ../extensions/selections/callbacks.c:77 +#| msgid "Selection" +msgid "Add to _Selection" +msgstr "Добавить в _выделение" + +#: ../extensions/selections/callbacks.c:86 +#| msgid "Selection" +msgid "Selection 1" +msgstr "Выделение 1" + +#: ../extensions/selections/callbacks.c:91 +#| msgid "Selection" +msgid "Selection 2" +msgstr "Выделение 2" + +#: ../extensions/selections/callbacks.c:96 +#| msgid "Selection" +msgid "Selection 3" +msgstr "Выделение 3" + +#: ../extensions/selections/callbacks.c:285 +#, c-format +msgid "" +"Use Alt-%d to add files to this selection, Ctrl-%d to view this selection." +msgstr "Alt-%d добавляет файлы в это выделение, Ctrl-%d показывает выделенное." + +#: ../extensions/selections/gth-selections-manager.c:239 +#, c-format +#| msgid "Selection" +msgid "Selection %d" +msgstr "Выделение %d" + +#: ../extensions/selections/gth-selections-manager.c:242 +#: ../extensions/selections/selections.extension.in.in.h:1 +#| msgid "Selection" +msgid "Selections" +msgstr "Выделения" + +#: ../extensions/selections/selections.extension.in.in.h:2 +#| msgid "No valid file selected." +msgid "Advanced file selection." +msgstr "Расширенное выделение файлов." + #: ../extensions/slideshow/callbacks.c:56 msgid "_Slideshow" msgstr "_Слайд-шоу" @@ -4235,58 +4407,58 @@ msgstr "Просмотр в режиме слайд-шоу" #: ../extensions/slideshow/callbacks.c:410 -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 #: ../extensions/slideshow/preferences.c:162 #: ../extensions/slideshow/slideshow.extension.in.in.h:1 msgid "Slideshow" msgstr "Слайд-шоу" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:1 -msgid "Add files to the playlist" -msgstr "Добавить файлы в список воспроизведения" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 -msgid "Playlist" -msgstr "Список воспроизведения" +msgid "_Personalize" +msgstr "_Персонализировать" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:3 -msgid "R_andom order" -msgstr "_В случайном порядке" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:4 -msgid "Remove the selected files" -msgstr "Удалить выделенные файлы" +msgid "_Transition effect:" +msgstr "_Эффект перехода:" #. This is the first part of the phrase "change automatically, every x seconds", where x is an input control that let the user choose a value. -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 msgid "_Change automatically, every" msgstr "_Изменять автоматически, всегда" +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 +msgid "_Restart when finished" +msgstr "_Перезапустить после окончания" + #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:8 -msgid "_Personalize" -msgstr "_Персонализировать" +msgid "R_andom order" +msgstr "_В случайном порядке" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:9 -msgid "_Restart when finished" -msgstr "_Перезапустить после окончания" +msgid "Playlist" +msgstr "Список воспроизведения" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:10 -msgid "_Transition effect:" -msgstr "_Эффект перехода:" +msgid "Add files to the playlist" +msgstr "Добавить файлы в список воспроизведения" + +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:11 +msgid "Remove the selected files" +msgstr "Удалить выделенные файлы" -#: ../extensions/slideshow/gth-slideshow.c:229 +#: ../extensions/slideshow/gth-slideshow.c:232 msgid "Playing slideshow" msgstr "Воспроизведение слайд-шоу" -#: ../extensions/slideshow/gth-slideshow-preferences.c:183 +#: ../extensions/slideshow/gth-slideshow-preferences.c:184 msgid "Choose the files to play" msgstr "Выберите файлы для воспроизведения" -#: ../extensions/slideshow/gth-slideshow-preferences.c:192 +#: ../extensions/slideshow/gth-slideshow-preferences.c:193 msgid "Audio files" msgstr "Звуковые файлы" -#: ../extensions/slideshow/gth-slideshow-preferences.c:258 +#: ../extensions/slideshow/gth-slideshow-preferences.c:259 msgid "Random" msgstr "Случайно" @@ -4382,111 +4554,114 @@ msgid "View the previous page" msgstr "Просмотреть предыдущую страницу" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:5 -#, no-c-format -msgid "%P" -msgstr "%P" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:1 +msgid "All images on a single image" +msgstr "Все изображения в одном изображении" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:2 msgid "Adapts to the window width" msgstr "Изменяет размер под ширину окна" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:8 -msgid "All images on a single image" -msgstr "Все изображения в одном изображении" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 +msgid "Web Album" +msgstr "Веб-альбом" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 -msgid "Image Attributes" -msgstr "Атрибуты изображения" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:5 +#, no-c-format +msgid "%P" +msgstr "%P" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 -msgid "Image Page" -msgstr "Страница изображений" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 +msgid "_Copy originals to destination" +msgstr "_Копировать исходные изображения в место назначения" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 +msgid "_Adapt to the window width " +msgstr "_Масштабировать под ширину окна" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 msgid "Index Page" msgstr "Индексная страница" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 -msgid "Show the description, if available" -msgstr "Показать описание, если оно есть" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 -msgid "Show the following attributes:" -msgstr "Показать следующие атрибуты:" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 +msgid "Thumbnail Caption" +msgstr "Подпись миниатюры" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 msgid "The current image number" msgstr "Номер текущего изображения" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 -msgid "The file comment" -msgstr "Комментарий к файлу" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 msgid "The total number of images" msgstr "Общее количество изображений" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 -msgid "Thumbnail Caption" -msgstr "Подпись миниатюры" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 +msgid "The file comment" +msgstr "Комментарий к файлу" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 -msgid "Web Album" -msgstr "Веб-альбом" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 +msgid "Image Page" +msgstr "Страница изображений" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 -msgid "_Adapt to the window width " -msgstr "_Масштабировать под ширину окна" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 +msgid "Show the description, if available" +msgstr "Показать описание, если оно есть" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 -msgid "_Copy originals to destination" -msgstr "_Копировать исходные изображения в место назначения" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 +msgid "Show the following attributes:" +msgstr "Показать следующие атрибуты:" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:39 -msgid "_Resize if larger than:" -msgstr "Мас_штабировать, если больше, чем:" +msgid "Image Attributes" +msgstr "Атрибуты изображения" -#: ../extensions/webalbums/gth-web-exporter.c:1802 +#: ../extensions/webalbums/gth-web-exporter.c:1800 msgid "Could not show the destination" msgstr "Не удалось показать место назначения" -#: ../extensions/webalbums/gth-web-exporter.c:1838 +#: ../extensions/webalbums/gth-web-exporter.c:1836 msgid "The album has been created successfully." msgstr "Альбом успешно создан." -#: ../extensions/webalbums/gth-web-exporter.c:2106 -#: ../extensions/webalbums/gth-web-exporter.c:2133 +#: ../extensions/webalbums/gth-web-exporter.c:2104 +#: ../extensions/webalbums/gth-web-exporter.c:2132 msgid "Saving thumbnails" msgstr "Сохранение миниатюр" -#: ../extensions/webalbums/gth-web-exporter.c:2161 +#: ../extensions/webalbums/gth-web-exporter.c:2160 msgid "Saving HTML pages: Images" msgstr "Сохранение страниц HTML: изображения" -#: ../extensions/webalbums/gth-web-exporter.c:2219 +#: ../extensions/webalbums/gth-web-exporter.c:2218 msgid "Saving HTML pages: Indexes" msgstr "Сохранение страниц HTML: индексы" -#: ../extensions/webalbums/gth-web-exporter.c:2502 +#: ../extensions/webalbums/gth-web-exporter.c:2503 msgid "Copying original images" msgstr "Копирование исходных изображений" -#: ../extensions/webalbums/gth-web-exporter.c:2929 +#: ../extensions/webalbums/gth-web-exporter.c:2963 msgid "Could not find the style folder" msgstr "Не удалось найти папку со стилями" -#: ../extensions/webalbums/gth-web-exporter.c:2967 +#: ../extensions/webalbums/gth-web-exporter.c:3001 msgid "Could not create a temporary folder" msgstr "Не удалось создать временную папку" #: ../extensions/webalbums/webalbums.extension.in.in.h:1 +msgid "Web Albums" +msgstr "Веб-альбомы" + +#: ../extensions/webalbums/webalbums.extension.in.in.h:2 msgid "Create static web albums." msgstr "Создать статические веб-альбомы." -#: ../extensions/webalbums/webalbums.extension.in.in.h:2 -msgid "Web Albums" -msgstr "Веб-альбомы" +#: ../gthumb/dlg-location.c:200 ../gthumb/gth-browser.c:1396 +#: ../gthumb/gth-browser.c:1969 ../gthumb/gth-browser.c:6214 +#: ../gthumb/gth-browser.c:6233 ../gthumb/gth-browser.c:6257 +#, c-format +msgid "Could not load the position \"%s\"" +msgstr "Не удалось загрузить положение «%s»" #: ../gthumb/dlg-personalize-filters.c:237 msgid "Filter" @@ -4504,8 +4679,7 @@ msgid "Edit Filter" msgstr "Изменить фильтр" -#: ../gthumb/dlg-preferences-extensions.c:67 -#: ../gthumb/gth-filterbar.c:269 +#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:277 msgid "All" msgstr "Все" @@ -4570,66 +4744,31 @@ msgid "_Restart" msgstr "_Перезапустить" -#: ../gthumb/eggfileformatchooser.c:236 -#, c-format -msgid "File _Format: %s" -msgstr "_Формат файла: %s" - -#: ../gthumb/eggfileformatchooser.c:397 -#: ../gthumb/gth-main-default-tests.c:197 -msgid "All Files" -msgstr "Все файлы" - -#: ../gthumb/eggfileformatchooser.c:398 -msgid "All Supported Files" -msgstr "Все поддерживаемые файлы" - -#: ../gthumb/eggfileformatchooser.c:407 -msgid "By Extension" -msgstr "По расширению" - -#: ../gthumb/eggfileformatchooser.c:422 -msgid "File Format" -msgstr "Формат файла" - -#: ../gthumb/eggfileformatchooser.c:440 -msgid "Extension(s)" -msgstr "Расширение(я)" - -#: ../gthumb/eggfileformatchooser.c:681 -#, c-format -msgid "The program was not able to find out the file format you want to use for `%s'. Please make sure to use a known extension for that file or manually choose a file format from the list below." -msgstr "Программе не удалось найти формат файла, который вы хотите использовать для «%s». Убедитесь, что вы используете известное расширение для этого файла или выберите формат файла вручную из списка." - -#: ../gthumb/eggfileformatchooser.c:688 -msgid "File format not recognized" -msgstr "Неизвестный формат файла" - #. For translators: This is a progress size indicator, for example: 230.4 MB of 512.8 MB -#: ../gthumb/gio-utils.c:1355 +#: ../gthumb/gio-utils.c:1351 #, c-format msgid "%s of %s" msgstr "%s из %s" -#: ../gthumb/gio-utils.c:1390 +#: ../gthumb/gio-utils.c:1386 #, c-format msgid "Moving \"%s\" to \"%s\"" msgstr "Перемещение «%s» в «%s»" -#: ../gthumb/gio-utils.c:1392 +#: ../gthumb/gio-utils.c:1388 #, c-format msgid "Copying \"%s\" to \"%s\"" msgstr "Копирование «%s» в «%s»" -#: ../gthumb/gio-utils.c:1733 +#: ../gthumb/gio-utils.c:1750 msgid "Moving files" msgstr "Перемещение файлов" -#: ../gthumb/gio-utils.c:1733 +#: ../gthumb/gio-utils.c:1750 msgid "Copying files" msgstr "Копирование файлов" -#: ../gthumb/gio-utils.c:1734 +#: ../gthumb/gio-utils.c:1751 msgid "Getting file information" msgstr "Получение информации о файлах" @@ -4639,7 +4778,7 @@ #. * the separator that your locale uses or use "%Id" instead #. * of "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2845 +#: ../gthumb/glib-utils.c:3068 #, c-format msgctxt "long time format" msgid "%d:%02d:%02d" @@ -4651,29 +4790,47 @@ #. * separator that your locale uses or use "%Id" instead of #. * "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2854 +#: ../gthumb/glib-utils.c:3077 #, c-format msgctxt "short time format" msgid "%d:%02d" msgstr "%d:%02d" -#: ../gthumb/gth-browser-actions-callbacks.c:391 -msgid "gthumb is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version." -msgstr "gthumb это свободное ПО: вы можете распространять и/или изменять его согласно условиям лицензии GNU Public License версии 2 или более поздней, опубликованной Фондом Свободного Программного Обеспечения." - -#: ../gthumb/gth-browser-actions-callbacks.c:395 -msgid "gthumb is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details." -msgstr "gthumb распространяется в надежде, что это ПО будет вам полезным, но БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ, даже неявных гарантий ТОВАРНОСТИ или ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ. Подробности см. в лицензии GNU General Public License." - -#: ../gthumb/gth-browser-actions-callbacks.c:399 -msgid "You should have received a copy of the GNU General Public License along with gthumb. If not, see http://www.gnu.org/licenses/." -msgstr "Вы должны были получить копии лицензии GNU General Public License, вместе с gthumb. Если это не так, см. http://www.gnu.org/licenses/." +#: ../gthumb/gth-browser-actions-callbacks.c:414 +msgid "" +"gthumb is free software; you can redistribute it and/or modify it under the " +"terms of the GNU General Public License as published by the Free Software " +"Foundation; either version 2 of the License, or (at your option) any later " +"version." +msgstr "" +"gthumb это свободное ПО: вы можете распространять и/или изменять его " +"согласно условиям лицензии GNU Public License версии 2 или более поздней, " +"опубликованной Фондом Свободного Программного Обеспечения." #: ../gthumb/gth-browser-actions-callbacks.c:418 +msgid "" +"gthumb is distributed in the hope that it will be useful, but WITHOUT ANY " +"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " +"details." +msgstr "" +"gthumb распространяется в надежде, что это ПО будет вам полезным, но БЕЗ " +"КАКИХ-ЛИБО ГАРАНТИЙ, даже неявных гарантий ТОВАРНОСТИ или ПРИГОДНОСТИ ДЛЯ " +"КОНКРЕТНОЙ ЦЕЛИ. Подробности см. в лицензии GNU General Public License." + +#: ../gthumb/gth-browser-actions-callbacks.c:422 +msgid "" +"You should have received a copy of the GNU General Public License along with " +"gthumb. If not, see http://www.gnu.org/licenses/." +msgstr "" +"Вы должны были получить копии лицензии GNU General Public License, вместе с " +"gthumb. Если это не так, см. http://www.gnu.org/licenses/." + +#: ../gthumb/gth-browser-actions-callbacks.c:441 msgid "An image viewer and browser for GNOME." msgstr "Программа просмотра изображений для GNOME." -#: ../gthumb/gth-browser-actions-callbacks.c:421 +#: ../gthumb/gth-browser-actions-callbacks.c:444 msgid "translator_credits" msgstr "" "Виктор Вислобоков \n" @@ -4762,137 +4919,144 @@ msgid "Leave Fullscreen" msgstr "Выйти из полноэкранного режима" -#: ../gthumb/gth-browser-actions-entries.h:144 -#: ../gthumb/gth-browser.c:3567 +#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3841 msgid "Go to the previous visited location" msgstr "Перейти к предыдущему посещённому местоположению" -#: ../gthumb/gth-browser-actions-entries.h:150 -#: ../gthumb/gth-browser.c:3585 +#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3859 msgid "Go to the next visited location" msgstr "Перейти к следующему посещённому местоположению" -#: ../gthumb/gth-browser-actions-entries.h:156 -#: ../gthumb/gth-browser.c:3603 +#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3877 msgid "Go up one level" msgstr "Перейти на уровень выше" -#: ../gthumb/gth-browser-actions-entries.h:167 -#: ../gthumb/gth-browser.c:672 +#: ../gthumb/gth-browser-actions-entries.h:161 +#| msgid "_Location" +msgid "_Location..." +msgstr "_Местоположение…" + +#: ../gthumb/gth-browser-actions-entries.h:162 +msgid "Specify a location to open" +msgstr "Укажите местоположение" + +#: ../gthumb/gth-browser-actions-entries.h:173 ../gthumb/gth-browser.c:721 msgid "_Delete History" msgstr "_Удалить историю" -#: ../gthumb/gth-browser-actions-entries.h:168 +#: ../gthumb/gth-browser-actions-entries.h:174 msgid "Delete the list of visited locations" msgstr "Удалить список посещённых местоположений" -#: ../gthumb/gth-browser-actions-entries.h:174 +#: ../gthumb/gth-browser-actions-entries.h:180 msgid "View the folders" msgstr "Просмотр папок" -#: ../gthumb/gth-browser-actions-entries.h:180 +#: ../gthumb/gth-browser-actions-entries.h:186 msgid "Show information about gthumb" msgstr "Показать информацию о gThumb" -#: ../gthumb/gth-browser-actions-entries.h:185 +#: ../gthumb/gth-browser-actions-entries.h:191 msgid "Contents" msgstr "Содержание" -#: ../gthumb/gth-browser-actions-entries.h:186 +#: ../gthumb/gth-browser-actions-entries.h:192 msgid "Display the gthumb Manual" msgstr "Показать руководство по gthumb" -#: ../gthumb/gth-browser-actions-entries.h:191 +#: ../gthumb/gth-browser-actions-entries.h:197 msgid "_Keyboard Shortcuts" msgstr "_Горячие клавиши" -#: ../gthumb/gth-browser-actions-entries.h:200 +#: ../gthumb/gth-browser-actions-entries.h:203 +#: ../gthumb/gth-browser-actions-entries.h:257 +msgid "Edit" +msgstr "Изменить" + +#: ../gthumb/gth-browser-actions-entries.h:204 +#: ../gthumb/gth-browser-actions-entries.h:258 +msgid "Edit file" +msgstr "Изменить файл" + +#: ../gthumb/gth-browser-actions-entries.h:212 msgid "_Toolbar" msgstr "Панель _инструментов" -#: ../gthumb/gth-browser-actions-entries.h:201 +#: ../gthumb/gth-browser-actions-entries.h:213 msgid "View or hide the toolbar of this window" msgstr "Показать или спрятать панель инструментов данного окна" -#: ../gthumb/gth-browser-actions-entries.h:205 +#: ../gthumb/gth-browser-actions-entries.h:217 msgid "_Statusbar" msgstr "Строка _состояния" -#: ../gthumb/gth-browser-actions-entries.h:206 +#: ../gthumb/gth-browser-actions-entries.h:218 msgid "View or hide the statusbar of this window" msgstr "Показать или спряать строку состояния данного окна" -#: ../gthumb/gth-browser-actions-entries.h:210 +#: ../gthumb/gth-browser-actions-entries.h:222 msgid "_Filterbar" msgstr "Панель _фильтров" -#: ../gthumb/gth-browser-actions-entries.h:211 +#: ../gthumb/gth-browser-actions-entries.h:223 msgid "View or hide the filterbar of this window" msgstr "Показать или спрятать панель фильтров данного окна" -#: ../gthumb/gth-browser-actions-entries.h:215 +#: ../gthumb/gth-browser-actions-entries.h:227 msgid "_Sidebar" msgstr "_Боковая панель" -#: ../gthumb/gth-browser-actions-entries.h:216 +#: ../gthumb/gth-browser-actions-entries.h:228 msgid "View or hide the sidebar of this window" msgstr "Показать или спрятать боковую панель данного окна" -#: ../gthumb/gth-browser-actions-entries.h:220 +#: ../gthumb/gth-browser-actions-entries.h:232 msgid "_Thumbnail Pane" msgstr "Панель миниат_юр" -#: ../gthumb/gth-browser-actions-entries.h:221 +#: ../gthumb/gth-browser-actions-entries.h:233 msgid "View or hide the thumbnail pane in viewer mode" msgstr "Показать или спрятать панель миниатюр в режиме просмотра" -#: ../gthumb/gth-browser-actions-entries.h:225 +#: ../gthumb/gth-browser-actions-entries.h:237 msgid "_Thumbnails" msgstr "Миниат_юры" -#: ../gthumb/gth-browser-actions-entries.h:226 +#: ../gthumb/gth-browser-actions-entries.h:238 msgid "View thumbnails" msgstr "Просмотреть миниатюры" -#: ../gthumb/gth-browser-actions-entries.h:230 +#: ../gthumb/gth-browser-actions-entries.h:242 msgid "_Hidden Files" msgstr "С_крытые файлы" -#: ../gthumb/gth-browser-actions-entries.h:231 +#: ../gthumb/gth-browser-actions-entries.h:243 msgid "Show hidden files and folders" msgstr "Показывать скрытые файлы и папки" -#: ../gthumb/gth-browser-actions-entries.h:236 -#: ../gthumb/gth-browser-actions-entries.h:241 +#: ../gthumb/gth-browser-actions-entries.h:248 +#: ../gthumb/gth-browser-actions-entries.h:253 msgid "View file properties" msgstr "Просмотреть свойства файла" -#: ../gthumb/gth-browser-actions-entries.h:245 -msgid "Edit" -msgstr "Изменить" - -#: ../gthumb/gth-browser-actions-entries.h:246 -msgid "Edit file" -msgstr "Изменить файл" - -#: ../gthumb/gth-browser-actions-entries.h:250 +#: ../gthumb/gth-browser-actions-entries.h:262 msgid "_Fit Window to Image" msgstr "_Подогнать окно по изображению" -#: ../gthumb/gth-browser-actions-entries.h:251 +#: ../gthumb/gth-browser-actions-entries.h:263 msgid "Resize the window to the size of the image" msgstr "Изменить размер окна в соответствии с размером изображения" -#: ../gthumb/gth-browser.c:369 +#: ../gthumb/gth-browser.c:418 #, c-format msgid "Open %s" msgstr "Открыть %s" -#: ../gthumb/gth-browser.c:509 +#: ../gthumb/gth-browser.c:558 msgid "[modified]" msgstr "[изменён]" -#: ../gthumb/gth-browser.c:996 +#: ../gthumb/gth-browser.c:1117 #, c-format msgid "%d file selected (%s)" msgid_plural "%d files selected (%s)" @@ -4900,64 +5064,51 @@ msgstr[1] "%d файла выделено (%s)" msgstr[2] "%d файлов выделено (%s)" -#: ../gthumb/gth-browser.c:1031 +#: ../gthumb/gth-browser.c:1152 #, c-format msgid "%s of free space" msgstr "%s свободного места" -#: ../gthumb/gth-browser.c:1240 -#: ../gthumb/gth-browser.c:1799 -#: ../gthumb/gth-browser.c:5874 -#: ../gthumb/gth-browser.c:5893 -#: ../gthumb/gth-browser.c:5918 -#, c-format -msgid "Could not load the position \"%s\"" -msgstr "Не удалось загрузить положение «%s»" - -#: ../gthumb/gth-browser.c:1895 -#: ../gthumb/gth-browser.c:1922 +#: ../gthumb/gth-browser.c:2073 ../gthumb/gth-browser.c:2100 #, c-format msgid "No suitable module found for %s" msgstr "Подходящий модуль для %s не найден" -#: ../gthumb/gth-browser.c:2042 +#: ../gthumb/gth-browser.c:2219 #, c-format msgid "Save changes to file '%s'?" msgstr "Сохранить изменения в файл «%s»?" -#: ../gthumb/gth-browser.c:2047 +#: ../gthumb/gth-browser.c:2224 msgid "If you don't save, changes to the file will be permanently lost." msgstr "Если не сохранить изменения, они будут безвозвратно потеряны." -#: ../gthumb/gth-browser.c:2048 +#: ../gthumb/gth-browser.c:2225 msgid "Do _Not Save" msgstr "_Не сохранять" -#: ../gthumb/gth-browser.c:2818 -#: ../gthumb/gth-source-tree.c:182 +#: ../gthumb/gth-browser.c:3020 ../gthumb/gth-source-tree.c:182 msgid "Could not change name" msgstr "Не удалось изменить имя" -#: ../gthumb/gth-browser.c:3247 -#: ../gthumb/gth-main-default-metadata.c:41 +#: ../gthumb/gth-browser.c:3451 ../gthumb/gth-main-default-metadata.c:41 msgid "Modified" msgstr "Изменено" -#: ../gthumb/gth-browser.c:3568 -#: ../gthumb/gth-browser.c:3586 +#: ../gthumb/gth-browser.c:3842 ../gthumb/gth-browser.c:3860 msgid "View the list of visited locations" msgstr "Просмотреть список посещённых местоположений" -#: ../gthumb/gth-browser.c:3604 +#: ../gthumb/gth-browser.c:3878 msgid "View the list of upper locations" msgstr "Просмотреть список местоположений верхнего уровня" -#: ../gthumb/gth-browser.c:5875 +#: ../gthumb/gth-browser.c:6215 #, c-format msgid "File type not supported" msgstr "Тип файла не поддерживается" -#: ../gthumb/gth-browser.c:5919 +#: ../gthumb/gth-browser.c:6258 #, c-format msgid "No suitable module found" msgstr "Подходящий модуль не найден" @@ -4967,33 +5118,39 @@ msgid "Could not open the module `%s`: %s" msgstr "Не удалось открыть модуль «%s»: %s" -#: ../gthumb/gth-extensions.c:733 +#: ../gthumb/gth-extensions.c:754 #, c-format msgid "The extension '%1$s' is required by the extension '%2$s'" msgstr "Расширение «%1$s» требуется для расширения «%2$s»" -#: ../gthumb/gth-file-source-vfs.c:117 +#: ../gthumb/gth-file-chooser-dialog.c:144 +msgid "All Supported Files" +msgstr "Все поддерживаемые файлы" + +#: ../gthumb/gth-file-source-vfs.c:121 msgid "Home Folder" msgstr "Домашняя папка" -#: ../gthumb/gth-file-source-vfs.c:122 +#: ../gthumb/gth-file-source-vfs.c:126 msgid "File System" msgstr "Файловая система" -#: ../gthumb/gth-file-source-vfs.c:735 -msgid "The files cannot be moved to the Trash. Do you want to delete them permanently?" +#: ../gthumb/gth-file-source-vfs.c:739 +msgid "" +"The files cannot be moved to the Trash. Do you want to delete them " +"permanently?" msgstr "Файлы не могут быть перемещены в корзину. Удалить их навсегда?" -#: ../gthumb/gth-file-source-vfs.c:746 +#: ../gthumb/gth-file-source-vfs.c:750 msgid "Could not move the files to the Trash" msgstr "Не удалось переместить файлы в корзину" -#: ../gthumb/gth-file-source-vfs.c:793 +#: ../gthumb/gth-file-source-vfs.c:797 #, c-format msgid "Are you sure you want to move \"%s\" to trash?" msgstr "Действительно переместить «%s» в корзину?" -#: ../gthumb/gth-file-source-vfs.c:797 +#: ../gthumb/gth-file-source-vfs.c:801 #, c-format msgid "Are you sure you want to move to trash the %'d selected file?" msgid_plural "Are you sure you want to move to trash the %'d selected files?" @@ -5001,39 +5158,36 @@ msgstr[1] "Действительно переместить в корзину %'d выбранных файла?" msgstr[2] "Действительно переместить в корзину %'d выбранных файлов?" -#: ../gthumb/gth-file-source-vfs.c:840 +#: ../gthumb/gth-file-source-vfs.c:844 #, c-format msgid "Are you sure you want to permanently delete the %'d selected file?" -msgid_plural "Are you sure you want to permanently delete the %'d selected files?" +msgid_plural "" +"Are you sure you want to permanently delete the %'d selected files?" msgstr[0] "Действительно окончательно удалить %'d выбранный файл?" msgstr[1] "Действительно окончательно удалить %'d выбранных файла?" msgstr[2] "Действительно окончательно удалить %'d выбранных файлов?" -#: ../gthumb/gth-filterbar.c:405 +#: ../gthumb/gth-filterbar.c:413 msgid "Hide the filterbar" msgstr "Скрыть панель фильтров" -#: ../gthumb/gth-filter.c:43 -#: ../gthumb/gth-filter-editor-dialog.c:178 +#: ../gthumb/gth-filter.c:43 ../gthumb/gth-filter-editor-dialog.c:178 #: ../gthumb/gth-test-simple.c:75 msgid "kB" msgstr "КБ" -#: ../gthumb/gth-filter.c:44 -#: ../gthumb/gth-filter-editor-dialog.c:179 +#: ../gthumb/gth-filter.c:44 ../gthumb/gth-filter-editor-dialog.c:179 #: ../gthumb/gth-test-simple.c:76 msgid "MB" msgstr "МБ" -#: ../gthumb/gth-filter.c:45 -#: ../gthumb/gth-filter-editor-dialog.c:180 +#: ../gthumb/gth-filter.c:45 ../gthumb/gth-filter-editor-dialog.c:180 #: ../gthumb/gth-test-simple.c:77 msgid "GB" msgstr "ГБ" #. "files" label -#: ../gthumb/gth-filter.c:289 -#: ../gthumb/gth-filter-editor-dialog.c:177 +#: ../gthumb/gth-filter.c:286 ../gthumb/gth-filter-editor-dialog.c:177 msgid "files" msgstr "файлы" @@ -5050,50 +5204,59 @@ msgid "No limit specified" msgstr "Не указано ограничение" -#: ../gthumb/gth-folder-tree.c:857 -msgid "Loading..." -msgstr "Загрузка…" - -#: ../gthumb/gth-folder-tree.c:1100 +#: ../gthumb/gth-folder-tree.c:1369 msgid "(Open Parent)" msgstr "(Открыть родителя)" -#: ../gthumb/gth-histogram-view.c:826 +#: ../gthumb/gth-histogram-view.c:825 msgid "Linear scale" msgstr "Линейная шкала" -#: ../gthumb/gth-histogram-view.c:838 +#: ../gthumb/gth-histogram-view.c:837 msgid "Logarithmic scale" msgstr "Логарифмическая шкала" -#: ../gthumb/gth-histogram-view.c:858 +#: ../gthumb/gth-histogram-view.c:857 msgid "Channel:" msgstr "Канал:" -#: ../gthumb/gth-histogram-view.c:890 +#: ../gthumb/gth-histogram-view.c:878 msgid "Value" msgstr "Значение" -#: ../gthumb/gth-histogram-view.c:896 +#: ../gthumb/gth-histogram-view.c:883 msgid "Red" msgstr "Красный" -#: ../gthumb/gth-histogram-view.c:902 +#: ../gthumb/gth-histogram-view.c:888 msgid "Green" msgstr "Зелёный" -#: ../gthumb/gth-histogram-view.c:908 +#: ../gthumb/gth-histogram-view.c:893 msgid "Blue" msgstr "Синий" -#: ../gthumb/gth-histogram-view.c:914 +#: ../gthumb/gth-histogram-view.c:898 msgid "Alpha" msgstr "Альфа" -#: ../gthumb/gth-histogram-view.c:921 +#: ../gthumb/gth-histogram-view.c:904 msgid "RGB" msgstr "RGB" +#: ../gthumb/gth-image-list-task.c:141 +msgid "Could not rename the file" +msgstr "Не удалось переименовать файл" + +#: ../gthumb/gth-image-saver.c:39 +msgid "No options available for this file type" +msgstr "Для файлов данного типа доступные параметры отсутствуют" + +#: ../gthumb/gth-image-saver.c:185 +#, c-format +msgid "Could not find a suitable module to save the image as \"%s\"" +msgstr "Не удалось найти подходящий модуль для сохранения изображения как «%s»" + #: ../gthumb/gth-load-file-data-task.c:108 msgid "Reading file information" msgstr "Чтение информации из файла" @@ -5107,7 +5270,7 @@ msgstr "Имя" #: ../gthumb/gth-main-default-metadata.c:40 -#: ../gthumb/gth-main-default-tests.c:248 +#: ../gthumb/gth-main-default-tests.c:284 msgid "Size" msgstr "Размер" @@ -5147,35 +5310,31 @@ msgid "dimensions" msgstr "размеры" -#: ../gthumb/gth-main-default-tests.c:225 +#: ../gthumb/gth-main-default-tests.c:233 +msgid "All Files" +msgstr "Все файлы" + +#: ../gthumb/gth-main-default-tests.c:261 msgid "Media" msgstr "Носитель" -#: ../gthumb/gth-main-default-tests.c:232 +#: ../gthumb/gth-main-default-tests.c:268 msgid "Text Files" msgstr "Текстовые файлы" -#: ../gthumb/gth-main-default-tests.c:240 +#: ../gthumb/gth-main-default-tests.c:276 msgid "Filename" msgstr "Имя файла" -#: ../gthumb/gth-main-default-tests.c:272 +#: ../gthumb/gth-main-default-tests.c:308 msgid "Title (embedded)" msgstr "Заголовок (встроенный)" -#: ../gthumb/gth-main-default-tests.c:278 +#: ../gthumb/gth-main-default-tests.c:316 msgid "Description (embedded)" msgstr "Описание (встроенное)" -#: ../gthumb/gth-pixbuf-list-task.c:139 -msgid "Could not rename the file" -msgstr "Не удалось переименовать файл" - -#: ../gthumb/gth-pixbuf-saver.c:34 -msgid "No options available for this file type" -msgstr "Для файлов данного типа доступные параметры отсутствуют" - -#: ../gthumb/gth-progress-dialog.c:142 +#: ../gthumb/gth-progress-dialog.c:146 msgid "Cancel operation" msgstr "Отменить операцию" @@ -5183,65 +5342,71 @@ msgid "Saving file information" msgstr "Сохранение информации в файле" -#: ../gthumb/gth-tags-entry.c:388 +#. Translators: %s is a filename +#: ../gthumb/gth-save-image-task.c:160 +#, c-format +#| msgid "Starting %s" +msgid "Saving '%s'" +msgstr "Сохранение «%s»" + +#: ../gthumb/gth-tags-entry.c:390 #, c-format msgid "Create tag «%s»" msgstr "Создать метку «%s»" -#: ../gthumb/gth-tags-entry.c:743 +#: ../gthumb/gth-tags-entry.c:814 msgid "Show all the tags" msgstr "Показать все метки" -#: ../gthumb/gth-tags-file.c:234 +#: ../gthumb/gth-tags-file.c:235 msgid "Holidays" msgstr "Праздники" -#: ../gthumb/gth-tags-file.c:235 +#: ../gthumb/gth-tags-file.c:236 msgid "Temporary" msgstr "Временное" -#: ../gthumb/gth-tags-file.c:236 +#: ../gthumb/gth-tags-file.c:237 msgid "Screenshots" msgstr "Снимки экрана" -#: ../gthumb/gth-tags-file.c:237 +#: ../gthumb/gth-tags-file.c:238 msgid "Science" msgstr "Наука" -#: ../gthumb/gth-tags-file.c:238 +#: ../gthumb/gth-tags-file.c:239 msgid "Favorite" msgstr "Избранное" -#: ../gthumb/gth-tags-file.c:239 +#: ../gthumb/gth-tags-file.c:240 msgid "Important" msgstr "Важное" -#: ../gthumb/gth-tags-file.c:240 +#: ../gthumb/gth-tags-file.c:241 msgid "GNOME" msgstr "GNOME" -#: ../gthumb/gth-tags-file.c:241 +#: ../gthumb/gth-tags-file.c:242 msgid "Games" msgstr "Игры" -#: ../gthumb/gth-tags-file.c:242 +#: ../gthumb/gth-tags-file.c:243 msgid "Party" msgstr "Вечеринка" -#: ../gthumb/gth-tags-file.c:243 +#: ../gthumb/gth-tags-file.c:244 msgid "Birthday" msgstr "День рождения" -#: ../gthumb/gth-tags-file.c:244 +#: ../gthumb/gth-tags-file.c:245 msgid "Astronomy" msgstr "Астрономия" -#: ../gthumb/gth-tags-file.c:245 +#: ../gthumb/gth-tags-file.c:246 msgid "Family" msgstr "Семья" -#: ../gthumb/gth-test-category.c:46 -#: ../gthumb/gth-test-simple.c:49 +#: ../gthumb/gth-test-category.c:46 ../gthumb/gth-test-simple.c:49 #: ../gthumb/gth-test-simple.c:64 msgid "is" msgstr "равно" @@ -5250,26 +5415,23 @@ msgid "is only" msgstr "только" -#: ../gthumb/gth-test-category.c:48 -#: ../gthumb/gth-test-simple.c:50 +#: ../gthumb/gth-test-category.c:48 ../gthumb/gth-test-simple.c:50 #: ../gthumb/gth-test-simple.c:65 msgid "is not" msgstr "не равно" -#: ../gthumb/gth-test-category.c:386 -#: ../gthumb/gth-test-simple.c:812 -#: ../gthumb/gth-test-simple.c:838 -#: ../gthumb/gth-test-simple.c:859 +#: ../gthumb/gth-test-category.c:407 ../gthumb/gth-test-simple.c:812 +#: ../gthumb/gth-test-simple.c:838 ../gthumb/gth-test-simple.c:859 #: ../gthumb/gth-test-simple.c:885 #, c-format msgid "The test definition is incomplete" msgstr "Тестовое определение неполно" -#: ../gthumb/gth-test-selector.c:251 +#: ../gthumb/gth-test-selector.c:252 msgid "Add a new rule" msgstr "Добавить новое правило" -#: ../gthumb/gth-test-selector.c:262 +#: ../gthumb/gth-test-selector.c:263 msgid "Remove this rule" msgstr "Удалить это правило" @@ -5313,11 +5475,11 @@ msgid "is after" msgstr "после" -#: ../gthumb/gth-time-selector.c:474 +#: ../gthumb/gth-time-selector.c:478 msgid "Today" msgstr "Сегодня" -#: ../gthumb/gth-time-selector.c:482 +#: ../gthumb/gth-time-selector.c:486 msgid "Now" msgstr "Теперь" @@ -5329,59 +5491,131 @@ msgid "Close _All Windows" msgstr "Закрыть _все окна" -#: ../gthumb/gtk-utils.c:551 +#: ../gthumb/gtk-utils.c:490 msgid "Could not display help" msgstr "Не удалось показать справку" -#: ../gthumb/gtk-utils.c:868 -#: ../gthumb/gtk-utils.c:875 +#: ../gthumb/gtk-utils.c:810 ../gthumb/gtk-utils.c:817 msgid "Could not launch the application" msgstr "Не удалось запустить приложение" -#: ../gthumb/gtk-utils.c:978 +#: ../gthumb/gtk-utils.c:920 msgid "_Copy Here" msgstr "_Копировать сюда" -#: ../gthumb/gtk-utils.c:983 +#: ../gthumb/gtk-utils.c:925 msgid "_Move Here" msgstr "_Переместить сюда" -#: ../gthumb/gtk-utils.c:988 +#: ../gthumb/gtk-utils.c:930 msgid "_Link Here" msgstr "_Создать ссылку сюда" -#: ../gthumb/gtk-utils.c:997 +#: ../gthumb/gtk-utils.c:939 msgid "Cancel" msgstr "Отмена" -#: ../gthumb/main.c:59 +#: ../gthumb/main.c:61 msgid "Open a new window" msgstr "Открыть новое окно" -#: ../gthumb/main.c:63 +#: ../gthumb/main.c:65 msgid "Start in fullscreen mode" msgstr "Запускать в полноэкранном режиме" -#: ../gthumb/main.c:67 +#: ../gthumb/main.c:69 msgid "Automatically start a slideshow" msgstr "Автоматически запускать слайд-шоу" -#: ../gthumb/main.c:71 +#: ../gthumb/main.c:73 msgid "Automatically import digital camera photos" msgstr "Автоматически импортировать снимки с цифровой камеры" -#: ../gthumb/main.c:75 +#: ../gthumb/main.c:77 msgid "Show version" msgstr "Показать версию" -#: ../gthumb/main.c:344 +#: ../gthumb/main.c:483 msgid "- Image browser and viewer" msgstr "— программа просмотра изображений" -#: ../gthumb/pixbuf-io.c:174 -#, c-format -msgid "Could not find a suitable module to save the image as \"%s\"" -msgstr "Не удалось найти подходящий модуль для сохранения изображения как «%s»" +#~ msgid "Whether to always use a black background." +#~ msgstr "Всегда ли использовать чёрный фон." + +#~ msgid "Exif DateTimeOriginal tag" +#~ msgstr "Тег EXIF DateTimeOriginal" + +#~ msgid "_Resize to:" +#~ msgstr "_Изменить размер на:" + +#~ msgid "×" +#~ msgstr "×" + +#~ msgid "Desaturate" +#~ msgstr "Обесцветить" + +#~ msgid "White balance correction" +#~ msgstr "Коррекция баланса белого" + +#~ msgid "Enhance Colors" +#~ msgstr "Улучшить цветопередачу" + +#~ msgid "Automatic white balance correction" +#~ msgstr "Автоматическая коррекция баланса белого" + +#~ msgid "" +#~ "Type the characters you see in the picture below. Letters are not case-" +#~ "sensitive." +#~ msgstr "" +#~ "Введите символы, которые видите на картинке ниже. Буквы вводятся без " +#~ "учёта регистра." + +#~ msgid "_E-Mail:" +#~ msgstr "_Эл. почта:" + +#~ msgid "_Password:" +#~ msgstr "_Пароль:" + +#~ msgid "Picasa Web Album" +#~ msgstr "Веб-альбом Picasa" + +#~ msgid "Account" +#~ msgstr "Учётная запись" + +#~ msgid "Could not load the file" +#~ msgstr "Не удалось загрузить файл" + +#~ msgid "Save images" +#~ msgstr "Сохранить изображения" + +#~ msgid "Save images in common file formats such as JPEG, PNG and TIFF" +#~ msgstr "" +#~ "Сохранить изображения в распространённых форматах таких, как JPEG, PNG и " +#~ "TIFF" + +#~ msgid "File _Format: %s" +#~ msgstr "_Формат файла: %s" + +#~ msgid "By Extension" +#~ msgstr "По расширению" + +#~ msgid "File Format" +#~ msgstr "Формат файла" + +#~ msgid "Extension(s)" +#~ msgstr "Расширение(я)" + +#~ msgid "" +#~ "The program was not able to find out the file format you want to use for `" +#~ "%s'. Please make sure to use a known extension for that file or manually " +#~ "choose a file format from the list below." +#~ msgstr "" +#~ "Программе не удалось найти формат файла, который вы хотите использовать " +#~ "для «%s». Убедитесь, что вы используете известное расширение для этого " +#~ "файла или выберите формат файла вручную из списка." + +#~ msgid "File format not recognized" +#~ msgstr "Неизвестный формат файла" #~ msgid "" #~ "Possible values are: actual_size, fit, keep_prev, fit_if_larger, " diff -Nru gthumb-3.0.2/po/sl.po gthumb-3.2.3/po/sl.po --- gthumb-3.0.2/po/sl.po 2012-08-14 16:25:43.000000000 +0000 +++ gthumb-3.2.3/po/sl.po 2013-04-30 17:06:23.000000000 +0000 @@ -2,25 +2,26 @@ # Copyright (C) 2002-2007 Free Software Foundation, Inc. # This file is distributed under the same license as the gthumb package. # -# Matej Urbančič , 2007 - 2009. # Andrej Žnidaršič , 2009 - 2010. +# Matej Urbančič , 2007 - 2013. # msgid "" msgstr "" "Project-Id-Version: gthumb master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gthumb&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-03-25 20:13+0000\n" -"PO-Revision-Date: 2012-03-25 22:16+0100\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=gthumb&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-01-24 15:43+0000\n" +"PO-Revision-Date: 2013-01-26 20:31+0100\n" "Last-Translator: Matej Urbančič \n" "Language-Team: Slovenian GNOME Translation Team \n" -"Language: \n" +"Language: sl_SI\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n" -"X-Poedit-Country: SLOVENIA\n" -"X-Poedit-Language: Slovenian\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" +"%100==4 ? 3 : 0);\n" "X-Poedit-SourceCharset: utf-8\n" +"X-Generator: Poedit 1.5.4\n" #: ../copy-n-paste/eggdesktopfile.c:165 #, c-format @@ -55,7 +56,8 @@ #: ../copy-n-paste/eggdesktopfile.c:1391 #, c-format msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "Ni mogoče poslati URI-ja dokumenta na vnos predmeta namizja 'Vrsta=Povezava'" +msgstr "" +"Ni mogoče poslati URI-ja dokumenta na vnos predmeta namizja 'Vrsta=Povezava'" #: ../copy-n-paste/eggdesktopfile.c:1412 #, c-format @@ -91,10 +93,8 @@ msgstr "Prikaži možnosti upravljanja seje" #. manually set name and icon -#: ../data/gthumb.desktop.in.in.h:1 -#: ../gthumb/gth-browser.c:529 -#: ../gthumb/gth-progress-dialog.c:388 -#: ../gthumb/main.c:313 +#: ../data/gthumb.desktop.in.in.h:1 ../gthumb/gth-browser.c:578 +#: ../gthumb/gth-progress-dialog.c:390 ../gthumb/main.c:315 msgid "gThumb" msgstr "gThumb" @@ -127,8 +127,12 @@ msgstr "Uvozi fotografij s kartice digitalnega fotoaparata" #: ../data/org.gnome.gthumb.gschema.xml.in.h:1 -msgid "Images over this size (in bytes) will not be thumbnailed. Use 0 if you want to generate thumbnails for all images." -msgstr "Slike nad to velikostjo (v bajtih) bodo bile brez sličic. V primeru, da želite ustvariti sličice za vse slike, uporabite vrednost 0." +msgid "" +"Images over this size (in bytes) will not be thumbnailed. Use 0 if you want " +"to generate thumbnails for all images." +msgstr "" +"Slike nad to velikostjo (v bajtih) bodo bile brez sličic. V primeru, da " +"želite ustvariti sličice za vse slike, uporabite vrednost 0." #: ../data/org.gnome.gthumb.gschema.xml.in.h:2 msgid "Whether to resize the window to fit the size of the image" @@ -159,8 +163,12 @@ msgstr "Mogoči vrednosti sta tif in tiff." #: ../data/org.gnome.gthumb.rename-series.gschema.xml.in.h:1 -msgid "Possible values include: general::unsorted, file::name, file::size, file::mtime, exif::photo::datetimeoriginal" -msgstr "Mogoče vrednosti vključujejo: general::unsorted, file::name, file::size, file::mtime, exif::photo::datetimeoriginal" +msgid "" +"Possible values include: general::unsorted, file::name, file::size, file::" +"mtime, exif::photo::datetimeoriginal" +msgstr "" +"Mogoče vrednosti vključujejo: general::unsorted, file::name, file::size, " +"file::mtime, exif::photo::datetimeoriginal" #: ../data/ui/extensions-preferences.ui.h:1 msgid "_Extensions:" @@ -184,9 +192,8 @@ msgstr "_Skladanje" #. limit label -#: ../data/ui/filter-editor.ui.h:3 -#: ../gthumb/gth-filter.c:270 -#: ../gthumb/gth-filter.c:342 +#: ../data/ui/filter-editor.ui.h:3 ../gthumb/gth-filter.c:269 +#: ../gthumb/gth-filter.c:337 msgid "_Limit to" msgstr "_Omeji na" @@ -225,7 +232,6 @@ msgstr "Izbrano:" #: ../data/ui/location.ui.h:1 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 msgid "_Location:" msgstr "_Mesto:" @@ -242,7 +248,6 @@ msgstr "Ime datoteke:" #: ../data/ui/overwrite-dialog.ui.h:4 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 #: ../extensions/image_print/data/ui/print-layout.ui.h:23 msgid "Size:" msgstr "Velikost:" @@ -389,7 +394,7 @@ #: ../data/ui/preferences.ui.h:25 #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 -#: ../extensions/edit_metadata/gth-edit-general-page.c:473 +#: ../extensions/edit_metadata/gth-edit-general-page.c:481 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 #: ../gthumb/gth-main-default-metadata.c:33 msgid "General" @@ -445,8 +450,7 @@ msgid "D_etermine image type from content (slower)" msgstr "_Določi vrsto slike iz vsebine (počasneje) " -#: ../data/ui/preferences.ui.h:38 -#: ../gthumb/dlg-preferences-extensions.c:71 +#: ../data/ui/preferences.ui.h:38 ../gthumb/dlg-preferences-extensions.c:71 #: ../gthumb/gth-browser-actions-entries.h:179 msgid "Browser" msgstr "Brskalnik" @@ -508,7 +512,6 @@ #: ../extensions/image_viewer/image_viewer.extension.in.in.h:3 #: ../extensions/list_tools/list_tools.extension.in.in.h:3 #: ../extensions/photo_importer/photo_importer.extension.in.in.h:3 -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:3 #: ../extensions/raw_files/raw_files.extension.in.in.h:3 #: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:3 #: ../extensions/rename_series/rename_series.extension.in.in.h:3 @@ -602,18 +605,129 @@ msgid "Write to Disc" msgstr "Zapiši na disk" -#: ../extensions/cairo_io/cairo-io-jpeg.c:62 +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:62 #, c-format msgid "Error interpreting JPEG image file: %s" msgstr "Napaka tolmačenja slikovne datoteke JPEG: %s" -#: ../extensions/cairo_io/cairo-io-jpeg.c:482 +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:483 #, c-format msgid "Unknown JPEG color space (%d)" msgstr "Neznan barvni prostor zapisa JPEG (%d)" -#: ../extensions/catalogs/actions.c:92 -#: ../extensions/catalogs/actions.c:213 +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:1 +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:1 +msgid "_Default extension:" +msgstr "_Privzete pripona:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:2 +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:1 +msgid "_Quality:" +msgstr "_Kakovost:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:3 +msgid "_Smoothing:" +msgstr "_Glajenje:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:4 +msgid "Opti_mize" +msgstr "Opti_miziraj" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:5 +msgid "_Progressive" +msgstr "_Napredno" + +#: ../extensions/cairo_io/data/ui/png-options.ui.h:1 +msgid "Compression _level:" +msgstr "_Raven stiskanja:" + +#: ../extensions/cairo_io/data/ui/save-options-preferences.ui.h:1 +msgid "Default options:" +msgstr "Privzete možnosti:" + +#: ../extensions/cairo_io/data/ui/tga-options.ui.h:1 +msgid "_RLE compression" +msgstr "Stiskanje _RLE" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:2 +msgid "Compression" +msgstr "Stiskanje" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:3 +msgid "_No compression" +msgstr "_Brez stiskanja" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:4 +msgid "No_rmal (Deflate)" +msgstr "O_bičajno (stisnjeno)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:5 +msgid "_Loss compression (JPEG)" +msgstr "_Stiskanje z izgubo (JPEG)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:6 +msgid "Resolution" +msgstr "Ločljivost" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:7 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 +msgid "_Horizontal:" +msgstr "_Vodoravno:" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:8 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 +msgid "_Vertical:" +msgstr "_Navpično:" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:9 +msgid "dpi" +msgstr "dpi" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:2 +msgid "_Method:" +msgstr "_Način:" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:3 +msgid "_Lossless" +msgstr "Brez _izgub" + +#: ../extensions/cairo_io/gth-image-saver-jpeg.c:516 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:140 +msgid "JPEG" +msgstr "JPEG" + +#: ../extensions/cairo_io/gth-image-saver-png.c:353 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:110 +msgid "PNG" +msgstr "PNG" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:257 +#: ../extensions/cairo_io/gth-image-saver-tiff.c:435 +#: ../gthumb/gth-buffer-data.c:84 +msgid "Insufficient memory" +msgstr "Nezadostna količina pomnilnika" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:344 +msgid "TGA" +msgstr "TGA" + +#: ../extensions/cairo_io/gth-image-saver-tiff.c:559 +msgid "TIFF" +msgstr "TIFF" + +#: ../extensions/cairo_io/gth-image-saver-webp.c:382 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:165 +msgid "WebP" +msgstr "WebP" + +#: ../extensions/cairo_io/preferences.c:134 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 +msgid "Saving" +msgstr "Shranjevanje" + +#: ../extensions/catalogs/actions.c:92 ../extensions/catalogs/actions.c:213 #: ../extensions/catalogs/dlg-add-to-catalog.c:274 #: ../extensions/catalogs/dlg-add-to-catalog.c:394 #: ../extensions/file_manager/actions.c:68 @@ -623,8 +737,7 @@ msgid "No name specified" msgstr "Ime ni določeno" -#: ../extensions/catalogs/actions.c:99 -#: ../extensions/catalogs/actions.c:220 +#: ../extensions/catalogs/actions.c:99 ../extensions/catalogs/actions.c:220 #: ../extensions/catalogs/dlg-add-to-catalog.c:281 #: ../extensions/catalogs/dlg-add-to-catalog.c:401 #: ../extensions/file_manager/actions.c:75 @@ -632,8 +745,7 @@ msgid "Invalid name. The following characters are not allowed: %s" msgstr "Neveljavno ime. V imenu so nedovoljeni znaki: %s" -#: ../extensions/catalogs/actions.c:155 -#: ../extensions/catalogs/actions.c:267 +#: ../extensions/catalogs/actions.c:155 ../extensions/catalogs/actions.c:267 #: ../extensions/catalogs/dlg-add-to-catalog.c:338 #: ../extensions/catalogs/dlg-add-to-catalog.c:448 #: ../extensions/catalogs/gth-file-source-catalogs.c:508 @@ -651,8 +763,7 @@ msgid "Enter the catalog name:" msgstr "Ime kataloga:" -#: ../extensions/catalogs/actions.c:181 -#: ../extensions/catalogs/actions.c:293 +#: ../extensions/catalogs/actions.c:181 ../extensions/catalogs/actions.c:293 #: ../extensions/catalogs/dlg-add-to-catalog.c:362 #: ../extensions/catalogs/dlg-add-to-catalog.c:474 #: ../extensions/file_manager/actions.c:136 @@ -683,15 +794,16 @@ msgstr "Doda_j v katalog" #: ../extensions/catalogs/callbacks.c:105 +#: ../extensions/selections/callbacks.c:80 msgid "Open _Folder" msgstr "Odpri _mapo" #: ../extensions/catalogs/callbacks.c:106 +#: ../extensions/selections/callbacks.c:81 msgid "Go to the folder that contains the selected file" msgstr "Gre v mapo, ki vsebuje izbrano datoteko" #: ../extensions/catalogs/callbacks.c:110 -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:85 msgid "Other..." msgstr "Ostalo ..." @@ -727,37 +839,36 @@ msgid "Rena_me" msgstr "Prei_menuj" -#: ../extensions/catalogs/callbacks.c:279 -#: ../extensions/catalogs/callbacks.c:282 +#: ../extensions/catalogs/callbacks.c:281 +#: ../extensions/catalogs/callbacks.c:284 msgid "Command Line" msgstr "Ukazna vrstica" -#: ../extensions/catalogs/callbacks.c:497 -#: ../extensions/catalogs/callbacks.c:502 +#: ../extensions/catalogs/callbacks.c:496 +#: ../extensions/catalogs/callbacks.c:501 #: ../extensions/photo_importer/dlg-photo-importer.c:364 #: ../extensions/photo_importer/dlg-photo-importer.c:404 -#: ../gthumb/gth-file-list.c:43 -#: ../gthumb/gth-folder-tree.c:883 +#: ../gthumb/gth-file-list.c:43 ../gthumb/gth-folder-tree.c:1093 msgid "(Empty)" msgstr "(Prazno)" -#: ../extensions/catalogs/callbacks.c:697 +#: ../extensions/catalogs/callbacks.c:700 msgid "Catalog Properties" msgstr "Lastnosti kataloga" -#: ../extensions/catalogs/callbacks.c:711 +#: ../extensions/catalogs/callbacks.c:714 msgid "Organize" msgstr "Organiziraj" -#: ../extensions/catalogs/callbacks.c:712 +#: ../extensions/catalogs/callbacks.c:715 msgid "Automatically organize files by date" msgstr "Samodejno organiziraj datoteke po datumu" #: ../extensions/catalogs/catalogs.extension.in.in.h:1 #: ../extensions/catalogs/gth-catalog.c:611 #: ../extensions/catalogs/gth-catalog.c:662 -#: ../extensions/catalogs/gth-catalog.c:1024 -#: ../extensions/catalogs/gth-catalog.c:1025 +#: ../extensions/catalogs/gth-catalog.c:1016 +#: ../extensions/catalogs/gth-catalog.c:1017 msgid "Catalogs" msgstr "Katalogi" @@ -783,12 +894,12 @@ #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:5 #: ../extensions/file_manager/actions.c:945 -#: ../extensions/webalbums/gth-web-exporter.c:1842 +#: ../extensions/webalbums/gth-web-exporter.c:1840 msgid "_View the destination" msgstr "_Pogled cilja" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:1 -#: ../gthumb/gth-file-properties.c:212 +#: ../gthumb/gth-file-properties.c:209 msgid "Properties" msgstr "Lastnosti" @@ -837,7 +948,7 @@ msgstr "_Predogled kataloga:" #: ../extensions/catalogs/data/ui/organize-files.ui.h:1 -#: ../extensions/edit_metadata/gth-edit-general-page.c:550 +#: ../extensions/edit_metadata/gth-edit-general-page.c:558 #: ../gthumb/gth-main-default-tests.c:300 msgid "Date photo was taken" msgstr "Datum zajema fotografije" @@ -848,7 +959,7 @@ msgstr "Datum spremembe datoteke" #: ../extensions/catalogs/data/ui/organize-files.ui.h:3 -#: ../extensions/comments/main.c:159 +#: ../extensions/comments/main.c:182 msgid "Tag" msgstr "Oznaka" @@ -903,10 +1014,11 @@ #: ../extensions/catalogs/dlg-organize-files.c:120 msgid "Files will be organized in catalogs. No file will be moved on disk." -msgstr "Datoteke bodo organizirane v kataloge. Nobena datoteka ne bo premaknjena na disku." +msgstr "" +"Datoteke bodo organizirane v kataloge. Nobena datoteka ne bo premaknjena na " +"disku." -#: ../extensions/catalogs/gth-catalog.c:1122 -#: ../extensions/comments/main.c:44 +#: ../extensions/catalogs/gth-catalog.c:1114 ../extensions/comments/main.c:45 #: ../extensions/edit_metadata/callbacks.c:106 #: ../gthumb/gth-main-default-metadata.c:53 msgid "Tags" @@ -943,15 +1055,15 @@ msgid "Copying files to '%s'" msgstr "Kopiranje datotek v '%s'" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1388 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1322 msgid "Could not remove the files from the catalog" msgstr "Ni mogoče odstraniti datotek iz kataloga" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1446 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:685 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:694 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:723 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:1228 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1380 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:746 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:755 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:785 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:1320 #: ../extensions/search/gth-search.c:265 msgid "Invalid file format" msgstr "Neveljavna vrsta datoteke" @@ -978,77 +1090,74 @@ msgstr "Spremeni datum datotek" #: ../extensions/change_date/data/ui/change-date.ui.h:1 +msgid "+" +msgstr "+" + +#: ../extensions/change_date/data/ui/change-date.ui.h:2 +msgid "-" +msgstr "-" + +#: ../extensions/change_date/data/ui/change-date.ui.h:3 msgid "Change Date" msgstr "Spremeni datum" -#: ../extensions/change_date/data/ui/change-date.ui.h:2 +#: ../extensions/change_date/data/ui/change-date.ui.h:4 msgid "Change the following values:" msgstr "Spremeni naslednje vrednosti:" -#: ../extensions/change_date/data/ui/change-date.ui.h:3 +#: ../extensions/change_date/data/ui/change-date.ui.h:5 msgid "_Last modified date" msgstr "Datum z_adnje spremembe" -#: ../extensions/change_date/data/ui/change-date.ui.h:4 +#: ../extensions/change_date/data/ui/change-date.ui.h:6 msgid "Co_mment date" msgstr "Datum o_pombe" -#: ../extensions/change_date/data/ui/change-date.ui.h:5 -msgid "Exif DateTimeOriginal tag" -msgstr "Exif oznaka IzvorniDatumČas" - -#: ../extensions/change_date/data/ui/change-date.ui.h:6 +#: ../extensions/change_date/data/ui/change-date.ui.h:7 msgid "Change to:" msgstr "Spremeni v:" -#: ../extensions/change_date/data/ui/change-date.ui.h:7 +#: ../extensions/change_date/data/ui/change-date.ui.h:8 msgid "The _following date:" msgstr "_Naslednji datum:" -#: ../extensions/change_date/data/ui/change-date.ui.h:8 +#: ../extensions/change_date/data/ui/change-date.ui.h:9 msgid "File _modified date" msgstr "Datum _spremembe datoteke" -#: ../extensions/change_date/data/ui/change-date.ui.h:9 +#: ../extensions/change_date/data/ui/change-date.ui.h:10 msgid "File c_reation date" msgstr "Datum _ustvarjanja datoteke" -#: ../extensions/change_date/data/ui/change-date.ui.h:10 +#: ../extensions/change_date/data/ui/change-date.ui.h:11 msgid "Date p_hoto was taken" msgstr "Datum zajema _fotografije" -#: ../extensions/change_date/data/ui/change-date.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:12 msgid "A_djust by" msgstr "Prilago_di za" -#: ../extensions/change_date/data/ui/change-date.ui.h:12 +#: ../extensions/change_date/data/ui/change-date.ui.h:13 msgid "hours" msgstr "ure" -#: ../extensions/change_date/data/ui/change-date.ui.h:13 +#: ../extensions/change_date/data/ui/change-date.ui.h:14 msgid "minutes" msgstr "minute" -#: ../extensions/change_date/data/ui/change-date.ui.h:14 +#: ../extensions/change_date/data/ui/change-date.ui.h:15 #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:6 msgid "seconds" msgstr "sekund" -#: ../extensions/change_date/data/ui/change-date.ui.h:15 -msgid "+" -msgstr "+" - -#: ../extensions/change_date/data/ui/change-date.ui.h:16 -msgid "-" -msgstr "-" - #: ../extensions/comments/callbacks.c:46 msgid "Import Embedded Metadata" msgstr "Uvozi vstavljene metapodatke" #: ../extensions/comments/callbacks.c:47 msgid "Import the metadata stored inside files into the gThumb comment system" -msgstr "Uvozi metapodatke, ki so shranjeni v datotekah v sistem opomb programa gThumb" +msgstr "" +"Uvozi metapodatke, ki so shranjeni v datotekah v sistem opomb programa gThumb" #: ../extensions/comments/comments.extension.in.in.h:1 msgid "Comments and tags" @@ -1067,18 +1176,16 @@ msgid "_Synchronize with the embedded metadata" msgstr "_Uskladi z vloženimi metapodatki" -#: ../extensions/comments/main.c:34 +#: ../extensions/comments/main.c:35 #: ../extensions/edit_metadata/callbacks.c:100 msgid "Comment" msgstr "Opomba" -#: ../extensions/comments/main.c:40 -#: ../gthumb/gth-main-default-metadata.c:46 +#: ../extensions/comments/main.c:41 ../gthumb/gth-main-default-metadata.c:46 msgid "Title" msgstr "Naslov" -#: ../extensions/comments/main.c:41 -#: ../extensions/comments/main.c:143 +#: ../extensions/comments/main.c:42 ../extensions/comments/main.c:166 #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 #: ../extensions/image_print/data/ui/print-layout.ui.h:8 @@ -1090,19 +1197,16 @@ msgid "Description" msgstr "Opis" -#: ../extensions/comments/main.c:42 -#: ../extensions/comments/main.c:151 +#: ../extensions/comments/main.c:43 ../extensions/comments/main.c:174 #: ../gthumb/gth-main-default-metadata.c:50 msgid "Place" msgstr "Mesto" -#: ../extensions/comments/main.c:43 -#: ../gthumb/gth-main-default-metadata.c:51 +#: ../extensions/comments/main.c:44 ../gthumb/gth-main-default-metadata.c:51 msgid "Date" msgstr "Datum" -#: ../extensions/comments/main.c:45 -#: ../gthumb/gth-main-default-metadata.c:54 +#: ../extensions/comments/main.c:46 ../gthumb/gth-main-default-metadata.c:54 msgid "Rating" msgstr "Ocena" @@ -1136,10 +1240,10 @@ msgstr "Ustvari sliko kazala s sličicami izbranih datotek." #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:1 -#: ../extensions/file_tools/gth-file-tool-crop.c:424 -#: ../extensions/file_tools/gth-file-tool-crop.c:454 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 -#: ../extensions/file_tools/gth-file-tool-rotate.c:415 +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:446 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 +#: ../extensions/file_tools/gth-file-tool-rotate.c:397 #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:14 #: ../extensions/slideshow/main.c:277 msgid "None" @@ -1181,16 +1285,6 @@ msgid "_Gradient" msgstr "_Preliv" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 -msgid "_Horizontal:" -msgstr "_Vodoravno:" - -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 -msgid "_Vertical:" -msgstr "_Navpično:" - #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:14 msgid "Select a color" msgstr "Izbor barve" @@ -1278,6 +1372,7 @@ #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:6 #: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 #: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 @@ -1309,13 +1404,6 @@ msgid "Create _HTML image map" msgstr "Ustvari _HTML zemljevid slik" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 -#: ../extensions/pixbuf_savers/preferences.c:134 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 -msgid "Saving" -msgstr "Shranjevanje" - #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 msgid "Create a new theme" msgstr "Ustvari novo temo" @@ -1392,21 +1480,21 @@ msgid "Image Wall" msgstr "Stena slike" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:486 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:498 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:512 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:481 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:492 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:506 msgid "Could not save the theme" msgstr "Teme ni mogoče shraniti" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:657 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:651 msgid "Could not delete the theme" msgstr "Teme ni mogoče izbrisati" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:248 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:247 msgid "Creating images" msgstr "Ustvarjanje slik" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:897 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:896 msgid "Generating thumbnails" msgstr "Ustvarjanje sličic" @@ -1464,16 +1552,16 @@ msgid "_Use the original image folder" msgstr "Uporabi _privzeto mapo slik" -#: ../extensions/convert_format/dlg-convert-format.c:93 +#: ../extensions/convert_format/dlg-convert-format.c:95 msgid "Converting images" msgstr "Pretvarjanje slik" -#: ../extensions/desktop_background/actions.c:162 +#: ../extensions/desktop_background/actions.c:158 msgid "Could not show the desktop background properties" msgstr "Lastnosti ozadja namizja ni mogoče pokazati" -#: ../extensions/desktop_background/actions.c:228 -#: ../extensions/desktop_background/actions.c:246 +#: ../extensions/desktop_background/actions.c:224 +#: ../extensions/desktop_background/actions.c:242 msgid "Could not set the desktop background" msgstr "Ozadja namizja ni mogoče nastaviti" @@ -1491,8 +1579,11 @@ msgstr "Ozadje namizja" #: ../extensions/edit_metadata/actions.c:66 -msgid "Are you sure you want to permanently delete the metadata of the selected files?" -msgstr "Ali ste prepričani, da želite trajno izbrisati metapodatke izbranih datotek?" +msgid "" +"Are you sure you want to permanently delete the metadata of the selected " +"files?" +msgstr "" +"Ali ste prepričani, da želite trajno izbrisati metapodatke izbranih datotek?" #: ../extensions/edit_metadata/actions.c:73 msgid "If you delete the metadata, it will be permanently lost." @@ -1566,7 +1657,8 @@ #: ../extensions/edit_metadata/gth-edit-comment-dialog.c:66 #: ../extensions/edit_metadata/gth-edit-tags-dialog.c:83 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:335 +#: ../extensions/facebook/dlg-import-from-facebook.c:319 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:324 #, c-format msgid "%d file" msgid_plural "%d files" @@ -1576,7 +1668,7 @@ msgstr[3] "%d datoteke" #: ../extensions/edit_metadata/gth-edit-comment-dialog.c:144 -#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:192 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:197 msgid "Sa_ve and Close" msgstr "S_hrani in zapri" @@ -1584,28 +1676,28 @@ msgid "Save only cha_nged fields" msgstr "Shrani le spre_menjena polja" -#: ../extensions/edit_metadata/gth-edit-general-page.c:547 +#: ../extensions/edit_metadata/gth-edit-general-page.c:555 msgid "No date" msgstr "Brez datuma" -#: ../extensions/edit_metadata/gth-edit-general-page.c:548 +#: ../extensions/edit_metadata/gth-edit-general-page.c:556 msgid "The following date" msgstr "Naslednji datum" -#: ../extensions/edit_metadata/gth-edit-general-page.c:549 +#: ../extensions/edit_metadata/gth-edit-general-page.c:557 #: ../extensions/importer/gth-import-preferences-dialog.c:331 msgid "Current date" msgstr "Trenutni datum" -#: ../extensions/edit_metadata/gth-edit-general-page.c:551 +#: ../extensions/edit_metadata/gth-edit-general-page.c:559 msgid "Last modified date" msgstr "Datum zadnje spremembe" -#: ../extensions/edit_metadata/gth-edit-general-page.c:552 +#: ../extensions/edit_metadata/gth-edit-general-page.c:560 msgid "File creation date" msgstr "Datum ustvaritve datoteke" -#: ../extensions/edit_metadata/gth-edit-general-page.c:553 +#: ../extensions/edit_metadata/gth-edit-general-page.c:561 msgid "Do not modify" msgstr "Ne spreminjaj" @@ -1615,20 +1707,20 @@ msgid "%s Tags" msgstr "Oznake %s" -#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:184 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:189 msgid "Assign Tags" msgstr "Dodeli oznake" -#: ../extensions/edit_metadata/gth-tag-task.c:115 -#: ../extensions/edit_metadata/gth-tag-task.c:132 +#: ../extensions/edit_metadata/gth-tag-task.c:119 +#: ../extensions/edit_metadata/gth-tag-task.c:136 msgid "Assigning tags to the selected files" msgstr "Dodeljevanje oznak izbranim datotekam" -#: ../extensions/edit_metadata/gth-tag-task.c:115 +#: ../extensions/edit_metadata/gth-tag-task.c:119 msgid "Writing files" msgstr "Zapisovanje datotek" -#: ../extensions/edit_metadata/gth-tag-task.c:132 +#: ../extensions/edit_metadata/gth-tag-task.c:136 msgid "Reading files" msgstr "Branje datotek" @@ -1741,7 +1833,7 @@ msgid "XMP Attached" msgstr "Pripet XMP" -#: ../extensions/exiv2_tools/main.c:256 +#: ../extensions/exiv2_tools/main.c:272 msgid "date photo was taken" msgstr "datum zajema fotografije" @@ -1749,47 +1841,52 @@ msgid "Share" msgstr "Souporaba" -#: ../extensions/facebook/callbacks.c:54 +#: ../extensions/facebook/callbacks.c:59 ../extensions/facebook/callbacks.c:64 msgid "Face_book..." msgstr "Face_book..." -#: ../extensions/facebook/callbacks.c:55 +#: ../extensions/facebook/callbacks.c:60 +msgid "Download photos from Facebook" +msgstr "Prejemanje fotografij s Facebooka" + +#: ../extensions/facebook/callbacks.c:65 msgid "Upload photos to Facebook" msgstr "Pošiljanje fotografij na Facebook" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:1 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 msgid "Export to Flickr" msgstr "Izvozi v Flickr" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:2 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 #: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 msgid "_Upload" msgstr "_Pošlji" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:3 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 msgid "_Account:" msgstr "R_ačun:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:4 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:3 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 #: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 #: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 msgid "Edit accounts" msgstr "Urejanje računov" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 msgid "A_lbum:" msgstr "A_lbum:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 msgid "Add a new album" msgstr "Dodaj nov album" @@ -1798,9 +1895,12 @@ msgstr "Prilagodi velikost slike, če je ta večja od navedene velikosti" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:8 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 -msgid "_Resize to:" -msgstr "Sp_remeni velikost v:" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 +msgid "_Resize if larger than:" +msgstr "_Spremeni velikost, če je večja kot:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:9 msgid "720 x 720" @@ -1822,30 +1922,13 @@ msgid "2048 x 2048" msgstr "2048 x 2048" -#: ../extensions/facebook/data/ui/facebook-account-chooser.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-account-chooser.ui.h:1 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 -#: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 -#: ../extensions/picasaweb/data/ui/picasa-web-account-chooser.ui.h:1 -msgid "A_ccount:" -msgstr "Ra_čun:" - -#: ../extensions/facebook/data/ui/facebook-account-manager.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-account-manager.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-account-manager.ui.h:1 -#: ../extensions/picasaweb/data/ui/picasa-web-account-manager.ui.h:1 -msgid "A_ccounts:" -msgstr "R_ačuni:" - #: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 msgid "Public photos" msgstr "Javne fotografije" #: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 msgid "Private photos, visible to friends" msgstr "Zasebne fotografije, vidne prijateljem" @@ -1859,25 +1942,6 @@ msgid "_Visibility:" msgstr "_Vidnost:" -#: ../extensions/facebook/data/ui/facebook-ask-authorization.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-ask-authorization.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-ask-authorization.ui.h:1 -msgid "_Authorize..." -msgstr "Poo_blasti ..." - -#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:1 -#: ../extensions/facebook/facebook-authentication.c:472 -#: ../extensions/flicker_utils/flickr-authentication.c:408 -#: ../extensions/oauth/oauth-authentication.c:423 -msgid "Once you're done, click the 'Continue' button below." -msgstr "Ko boste končali, kliknite na gumb 'Nadaljuj' spodaj." - -#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 -#: ../extensions/flicker_utils/data/ui/flicker-complete-authorization.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-complete-authorization.ui.h:1 -msgid "C_ontinue" -msgstr "_Nadaljuj" - #: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:1 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:1 @@ -1889,70 +1953,92 @@ #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:2 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:2 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:2 -#: ../extensions/webalbums/gth-web-exporter.c:1841 +#: ../extensions/webalbums/gth-web-exporter.c:1839 msgid "_Open in the Browser" msgstr "_Odpri v brskalniku" -#: ../extensions/facebook/dlg-export-to-facebook.c:130 -#: ../extensions/facebook/dlg-export-to-facebook.c:335 -#: ../extensions/facebook/facebook-authentication.c:192 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 +msgid "Import from Picasa Web Album" +msgstr "Uvozi iz spletnega albuma Picasa" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:2 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 +msgid "_Import" +msgstr "_Uvoz " + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:4 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 +#: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 +msgid "A_ccount:" +msgstr "Ra_čun:" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:5 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 +msgid "_Album:" +msgstr "_Album:" + +#: ../extensions/facebook/dlg-export-to-facebook.c:123 +#: ../extensions/facebook/dlg-export-to-facebook.c:326 +#: ../extensions/facebook/dlg-import-from-facebook.c:226 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:138 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:399 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:237 -#: ../extensions/flicker_utils/flickr-authentication.c:191 -#: ../extensions/oauth/oauth-authentication.c:187 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:414 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:231 +#: ../extensions/oauth/web-service.c:380 #: ../extensions/photobucket/dlg-export-to-photobucket.c:131 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:376 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:139 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:424 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:380 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:375 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:124 msgid "Could not connect to the server" msgstr "Ni se mogoče povezati s strežnikom" -#: ../extensions/facebook/dlg-export-to-facebook.c:182 +#: ../extensions/facebook/dlg-export-to-facebook.c:175 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:246 #: ../extensions/photobucket/dlg-export-to-photobucket.c:182 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:192 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:176 msgid "Could not upload the files" msgstr "Datotek ni mogoče poslati" -#: ../extensions/facebook/dlg-export-to-facebook.c:412 +#: ../extensions/facebook/dlg-export-to-facebook.c:397 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:188 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:223 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:462 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:717 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:457 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:309 msgid "Could not create the album" msgstr "Albuma ni mogoče ustvariti" -#: ../extensions/facebook/dlg-export-to-facebook.c:481 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:534 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:783 +#: ../extensions/facebook/dlg-export-to-facebook.c:465 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:528 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:375 msgid "New Album" msgstr "Nov album" -#: ../extensions/facebook/dlg-export-to-facebook.c:561 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:557 -#: ../extensions/image_print/gth-image-print-job.c:1789 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:614 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1002 +#: ../extensions/facebook/dlg-export-to-facebook.c:557 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:583 +#: ../extensions/image_print/gth-image-print-job.c:1739 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:607 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:597 msgid "No valid file selected." msgstr "Nobena veljavna datoteka ni izbrana." -#: ../extensions/facebook/dlg-export-to-facebook.c:562 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:558 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:615 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1003 +#: ../extensions/facebook/dlg-export-to-facebook.c:558 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:584 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:608 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:598 msgid "Could not export the files" msgstr "Datotek ni mogoče izvoziti" -#: ../extensions/facebook/dlg-export-to-facebook.c:570 -#: ../extensions/find_duplicates/gth-find-duplicates.c:255 -#: ../extensions/find_duplicates/gth-find-duplicates.c:347 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:566 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:623 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1010 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:803 -#: ../gthumb/gth-browser.c:1005 +#: ../extensions/facebook/dlg-export-to-facebook.c:566 +#: ../extensions/find_duplicates/gth-find-duplicates.c:277 +#: ../extensions/find_duplicates/gth-find-duplicates.c:470 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:592 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:616 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:605 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:254 +#: ../gthumb/gth-browser.c:1116 #, c-format msgid "%d file (%s)" msgid_plural "%d files (%s)" @@ -1961,92 +2047,35 @@ msgstr[2] "%d datoteki (%s)" msgstr[3] "%d datoteke (%s)" -#: ../extensions/facebook/dlg-export-to-facebook.c:591 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:589 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:642 +#: ../extensions/facebook/dlg-export-to-facebook.c:587 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:615 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:635 #, c-format msgid "Export to %s" msgstr "Izvozi v %s" -#: ../extensions/facebook/facebook-account-chooser-dialog.c:200 -#: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:200 -#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 -msgid "New authentication..." -msgstr "Nova overitev ..." +#: ../extensions/facebook/dlg-import-from-facebook.c:344 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:349 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:279 +msgid "Could not get the photo list" +msgstr "Ni mogoče dobiti seznama fotografij" -#: ../extensions/facebook/facebook-authentication.c:194 -#: ../extensions/flicker_utils/flickr-authentication.c:193 -#: ../extensions/oauth/oauth-authentication.c:189 -msgid "Choose _Account..." -msgstr "Izberi _račun ..." +#: ../extensions/facebook/dlg-import-from-facebook.c:378 +#: ../extensions/facebook/dlg-import-from-facebook.c:533 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:386 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:551 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:313 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:586 +msgid "No album selected" +msgstr "Noben album ni izbran" -#: ../extensions/facebook/facebook-authentication.c:471 -#: ../extensions/flicker_utils/flickr-authentication.c:407 -#: ../extensions/oauth/oauth-authentication.c:422 +#: ../extensions/facebook/dlg-import-from-facebook.c:551 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:569 #, c-format -msgid "Return to this window when you have finished the authorization process on %s" -msgstr "Vrnite se v to okno, ko boste končali opravilo pooblastitve na %s" - -#: ../extensions/facebook/facebook-authentication.c:556 -#: ../extensions/flicker_utils/flickr-authentication.c:487 -#: ../extensions/oauth/oauth-authentication.c:502 -#, c-format -msgid "gthumb requires your authorization to upload the photos to %s" -msgstr "gthumb zahteva vašo pooblastitev za pošiljanje fotografij na %s" - -#: ../extensions/facebook/facebook-authentication.c:557 -#: ../extensions/flicker_utils/flickr-authentication.c:488 -#: ../extensions/oauth/oauth-authentication.c:503 -#, c-format -msgid "Click 'Authorize' to open your web browser and authorize gthumb to upload photos to %s. When you're finished, return to this window to complete the authorization." -msgstr "Kliknite 'Pooblasti' za odprtje spletnega brskalnika in pooblastite gthumb za pošiljanje fotografij na %s. Ko boste končali, se vrnite v to okno za dokončanje pooblastitve." - -#: ../extensions/facebook/facebook-authentication.c:652 -#: ../extensions/flicker_utils/flickr-authentication.c:588 -#: ../extensions/oauth/oauth-authentication.c:605 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:820 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:684 -msgid "Choose Account" -msgstr "Izbor računa" - -#: ../extensions/facebook/facebook-authentication.c:761 -#: ../extensions/flicker_utils/flickr-authentication.c:697 -#: ../extensions/oauth/oauth-authentication.c:714 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:881 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:745 -msgid "Edit Accounts" -msgstr "Urejanje računov" - -#: ../extensions/facebook/facebook-connection.c:275 -#: ../extensions/facebook/facebook-connection.c:435 -#: ../extensions/facebook/facebook-service.c:162 -#: ../extensions/facebook/facebook-service.c:265 -#: ../extensions/facebook/facebook-service.c:468 -#: ../extensions/flicker_utils/flickr-connection.c:266 -#: ../extensions/flicker_utils/flickr-connection.c:413 -#: ../extensions/flicker_utils/flickr-service.c:195 -#: ../extensions/flicker_utils/flickr-service.c:398 -#: ../extensions/photobucket/photobucket-consumer.c:74 -#: ../extensions/photobucket/photobucket-consumer.c:79 -#: ../extensions/photobucket/photobucket-consumer.c:115 -#: ../extensions/photobucket/photobucket-consumer.c:170 -msgid "Unknown error" -msgstr "Neznana napaka" - -#: ../extensions/facebook/facebook-connection.c:310 -#: ../extensions/facebook/facebook-connection.c:461 -#: ../extensions/facebook/facebook-service.c:188 -#: ../extensions/facebook/facebook-service.c:290 -#: ../extensions/flicker_utils/flickr-connection.c:292 -#: ../extensions/flicker_utils/flickr-connection.c:439 -#: ../extensions/flicker_utils/flickr-service.c:219 -#: ../extensions/oauth/oauth-connection.c:356 -#: ../extensions/oauth/oauth-connection.c:431 -#: ../extensions/oauth/oauth-connection.c:535 -#: ../extensions/picasaweb/google-connection.c:344 -msgid "Connecting to the server" -msgstr "Povezovanje s strežnikom" +msgid "Import from %s" +msgstr "Uvozi iz %s" +#: ../extensions/facebook/dlg-import-from-facebook.c:551 #: ../extensions/facebook/facebook.extension.in.in.h:1 msgid "Facebook" msgstr "Facebook" @@ -2055,58 +2084,49 @@ msgid "Upload images to Facebook" msgstr "Pošiljanje fotografij na Facebook" -#: ../extensions/facebook/facebook-service.c:188 -#: ../extensions/facebook/facebook-service.c:290 -#: ../extensions/flicker_utils/flickr-service.c:219 -#: ../extensions/oauth/oauth-connection.c:356 -#: ../extensions/oauth/oauth-connection.c:431 -#: ../extensions/oauth/oauth-connection.c:535 -msgid "Getting account information" -msgstr "Pridobivanje podrobnosti računa" - -#: ../extensions/facebook/facebook-service.c:396 -#: ../extensions/flicker_utils/flickr-service.c:323 -#: ../extensions/photobucket/photobucket-service.c:207 -#: ../extensions/picasaweb/picasa-web-service.c:209 +#: ../extensions/facebook/facebook-service.c:462 +#: ../extensions/flicker_utils/flickr-service.c:863 +#: ../extensions/photobucket/photobucket-service.c:310 +#: ../extensions/picasaweb/picasa-web-service.c:711 msgid "Getting the album list" msgstr "Pridobivanje seznama albumov" -#: ../extensions/facebook/facebook-service.c:525 -#: ../extensions/flicker_utils/flickr-service.c:426 -#: ../extensions/flicker_utils/flickr-service.c:546 -#: ../extensions/flicker_utils/flickr-service.c:584 -#: ../extensions/photobucket/photobucket-service.c:316 -#: ../extensions/picasaweb/picasa-web-service.c:300 +#: ../extensions/facebook/facebook-service.c:584 +#: ../extensions/flicker_utils/flickr-service.c:965 +#: ../extensions/flicker_utils/flickr-service.c:1087 +#: ../extensions/flicker_utils/flickr-service.c:1126 +#: ../extensions/photobucket/photobucket-service.c:423 +#: ../extensions/picasaweb/picasa-web-service.c:805 msgid "Creating the new album" msgstr "Ustvarjanje novega albuma" -#: ../extensions/facebook/facebook-service.c:584 -#: ../extensions/flicker_utils/flickr-service.c:634 -#: ../extensions/photobucket/photobucket-service.c:373 -#: ../extensions/picasaweb/picasa-web-service.c:357 +#: ../extensions/facebook/facebook-service.c:645 +#: ../extensions/flicker_utils/flickr-service.c:1176 +#: ../extensions/photobucket/photobucket-service.c:485 +#: ../extensions/picasaweb/picasa-web-service.c:860 #, c-format msgid "Could not upload '%s': %s" msgstr "Ni mogoče poslati '%s': %s" #. Translators: %s is a filename -#: ../extensions/facebook/facebook-service.c:670 -#: ../extensions/flicker_utils/flickr-service.c:745 -#: ../extensions/photobucket/photobucket-service.c:430 -#: ../extensions/picasaweb/picasa-web-service.c:412 +#: ../extensions/facebook/facebook-service.c:710 +#: ../extensions/flicker_utils/flickr-service.c:1287 +#: ../extensions/photobucket/photobucket-service.c:542 +#: ../extensions/picasaweb/picasa-web-service.c:917 #, c-format msgid "Uploading '%s'" msgstr "Pošiljanje '%s'" -#: ../extensions/facebook/facebook-service.c:886 -#: ../extensions/flicker_utils/flickr-service.c:914 -#: ../extensions/photobucket/photobucket-service.c:599 -#: ../extensions/picasaweb/picasa-web-service.c:605 +#: ../extensions/facebook/facebook-service.c:923 +#: ../extensions/flicker_utils/flickr-service.c:1482 +#: ../extensions/photobucket/photobucket-service.c:714 +#: ../extensions/picasaweb/picasa-web-service.c:1138 msgid "Uploading the files to the server" msgstr "Pošiljanje datotek na strežnik" -#: ../extensions/facebook/facebook-service.c:1003 -#: ../extensions/flicker_utils/flickr-service.c:1077 -#: ../extensions/picasaweb/picasa-web-service.c:718 +#: ../extensions/facebook/facebook-service.c:1022 +#: ../extensions/flicker_utils/flickr-service.c:1651 +#: ../extensions/picasaweb/picasa-web-service.c:1257 msgid "Getting the photo list" msgstr "Pridobivanje seznama fotografij" @@ -2120,22 +2140,28 @@ #: ../extensions/file_manager/actions.c:400 #: ../extensions/file_manager/callbacks.c:380 -#: ../extensions/file_manager/callbacks.c:842 +#: ../extensions/file_manager/callbacks.c:838 msgid "Could not move the files" msgstr "Datotek ni mogoče premakniti" #: ../extensions/file_manager/actions.c:401 #: ../extensions/file_manager/callbacks.c:381 -#: ../extensions/file_manager/callbacks.c:843 -msgid "Files cannot be moved to the current location, as alternative you can choose to copy them." -msgstr "Datotek ni mogoče premakniti na trenutno mesto, lahko pa jih poskusite kopirati." +#: ../extensions/file_manager/callbacks.c:839 +msgid "" +"Files cannot be moved to the current location, as alternative you can choose " +"to copy them." +msgstr "" +"Datotek ni mogoče premakniti na trenutno mesto, lahko pa jih poskusite " +"kopirati." #: ../extensions/file_manager/actions.c:563 msgid "Could not open the location" msgstr "Mesta ni mogoče odpreti" #: ../extensions/file_manager/actions.c:696 -msgid "The folder is not empty, do you want to delete the folder and its content permanently?" +msgid "" +"The folder is not empty, do you want to delete the folder and its content " +"permanently?" msgstr "Mapa ni prazna, ali želite mapo in njeno vsebino trajno izbrisati?" #: ../extensions/file_manager/actions.c:712 @@ -2143,7 +2169,9 @@ msgstr "Mape ni mogoče izbrisati" #: ../extensions/file_manager/actions.c:773 -msgid "The folder cannot be moved to the Trash. Do you want to delete it permanently?" +msgid "" +"The folder cannot be moved to the Trash. Do you want to delete it " +"permanently?" msgstr "Mape ni mogoče premakniti v smeti. Ali jo želite trajno izbrisati?" #: ../extensions/file_manager/actions.c:780 @@ -2208,6 +2236,7 @@ #: ../extensions/file_manager/callbacks.c:187 #: ../extensions/file_manager/callbacks.c:223 #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:5 +#: ../gthumb/gth-tags-entry.c:871 msgid "_Delete" msgstr "_Izbriši" @@ -2259,10 +2288,10 @@ msgid "Move the selected files to another folder" msgstr "Premakni izbrane datoteke v drugo mapo" -#: ../extensions/file_manager/callbacks.c:1003 -#: ../extensions/find_duplicates/gth-find-duplicates.c:581 -#: ../gthumb/gth-browser.c:4939 -#: ../gthumb/gth-browser.c:4973 +#: ../extensions/file_manager/callbacks.c:999 +#: ../extensions/find_duplicates/gth-find-duplicates.c:766 +#: ../gthumb/gth-browser.c:5234 ../gthumb/gth-browser.c:5268 +#: ../gthumb/gth-progress-dialog.c:406 msgid "Could not perform the operation" msgstr "Ni mogoče izvesti opravila" @@ -2279,6 +2308,7 @@ msgstr "Brisanje datotek" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:1 +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:5 msgid "_Preview" msgstr "_Predogled" @@ -2320,81 +2350,96 @@ msgstr "P_onastavi" #: ../extensions/file_tools/data/ui/crop-options.ui.h:1 -msgid "_Position:" -msgstr "_Položaj:" +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +msgid "Selection" +msgstr "Izbira" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 +msgid "_Width:" +msgstr "_Širina:" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:3 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 +msgid "Heigh_t:" +msgstr "_Višina:" -#. this is used to separate the dimensions, for example: 120 × 250 #: ../extensions/file_tools/data/ui/crop-options.ui.h:4 -msgid "×" -msgstr "×" +msgid "_Position:" +msgstr "_Položaj:" #: ../extensions/file_tools/data/ui/crop-options.ui.h:5 -msgid "_Grid:" -msgstr "_Mreža:" - -#: ../extensions/file_tools/data/ui/crop-options.ui.h:6 msgid "Maximize" msgstr "Razpni" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:6 msgid "Center" msgstr "Sredinsko" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 -msgid "Selection" -msgstr "Izbira" - -#: ../extensions/file_tools/data/ui/crop-options.ui.h:9 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 #: ../extensions/file_tools/data/ui/resize-options.ui.h:5 +msgid "Aspect ratio" +msgstr "Razmerje velikosti" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 msgid "I_nvert aspect ratio" msgstr "_Obrni razmerje velikosti" #. after the colon there is a control to select the size in pixels -#: ../extensions/file_tools/data/ui/crop-options.ui.h:11 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:10 msgid "M_ultiple of:" msgstr "Ve_čkratnik števila:" #. abbreviation of pixel -#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:12 msgid "px" msgstr "točk" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 +#: ../gthumb/gth-file-chooser-dialog.c:252 +msgid "Options" +msgstr "Možnosti" + #: ../extensions/file_tools/data/ui/crop-options.ui.h:14 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 -msgid "Aspect ratio" -msgstr "Razmerje velikosti" +msgid "_Grid:" +msgstr "_Mreža:" #: ../extensions/file_tools/data/ui/crop-options.ui.h:15 msgid "C_rop" msgstr "_Obreži" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 -msgid "_Width:" -msgstr "_Širina:" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 -msgid "Heigh_t:" -msgstr "_Višina:" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 -msgid "Set the image size to this value" -msgstr "Nastavi velikost slike na to vrednost" +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:1 +msgid "Method" +msgstr "Način" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:2 +msgid "_Brightness" +msgstr "_Svetlost" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:3 +msgid "_Saturation" +msgstr "_Nasičenost" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:4 +msgid "_Average" +msgstr "Po_vprečje" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 #: ../gthumb/gth-main-default-metadata.c:47 msgid "Dimensions" msgstr "Mere" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 -msgid "High _quality" -msgstr "Visoka _kakovost" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +msgid "Set the image size to this value" +msgstr "Nastavi velikost slike na to vrednost" #: ../extensions/file_tools/data/ui/resize-options.ui.h:8 -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 -msgid "Options" -msgstr "Možnosti" +msgid "High _quality" +msgstr "Visoka _kakovost" #: ../extensions/file_tools/data/ui/resize-options.ui.h:9 msgid "Original dimensions:" @@ -2420,45 +2465,45 @@ msgstr "%" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:1 -msgid "Align" -msgstr "Poravnaj" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 msgid "Angle" msgstr "Kot" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 +msgid "Align" +msgstr "Poravnaj" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 +msgid "Image size" +msgstr "Velikost slike" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 msgid "Point 1:" msgstr "Točka 1:" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 msgid "Point 2:" msgstr "Točka 2:" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 msgid "Keep aspect ratio" msgstr "Ohrani razmerje velikosti" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 -msgid "Image size" -msgstr "Velikost slike" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 msgid "Grid:" msgstr "Mreža:" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 +msgid "_Background:" +msgstr "_Ozadje:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 msgid "Pick a background color" msgstr "Izbor barve ozadja" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 msgid "_Transparent" msgstr "_Prosojno" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 -msgid "_Background:" -msgstr "_Ozadje:" - #: ../extensions/file_tools/data/ui/rotate-options.ui.h:12 msgid "Reset" msgstr "Ponastavi" @@ -2520,140 +2565,134 @@ msgid "Basic tools to modify images." msgstr "Osnovna orodja za spreminjanje slik." -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:372 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:272 +#: ../extensions/file_tools/gth-file-tool-grayscale.c:248 +#: ../extensions/file_tools/gth-file-tool-negative.c:68 +msgid "Applying changes" +msgstr "Uveljavljanje sprememb" + +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 msgid "Adjust Colors..." msgstr "Prilagodi barve ..." -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 msgid "Adjust Colors" msgstr "Prilagajanje barv" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:531 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:619 msgid "Change brightness, contrast, saturation and gamma level of the image" msgstr "Spremeni svetlost, kontrast, nasičenje in gama raven slike" -#: ../extensions/file_tools/gth-file-tool-crop.c:424 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:304 +msgid "Adjust Contrast" +msgstr "Prilagodi kontrast" + +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:305 +msgid "Automatic contrast adjustment" +msgstr "Samodejno prilagajanje kontrasta" + +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 msgid "Square" msgstr "Kvadrat" -#: ../extensions/file_tools/gth-file-tool-crop.c:425 -#: ../extensions/file_tools/gth-file-tool-resize.c:499 +#: ../extensions/file_tools/gth-file-tool-crop.c:417 +#: ../extensions/file_tools/gth-file-tool-resize.c:590 #, c-format msgid "%d x %d (Image)" msgstr "%d x %d (slika)" -#: ../extensions/file_tools/gth-file-tool-crop.c:428 -#: ../extensions/file_tools/gth-file-tool-resize.c:503 +#: ../extensions/file_tools/gth-file-tool-crop.c:420 +#: ../extensions/file_tools/gth-file-tool-resize.c:594 #, c-format msgid "%d x %d (Screen)" msgstr "%d x %d (zaslon)" -#: ../extensions/file_tools/gth-file-tool-crop.c:432 -#: ../extensions/file_tools/gth-file-tool-resize.c:508 +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-resize.c:599 msgid "5:4" msgstr "5:4" -#: ../extensions/file_tools/gth-file-tool-crop.c:433 -#: ../extensions/file_tools/gth-file-tool-resize.c:509 +#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-resize.c:600 msgid "4:3 (DVD, Book)" msgstr "4:3 (knjiga, DVD)" -#: ../extensions/file_tools/gth-file-tool-crop.c:434 -#: ../extensions/file_tools/gth-file-tool-resize.c:510 +#: ../extensions/file_tools/gth-file-tool-crop.c:426 +#: ../extensions/file_tools/gth-file-tool-resize.c:601 msgid "7:5" msgstr "7:5" -#: ../extensions/file_tools/gth-file-tool-crop.c:435 -#: ../extensions/file_tools/gth-file-tool-resize.c:511 +#: ../extensions/file_tools/gth-file-tool-crop.c:427 +#: ../extensions/file_tools/gth-file-tool-resize.c:602 msgid "3:2 (Postcard)" msgstr "3:2 (Razglednica)" -#: ../extensions/file_tools/gth-file-tool-crop.c:436 -#: ../extensions/file_tools/gth-file-tool-resize.c:512 +#: ../extensions/file_tools/gth-file-tool-crop.c:428 +#: ../extensions/file_tools/gth-file-tool-resize.c:603 msgid "16:10" msgstr "16:10" -#: ../extensions/file_tools/gth-file-tool-crop.c:437 -#: ../extensions/file_tools/gth-file-tool-resize.c:513 +#: ../extensions/file_tools/gth-file-tool-crop.c:429 +#: ../extensions/file_tools/gth-file-tool-resize.c:604 msgid "16:9 (DVD)" msgstr "16:9 (DVD)" -#: ../extensions/file_tools/gth-file-tool-crop.c:438 -#: ../extensions/file_tools/gth-file-tool-resize.c:514 +#: ../extensions/file_tools/gth-file-tool-crop.c:430 +#: ../extensions/file_tools/gth-file-tool-resize.c:605 msgid "1.85:1" msgstr "1.85:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:439 -#: ../extensions/file_tools/gth-file-tool-resize.c:515 +#: ../extensions/file_tools/gth-file-tool-crop.c:431 +#: ../extensions/file_tools/gth-file-tool-resize.c:606 msgid "2.39:1" msgstr "2.39:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:440 -#: ../extensions/file_tools/gth-file-tool-resize.c:516 +#: ../extensions/file_tools/gth-file-tool-crop.c:432 +#: ../extensions/file_tools/gth-file-tool-resize.c:607 #: ../extensions/image_print/data/ui/print-layout.ui.h:2 #: ../extensions/rename_series/gth-template-selector.c:234 msgid "Custom" msgstr "Po meri" -#: ../extensions/file_tools/gth-file-tool-crop.c:455 -#: ../extensions/file_tools/gth-file-tool-rotate.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:447 +#: ../extensions/file_tools/gth-file-tool-rotate.c:398 msgid "Rule of Thirds" msgstr "Pravilo tretjin" -#: ../extensions/file_tools/gth-file-tool-crop.c:456 -#: ../extensions/file_tools/gth-file-tool-rotate.c:417 +#: ../extensions/file_tools/gth-file-tool-crop.c:448 +#: ../extensions/file_tools/gth-file-tool-rotate.c:399 msgid "Golden Sections" msgstr "Zlati rezi" -#: ../extensions/file_tools/gth-file-tool-crop.c:457 -#: ../extensions/file_tools/gth-file-tool-rotate.c:418 +#: ../extensions/file_tools/gth-file-tool-crop.c:449 +#: ../extensions/file_tools/gth-file-tool-rotate.c:400 msgid "Center Lines" msgstr "Sredinske črte" -#: ../extensions/file_tools/gth-file-tool-crop.c:458 -#: ../extensions/file_tools/gth-file-tool-rotate.c:419 +#: ../extensions/file_tools/gth-file-tool-crop.c:450 +#: ../extensions/file_tools/gth-file-tool-rotate.c:401 msgid "Uniform" msgstr "Enotno" -#: ../extensions/file_tools/gth-file-tool-crop.c:614 +#: ../extensions/file_tools/gth-file-tool-crop.c:608 msgid "Crop..." msgstr "Obreži ..." -#: ../extensions/file_tools/gth-file-tool-crop.c:614 +#: ../extensions/file_tools/gth-file-tool-crop.c:608 msgid "Crop" msgstr "Obreži" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:68 -#: ../extensions/file_tools/gth-file-tool-negative.c:68 -msgid "Applying changes" -msgstr "Uveljavljanje sprememb" - -#: ../extensions/file_tools/gth-file-tool-desaturate.c:203 -msgid "Desaturate" -msgstr "Zmanjšaj nasičenje" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:119 -msgid "White balance correction" -msgstr "Popravljanje ravnotežja bele barve" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:342 -msgid "Enhance Colors" -msgstr "Izboljšaj barve" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:343 -msgid "Automatic white balance correction" -msgstr "Samodejno popravi ravnotežje bele barve" - -#: ../extensions/file_tools/gth-file-tool-equalize.c:86 +#: ../extensions/file_tools/gth-file-tool-equalize.c:45 msgid "Equalizing image histogram" msgstr "Uravnavanje histograma slike" -#: ../extensions/file_tools/gth-file-tool-equalize.c:275 +#: ../extensions/file_tools/gth-file-tool-equalize.c:230 msgid "Equalize" msgstr "Uravnavanje" -#: ../extensions/file_tools/gth-file-tool-equalize.c:276 +#: ../extensions/file_tools/gth-file-tool-equalize.c:231 msgid "Equalize image histogram" msgstr "Uravna histogram slike" @@ -2665,6 +2704,14 @@ msgid "Flip the image vertically" msgstr "Zrcali sliko navpično" +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale..." +msgstr "Sivine ..." + +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale" +msgstr "Sivine" + #: ../extensions/file_tools/gth-file-tool-mirror.c:87 msgid "Mirror" msgstr "Zrcaljenje" @@ -2681,23 +2728,28 @@ msgid "Redo" msgstr "Uveljavi" -#: ../extensions/file_tools/gth-file-tool-resize.c:680 +#: ../extensions/file_tools/gth-file-tool-resize.c:214 +#: ../extensions/resize_images/dlg-resize-images.c:180 +msgid "Resizing images" +msgstr "Spreminjanje v" + +#: ../extensions/file_tools/gth-file-tool-resize.c:808 msgid "Resize..." msgstr "Spremeni velikost ..." -#: ../extensions/file_tools/gth-file-tool-resize.c:680 +#: ../extensions/file_tools/gth-file-tool-resize.c:808 msgid "Resize" msgstr "Spremeni velikost" -#: ../extensions/file_tools/gth-file-tool-rotate.c:636 +#: ../extensions/file_tools/gth-file-tool-rotate.c:628 msgid "Rotate..." msgstr "Zavrti ..." -#: ../extensions/file_tools/gth-file-tool-rotate.c:636 +#: ../extensions/file_tools/gth-file-tool-rotate.c:628 msgid "Rotate" msgstr "Zavrti" -#: ../extensions/file_tools/gth-file-tool-rotate.c:637 +#: ../extensions/file_tools/gth-file-tool-rotate.c:629 msgid "Freely rotate the image" msgstr "Prosto zavrti sliko" @@ -2727,15 +2779,15 @@ msgid "Save" msgstr "Shrani" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:100 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:101 msgid "Sharpening image" msgstr "Ostrenje slike" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 msgid "Enhance Focus..." msgstr "Izboljšaj žarišče ..." -#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 msgid "Enhance Focus" msgstr "Izboljšaj žarišče" @@ -2795,28 +2847,28 @@ msgid "Find duplicated files." msgstr "Najdi podvojene datoteke." -#: ../extensions/find_duplicates/gth-find-duplicates.c:53 +#: ../extensions/find_duplicates/gth-find-duplicates.c:65 msgid "leave the newest duplicates" msgstr "ohrani novejšo različico dvojnika" -#: ../extensions/find_duplicates/gth-find-duplicates.c:54 +#: ../extensions/find_duplicates/gth-find-duplicates.c:66 msgid "leave the oldest duplicates" msgstr "ohrani starejšo različico dvojnika" -#: ../extensions/find_duplicates/gth-find-duplicates.c:55 +#: ../extensions/find_duplicates/gth-find-duplicates.c:67 msgid "by folder..." msgstr "po mapah ..." -#: ../extensions/find_duplicates/gth-find-duplicates.c:56 +#: ../extensions/find_duplicates/gth-find-duplicates.c:68 msgid "all files" msgstr "vse datoteke" -#: ../extensions/find_duplicates/gth-find-duplicates.c:57 +#: ../extensions/find_duplicates/gth-find-duplicates.c:69 msgid "no file" msgstr "brez datotek" -#: ../extensions/find_duplicates/gth-find-duplicates.c:397 -#: ../extensions/find_duplicates/gth-find-duplicates.c:492 +#: ../extensions/find_duplicates/gth-find-duplicates.c:560 +#: ../extensions/find_duplicates/gth-find-duplicates.c:668 #, c-format msgid "%d duplicate" msgid_plural "%d duplicates" @@ -2825,15 +2877,15 @@ msgstr[2] "%d dvojnika" msgstr[3] "%d dvojniki" -#: ../extensions/find_duplicates/gth-find-duplicates.c:536 +#: ../extensions/find_duplicates/gth-find-duplicates.c:712 msgid "Search completed" msgstr "Iskanje je končano" -#: ../extensions/find_duplicates/gth-find-duplicates.c:548 +#: ../extensions/find_duplicates/gth-find-duplicates.c:725 msgid "Searching for duplicates" msgstr "Iskanje podvojenih datotek" -#: ../extensions/find_duplicates/gth-find-duplicates.c:551 +#: ../extensions/find_duplicates/gth-find-duplicates.c:728 #: ../gthumb/gth-load-file-data-task.c:106 #: ../gthumb/gth-save-file-data-task.c:100 #, c-format @@ -2844,20 +2896,19 @@ msgstr[2] "%d preostali datoteki" msgstr[3] "%d preostale datoteke" -#: ../extensions/find_duplicates/gth-find-duplicates.c:634 +#: ../extensions/find_duplicates/gth-find-duplicates.c:830 msgid "Getting the file list" msgstr "Pridobivanje seznama datotek" -#: ../extensions/find_duplicates/gth-find-duplicates.c:740 +#: ../extensions/find_duplicates/gth-find-duplicates.c:1016 msgid "Duplicates" msgstr "Podvojeno" -#: ../extensions/find_duplicates/gth-find-duplicates.c:997 +#: ../extensions/find_duplicates/gth-find-duplicates.c:1306 msgid "Select" msgstr "Izberi" -#: ../extensions/flicker/callbacks.c:59 -#: ../extensions/flicker/callbacks.c:64 +#: ../extensions/flicker/callbacks.c:59 ../extensions/flicker/callbacks.c:64 msgid "_Flickr..." msgstr "_Flickr ..." @@ -2878,7 +2929,7 @@ msgstr "Pošiljanje slik na Flickr" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 #: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 msgid "Free space:" msgstr "Neporabljen prostor:" @@ -2900,69 +2951,93 @@ msgid "_Safety:" msgstr "_Varnost:" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 msgid "Private photos, visible to family and friends" msgstr "Zasebne fotografije, vidne družini in prijateljem" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 msgid "Private photos, visible to family" msgstr "Zasebne fotografije, vidne družini" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 msgid "Private photos" msgstr "Zasebne fotografije" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 msgid "Safe content" msgstr "Varna vsebina" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 msgid "Moderate content" msgstr "Srednja vsebina" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:17 msgid "Restricted content" msgstr "Omejena vsebina" -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 -msgid "_Import" -msgstr "_Uvoz " +#: ../extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui.h:1 +msgid "C_ontinue" +msgstr "_Nadaljuj" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:360 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:830 -msgid "Could not get the photo list" -msgstr "Ni mogoče dobiti seznama fotografij" +#: ../extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui.h:2 +msgid "_Authorize..." +msgstr "Poo_blasti ..." -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:397 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:561 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:864 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1026 -msgid "No album selected" -msgstr "Noben album ni izbran" +#: ../extensions/flicker_utils/flickr-consumer.c:124 +#: ../extensions/flicker_utils/flickr-service.c:237 +#: ../extensions/flicker_utils/flickr-service.c:348 +#: ../extensions/flicker_utils/flickr-service.c:672 +#: ../extensions/flicker_utils/flickr-service.c:937 +#: ../extensions/oauth/oauth-service.c:154 +#: ../extensions/photobucket/photobucket-consumer.c:74 +#: ../extensions/photobucket/photobucket-consumer.c:82 +#: ../extensions/photobucket/photobucket-consumer.c:149 +#: ../extensions/photobucket/photobucket-service.c:132 +msgid "Unknown error" +msgstr "Neznana napaka" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:579 +#: ../extensions/flicker_utils/flickr-service.c:502 #, c-format -msgid "Import from %s" -msgstr "Uvozi iz %s" +msgid "" +"Return to this window when you have finished the authorization process on %s" +msgstr "Vrnite se v to okno, ko boste končali opravilo pooblastitve na %s" + +#: ../extensions/flicker_utils/flickr-service.c:503 +msgid "Once you're done, click the 'Continue' button below." +msgstr "Ko boste končali, kliknite na gumb 'Nadaljuj' spodaj." + +#: ../extensions/flicker_utils/flickr-service.c:571 +#, c-format +msgid "gThumb requires your authorization to upload the photos to %s" +msgstr "Program gThumb zahteva potrditev za pošiljanje fotografij na %s" + +#: ../extensions/flicker_utils/flickr-service.c:572 +#, c-format +msgid "" +"Click 'Authorize' to open your web browser and authorize gthumb to upload " +"photos to %s. When you're finished, return to this window to complete the " +"authorization." +msgstr "" +"Kliknite 'Pooblasti' za odprtje spletnega brskalnika in pooblastite gthumb " +"za pošiljanje fotografij na %s. Ko boste končali, se vrnite v to okno za " +"dokončanje pooblastitve." #: ../extensions/gstreamer_tools/actions.c:66 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1080 -#: ../gthumb/gth-browser.c:2008 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1072 +#: ../gthumb/gth-browser.c:2175 msgid "Could not save the file" msgstr "Ni mogoče shraniti datoteke" -#: ../extensions/gstreamer_tools/actions.c:126 +#: ../extensions/gstreamer_tools/actions.c:130 msgid "Could not take a screenshot" msgstr "Ni mogoče zajeti zaslonske slike" -#: ../extensions/gstreamer_tools/actions.c:132 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1248 +#: ../extensions/gstreamer_tools/actions.c:136 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1245 msgid "Save Image" msgstr "Shrani sliko" -#: ../extensions/gstreamer_tools/actions.c:152 +#: ../extensions/gstreamer_tools/actions.c:156 msgctxt "Filename" msgid "Screenshot" msgstr "Zaslonska slika" @@ -2972,7 +3047,7 @@ msgstr "Počasneje" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:686 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:699 msgid "Play" msgstr "Predvajaj" @@ -3018,11 +3093,11 @@ msgid "Take a screenshot" msgstr "Zajemi zaslonsko sliko" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:663 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 msgid "Playing video" msgstr "Predvajanje video datotek" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:689 msgid "Pause" msgstr "Premor" @@ -3081,20 +3156,19 @@ msgid "Sample rate" msgstr "Vzorčna hitrost" -#: ../extensions/gstreamer_utils/gstreamer-utils.c:363 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:362 msgid "Stereo" msgstr "Stereo" -#: ../extensions/gstreamer_utils/gstreamer-utils.c:363 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:362 msgid "Mono" msgstr "Mono" #. Translators: this is an image size, such as 1024 × 768 -#: ../extensions/gstreamer_utils/gstreamer-utils.c:396 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1303 -#: ../extensions/image_viewer/gth-metadata-provider-image.c:190 -#: ../extensions/webalbums/dlg-web-exporter.c:442 -#: ../extensions/webalbums/gth-web-exporter.c:2446 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:395 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1300 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:209 +#: ../extensions/webalbums/gth-web-exporter.c:2446 ../gthumb/gtk-utils.c:1037 #, c-format msgid "%d × %d" msgstr "%d × %d" @@ -3103,7 +3177,7 @@ msgid "Could not print the selected files" msgstr "Ni mogoče natisniti izbranih datotek" -#: ../extensions/image_print/callbacks.c:54 +#: ../extensions/image_print/callbacks.c:65 msgid "Print the selected images" msgstr "Natisni izbrane slike" @@ -3176,26 +3250,26 @@ msgid "Fonts" msgstr "Pisave" -#: ../extensions/image_print/gth-image-print-job.c:971 +#: ../extensions/image_print/gth-image-print-job.c:914 #: ../extensions/webalbums/data/albumthemes/text.h:31 #, c-format msgid "Page %d of %d" msgstr "Stran %d od %d" -#: ../extensions/image_print/gth-image-print-job.c:1734 -#: ../extensions/image_print/gth-image-print-job.c:1861 -#: ../extensions/image_print/gth-image-print-job.c:1898 +#: ../extensions/image_print/gth-image-print-job.c:1680 +#: ../extensions/image_print/gth-image-print-job.c:1845 +#: ../extensions/image_print/gth-image-print-job.c:1888 msgid "Could not print" msgstr "Ni mogoče natisniti" -#: ../extensions/image_print/gth-image-print-job.c:1796 +#: ../extensions/image_print/gth-image-print-job.c:1746 #: ../gthumb/gth-main-default-tests.c:240 msgid "Images" msgstr "Slike" -#: ../extensions/image_print/gth-image-print-job.c:1863 -#: ../gthumb/gth-image-loader.c:204 -#: ../gthumb/gth-image-loader.c:278 +#: ../extensions/image_print/gth-image-print-job.c:1847 +#: ../gthumb/gth-image-loader.c:197 ../gthumb/gth-image-loader.c:304 +#: ../gthumb/gth-image-utils.c:131 ../gthumb/gth-image-utils.c:137 msgid "No suitable loader available for this file type" msgstr "Za to vrsto datotek ni primernega nalagalnika" @@ -3206,7 +3280,7 @@ msgstr "Nalaganje \"%s\"" #: ../extensions/image_print/gth-load-image-info-task.c:166 -#: ../extensions/webalbums/gth-web-exporter.c:2685 +#: ../extensions/webalbums/gth-web-exporter.c:2719 msgid "Loading images" msgstr "Nalaganje slik" @@ -3248,7 +3322,7 @@ #: ../extensions/image_rotation/gth-reset-orientation-task.c:111 #: ../extensions/image_rotation/gth-transform-task.c:141 -#: ../extensions/webalbums/gth-web-exporter.c:2339 +#: ../extensions/webalbums/gth-web-exporter.c:2338 #: ../extensions/webalbums/gth-web-exporter.c:2423 msgid "Saving images" msgstr "Shranjevanje slik" @@ -3268,17 +3342,25 @@ #: ../extensions/image_rotation/rotation-utils.c:122 msgid "" -"This transformation may introduce small image distortions along one or more edges, because the image dimensions are not multiples of 8.\n" +"This transformation may introduce small image distortions along one or more " +"edges, because the image dimensions are not multiples of 8.\n" "\n" -"The distortion is reversible, however. If the resulting image is unacceptable, simply apply the reverse transformation to return to the original image.\n" +"The distortion is reversible, however. If the resulting image is " +"unacceptable, simply apply the reverse transformation to return to the " +"original image.\n" "\n" -"You can also choose to discard (or trim) any untransformable edge pixels. For practical use, this mode gives the best looking results, but the transformation is not strictly lossless anymore." +"You can also choose to discard (or trim) any untransformable edge pixels. " +"For practical use, this mode gives the best looking results, but the " +"transformation is not strictly lossless anymore." msgstr "" -"Preoblikovanje lahko povzroči majhno popačenje slike na enem ali več robovih, ker mere slike niso mnogokratniki števila 8.\n" +"Preoblikovanje lahko povzroči majhno popačenje slike na enem ali več " +"robovih, ker mere slike niso mnogokratniki števila 8.\n" "\n" -"Popačenje je povrnljivo. V primeru da je preoblikovana slika nesprejemljiva, za vrnitev na izvirno sliko uporabite obratno preoblikovanje.\n" +"Popačenje je povrnljivo. V primeru da je preoblikovana slika nesprejemljiva, " +"za vrnitev na izvirno sliko uporabite obratno preoblikovanje.\n" "\n" -"Moteče robne točke lahko zavržete (ali obrežete). V praksi ta način daje najboljše rezultate, toda preoblikovanje ni več strogo brez izgub." +"Moteče robne točke lahko zavržete (ali obrežete). V praksi ta način daje " +"najboljše rezultate, toda preoblikovanje ni več strogo brez izgub." #: ../extensions/image_rotation/rotation-utils.c:128 msgid "_Trim" @@ -3484,39 +3566,39 @@ msgid "custom format" msgstr "oblika po meri" -#: ../extensions/importer/gth-import-task.c:442 -#: ../extensions/importer/gth-import-task.c:477 -#: ../extensions/importer/gth-import-task.c:648 +#: ../extensions/importer/gth-import-task.c:426 +#: ../extensions/importer/gth-import-task.c:461 +#: ../extensions/importer/gth-import-task.c:671 msgid "Importing files" msgstr "Uvažanje datotek" -#: ../extensions/importer/gth-import-task.c:598 +#: ../extensions/importer/gth-import-task.c:620 msgid "No file imported" msgstr "Nobena datoteka ni bila uvožena" -#: ../extensions/importer/gth-import-task.c:599 +#: ../extensions/importer/gth-import-task.c:621 msgid "The selected files are already present in the destination." msgstr "Izbrane datoteke so že prisotne na cilju." -#: ../extensions/importer/gth-import-task.c:622 +#: ../extensions/importer/gth-import-task.c:644 #: ../gthumb/gth-file-source-vfs.c:694 msgid "Could not delete the files" msgstr "Datotek ni mogoče izbrisati" -#: ../extensions/importer/gth-import-task.c:623 +#: ../extensions/importer/gth-import-task.c:645 msgid "Delete operation not supported." msgstr "Dejanje izbrisa ni podprto." -#: ../extensions/importer/gth-import-task.c:709 +#: ../extensions/importer/gth-import-task.c:732 msgid "Last imported" msgstr "Zadnjič uvoženo" -#: ../extensions/importer/gth-import-task.c:815 +#: ../extensions/importer/gth-import-task.c:838 msgid "No file specified." msgstr "Ni določene datoteke." #. Translators: For example: Not enough free space in '/home/user/Images'.\n1.3 GB of space is required but only 300 MB is available. -#: ../extensions/importer/gth-import-task.c:852 +#: ../extensions/importer/gth-import-task.c:875 #, c-format msgid "" "Not enough free space in '%s'.\n" @@ -3525,8 +3607,7 @@ "Ni dovolj prostora v mapi '%s'.\n" "Zahtevano je %s prostora, na voljo pa ga je le %s." -#: ../extensions/list_tools/callbacks.c:76 -#: ../gthumb/gth-filterbar.c:304 +#: ../extensions/list_tools/callbacks.c:76 ../gthumb/gth-filterbar.c:311 msgid "Personalize..." msgstr "Ukaz po meri ..." @@ -3669,9 +3750,9 @@ msgstr "Vnesite vrednost:" #: ../extensions/list_tools/gth-script.c:745 -#: ../extensions/webalbums/gth-web-exporter.c:560 -#: ../extensions/webalbums/gth-web-exporter.c:572 -#: ../extensions/webalbums/gth-web-exporter.c:580 +#: ../extensions/webalbums/gth-web-exporter.c:558 +#: ../extensions/webalbums/gth-web-exporter.c:570 +#: ../extensions/webalbums/gth-web-exporter.c:578 msgid "Malformed command" msgstr "Slabo oblikovan ukaz" @@ -3736,6 +3817,47 @@ msgid "View the photo position on the map" msgstr "Poglej mesto zajema slike na zemljevidu." +#: ../extensions/oauth/data/ui/oauth-account-manager.ui.h:1 +msgid "A_ccounts:" +msgstr "R_ačuni:" + +#: ../extensions/oauth/data/ui/oauth-ask-authorization.ui.h:1 +#: ../gthumb/gth-folder-tree.c:1067 +msgid "Loading..." +msgstr "Nalaganje ..." + +#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 +msgid "New authentication..." +msgstr "Nova overitev ..." + +#: ../extensions/oauth/oauth-ask-authorization-dialog.c:191 +msgid "Authorization Required" +msgstr "Zahtevana je overitev" + +#: ../extensions/oauth/web-service.c:382 +msgid "Choose _Account..." +msgstr "Izberi _račun ..." + +#: ../extensions/oauth/web-service.c:660 +msgid "Choose Account" +msgstr "Izbor računa" + +#: ../extensions/oauth/web-service.c:777 +msgid "Edit Accounts" +msgstr "Urejanje računov" + +#: ../extensions/oauth/web-service.c:795 ../extensions/oauth/web-service.c:812 +msgid "Connecting to the server" +msgstr "Povezovanje s strežnikom" + +#: ../extensions/oauth/web-service.c:796 +msgid "Asking authorization" +msgstr "Potrditev overitve" + +#: ../extensions/oauth/web-service.c:813 +msgid "Getting account information" +msgstr "Pridobivanje podrobnosti računa" + #: ../extensions/photobucket/callbacks.c:54 msgid "Photobucket..." msgstr "Photobucket ..." @@ -3744,68 +3866,68 @@ msgid "Upload photos to Photobucket" msgstr "Pošiljanje fotografij na Photobucket" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +msgid "_Scramble filenames" +msgstr "_Predelaj imena datotek" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 msgid "Tiny ( 100 x 75 )" msgstr "Drobcena ( 100 x 75 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 msgid "Small ( 160 x 120 )" msgstr "Majhna ( 160 x 120 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 msgid "Medium ( 320 x 240 )" msgstr "Srednja ( 320 x 240 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 msgid "Large ( 640 x 480 )" msgstr "Velika ( 640 x 480 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 msgid "15ʺ screen ( 800 x 600 )" msgstr "15ʺ zaslon ( 800 x 600 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 msgid "17ʺ screen ( 1024 x 768 )" msgstr "17ʺ zaslon ( 1024 x 768 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 msgid "1 megabyte file size" msgstr "Velikost datoteke 1 megabajt" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 -msgid "_Scramble filenames" -msgstr "_Predelaj imena datotek" - #: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 msgid "_Container:" msgstr "_Zabojnik:" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:290 msgid "Tiny ( 100 × 75 )" msgstr "Drobcena ( 100 x 75 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 msgid "Small ( 160 × 120 )" msgstr "Majhna ( 160 x 120 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 msgid "Medium ( 320 × 240 )" msgstr "Srednja ( 320 x 240 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 msgid "Large ( 640 × 480 )" msgstr "Velika ( 640 x 480 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 msgid "15ʺ screen ( 800 × 600 )" msgstr "15ʺ zaslon ( 800 x 600 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 msgid "17ʺ screen ( 1024 × 768 )" msgstr "17ʺ zaslon ( 1024 x 768 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:304 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:303 msgid "2 megabyte file size" msgstr "Velikost datoteke 2 megabajta" @@ -3847,7 +3969,7 @@ #. view label #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 -#: ../gthumb/gth-filterbar.c:414 +#: ../gthumb/gth-filterbar.c:421 msgid "S_how:" msgstr "_Pokaži:" @@ -3864,7 +3986,7 @@ msgstr "_Izbriši uvožene slike z vira" #: ../extensions/photo_importer/dlg-photo-importer.c:227 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:174 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:149 msgid "Could not import the files" msgstr "Datotek ni mogoče uvoziti" @@ -3879,7 +4001,7 @@ msgstr "Mape ni mogoče naložiti" #: ../extensions/photo_importer/dlg-photo-importer.c:369 -#: ../gthumb/gth-browser.c:1921 +#: ../gthumb/gth-browser.c:2089 msgid "Getting folder listing..." msgstr "Pridobivanje seznama map ..." @@ -3924,49 +4046,15 @@ msgid "_Albums:" msgstr "_Albumi:" -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 -msgid "Import from Picasa Web Album" -msgstr "Uvozi iz spletnega albuma Picasa" - -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 -msgid "_Album:" -msgstr "_Album:" - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:1 -msgid "_E-Mail:" -msgstr "_Elektronska pošta:" - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 -msgid "Type the characters you see in the picture below. Letters are not case-sensitive." -msgstr "Vnesite znake, ki jih vidite na sliki spodaj. Črke niso občutljive na velikost." - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:3 -msgid "_Password:" -msgstr "_Geslo:" - #: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 msgid "Public" msgstr "Javno" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:354 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:310 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:458 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:469 msgid "Could not get the album list" msgstr "Ni mogoče dobiti seznama albumov" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:438 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:394 -msgid "Picasa Web Album" -msgstr "Spletni album Picasa" - -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:525 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:481 -msgid "Account" -msgstr "Račun" - -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:104 -msgid "Could not load the file" -msgstr "Ni mogoče naložiti datoteke" - #: ../extensions/picasaweb/picasaweb.extension.in.in.h:1 msgid "Picasa Web Albums" msgstr "Picasa spletni albumi" @@ -3975,92 +4063,6 @@ msgid "Upload images to Picasa Web Albums" msgstr "Pošlje slike na Picasa spletne albume" -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:1 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:1 -msgid "_Default extension:" -msgstr "_Privzete pripona:" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:2 -msgid "_Quality:" -msgstr "_Kakovost:" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 -msgid "_Smoothing:" -msgstr "_Glajenje:" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 -msgid "Opti_mize" -msgstr "Opti_miziraj" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:5 -msgid "_Progressive" -msgstr "_Napredno" - -#: ../extensions/pixbuf_savers/data/ui/png-options.ui.h:1 -msgid "Compression _level:" -msgstr "_Raven stiskanja:" - -#: ../extensions/pixbuf_savers/data/ui/save-options-preferences.ui.h:1 -msgid "Default options:" -msgstr "Privzete možnosti:" - -#: ../extensions/pixbuf_savers/data/ui/tga-options.ui.h:1 -msgid "_RLE compression" -msgstr "Stiskanje _RLE" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:2 -msgid "_No compression" -msgstr "_Brez stiskanja" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:3 -msgid "No_rmal (Deflate)" -msgstr "O_bičajno (stisnjeno)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 -msgid "_Loss compression (JPEG)" -msgstr "_Stiskanje z izgubo (JPEG)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 -msgid "Compression" -msgstr "Stiskanje" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 -msgid "dpi" -msgstr "dpi" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:9 -msgid "Resolution" -msgstr "Ločljivost" - -#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:519 -msgid "JPEG" -msgstr "JPEG" - -#: ../extensions/pixbuf_savers/gth-png-saver.c:140 -msgid "PNG" -msgstr "PNG" - -#: ../extensions/pixbuf_savers/gth-tga-saver.c:286 -#: ../gthumb/gth-buffer-data.c:84 -msgid "Insufficient memory" -msgstr "Nezadostna količina pomnilnika" - -#: ../extensions/pixbuf_savers/gth-tga-saver.c:373 -msgid "TGA" -msgstr "TGA" - -#: ../extensions/pixbuf_savers/gth-tiff-saver.c:537 -msgid "TIFF" -msgstr "TIFF" - -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:1 -msgid "Save images" -msgstr "Shrani slike" - -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:2 -msgid "Save images in common file formats such as JPEG, PNG and TIFF" -msgstr "Shrani slike v običajnih vrstah datotek kot so JPEG, PNG in TIFF" - #: ../extensions/raw_files/raw_files.extension.in.in.h:1 msgid "Raw format support" msgstr "Podpora za surovo vrsto" @@ -4069,11 +4071,11 @@ msgid "Allow to load raw format images." msgstr "Dovoli nalaganje slik surove vrste." -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 msgid "_X:" msgstr "_X:" -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 msgid "_Y:" msgstr "_Y:" @@ -4195,36 +4197,36 @@ msgid "File attribute" msgstr "Atribut datoteke" -#: ../extensions/rename_series/dlg-rename-series.c:552 -#: ../extensions/rename_series/dlg-rename-series.c:683 +#: ../extensions/rename_series/dlg-rename-series.c:558 +#: ../extensions/rename_series/dlg-rename-series.c:689 msgid "Could not rename the files" msgstr "Ni mogoče preimenovati datotek" -#: ../extensions/rename_series/dlg-rename-series.c:780 +#: ../extensions/rename_series/dlg-rename-series.c:786 msgid "Could not save the template" msgstr "Predloge ni mogoče shraniti" -#: ../extensions/rename_series/dlg-rename-series.c:798 +#: ../extensions/rename_series/dlg-rename-series.c:804 msgid "Edit Template" msgstr "Uredi predlogo" -#: ../extensions/rename_series/dlg-rename-series.c:856 +#: ../extensions/rename_series/dlg-rename-series.c:862 msgid "Old Name" msgstr "Staro ime" -#: ../extensions/rename_series/dlg-rename-series.c:867 +#: ../extensions/rename_series/dlg-rename-series.c:873 msgid "New Name" msgstr "Novo ime" -#: ../extensions/rename_series/dlg-rename-series.c:944 +#: ../extensions/rename_series/dlg-rename-series.c:950 msgid "Keep original case" msgstr "Ohrani izvirno velikost" -#: ../extensions/rename_series/dlg-rename-series.c:945 +#: ../extensions/rename_series/dlg-rename-series.c:951 msgid "Convert to lower-case" msgstr "Pretvori v male črke" -#: ../extensions/rename_series/dlg-rename-series.c:946 +#: ../extensions/rename_series/dlg-rename-series.c:952 msgid "Convert to upper-case" msgstr "Pretvori v velike črke" @@ -4273,11 +4275,7 @@ msgid "pixel" msgstr "točka" -#: ../extensions/resize_images/dlg-resize-images.c:168 -msgid "Resizing images" -msgstr "Spreminjanje v" - -#: ../extensions/resize_images/dlg-resize-images.c:412 +#: ../extensions/resize_images/dlg-resize-images.c:423 msgid "Keep the original format" msgstr "Ohrani izvirni zapis" @@ -4289,8 +4287,7 @@ msgid "Resize series of images." msgstr "Spremeni velikost zaporedja slik." -#: ../extensions/search/actions.c:49 -#: ../extensions/search/actions.c:117 +#: ../extensions/search/actions.c:49 ../extensions/search/actions.c:117 #: ../extensions/search/actions.c:123 msgid "Could not perform the search" msgstr "Ni mogoče izvesti iskanja" @@ -4344,33 +4341,36 @@ msgid "File search tool." msgstr "Orodje iskanja datotek." -#: ../extensions/selections/callbacks.c:62 +#: ../extensions/selections/callbacks.c:77 msgid "Add to _Selection" msgstr "Dodaj v iz_bor" -#: ../extensions/selections/callbacks.c:65 +#: ../extensions/selections/callbacks.c:86 msgid "Selection 1" msgstr "Izbor 1" -#: ../extensions/selections/callbacks.c:70 +#: ../extensions/selections/callbacks.c:91 msgid "Selection 2" msgstr "Izbor 2" -#: ../extensions/selections/callbacks.c:75 +#: ../extensions/selections/callbacks.c:96 msgid "Selection 3" msgstr "Izbor 3" -#: ../extensions/selections/callbacks.c:180 +#: ../extensions/selections/callbacks.c:285 #, c-format -msgid "Use Alt-%d to add files to this selection, Ctrl-%d to view this selection." -msgstr "Uporabi Alt-%d za dodajanje datotek temu izboru, Ctrl-%d za ogled tega izbora." +msgid "" +"Use Alt-%d to add files to this selection, Ctrl-%d to view this selection." +msgstr "" +"Uporabi Alt-%d za dodajanje datotek temu izboru, Ctrl-%d za ogled tega " +"izbora." -#: ../extensions/selections/gth-selections-manager.c:250 +#: ../extensions/selections/gth-selections-manager.c:239 #, c-format msgid "Selection %d" msgstr "Izbor %d" -#: ../extensions/selections/gth-selections-manager.c:253 +#: ../extensions/selections/gth-selections-manager.c:242 #: ../extensions/selections/selections.extension.in.in.h:1 msgid "Selections" msgstr "Izbori" @@ -4427,7 +4427,7 @@ msgid "Remove the selected files" msgstr "Odstrani izbrane datoteke" -#: ../extensions/slideshow/gth-slideshow.c:229 +#: ../extensions/slideshow/gth-slideshow.c:231 msgid "Playing slideshow" msgstr "Predvajanje predstavitve" @@ -4556,10 +4556,6 @@ msgid "_Copy originals to destination" msgstr "_Kopiraj izvirnike na cilj" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 -msgid "_Resize if larger than:" -msgstr "_Spremeni velikost, če je večja kot:" - #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 msgid "_Adapt to the window width " msgstr "_Prilagodi okno širini" @@ -4600,36 +4596,36 @@ msgid "Image Attributes" msgstr "Atributi slike" -#: ../extensions/webalbums/gth-web-exporter.c:1802 +#: ../extensions/webalbums/gth-web-exporter.c:1800 msgid "Could not show the destination" msgstr "Ni mogoče pokazati cilja" -#: ../extensions/webalbums/gth-web-exporter.c:1838 +#: ../extensions/webalbums/gth-web-exporter.c:1836 msgid "The album has been created successfully." msgstr "Album je bil uspešno ustvarjen." -#: ../extensions/webalbums/gth-web-exporter.c:2106 -#: ../extensions/webalbums/gth-web-exporter.c:2133 +#: ../extensions/webalbums/gth-web-exporter.c:2104 +#: ../extensions/webalbums/gth-web-exporter.c:2132 msgid "Saving thumbnails" msgstr "Shranjevanje sličic" -#: ../extensions/webalbums/gth-web-exporter.c:2161 +#: ../extensions/webalbums/gth-web-exporter.c:2160 msgid "Saving HTML pages: Images" msgstr "Shranjevanje strani HTML: slike" -#: ../extensions/webalbums/gth-web-exporter.c:2219 +#: ../extensions/webalbums/gth-web-exporter.c:2218 msgid "Saving HTML pages: Indexes" msgstr "Shranjevanje strani HTML: kazala" -#: ../extensions/webalbums/gth-web-exporter.c:2502 +#: ../extensions/webalbums/gth-web-exporter.c:2503 msgid "Copying original images" msgstr "Kopiranje izvirnih slik" -#: ../extensions/webalbums/gth-web-exporter.c:2929 +#: ../extensions/webalbums/gth-web-exporter.c:2963 msgid "Could not find the style folder" msgstr "Ni mogoče najti mape slogov" -#: ../extensions/webalbums/gth-web-exporter.c:2967 +#: ../extensions/webalbums/gth-web-exporter.c:3001 msgid "Could not create a temporary folder" msgstr "Začasne mape ni mogoče ustvariti" @@ -4641,12 +4637,9 @@ msgid "Create static web albums." msgstr "Ustvari statične spletne albume." -#: ../gthumb/dlg-location.c:200 -#: ../gthumb/gth-browser.c:1250 -#: ../gthumb/gth-browser.c:1809 -#: ../gthumb/gth-browser.c:5899 -#: ../gthumb/gth-browser.c:5918 -#: ../gthumb/gth-browser.c:5942 +#: ../gthumb/dlg-location.c:200 ../gthumb/gth-browser.c:1396 +#: ../gthumb/gth-browser.c:1969 ../gthumb/gth-browser.c:6214 +#: ../gthumb/gth-browser.c:6233 ../gthumb/gth-browser.c:6257 #, c-format msgid "Could not load the position \"%s\"" msgstr "Ni mogoče naložiti položaja \"%s\"" @@ -4667,8 +4660,7 @@ msgid "Edit Filter" msgstr "Uredi filter" -#: ../gthumb/dlg-preferences-extensions.c:67 -#: ../gthumb/gth-filterbar.c:270 +#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:277 msgid "All" msgstr "Vse" @@ -4733,41 +4725,6 @@ msgid "_Restart" msgstr "_Znova zaženi" -#: ../gthumb/eggfileformatchooser.c:236 -#, c-format -msgid "File _Format: %s" -msgstr "_Vrsta datoteke: %s" - -#: ../gthumb/eggfileformatchooser.c:397 -#: ../gthumb/gth-main-default-tests.c:233 -msgid "All Files" -msgstr "Vse datoteke" - -#: ../gthumb/eggfileformatchooser.c:398 -msgid "All Supported Files" -msgstr "Vse podprte datoteke" - -#: ../gthumb/eggfileformatchooser.c:407 -msgid "By Extension" -msgstr "Po priponi" - -#: ../gthumb/eggfileformatchooser.c:422 -msgid "File Format" -msgstr "Vrsta datoteke" - -#: ../gthumb/eggfileformatchooser.c:440 -msgid "Extension(s)" -msgstr "Pripone" - -#: ../gthumb/eggfileformatchooser.c:681 -#, c-format -msgid "The program was not able to find out the file format you want to use for `%s'. Please make sure to use a known extension for that file or manually choose a file format from the list below." -msgstr "Ni mogoče določiti vrste datoteke, ki jo želite uporabiti za `%s'. Prepričajte se, da uporabljate znano pripono datoteke ali pa sami izberite vrsto datoteke iz spodnjega seznama." - -#: ../gthumb/eggfileformatchooser.c:688 -msgid "File format not recognized" -msgstr "Vrsta datoteka ni bila prepoznana" - #. For translators: This is a progress size indicator, for example: 230.4 MB of 512.8 MB #: ../gthumb/gio-utils.c:1351 #, c-format @@ -4802,7 +4759,7 @@ #. * the separator that your locale uses or use "%Id" instead #. * of "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2848 +#: ../gthumb/glib-utils.c:3068 #, c-format msgctxt "long time format" msgid "%d:%02d:%02d" @@ -4814,29 +4771,48 @@ #. * separator that your locale uses or use "%Id" instead of #. * "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2857 +#: ../gthumb/glib-utils.c:3077 #, c-format msgctxt "short time format" msgid "%d:%02d" msgstr "%d:%02d" -#: ../gthumb/gth-browser-actions-callbacks.c:400 -msgid "gthumb is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version." -msgstr "gthumb je prosta programska oprema; program lahko razširjate in/ali spreminjate pod pogoji Splošnega dovoljenja GNU (GNU General PublicLicense), kot ga je objavila ustanova Free Software Foundation; bodisi različice 2 ali (po vaši izbiri) katerekoli poznejše različice." - -#: ../gthumb/gth-browser-actions-callbacks.c:404 -msgid "gthumb is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details." -msgstr "gthumb se razširja v upanju, da bo uporaben, vendar BREZ VSAKRŠNEGA JAMSTVA; tudi brez posredne zagotovitve CENOVNE VREDNOSTI ali PRIMERNOSTI ZA DOLOČEN NAMEN. Za podrobnosti glejte besedilo GNU General Public License." - -#: ../gthumb/gth-browser-actions-callbacks.c:408 -msgid "You should have received a copy of the GNU General Public License along with gthumb. If not, see http://www.gnu.org/licenses/." -msgstr "Skupaj s programom bi morali dobiti tudi kopijo GNU splošne javne licence. V primeru, da je niste, si oglejte http://www.gnu.org/licenses/." +#: ../gthumb/gth-browser-actions-callbacks.c:414 +msgid "" +"gthumb is free software; you can redistribute it and/or modify it under the " +"terms of the GNU General Public License as published by the Free Software " +"Foundation; either version 2 of the License, or (at your option) any later " +"version." +msgstr "" +"gthumb je prosta programska oprema; program lahko razširjate in/ali " +"spreminjate pod pogoji Splošnega dovoljenja GNU (GNU General PublicLicense), " +"kot ga je objavila ustanova Free Software Foundation; bodisi različice 2 ali " +"(po vaši izbiri) katerekoli poznejše različice." + +#: ../gthumb/gth-browser-actions-callbacks.c:418 +msgid "" +"gthumb is distributed in the hope that it will be useful, but WITHOUT ANY " +"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " +"details." +msgstr "" +"gthumb se razširja v upanju, da bo uporaben, vendar BREZ VSAKRŠNEGA JAMSTVA; " +"tudi brez posredne zagotovitve CENOVNE VREDNOSTI ali PRIMERNOSTI ZA DOLOČEN " +"NAMEN. Za podrobnosti glejte besedilo GNU General Public License." -#: ../gthumb/gth-browser-actions-callbacks.c:427 +#: ../gthumb/gth-browser-actions-callbacks.c:422 +msgid "" +"You should have received a copy of the GNU General Public License along with " +"gthumb. If not, see http://www.gnu.org/licenses/." +msgstr "" +"Skupaj s programom bi morali dobiti tudi kopijo GNU splošne javne licence. V " +"primeru, da je niste, si oglejte http://www.gnu.org/licenses/." + +#: ../gthumb/gth-browser-actions-callbacks.c:441 msgid "An image viewer and browser for GNOME." msgstr "Brskalnik in pregledovalnik slik za GNOME." -#: ../gthumb/gth-browser-actions-callbacks.c:430 +#: ../gthumb/gth-browser-actions-callbacks.c:444 msgid "translator_credits" msgstr "" "Matej Urbančič, \n" @@ -4922,18 +4898,15 @@ msgid "Leave Fullscreen" msgstr "Zapusti celozaslonski način" -#: ../gthumb/gth-browser-actions-entries.h:144 -#: ../gthumb/gth-browser.c:3586 +#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3841 msgid "Go to the previous visited location" msgstr "Pojdi na predhodno obiskano mesto" -#: ../gthumb/gth-browser-actions-entries.h:150 -#: ../gthumb/gth-browser.c:3604 +#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3859 msgid "Go to the next visited location" msgstr "Pojdi na naslednje obiskano mesto" -#: ../gthumb/gth-browser-actions-entries.h:156 -#: ../gthumb/gth-browser.c:3622 +#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3877 msgid "Go up one level" msgstr "Pojdi eno raven višje" @@ -4945,8 +4918,7 @@ msgid "Specify a location to open" msgstr "Mesto za odpiranje" -#: ../gthumb/gth-browser-actions-entries.h:173 -#: ../gthumb/gth-browser.c:672 +#: ../gthumb/gth-browser-actions-entries.h:173 ../gthumb/gth-browser.c:721 msgid "_Delete History" msgstr "_Izbriši zgodovino" @@ -4974,93 +4946,95 @@ msgid "_Keyboard Shortcuts" msgstr "_Tipkovne bližnjice" -#: ../gthumb/gth-browser-actions-entries.h:206 +#: ../gthumb/gth-browser-actions-entries.h:203 +#: ../gthumb/gth-browser-actions-entries.h:257 +msgid "Edit" +msgstr "Uredi" + +#: ../gthumb/gth-browser-actions-entries.h:204 +#: ../gthumb/gth-browser-actions-entries.h:258 +msgid "Edit file" +msgstr "Uredi datoteko" + +#: ../gthumb/gth-browser-actions-entries.h:212 msgid "_Toolbar" msgstr "_Orodna vrstica" -#: ../gthumb/gth-browser-actions-entries.h:207 +#: ../gthumb/gth-browser-actions-entries.h:213 msgid "View or hide the toolbar of this window" msgstr "Pokaže ali skrije orodno vrstico tega okna" -#: ../gthumb/gth-browser-actions-entries.h:211 +#: ../gthumb/gth-browser-actions-entries.h:217 msgid "_Statusbar" msgstr "_Vrstica stanja" -#: ../gthumb/gth-browser-actions-entries.h:212 +#: ../gthumb/gth-browser-actions-entries.h:218 msgid "View or hide the statusbar of this window" msgstr "Pokaže ali skrije vrstico stanja tega okna" -#: ../gthumb/gth-browser-actions-entries.h:216 +#: ../gthumb/gth-browser-actions-entries.h:222 msgid "_Filterbar" msgstr "Vrstica _filtra" -#: ../gthumb/gth-browser-actions-entries.h:217 +#: ../gthumb/gth-browser-actions-entries.h:223 msgid "View or hide the filterbar of this window" msgstr "Pokaže ali skrije filtrirno vrstico tega okna" -#: ../gthumb/gth-browser-actions-entries.h:221 +#: ../gthumb/gth-browser-actions-entries.h:227 msgid "_Sidebar" msgstr "_Stranska vrstica" -#: ../gthumb/gth-browser-actions-entries.h:222 +#: ../gthumb/gth-browser-actions-entries.h:228 msgid "View or hide the sidebar of this window" msgstr "Pokaže ali skrije stransko vrstico tega okna" -#: ../gthumb/gth-browser-actions-entries.h:226 +#: ../gthumb/gth-browser-actions-entries.h:232 msgid "_Thumbnail Pane" msgstr "Pladenj s_ličic" -#: ../gthumb/gth-browser-actions-entries.h:227 +#: ../gthumb/gth-browser-actions-entries.h:233 msgid "View or hide the thumbnail pane in viewer mode" msgstr "Pokaže ali skrije pladenj sličic v načinu pregledovalnika" -#: ../gthumb/gth-browser-actions-entries.h:231 +#: ../gthumb/gth-browser-actions-entries.h:237 msgid "_Thumbnails" msgstr "_Sličice" -#: ../gthumb/gth-browser-actions-entries.h:232 +#: ../gthumb/gth-browser-actions-entries.h:238 msgid "View thumbnails" msgstr "Pogled sličic" -#: ../gthumb/gth-browser-actions-entries.h:236 +#: ../gthumb/gth-browser-actions-entries.h:242 msgid "_Hidden Files" msgstr "_Skrite datoteke" -#: ../gthumb/gth-browser-actions-entries.h:237 +#: ../gthumb/gth-browser-actions-entries.h:243 msgid "Show hidden files and folders" msgstr "Pokaže skrite datoteke in mape" -#: ../gthumb/gth-browser-actions-entries.h:242 -#: ../gthumb/gth-browser-actions-entries.h:247 +#: ../gthumb/gth-browser-actions-entries.h:248 +#: ../gthumb/gth-browser-actions-entries.h:253 msgid "View file properties" msgstr "Pogled lastnosti datoteke" -#: ../gthumb/gth-browser-actions-entries.h:251 -msgid "Edit" -msgstr "Uredi" - -#: ../gthumb/gth-browser-actions-entries.h:252 -msgid "Edit file" -msgstr "Uredi datoteko" - -#: ../gthumb/gth-browser-actions-entries.h:256 +#: ../gthumb/gth-browser-actions-entries.h:262 msgid "_Fit Window to Image" msgstr "_Prilagodi okno sliki" -#: ../gthumb/gth-browser-actions-entries.h:257 +#: ../gthumb/gth-browser-actions-entries.h:263 msgid "Resize the window to the size of the image" msgstr "Spremeni velikost okna na velikost slike" -#: ../gthumb/gth-browser.c:369 +#: ../gthumb/gth-browser.c:418 #, c-format msgid "Open %s" msgstr "Odpri %s" -#: ../gthumb/gth-browser.c:509 +#: ../gthumb/gth-browser.c:558 msgid "[modified]" msgstr "[spremenjeno]" -#: ../gthumb/gth-browser.c:1006 +#: ../gthumb/gth-browser.c:1117 #, c-format msgid "%d file selected (%s)" msgid_plural "%d files selected (%s)" @@ -5069,55 +5043,51 @@ msgstr[2] "%d izbrani datoteki (%s)" msgstr[3] "%d izbrane datoteke (%s)" -#: ../gthumb/gth-browser.c:1041 +#: ../gthumb/gth-browser.c:1152 #, c-format msgid "%s of free space" msgstr "%s neporabljenega prostora" -#: ../gthumb/gth-browser.c:1905 -#: ../gthumb/gth-browser.c:1932 +#: ../gthumb/gth-browser.c:2073 ../gthumb/gth-browser.c:2100 #, c-format msgid "No suitable module found for %s" msgstr "Primernega modula za %s ni bilo mogoče najti" -#: ../gthumb/gth-browser.c:2052 +#: ../gthumb/gth-browser.c:2219 #, c-format msgid "Save changes to file '%s'?" msgstr "Ali naj bodo spremembe datoteke '%s' shranjene?" -#: ../gthumb/gth-browser.c:2057 +#: ../gthumb/gth-browser.c:2224 msgid "If you don't save, changes to the file will be permanently lost." msgstr "V primeru, da sprememb ne shranite, bodo trajno izgubljene." -#: ../gthumb/gth-browser.c:2058 +#: ../gthumb/gth-browser.c:2225 msgid "Do _Not Save" msgstr "_Ne shrani" -#: ../gthumb/gth-browser.c:2828 -#: ../gthumb/gth-source-tree.c:182 +#: ../gthumb/gth-browser.c:3020 ../gthumb/gth-source-tree.c:182 msgid "Could not change name" msgstr "Ni mogoče spremeniti imena" -#: ../gthumb/gth-browser.c:3257 -#: ../gthumb/gth-main-default-metadata.c:41 +#: ../gthumb/gth-browser.c:3451 ../gthumb/gth-main-default-metadata.c:41 msgid "Modified" msgstr "Spremenjeno" -#: ../gthumb/gth-browser.c:3587 -#: ../gthumb/gth-browser.c:3605 +#: ../gthumb/gth-browser.c:3842 ../gthumb/gth-browser.c:3860 msgid "View the list of visited locations" msgstr "Pogled seznama obiskanih mest" -#: ../gthumb/gth-browser.c:3623 +#: ../gthumb/gth-browser.c:3878 msgid "View the list of upper locations" msgstr "Pogled seznama zgornjih mest" -#: ../gthumb/gth-browser.c:5900 +#: ../gthumb/gth-browser.c:6215 #, c-format msgid "File type not supported" msgstr "Vrsta datoteke ni podprta" -#: ../gthumb/gth-browser.c:5943 +#: ../gthumb/gth-browser.c:6258 #, c-format msgid "No suitable module found" msgstr "Ni mogoče najti primernega modula" @@ -5127,11 +5097,15 @@ msgid "Could not open the module `%s`: %s" msgstr "Ni mogoče odpreti modula `%s`: %s" -#: ../gthumb/gth-extensions.c:744 +#: ../gthumb/gth-extensions.c:754 #, c-format msgid "The extension '%1$s' is required by the extension '%2$s'" msgstr "Razširitev '%2$s' zahteva nameščeno tudi razširitev '%1$s'." +#: ../gthumb/gth-file-chooser-dialog.c:144 +msgid "All Supported Files" +msgstr "Vse podprte datoteke" + #: ../gthumb/gth-file-source-vfs.c:121 msgid "Home Folder" msgstr "Domača mapa" @@ -5141,7 +5115,9 @@ msgstr "Datotečni sistem" #: ../gthumb/gth-file-source-vfs.c:739 -msgid "The files cannot be moved to the Trash. Do you want to delete them permanently?" +msgid "" +"The files cannot be moved to the Trash. Do you want to delete them " +"permanently?" msgstr "Datotek ni mogoče premakniti v smeti. Ali jih želite trajno izbrisati?" #: ../gthumb/gth-file-source-vfs.c:750 @@ -5157,45 +5133,50 @@ #, c-format msgid "Are you sure you want to move to trash the %'d selected file?" msgid_plural "Are you sure you want to move to trash the %'d selected files?" -msgstr[0] "Ali ste prepričani, da želite %'d izbranih datotek premakniti v smeti?" -msgstr[1] "Ali ste prepričani, da želite %'d izbrano datoteko premakniti v smeti?" -msgstr[2] "Ali ste prepričani, da želite %'d izbrani datoteki premakniti v smeti?" -msgstr[3] "Ali ste prepričani, da želite %'d izbrane datoteke premakniti v smeti?" +msgstr[0] "" +"Ali ste prepričani, da želite %'d izbranih datotek premakniti v smeti?" +msgstr[1] "" +"Ali ste prepričani, da želite %'d izbrano datoteko premakniti v smeti?" +msgstr[2] "" +"Ali ste prepričani, da želite %'d izbrani datoteki premakniti v smeti?" +msgstr[3] "" +"Ali ste prepričani, da želite %'d izbrane datoteke premakniti v smeti?" #: ../gthumb/gth-file-source-vfs.c:844 #, c-format msgid "Are you sure you want to permanently delete the %'d selected file?" -msgid_plural "Are you sure you want to permanently delete the %'d selected files?" -msgstr[0] "Ali ste prepričani, da želite trajno izbrisati %'d izbranih datotek?" -msgstr[1] "Ali ste prepričani, da želite trajno izbrisati %'d izbrano datoteko?" -msgstr[2] "Ali ste prepričani, da želite trajno izbrisati %'d izbrani datoteki?" -msgstr[3] "Ali ste prepričani, da želite trajno izbrisati %'d izbrane datoteke?" +msgid_plural "" +"Are you sure you want to permanently delete the %'d selected files?" +msgstr[0] "" +"Ali ste prepričani, da želite trajno izbrisati %'d izbranih datotek?" +msgstr[1] "" +"Ali ste prepričani, da želite trajno izbrisati %'d izbrano datoteko?" +msgstr[2] "" +"Ali ste prepričani, da želite trajno izbrisati %'d izbrani datoteki?" +msgstr[3] "" +"Ali ste prepričani, da želite trajno izbrisati %'d izbrane datoteke?" -#: ../gthumb/gth-filterbar.c:406 +#: ../gthumb/gth-filterbar.c:413 msgid "Hide the filterbar" msgstr "Skrij vrstico filtra" -#: ../gthumb/gth-filter.c:43 -#: ../gthumb/gth-filter-editor-dialog.c:178 +#: ../gthumb/gth-filter.c:43 ../gthumb/gth-filter-editor-dialog.c:178 #: ../gthumb/gth-test-simple.c:75 msgid "kB" msgstr "kB" -#: ../gthumb/gth-filter.c:44 -#: ../gthumb/gth-filter-editor-dialog.c:179 +#: ../gthumb/gth-filter.c:44 ../gthumb/gth-filter-editor-dialog.c:179 #: ../gthumb/gth-test-simple.c:76 msgid "MB" msgstr "MB" -#: ../gthumb/gth-filter.c:45 -#: ../gthumb/gth-filter-editor-dialog.c:180 +#: ../gthumb/gth-filter.c:45 ../gthumb/gth-filter-editor-dialog.c:180 #: ../gthumb/gth-test-simple.c:77 msgid "GB" msgstr "GB" #. "files" label -#: ../gthumb/gth-filter.c:291 -#: ../gthumb/gth-filter-editor-dialog.c:177 +#: ../gthumb/gth-filter.c:286 ../gthumb/gth-filter-editor-dialog.c:177 msgid "files" msgstr "datoteke" @@ -5212,50 +5193,59 @@ msgid "No limit specified" msgstr "Omejitev ni navedena" -#: ../gthumb/gth-folder-tree.c:857 -msgid "Loading..." -msgstr "Nalaganje ..." - -#: ../gthumb/gth-folder-tree.c:1100 +#: ../gthumb/gth-folder-tree.c:1369 msgid "(Open Parent)" msgstr "(Odpri nadrejeno)" -#: ../gthumb/gth-histogram-view.c:826 +#: ../gthumb/gth-histogram-view.c:825 msgid "Linear scale" msgstr "Linearna skala" -#: ../gthumb/gth-histogram-view.c:838 +#: ../gthumb/gth-histogram-view.c:837 msgid "Logarithmic scale" msgstr "Logaritmska skala" -#: ../gthumb/gth-histogram-view.c:858 +#: ../gthumb/gth-histogram-view.c:857 msgid "Channel:" msgstr "Kanal:" -#: ../gthumb/gth-histogram-view.c:890 +#: ../gthumb/gth-histogram-view.c:878 msgid "Value" msgstr "Vrednost" -#: ../gthumb/gth-histogram-view.c:896 +#: ../gthumb/gth-histogram-view.c:883 msgid "Red" msgstr "Rdeča" -#: ../gthumb/gth-histogram-view.c:902 +#: ../gthumb/gth-histogram-view.c:888 msgid "Green" msgstr "Zelena" -#: ../gthumb/gth-histogram-view.c:908 +#: ../gthumb/gth-histogram-view.c:893 msgid "Blue" msgstr "Modra" -#: ../gthumb/gth-histogram-view.c:914 +#: ../gthumb/gth-histogram-view.c:898 msgid "Alpha" msgstr "Alfa" -#: ../gthumb/gth-histogram-view.c:921 +#: ../gthumb/gth-histogram-view.c:904 msgid "RGB" msgstr "RGB" +#: ../gthumb/gth-image-list-task.c:141 +msgid "Could not rename the file" +msgstr "Datoteke ni mogoče preimenovati" + +#: ../gthumb/gth-image-saver.c:39 +msgid "No options available for this file type" +msgstr "Za to vrsto datotek ni razpoložljivih možnosti" + +#: ../gthumb/gth-image-saver.c:185 +#, c-format +msgid "Could not find a suitable module to save the image as \"%s\"" +msgstr "Ni mogoče najti primernega modula za shranjevanje slike kot \"%s\"" + #: ../gthumb/gth-load-file-data-task.c:108 msgid "Reading file information" msgstr "Pridobivanje podrobnosti datoteke" @@ -5309,6 +5299,10 @@ msgid "dimensions" msgstr "mere" +#: ../gthumb/gth-main-default-tests.c:233 +msgid "All Files" +msgstr "Vse datoteke" + #: ../gthumb/gth-main-default-tests.c:261 msgid "Media" msgstr "Večpredstavnostna datoteka" @@ -5329,15 +5323,7 @@ msgid "Description (embedded)" msgstr "Opis (vključen)" -#: ../gthumb/gth-pixbuf-list-task.c:139 -msgid "Could not rename the file" -msgstr "Datoteke ni mogoče preimenovati" - -#: ../gthumb/gth-pixbuf-saver.c:34 -msgid "No options available for this file type" -msgstr "Za to vrsto datotek ni razpoložljivih možnosti" - -#: ../gthumb/gth-progress-dialog.c:144 +#: ../gthumb/gth-progress-dialog.c:146 msgid "Cancel operation" msgstr "Prekliči opravilo" @@ -5345,65 +5331,70 @@ msgid "Saving file information" msgstr "Shranjevanje podrobnosti datoteke" -#: ../gthumb/gth-tags-entry.c:388 +#. Translators: %s is a filename +#: ../gthumb/gth-save-image-task.c:160 +#, c-format +msgid "Saving '%s'" +msgstr "Shranjevanje '%s'" + +#: ../gthumb/gth-tags-entry.c:390 #, c-format msgid "Create tag «%s»" msgstr "Ustvari oznako «%s»" -#: ../gthumb/gth-tags-entry.c:735 +#: ../gthumb/gth-tags-entry.c:814 msgid "Show all the tags" msgstr "Pokaži vse oznake" -#: ../gthumb/gth-tags-file.c:236 +#: ../gthumb/gth-tags-file.c:235 msgid "Holidays" msgstr "Počitnice" -#: ../gthumb/gth-tags-file.c:237 +#: ../gthumb/gth-tags-file.c:236 msgid "Temporary" msgstr "Začasno" -#: ../gthumb/gth-tags-file.c:238 +#: ../gthumb/gth-tags-file.c:237 msgid "Screenshots" msgstr "Zajete slike" -#: ../gthumb/gth-tags-file.c:239 +#: ../gthumb/gth-tags-file.c:238 msgid "Science" msgstr "Znanost" -#: ../gthumb/gth-tags-file.c:240 +#: ../gthumb/gth-tags-file.c:239 msgid "Favorite" msgstr "Priljubljeno" -#: ../gthumb/gth-tags-file.c:241 +#: ../gthumb/gth-tags-file.c:240 msgid "Important" msgstr "Pomembno" -#: ../gthumb/gth-tags-file.c:242 +#: ../gthumb/gth-tags-file.c:241 msgid "GNOME" msgstr "GNOME" -#: ../gthumb/gth-tags-file.c:243 +#: ../gthumb/gth-tags-file.c:242 msgid "Games" msgstr "Igre" -#: ../gthumb/gth-tags-file.c:244 +#: ../gthumb/gth-tags-file.c:243 msgid "Party" msgstr "Zabava" -#: ../gthumb/gth-tags-file.c:245 +#: ../gthumb/gth-tags-file.c:244 msgid "Birthday" msgstr "Rojstni dan" -#: ../gthumb/gth-tags-file.c:246 +#: ../gthumb/gth-tags-file.c:245 msgid "Astronomy" msgstr "Astronomija" -#: ../gthumb/gth-tags-file.c:247 +#: ../gthumb/gth-tags-file.c:246 msgid "Family" msgstr "Družina" -#: ../gthumb/gth-test-category.c:46 -#: ../gthumb/gth-test-simple.c:49 +#: ../gthumb/gth-test-category.c:46 ../gthumb/gth-test-simple.c:49 #: ../gthumb/gth-test-simple.c:64 msgid "is" msgstr "je" @@ -5412,16 +5403,13 @@ msgid "is only" msgstr "je le" -#: ../gthumb/gth-test-category.c:48 -#: ../gthumb/gth-test-simple.c:50 +#: ../gthumb/gth-test-category.c:48 ../gthumb/gth-test-simple.c:50 #: ../gthumb/gth-test-simple.c:65 msgid "is not" msgstr "ni" -#: ../gthumb/gth-test-category.c:394 -#: ../gthumb/gth-test-simple.c:812 -#: ../gthumb/gth-test-simple.c:838 -#: ../gthumb/gth-test-simple.c:859 +#: ../gthumb/gth-test-category.c:407 ../gthumb/gth-test-simple.c:812 +#: ../gthumb/gth-test-simple.c:838 ../gthumb/gth-test-simple.c:859 #: ../gthumb/gth-test-simple.c:885 #, c-format msgid "The test definition is incomplete" @@ -5475,11 +5463,11 @@ msgid "is after" msgstr "je po" -#: ../gthumb/gth-time-selector.c:477 +#: ../gthumb/gth-time-selector.c:478 msgid "Today" msgstr "Danes" -#: ../gthumb/gth-time-selector.c:485 +#: ../gthumb/gth-time-selector.c:486 msgid "Now" msgstr "Sedaj" @@ -5491,57 +5479,123 @@ msgid "Close _All Windows" msgstr "Zapri _vsa okna" -#: ../gthumb/gtk-utils.c:551 +#: ../gthumb/gtk-utils.c:490 msgid "Could not display help" msgstr "Pomoči ni mogoče prikazati" -#: ../gthumb/gtk-utils.c:868 -#: ../gthumb/gtk-utils.c:875 +#: ../gthumb/gtk-utils.c:810 ../gthumb/gtk-utils.c:817 msgid "Could not launch the application" msgstr "Programa ni mogoče zagnati" -#: ../gthumb/gtk-utils.c:978 +#: ../gthumb/gtk-utils.c:920 msgid "_Copy Here" msgstr "_Kopiraj sem" -#: ../gthumb/gtk-utils.c:983 +#: ../gthumb/gtk-utils.c:925 msgid "_Move Here" msgstr "_Premakni sem" -#: ../gthumb/gtk-utils.c:988 +#: ../gthumb/gtk-utils.c:930 msgid "_Link Here" msgstr "_Poveži sem" -#: ../gthumb/gtk-utils.c:997 +#: ../gthumb/gtk-utils.c:939 msgid "Cancel" msgstr "Prekliči" -#: ../gthumb/main.c:59 +#: ../gthumb/main.c:61 msgid "Open a new window" msgstr "Odpri novo okno" -#: ../gthumb/main.c:63 +#: ../gthumb/main.c:65 msgid "Start in fullscreen mode" msgstr "Zaženi v celozaslonskem načinu" -#: ../gthumb/main.c:67 +#: ../gthumb/main.c:69 msgid "Automatically start a slideshow" msgstr "Samodejno začni predstavitev" -#: ../gthumb/main.c:71 +#: ../gthumb/main.c:73 msgid "Automatically import digital camera photos" msgstr "Samodejno uvozi fotografije iz digitalnega fotoaparata" -#: ../gthumb/main.c:75 +#: ../gthumb/main.c:77 msgid "Show version" msgstr "Pokaži različico" -#: ../gthumb/main.c:344 +#: ../gthumb/main.c:483 msgid "- Image browser and viewer" msgstr "- Brskalnik in pregledovalnik slik" -#: ../gthumb/pixbuf-io.c:174 -#, c-format -msgid "Could not find a suitable module to save the image as \"%s\"" -msgstr "Ni mogoče najti primernega modula za shranjevanje slike kot \"%s\"" +#~ msgid "_Resize to:" +#~ msgstr "Sp_remeni velikost v:" + +#~ msgid "_E-Mail:" +#~ msgstr "_Elektronska pošta:" + +#~ msgid "" +#~ "Type the characters you see in the picture below. Letters are not case-" +#~ "sensitive." +#~ msgstr "" +#~ "Vnesite znake, ki jih vidite na sliki spodaj. Črke niso občutljive na " +#~ "velikost." + +#~ msgid "_Password:" +#~ msgstr "_Geslo:" + +#~ msgid "Picasa Web Album" +#~ msgstr "Spletni album Picasa" + +#~ msgid "Account" +#~ msgstr "Račun" + +#~ msgid "Could not load the file" +#~ msgstr "Ni mogoče naložiti datoteke" + +#~ msgid "Exif DateTimeOriginal tag" +#~ msgstr "Exif oznaka IzvorniDatumČas" + +#~ msgid "×" +#~ msgstr "×" + +#~ msgid "Desaturate" +#~ msgstr "Zmanjšaj nasičenje" + +#~ msgid "White balance correction" +#~ msgstr "Popravljanje ravnotežja bele barve" + +#~ msgid "Enhance Colors" +#~ msgstr "Izboljšaj barve" + +#~ msgid "Automatic white balance correction" +#~ msgstr "Samodejno popravi ravnotežje bele barve" + +#~ msgid "Save images" +#~ msgstr "Shrani slike" + +#~ msgid "Save images in common file formats such as JPEG, PNG and TIFF" +#~ msgstr "Shrani slike v običajnih vrstah datotek kot so JPEG, PNG in TIFF" + +#~ msgid "File _Format: %s" +#~ msgstr "_Vrsta datoteke: %s" + +#~ msgid "By Extension" +#~ msgstr "Po priponi" + +#~ msgid "File Format" +#~ msgstr "Vrsta datoteke" + +#~ msgid "Extension(s)" +#~ msgstr "Pripone" + +#~ msgid "" +#~ "The program was not able to find out the file format you want to use for `" +#~ "%s'. Please make sure to use a known extension for that file or manually " +#~ "choose a file format from the list below." +#~ msgstr "" +#~ "Ni mogoče določiti vrste datoteke, ki jo želite uporabiti za `%s'. " +#~ "Prepričajte se, da uporabljate znano pripono datoteke ali pa sami " +#~ "izberite vrsto datoteke iz spodnjega seznama." +#~ msgid "File format not recognized" +#~ msgstr "Vrsta datoteka ni bila prepoznana" diff -Nru gthumb-3.0.2/po/sr.po gthumb-3.2.3/po/sr.po --- gthumb-3.0.2/po/sr.po 2012-08-14 16:25:43.000000000 +0000 +++ gthumb-3.2.3/po/sr.po 2013-04-30 16:56:13.000000000 +0000 @@ -1,3757 +1,5526 @@ # Serbian translation of gthumb # Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005. -# # This file is distributed under the same license as the gthumb package. -# # Maintainer: Душан Живојнов -# +# Саша Петровић , 2013. +# Мирослав Николић , 2013. msgid "" msgstr "" "Project-Id-Version: gThumb\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-06-10 19:43+0200\n" -"PO-Revision-Date: 2005-06-10 19:43+0200\n" -"Last-Translator: Данило Шеган \n" -"Language-Team: Serbian (sr) \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gthumb" +"&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-02-16 21:21+0000\n" +"PO-Revision-Date: 2013-02-20 20:15+0200\n" +"Last-Translator: Мирослав Николић \n" +"Language-Team: Serbian \n" +"Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : " +"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Project-Style: gnome\n" -#: ../components/catalog-view/GNOME_GThumb_CatalogView.server.in.in.h:1 -msgid "Catalog" -msgstr "Kаталог" - -#: ../components/catalog-view/GNOME_GThumb_CatalogView.server.in.in.h:2 -msgid "GThumb Catalog View" -msgstr "GThumb Каталошки преглед" - -#: ../components/catalog-view/GNOME_GThumb_CatalogView.server.in.in.h:3 -msgid "View as Catalog" -msgstr "Погледај као каталог" - -#: ../components/catalog-view/GNOME_GThumb_CatalogView.xml.in.h:1 -#: ../src/gth-window-actions-entries.h:62 -msgid "Print the current image" -msgstr "Штампај тренутну слику" - -#: ../components/catalog-view/GNOME_GThumb_CatalogView.xml.in.h:2 -msgid "_Print" -msgstr "_Штампај" - -#: ../components/image-viewer/GNOME_GThumb_Viewer.server.in.in.h:1 -msgid "GThumb Image" -msgstr "GThumb слика" - -#: ../components/image-viewer/GNOME_GThumb_Viewer.server.in.in.h:2 -msgid "GThumb Viewer" -msgstr "GThumb прегледач" - -#: ../components/image-viewer/GNOME_GThumb_Viewer.server.in.in.h:3 -msgid "View with GThumb" -msgstr "Погледати са GThumb-ом" - -#: ../components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:1 -msgid "Flip" -msgstr "Преокрени" - -#: ../components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:2 -msgid "Flip the image" -msgstr "Преокрени слику" - -#: ../components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:3 -msgid "High" -msgstr "Високо" - -#: ../components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:4 -msgid "Low" -msgstr "Ниско" - -#: ../components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:5 -msgid "Mirror" -msgstr "Одраз" - -#: ../components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:6 -msgid "Mirror the image" -msgstr "Направи одраз слике" - -#: ../components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:7 -msgid "Rotate" -msgstr "Окрени" - -#: ../components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:8 -msgid "Rotate 180 _Degrees" -msgstr "Окрени за 180 степени" - -#: ../components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:9 -msgid "Rotate the image clockwise" -msgstr "Окрени слику у правцу казаљке на сату" - -#: ../components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:10 -msgid "Rotate the image of 180 degrees" -msgstr "Окрени слику за 180 степени" - -#: ../components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:11 -msgid "Save _As..." -msgstr "Сачувај _као..." - -#: ../components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:12 -#: ../src/gth-window-actions-entries.h:47 -#: ../src/gth-window-actions-entries.h:52 -msgid "Save current image" -msgstr "Сачувај тренутну слику" - -#: ../components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:13 -#: ../src/gth-window-actions-entries.h:263 -msgid "Start or stop current animation" -msgstr "Покрени или заустави тренутну анимацију" - -#: ../components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:14 -msgid "Start/Stop _Animation" -msgstr "Покрени/Заустави _анимацију" - -#: ../components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:15 -msgid "Transparency T_ype" -msgstr "Вр_ста провидности" - -#: ../components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:16 -#: ../src/gth-window-actions-entries.h:197 -msgid "View next animation frame" -msgstr "Погледај следећи оквир анимације" - -#: ../components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:17 -msgid "_Black" -msgstr "_Црно" - -#: ../components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:18 -msgid "_Checked" -msgstr "_Потврђено" - -#: ../components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:19 -#: ../src/gth-window-actions-entries.h:96 -msgid "_Flip" -msgstr "_Преокрени" - -#: ../components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:20 -#: ../src/gth-browser-actions-entries.h:46 -#: ../src/gth-browser-actions-entries.h:453 -#: ../src/gth-viewer-actions-entries.h:40 -msgid "_Image" -msgstr "_Слика" - -#: ../components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:21 -#: ../src/gth-window-actions-entries.h:101 -msgid "_Mirror" -msgstr "_Одраз" - -#: ../components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:22 -msgid "_None" -msgstr "_Ниједнa" - -#: ../components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:23 -msgid "_Rotate Clockwise" -msgstr "_Окрени у правцу казаљке на сату" - -#: ../components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:24 -msgid "_Step Animation" -msgstr "Анимација у _корацима" - -#: ../components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:25 -#: ../data/glade/gthumb_search.glade.h:30 -#: ../data/glade/gthumb_tools.glade.h:42 -#: ../src/gth-browser-actions-entries.h:41 -#: ../src/gth-viewer-actions-entries.h:37 -msgid "_View" -msgstr "П_реглед" - -#: ../components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:26 -msgid "_White" -msgstr "_Бело" - -#: ../components/image-viewer/GNOME_GThumb_Viewer.xml.in.h:27 -msgid "_Zoom Quality" -msgstr "_Квалитет увећања" - -#: ../components/image-viewer/viewer-stream.c:90 ../src/dlg-file-utils.c:526 -msgid "%d %b %Y, %H:%M" -msgstr "%d %b %Y, %H:%M" - -#: ../components/image-viewer/viewer-stream.c:99 -#: ../src/catalog-png-exporter.c:815 ../src/dlg-image-prop.c:425 -#: ../src/gth-browser.c:474 ../src/gth-exif-data-viewer.c:468 -#: ../src/gth-fullscreen.c:652 ../src/gth-viewer.c:541 -#, c-format -msgid "%d x %d pixels" -msgstr "%d x %d тачака" - -#: ../data/GNOME_GThumb.server.in.in.h:1 -msgid "GThumb Application" -msgstr "GThumb програм" - -#: ../data/GNOME_GThumb.server.in.in.h:2 -msgid "GThumb Application Factory" -msgstr "Фабрика GThumb програма" +#: ../copy-n-paste/eggdesktopfile.c:165 +#, c-format +msgid "File is not a valid .desktop file" +msgstr "Ово није исправна датотека радне површи" -#: ../data/albumthemes/text.h:27 ../src/dlg-duplicates.c:266 -msgid "Image" -msgstr "Слика" +#. translators: 'Version' is from a desktop file, and +#. * should not be translated. '%s' would probably be a +#. * version number. +#: ../copy-n-paste/eggdesktopfile.c:191 +#, c-format +msgid "Unrecognized desktop file Version '%s'" +msgstr "Непознато издање датотеке радне површи „%s“" -#: ../data/albumthemes/text.h:28 -msgid "Dimensions" -msgstr "Величина" +#: ../copy-n-paste/eggdesktopfile.c:974 +#, c-format +msgid "Starting %s" +msgstr "Покрећем %s" -#: ../data/albumthemes/text.h:29 ../src/dlg-image-prop.c:616 -#: ../src/gth-exif-data-viewer.c:497 -msgid "Bytes" -msgstr "Бајтова" +#: ../copy-n-paste/eggdesktopfile.c:1116 +#, c-format +msgid "Application does not accept documents on command line" +msgstr "Програм не прихвата документе у линији наредби" -#: ../data/albumthemes/text.h:30 -msgid "Date" -msgstr "Датум" +#: ../copy-n-paste/eggdesktopfile.c:1184 +#, c-format +msgid "Unrecognized launch option: %d" +msgstr "Нисам препознао могућност покретања: %d" -#: ../data/albumthemes/text.h:31 -msgid "Exposure time" -msgstr "Дужина експозиције" - -#: ../data/albumthemes/text.h:32 -msgid "Exposure mode" -msgstr "Начин експозиције" - -#: ../data/albumthemes/text.h:33 -msgid "Flash" -msgstr "Блиц" - -#: ../data/albumthemes/text.h:34 -msgid "Shutter speed" -msgstr "Брзина затварача" - -#: ../data/albumthemes/text.h:35 -msgid "Aperture value" -msgstr "Величина отвора" - -#: ../data/albumthemes/text.h:36 -msgid "Focal length" -msgstr "Жижна даљина" - -#: ../data/albumthemes/text.h:37 -msgid "Camera model" -msgstr "Модел камере" +#. translators: The 'Type=Link' string is found in a +#. * desktop file, and should not be translated. +#: ../copy-n-paste/eggdesktopfile.c:1391 +#, c-format +msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +msgstr "" +"Не могу да проследим адресе докумената на „Type=Link“ улаз радне површи" -#: ../data/albumthemes/text.h:38 ../data/glade/gthumb_edit.glade.h:33 -msgid "pixels" -msgstr "тачака" +#: ../copy-n-paste/eggdesktopfile.c:1412 +#, c-format +msgid "Not a launchable item" +msgstr "Није ставка која се може покренути" -#: ../data/glade/gthumb.glade.h:1 ../data/glade/gthumb_convert.glade.h:1 -#: ../data/glade/gthumb_crop.glade.h:1 ../data/glade/gthumb_edit.glade.h:1 -#: ../data/glade/gthumb_png_exporter.glade.h:1 -#: ../data/glade/gthumb_preferences.glade.h:1 -#: ../data/glade/gthumb_print.glade.h:1 ../data/glade/gthumb_tools.glade.h:1 -#: ../data/glade/gthumb_web_exporter.glade.h:1 -msgid " " -msgstr " " - -#: ../data/glade/gthumb.glade.h:2 ../data/glade/gthumb_convert.glade.h:2 -msgid "*" -msgstr "*" - -#: ../data/glade/gthumb.glade.h:3 -msgid "Categories:" -msgstr "Категорије:" - -#: ../data/glade/gthumb.glade.h:4 -msgid "Information on Channel:" -msgstr "Информација о каналу:" - -#: ../data/glade/gthumb.glade.h:5 -msgid "Overwrite the old image with the new one?" -msgstr "Преписати стари слику са новом?" - -#: ../data/glade/gthumb.glade.h:6 -msgid "A_vailable applications:" -msgstr "_Доступни програми:" +#: ../copy-n-paste/eggsmclient.c:226 +msgid "Disable connection to session manager" +msgstr "Онемогући везу са управником сесије" -#: ../data/glade/gthumb.glade.h:7 -msgid "Alpha" -msgstr "Алфа" +#: ../copy-n-paste/eggsmclient.c:229 +msgid "Specify file containing saved configuration" +msgstr "Наведите датотеку која садржи сачувана подешавања" -#: ../data/glade/gthumb.glade.h:8 -msgid "Blue" -msgstr "Плава" +#: ../copy-n-paste/eggsmclient.c:229 +msgid "FILE" +msgstr "ДАТОТЕКА" -#: ../data/glade/gthumb.glade.h:9 -msgid "Bookmarks" -msgstr "Обележивачи" +#: ../copy-n-paste/eggsmclient.c:232 +msgid "Specify session management ID" +msgstr "Наводи ИБ управника сесије" -#: ../data/glade/gthumb.glade.h:10 -msgid "C_atalogs:" -msgstr "К_аталози:" +#: ../copy-n-paste/eggsmclient.c:232 +msgid "ID" +msgstr "ИБ" -#: ../data/glade/gthumb.glade.h:11 -msgid "Choose a Catalog" -msgstr "Одабери каталог" +#: ../copy-n-paste/eggsmclient.c:253 +msgid "Session management options:" +msgstr "Могућности управљања сесијом:" -#: ../data/glade/gthumb.glade.h:12 ../src/gth-window-actions-entries.h:71 -msgid "Comm_ent" -msgstr "Ком_ентар" +#: ../copy-n-paste/eggsmclient.c:254 +msgid "Show session management options" +msgstr "Приказује могућности управљања сесијом" -#: ../data/glade/gthumb.glade.h:13 -msgid "Do not overwrite _the old image" -msgstr "Немој преписати _стари каталог" +#. manually set name and icon +#: ../data/gthumb.desktop.in.in.h:1 ../gthumb/gth-browser.c:578 +#: ../gthumb/gth-progress-dialog.c:390 ../gthumb/main.c:315 +msgid "gThumb" +msgstr "Гномов сличко" -#: ../data/glade/gthumb.glade.h:14 -msgid "Green" -msgstr "Зелена" +#: ../data/gthumb.desktop.in.in.h:2 +msgid "Image Viewer" +msgstr "Прегледник слика" -#: ../data/glade/gthumb.glade.h:15 -msgid "New Image:" -msgstr "Нова слика:" +#: ../data/gthumb.desktop.in.in.h:3 +msgid "gThumb Image Viewer" +msgstr "Прегледач слика Гномов сличко" -#: ../data/glade/gthumb.glade.h:16 -msgid "New _Library" -msgstr "Нова _библиотека:" +#: ../data/gthumb.desktop.in.in.h:4 +msgid "View and organize your images" +msgstr "Погледајте и средите своје слике" -#: ../data/glade/gthumb.glade.h:17 -msgid "Old Image:" -msgstr "Стара слика:" +#: ../data/gthumb-import.desktop.in.in.h:1 +msgid "Import with gThumb" +msgstr "Увезите са Гномовим сличком" -#: ../data/glade/gthumb.glade.h:18 -msgid "Open Images" -msgstr "Отворити слике" +#: ../data/gthumb-import.desktop.in.in.h:2 +msgid "Photo Import Tool" +msgstr "Алатка за увоз слика" -#: ../data/glade/gthumb.glade.h:19 -msgid "Over_write the old image" -msgstr "Пре_пиши старе слике" +#: ../data/gthumb-import.desktop.in.in.h:3 +msgid "gThumb Photo Import Tool" +msgstr "Алатка за увоз слика Гномов сличко" -#: ../data/glade/gthumb.glade.h:20 -msgid "Overwrite Image" -msgstr "Препиши слику" +#: ../data/gthumb-import.desktop.in.in.h:4 +msgid "Import the photos on your camera card" +msgstr "Увези слике из картице фотоапарата" -#: ../data/glade/gthumb.glade.h:21 -msgid "Overwrite _all images" -msgstr "Препиши _све слике" +#: ../data/org.gnome.gthumb.gschema.xml.in.h:1 +msgid "" +"Images over this size (in bytes) will not be thumbnailed. Use 0 if you want " +"to generate thumbnails for all images." +msgstr "" +"Слике преко ове величине (у бајтовима) неће имати умањени приказ. Користите " +"0 уколико желите да видите умањени приказ за све слике." -#: ../data/glade/gthumb.glade.h:22 -msgid "Photo _Data (EXIF)" -msgstr "Фотографски _подаци (EXIF)" +#: ../data/org.gnome.gthumb.gschema.xml.in.h:2 +msgid "Whether to resize the window to fit the size of the image" +msgstr "Да ли изменити прозор да се уклопи са величином слике" + +#: ../data/org.gnome.gthumb.gschema.xml.in.h:3 +msgid "Open files in the active window" +msgstr "Отвори датотеке у радном прозору" -#: ../data/glade/gthumb.glade.h:23 -msgid "R_ecent applications:" -msgstr "_Скорији програми:" +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:1 +msgid "Possible values are: white, black, checked, none." +msgstr "Дозвољене вредности су: white, black, checked, none." -#: ../data/glade/gthumb.glade.h:24 -msgid "Red" -msgstr "Црвена" +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:2 +msgid "Whether to reset the scrollbars position after changing image" +msgstr "Да ли вратити положај шине премицања на почетни после измене слике" -#: ../data/glade/gthumb.glade.h:25 -msgid "Value" -msgstr "Вредност" +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:3 +msgid "Whether to always use a black background." +msgstr "Да ли да увек користи црну позадину." -#: ../data/glade/gthumb.glade.h:26 -msgid "_Application:" -msgstr "_Програм:" +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:1 +msgid "Possible values are: jpeg, jpg." +msgstr "Дозвољене вредности су: png, jpeg." -#: ../data/glade/gthumb.glade.h:27 ../src/gth-folder-selection-dialog.c:445 -msgid "_Bookmarks:" -msgstr "_Обележивачи" +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:2 +msgid "Possible values are: tiff, tif." +msgstr "Дозвољене вредности су: tiff, tif." -#: ../data/glade/gthumb.glade.h:28 -msgid "_Do not overwrite any image" -msgstr "_Немој преписати ниједну слику" - -#: ../data/glade/gthumb.glade.h:29 -msgid "_General" -msgstr "_Опште" - -#: ../data/glade/gthumb.glade.h:30 -msgid "_Histogram" -msgstr "_Хистограм" +#: ../data/org.gnome.gthumb.rename-series.gschema.xml.in.h:1 +msgid "" +"Possible values include: general::unsorted, file::name, file::size, file::" +"mtime, exif::photo::datetimeoriginal" +msgstr "" +"У могуће вредности спадају: general::unsorted, file::name, file::size, file::" +"mtime, exif::photo::datetimeoriginal" -#: ../data/glade/gthumb.glade.h:31 -msgid "_New Catalog" -msgstr "_Нови каталог" +#: ../data/ui/extensions-preferences.ui.h:1 +msgid "_Extensions:" +msgstr "_Проширења:" + +#: ../data/ui/extensions-preferences.ui.h:2 +msgid "More extensions..." +msgstr "Још проширења..." + +#: ../data/ui/extensions-preferences.ui.h:3 +msgid "Some extensions are configurable." +msgstr "Нека проширења се могу подешавати." + +#: ../data/ui/filter-editor.ui.h:1 +msgid "Filter _Name:" +msgstr "Услов је _назив:" + +#: ../data/ui/filter-editor.ui.h:2 +#: ../extensions/search/data/ui/search-editor.ui.h:3 +msgid "_Match" +msgstr "_Поклапање" + +#. limit label +#: ../data/ui/filter-editor.ui.h:3 ../gthumb/gth-filter.c:269 +#: ../gthumb/gth-filter.c:337 +msgid "_Limit to" +msgstr "_Ограничи на" + +#: ../data/ui/filter-editor.ui.h:4 +msgid "selected by" +msgstr "одабрана по" + +#: ../data/ui/histogram-info.ui.h:1 +msgid "Mean:" +msgstr "Значи:" + +#. Short for "Standard deviation". Try to keep it under the 12 characters in the translation or it will be ellipsizied at the end. +#: ../data/ui/histogram-info.ui.h:3 +msgid "Std dev:" +msgstr "Стд одступање:" + +#: ../data/ui/histogram-info.ui.h:4 +msgid "Median:" +msgstr "Средња вредност:" + +#. After the colon there is the total number of pixels +#: ../data/ui/histogram-info.ui.h:6 +msgid "Pixels:" +msgstr "Тачкице:" + +#. After the colon there is a percentile. +#: ../data/ui/histogram-info.ui.h:8 +msgctxt "Pixels" +msgid "Max:" +msgstr "Највише:" + +#. After the colon there is the percentile of selected pixels. +#: ../data/ui/histogram-info.ui.h:10 +msgctxt "Pixels" +msgid "Selected:" +msgstr "Означено:" -#: ../data/glade/gthumb.glade.h:32 -msgid "_Next" -msgstr "_Следеће" - -#: ../data/glade/gthumb.glade.h:33 -msgid "_Previous" -msgstr "_Претходно" - -#: ../data/glade/gthumb.glade.h:34 -msgid "_Remove" -msgstr "Укл_они" - -#: ../data/glade/gthumb.glade.h:35 -msgid "_Save the new image as:" -msgstr "_Сачувај нову слику као:" - -#: ../data/glade/gthumb_camera.glade.h:1 ../data/glade/gthumb_search.glade.h:1 -#: ../data/glade/gthumb_web_exporter.glade.h:3 -msgid "..." -msgstr "..." - -#: ../data/glade/gthumb_camera.glade.h:2 ../data/glade/gthumb_search.glade.h:8 -msgid "Ca_tegories:" -msgstr "Ка_тегорије:" - -#: ../data/glade/gthumb_camera.glade.h:3 -msgid "Camera Model" -msgstr "Модел камере" - -#: ../data/glade/gthumb_camera.glade.h:4 -#: ../data/glade/gthumb_png_exporter.glade.h:24 -#: ../data/glade/gthumb_web_exporter.glade.h:19 -msgid "Choose destination folder" -msgstr "Одабери одредишни директоријум" +#: ../data/ui/location.ui.h:1 +msgid "_Location:" +msgstr "_Место:" -#: ../data/glade/gthumb_camera.glade.h:5 -msgid "Delete selected images from the camera" -msgstr "Уклони одабране слике из камере" +#: ../data/ui/overwrite-dialog.ui.h:1 +msgid "Overwrite the old file with the new one?" +msgstr "Заменити стару датотеку са новом?" + +#: ../data/ui/overwrite-dialog.ui.h:2 +msgid "Old File:" +msgstr "Стара датотека:" + +#: ../data/ui/overwrite-dialog.ui.h:3 +msgid "Filename:" +msgstr "Назив датотеке:" + +#: ../data/ui/overwrite-dialog.ui.h:4 +#: ../extensions/image_print/data/ui/print-layout.ui.h:23 +msgid "Size:" +msgstr "Величина:" + +#: ../data/ui/overwrite-dialog.ui.h:5 +msgid "Modified:" +msgstr "Измењена:" + +#: ../data/ui/overwrite-dialog.ui.h:6 +msgid "New File:" +msgstr "Нова датотека:" + +#: ../data/ui/overwrite-dialog.ui.h:7 +msgid "Over_write the old file" +msgstr "Препиши _стару датотеку" + +#: ../data/ui/overwrite-dialog.ui.h:8 +msgid "Do not overwrite _the old file" +msgstr "Немој преписати _стару датотеку" + +#: ../data/ui/overwrite-dialog.ui.h:9 +msgid "Overwrite _all files" +msgstr "Препиши _све датотеке" + +#: ../data/ui/overwrite-dialog.ui.h:10 +msgid "_Do not overwrite any file" +msgstr "_Немој преписати ни једну датотеку" + +#: ../data/ui/overwrite-dialog.ui.h:11 +msgid "_Save the new file as:" +msgstr "_Сачувај нову датотеку као:" + +#: ../data/ui/personalize-filters.ui.h:1 +msgid "Filters" +msgstr "Услови" + +#: ../data/ui/personalize-filters.ui.h:2 +msgid "_General filter:" +msgstr "_Општи услови:" + +#: ../data/ui/personalize-filters.ui.h:3 +msgid "_Other filters:" +msgstr "Други _услови:" + +#: ../data/ui/preferences.ui.h:1 +msgid "below the folder list" +msgstr "испод списка фасцикли" + +#: ../data/ui/preferences.ui.h:2 +msgid "on the right" +msgstr "с’ десна" -#: ../data/glade/gthumb_camera.glade.h:6 -msgid "Import Photos" -msgstr "Увези слике" +#: ../data/ui/preferences.ui.h:3 +msgid "gThumb Preferences" +msgstr "Поставке Гномовог сличка" -#: ../data/glade/gthumb_camera.glade.h:7 ../src/dlg-photo-importer.c:840 -#: ../src/dlg-photo-importer.c:879 ../src/dlg-photo-importer.c:1379 -msgid "No camera detected" -msgstr "Камера није препозната" - -#: ../data/glade/gthumb_camera.glade.h:8 -msgid "Select a camera model" -msgstr "Изаберите модел камере" - -#: ../data/glade/gthumb_camera.glade.h:9 -msgid "Update previews" -msgstr "Допуни прегледе" - -#: ../data/glade/gthumb_camera.glade.h:10 -msgid "_Auto Detect" -msgstr "_Сам нађи" - -#: ../data/glade/gthumb_camera.glade.h:11 -msgid "_Delete imported images from the camera" -msgstr "О_бриши увежене слике са камере" - -#: ../data/glade/gthumb_camera.glade.h:12 -#: ../data/glade/gthumb_png_exporter.glade.h:61 -#: ../data/glade/gthumb_web_exporter.glade.h:41 -msgid "_Destination:" -msgstr "О_дредиште:" +#: ../data/ui/preferences.ui.h:4 +msgid "_Toolbar style:" +msgstr "Изглед _траке алата:" -#: ../data/glade/gthumb_camera.glade.h:13 -msgid "_Film:" -msgstr "_Филм:" +#: ../data/ui/preferences.ui.h:5 +msgid "T_humbnails in viewer:" +msgstr "Умањен_и приказ у прегледнику:" -#: ../data/glade/gthumb_camera.glade.h:14 -msgid "_Import" -msgstr "Ув_ези" +#: ../data/ui/preferences.ui.h:6 +msgid "System settings" +msgstr "Системска подешавања" -#: ../data/glade/gthumb_camera.glade.h:15 -msgid "_Keep original filenames" -msgstr "Задржи _изворна имена датотека" - -#: ../data/glade/gthumb_camera.glade.h:16 -msgid "_Model:" -msgstr "_Модел:" - -#: ../data/glade/gthumb_camera.glade.h:17 -msgid "_Port:" -msgstr "_Прикључак:" - -#: ../data/glade/gthumb_comments.glade.h:1 -#: ../data/glade/gthumb_search.glade.h:4 -msgid "A_vailable categories:" -msgstr "Доступне категорије:" - -#: ../data/glade/gthumb_comments.glade.h:2 -#: ../data/glade/gthumb_search.glade.h:9 -msgid "Categories" -msgstr "Категорије" - -#: ../data/glade/gthumb_comments.glade.h:3 -#: ../data/glade/gthumb_search.glade.h:11 -msgid "Co_mment:" -msgstr "При_медба:" +#: ../data/ui/preferences.ui.h:7 +msgid "Text below icons" +msgstr "Текст испод иконица" -#: ../data/glade/gthumb_comments.glade.h:4 -#: ../libgthumb/gth-file-view-list.c:1371 -msgid "Comment" -msgstr "Примедба" +#: ../data/ui/preferences.ui.h:8 +msgid "Text beside icons" +msgstr "Текст поред иконица" -#: ../data/glade/gthumb_comments.glade.h:5 -msgid "Create a new category" -msgstr "Направи нову категорију" +#: ../data/ui/preferences.ui.h:9 +msgid "Icons only" +msgstr "Само иконице" -#: ../data/glade/gthumb_comments.glade.h:6 -msgid "Current date" -msgstr "Текући датум" +#: ../data/ui/preferences.ui.h:10 +msgid "Text only" +msgstr "Само текст" -#: ../data/glade/gthumb_comments.glade.h:7 -msgid "Do not modify" -msgstr "Не мењај" +#: ../data/ui/preferences.ui.h:11 +msgid "on the bottom" +msgstr "на дну" + +#: ../data/ui/preferences.ui.h:12 +msgid "on the side" +msgstr "бочно" + +#: ../data/ui/preferences.ui.h:13 +msgid "File _properties in browser:" +msgstr "Особине датотеке у _прегледнику:" + +#: ../data/ui/preferences.ui.h:14 +msgid "Appearance" +msgstr "Изглед" + +#: ../data/ui/preferences.ui.h:15 +msgid "Go to last _visited location" +msgstr "Иди на _задње посећено место" -#: ../data/glade/gthumb_comments.glade.h:8 -msgid "Image creation date" -msgstr "Датум прављења слике" +#: ../data/ui/preferences.ui.h:16 +msgid "Go to this _folder:" +msgstr "Иди у ову _фасциклу:" -#: ../data/glade/gthumb_comments.glade.h:9 -msgid "Last modified date" -msgstr "Датум последње измене" +#: ../data/ui/preferences.ui.h:17 +msgid "Choose startup folder" +msgstr "Одабери почетну фасциклу" -#: ../data/glade/gthumb_comments.glade.h:10 -msgid "No date" -msgstr "Нема датума" +#: ../data/ui/preferences.ui.h:18 +msgid "Set to C_urrent" +msgstr "Постави на трен_утно" -#: ../data/glade/gthumb_comments.glade.h:11 -msgid "Photo digitalization date (From EXIF data)" -msgstr "Датум _фото дигитализације (из EXIF података)" - -#: ../data/glade/gthumb_comments.glade.h:12 -msgid "Remove selected category" -msgstr "Уклонити изабрану категорију" +#: ../data/ui/preferences.ui.h:19 +msgid "_Reuse the active window to open files" +msgstr "_Поново користи радни прозор за отварање датотека" + +#: ../data/ui/preferences.ui.h:20 +msgid "On startup:" +msgstr "На покретању:" + +#: ../data/ui/preferences.ui.h:21 +msgid "As_k confirmation before deleting files or catalogs" +msgstr "Зат_ражи потврду пре брисања датотека или збирки" + +#: ../data/ui/preferences.ui.h:22 +msgid "Ask whether to save _modified files" +msgstr "Да питам да ли да сачувам _измењене датотеке" + +#: ../data/ui/preferences.ui.h:23 +msgid "_Store metadata inside files if possible" +msgstr "_Чувај метаподатке у датотекама уколико је могуће" + +#: ../data/ui/preferences.ui.h:24 +#: ../extensions/exiv2_tools/gth-edit-iptc-page.c:198 +#: ../extensions/gstreamer_tools/main.c:33 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:17 +msgid "Other" +msgstr "Друго" + +#: ../data/ui/preferences.ui.h:25 +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 +#: ../extensions/edit_metadata/gth-edit-general-page.c:481 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 +#: ../gthumb/gth-main-default-metadata.c:33 +msgid "General" +msgstr "Опште" -#: ../data/glade/gthumb_comments.glade.h:13 -msgid "Save only cha_nged fields" -msgstr "Сачувај само измење_на поља" +#: ../data/ui/preferences.ui.h:26 +#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 +#: ../extensions/image_print/data/ui/print-layout.ui.h:18 +msgid "Caption" +msgstr "Наслов" -#: ../data/glade/gthumb_comments.glade.h:14 -msgid "The following date" -msgstr "Следећи датум" +#: ../data/ui/preferences.ui.h:27 +msgid "Thumbnail _size:" +msgstr "Величина умањеног _приказа:" -#: ../data/glade/gthumb_comments.glade.h:15 -#: ../data/glade/gthumb_search.glade.h:23 -msgid "_Date:" -msgstr "_Датум:" +#: ../data/ui/preferences.ui.h:28 +msgid "48" +msgstr "48" -#: ../data/glade/gthumb_comments.glade.h:16 -msgid "_Delete" -msgstr "_Обриши" +#: ../data/ui/preferences.ui.h:29 +msgid "64" +msgstr "64" -#: ../data/glade/gthumb_comments.glade.h:17 -msgid "_New" -msgstr "_Нова" +#: ../data/ui/preferences.ui.h:30 +msgid "85" +msgstr "85" -#: ../data/glade/gthumb_comments.glade.h:18 -#: ../data/glade/gthumb_search.glade.h:26 -msgid "_Place:" -msgstr "_Место:" +#: ../data/ui/preferences.ui.h:31 +msgid "95" +msgstr "95" -#: ../data/glade/gthumb_comments.glade.h:19 -#: ../data/glade/gthumb_search.glade.h:29 -msgid "_Selected categories:" -msgstr "_Означене категорије:" - -#: ../data/glade/gthumb_convert.glade.h:3 -msgid "Compression" -msgstr "Сажимање" - -#: ../data/glade/gthumb_convert.glade.h:4 -msgid "Image type" -msgstr "Врста слике" - -#: ../data/glade/gthumb_convert.glade.h:5 -msgid "Resolution" -msgstr "Величина" - -#: ../data/glade/gthumb_convert.glade.h:6 -msgid "Ask" -msgstr "Питај" +#: ../data/ui/preferences.ui.h:32 +msgid "112" +msgstr "112" -#: ../data/glade/gthumb_convert.glade.h:7 -msgid "Compression _level:" -msgstr "_Ниво сажетог:" +#: ../data/ui/preferences.ui.h:33 +msgid "128" +msgstr "128" -#: ../data/glade/gthumb_convert.glade.h:8 -msgid "Convert Format" -msgstr "Формат претварања" +#: ../data/ui/preferences.ui.h:34 +msgid "164" +msgstr "164" -#: ../data/glade/gthumb_convert.glade.h:9 -msgid "JPEG Options" -msgstr "JPEG поставке" +#: ../data/ui/preferences.ui.h:35 +msgid "200" +msgstr "200" -#: ../data/glade/gthumb_convert.glade.h:10 -msgid "No_rmal (Deflate)" -msgstr "Но_рмално (Deflate)" +#: ../data/ui/preferences.ui.h:36 +msgid "256" +msgstr "256" -#: ../data/glade/gthumb_convert.glade.h:11 -msgid "Opti_mize" -msgstr "Опти_мизуј" +#: ../data/ui/preferences.ui.h:37 +msgid "D_etermine image type from content (slower)" +msgstr "Одреди врсту слике из _садржаја (спорије)" -#: ../data/glade/gthumb_convert.glade.h:12 -msgid "Overwrite" -msgstr "Препиши" - -#: ../data/glade/gthumb_convert.glade.h:13 -msgid "Overwrite mode:" -msgstr "Начин преписа:" - -#: ../data/glade/gthumb_convert.glade.h:14 -msgid "PNG Options" -msgstr "PNG поставке" - -#: ../data/glade/gthumb_convert.glade.h:15 -msgid "R_emove original" -msgstr "Ук_лони оригинал" +#: ../data/ui/preferences.ui.h:38 ../gthumb/dlg-preferences-extensions.c:71 +#: ../gthumb/gth-browser-actions-entries.h:179 +msgid "Browser" +msgstr "Прегледник" -#: ../data/glade/gthumb_convert.glade.h:16 -msgid "Rename" -msgstr "Промени име" +#: ../data/ui/sort-order.ui.h:1 +msgid "Sort By" +msgstr "Поређај по" + +#: ../data/ui/sort-order.ui.h:2 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:4 +msgid "_Sort by:" +msgstr "_Поређај по:" + +#: ../data/ui/sort-order.ui.h:3 +msgid "_Inverse order" +msgstr "_Обрнути поредак" + +#: ../extensions/23hq/23hq.extension.in.in.h:1 +msgid "23" +msgstr "23" + +#: ../extensions/23hq/23hq.extension.in.in.h:2 +msgid "Upload images to 23hq.com" +msgstr "Отпреми слике на 23hq.com" + +#: ../extensions/23hq/callbacks.c:68 +msgid "_23..." +msgstr "_23..." + +#: ../extensions/23hq/callbacks.c:69 +msgid "Upload photos to 23" +msgstr "Отпреми слике на 23" -#: ../data/glade/gthumb_convert.glade.h:17 ../src/dlg-convert.c:316 -msgid "Skip" -msgstr "Прескочити" - -#: ../data/glade/gthumb_convert.glade.h:18 -msgid "TGA Options" -msgstr "TGA поставке" - -#: ../data/glade/gthumb_convert.glade.h:19 -msgid "TIFF Options" -msgstr "TIFF поставке" - -#: ../data/glade/gthumb_convert.glade.h:20 -msgid "T_GA" -msgstr "T_GA" +#: ../extensions/bookmarks/bookmarks.extension.in.in.h:1 +#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:1 +msgid "Bookmarks" +msgstr "Обележивачи" -#: ../data/glade/gthumb_convert.glade.h:21 -#: ../data/glade/gthumb_png_exporter.glade.h:65 -msgid "_Horizontal:" -msgstr "_Хоризонтално:" +#: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 +msgid "Add bookmarks support." +msgstr "Додај подршку обележивача." + +#: ../extensions/bookmarks/bookmarks.extension.in.in.h:3 +#: ../extensions/burn_disc/burn_disc.extension.in.in.h:3 +#: ../extensions/catalogs/catalogs.extension.in.in.h:3 +#: ../extensions/change_date/change_date.extension.in.in.h:3 +#: ../extensions/comments/comments.extension.in.in.h:3 +#: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:3 +#: ../extensions/convert_format/convert_format.extension.in.in.h:3 +#: ../extensions/desktop_background/desktop_background.extension.in.in.h:3 +#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:3 +#: ../extensions/exiv2_tools/exiv2_tools.extension.in.in.h:3 +#: ../extensions/file_manager/file_manager.extension.in.in.h:3 +#: ../extensions/file_tools/file_tools.extension.in.in.h:3 +#: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:3 +#: ../extensions/gstreamer_tools/gstreamer_tools.extension.in.in.h:3 +#: ../extensions/image_print/image_print.extension.in.in.h:3 +#: ../extensions/image_rotation/image_rotation.extension.in.in.h:3 +#: ../extensions/image_viewer/image_viewer.extension.in.in.h:3 +#: ../extensions/list_tools/list_tools.extension.in.in.h:3 +#: ../extensions/photo_importer/photo_importer.extension.in.in.h:3 +#: ../extensions/raw_files/raw_files.extension.in.in.h:3 +#: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:3 +#: ../extensions/rename_series/rename_series.extension.in.in.h:3 +#: ../extensions/resize_images/resize_images.extension.in.in.h:3 +#: ../extensions/search/search.extension.in.in.h:3 +#: ../extensions/selections/selections.extension.in.in.h:3 +#: ../extensions/slideshow/slideshow.extension.in.in.h:3 +#: ../extensions/webalbums/webalbums.extension.in.in.h:3 +msgid "gthumb development team" +msgstr "Развојна дружина Гномовог сличка" -#: ../data/glade/gthumb_convert.glade.h:22 -msgid "_JPEG" -msgstr "_JPEG" +#: ../extensions/bookmarks/callbacks.c:54 +msgid "_Bookmarks" +msgstr "_Обележивачи" -#: ../data/glade/gthumb_convert.glade.h:23 -msgid "_Loss compression (JPEG)" -msgstr "_Сажимање са губицима (JPEG)" +#: ../extensions/bookmarks/callbacks.c:55 +msgid "_System Bookmarks" +msgstr "_Системски обележивачи" -#: ../data/glade/gthumb_convert.glade.h:24 -msgid "_No compression" -msgstr "_Нема сажимања" +#: ../extensions/bookmarks/callbacks.c:58 +msgid "_Add Bookmark" +msgstr "_Додај обележивач" -#: ../data/glade/gthumb_convert.glade.h:25 -msgid "_PNG" -msgstr "_PNG" +#: ../extensions/bookmarks/callbacks.c:59 +msgid "Add current location to bookmarks" +msgstr "Додати тренутно место у обележиваче" -#: ../data/glade/gthumb_convert.glade.h:26 -msgid "_Progressive" -msgstr "_Прогресивно" +#: ../extensions/bookmarks/callbacks.c:63 +msgid "_Edit Bookmarks..." +msgstr "_Уреди обележиваче..." -#: ../data/glade/gthumb_convert.glade.h:27 -msgid "_Quality:" -msgstr "_Квалитет:" +#: ../extensions/bookmarks/callbacks.c:64 +msgid "Edit bookmarks" +msgstr "Уреди обележиваче" -#: ../data/glade/gthumb_convert.glade.h:28 -msgid "_RLE compression" -msgstr "_RLE сажимање" +#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:2 +msgid "_Bookmarks:" +msgstr "_Обележивачи:" -#: ../data/glade/gthumb_convert.glade.h:29 -msgid "_Smoothing:" -msgstr "_Углачавање:" +#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:3 +msgid "_Name" +msgstr "_Назив" -#: ../data/glade/gthumb_convert.glade.h:30 -msgid "_TIFF" -msgstr "_TIFF" +#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:4 +msgid "_Location" +msgstr "_Место" -#: ../data/glade/gthumb_convert.glade.h:31 -#: ../data/glade/gthumb_png_exporter.glade.h:70 -msgid "_Vertical:" -msgstr "_Вертикално:" +#: ../extensions/bookmarks/dlg-bookmarks.c:70 +msgid "Could not remove the bookmark" +msgstr "Не могу уклонити обележивач" -#: ../data/glade/gthumb_convert.glade.h:32 -msgid "dpi" -msgstr "тпи" +#: ../extensions/burn_disc/burn_disc.extension.in.in.h:1 +msgid "Burn CD/DVD" +msgstr "Нарежи ЦД/ДВД" -#: ../data/glade/gthumb_crop.glade.h:2 -msgid "4 x 3 (Book, DVD)" -msgstr "10 x 7,5 (књига, ДВД)" - -#: ../data/glade/gthumb_crop.glade.h:3 -msgid "4 x 6 (Postcard)" -msgstr "10 x 15 (разгледница)" - -#: ../data/glade/gthumb_crop.glade.h:4 -msgid "5 x 7" -msgstr "13 x 18" - -#: ../data/glade/gthumb_crop.glade.h:5 -msgid "8 x 10" -msgstr "20 x 25" - -#: ../data/glade/gthumb_crop.glade.h:6 -msgid "Aspect ratio" -msgstr "Однос висине и ширине" - -#: ../data/glade/gthumb_crop.glade.h:7 -msgid "Selection" -msgstr "Избор" +#: ../extensions/burn_disc/burn_disc.extension.in.in.h:2 +msgid "Save files to an optical disc." +msgstr "Сачувајте датотеке на оптички диск." -#: ../data/glade/gthumb_crop.glade.h:8 -msgid "Crop" -msgstr "Одсеци" +#: ../extensions/burn_disc/callbacks.c:55 +msgid "_Optical Disc..." +msgstr "_Оптички диск..." -#: ../data/glade/gthumb_crop.glade.h:9 ../data/glade/gthumb_print.glade.h:17 -msgid "Custom" -msgstr "Произвољно" +#: ../extensions/burn_disc/callbacks.c:56 +msgid "Write files to an optical disc" +msgstr "Упиши датотеке на оптички диск" -#: ../data/glade/gthumb_crop.glade.h:10 -#: ../data/glade/gthumb_preferences.glade.h:47 -msgid "None" -msgstr "Ништа" +#: ../extensions/burn_disc/data/ui/burn-disc-options.ui.h:1 +msgid "Disc Name" +msgstr "Назив диска" -#: ../data/glade/gthumb_crop.glade.h:11 -msgid "Square" -msgstr "Квадрирај" +#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:1 +msgid "Current _folder" +msgstr "Тренутна _фасцикла" -#: ../data/glade/gthumb_crop.glade.h:12 -#: ../src/gth-window-actions-entries.h:171 -msgid "_Crop" -msgstr "_Исечак" +#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:2 +msgid "Current folder and its s_ub-folders" +msgstr "Тренутна фасцикла и њене под_фасцикле" -#: ../data/glade/gthumb_crop.glade.h:13 ../data/glade/gthumb_edit.glade.h:21 -#: ../data/glade/gthumb_print.glade.h:33 -msgid "_Height:" -msgstr "_Висина:" +#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:3 +msgid "_Selected files" +msgstr "_Означене датотеке" -#: ../data/glade/gthumb_crop.glade.h:14 ../data/glade/gthumb_edit.glade.h:31 -#: ../data/glade/gthumb_print.glade.h:39 -msgid "_Width:" -msgstr "_Ширина:" +#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:4 +msgid "Source" +msgstr "Извор" -#: ../data/glade/gthumb_crop.glade.h:15 -msgid "_X:" -msgstr "_X:" +#: ../extensions/burn_disc/gth-burn-task.c:238 +#: ../extensions/burn_disc/gth-burn-task.c:259 +#: ../extensions/burn_disc/gth-burn-task.c:397 +msgid "Write to Disc" +msgstr "Упиши на диск" -#: ../data/glade/gthumb_crop.glade.h:16 -msgid "_Y:" -msgstr "_Y:" +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:62 +#, c-format +msgid "Error interpreting JPEG image file: %s" +msgstr "Грешка приликом тумачења ЈПЕГ сликовне датотеке: %s" -#: ../data/glade/gthumb_edit.glade.h:2 -#: ../data/glade/gthumb_png_exporter.glade.h:2 -#: ../data/glade/gthumb_preferences.glade.h:2 -#: ../data/glade/gthumb_tools.glade.h:2 -#: ../data/glade/gthumb_web_exporter.glade.h:2 -msgid " " -msgstr " " +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:483 +#, c-format +msgid "Unknown JPEG color space (%d)" +msgstr "Непознато ЈПЕГ окружење боја (%d)" -#: ../data/glade/gthumb_edit.glade.h:4 ../data/glade/gthumb_print.glade.h:3 -#, no-c-format -msgid "%" -msgstr "%" +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:1 +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:1 +msgid "_Default extension:" +msgstr "_Подразумевани наставак:" -#: ../data/glade/gthumb_edit.glade.h:5 -msgid "Color levels" -msgstr "Нивои боје" - -#: ../data/glade/gthumb_edit.glade.h:6 -msgid "New dimensions" -msgstr "Нова величина" - -#: ../data/glade/gthumb_edit.glade.h:7 -msgid "Original dimensions" -msgstr "Првобитна величина" - -#: ../data/glade/gthumb_edit.glade.h:8 -msgid "Scale ratio" -msgstr "Пропорције" - -#: ../data/glade/gthumb_edit.glade.h:9 -msgid "Brightness - Contrast" -msgstr "Светлина - контраст" - -#: ../data/glade/gthumb_edit.glade.h:10 -msgid "Color Balance" -msgstr "Однос боје" +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:2 +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:1 +msgid "_Quality:" +msgstr "_Квалитет:" -#: ../data/glade/gthumb_edit.glade.h:11 -msgid "Con_trast:" -msgstr "Кон_траст:" +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:3 +msgid "_Smoothing:" +msgstr "_Углачавање:" -#: ../data/glade/gthumb_edit.glade.h:12 -msgid "Cyan-_Red:" -msgstr "Светло плава-_Црвена:" +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:4 +msgid "Opti_mize" +msgstr "Опти_мизуј" -#: ../data/glade/gthumb_edit.glade.h:13 -msgid "Height:" -msgstr "Висина:" +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:5 +msgid "_Progressive" +msgstr "_Прогресивно" -#: ../data/glade/gthumb_edit.glade.h:14 -msgid "High _quality" -msgstr "Добар _квалитет" +#: ../extensions/cairo_io/data/ui/png-options.ui.h:1 +msgid "Compression _level:" +msgstr "_Ниво сажимања:" -#: ../data/glade/gthumb_edit.glade.h:15 -msgid "Hue - Saturation" -msgstr "Нијансе - засићеност" - -#: ../data/glade/gthumb_edit.glade.h:16 -msgid "Posterize" -msgstr "Направи плакат" - -#: ../data/glade/gthumb_edit.glade.h:17 -msgid "Preserve l_uminosity" -msgstr "Задржи о_светљеност" - -#: ../data/glade/gthumb_edit.glade.h:18 -msgid "Scale Image" -msgstr "Скалирана слика" - -#: ../data/glade/gthumb_edit.glade.h:19 -msgid "Width:" -msgstr "Ширина:" +#: ../extensions/cairo_io/data/ui/save-options-preferences.ui.h:1 +msgid "Default options:" +msgstr "Предодређене могућности:" -#: ../data/glade/gthumb_edit.glade.h:20 -msgid "_Brightness:" -msgstr "_Светлина:" +#: ../extensions/cairo_io/data/ui/tga-options.ui.h:1 +msgid "_RLE compression" +msgstr "_РЛЕ сажимање" -#: ../data/glade/gthumb_edit.glade.h:22 -msgid "_Hue:" -msgstr "_Нијанса:" - -#: ../data/glade/gthumb_edit.glade.h:23 -msgid "_Keep aspect ratio" -msgstr "_Задржи пропорције" - -#: ../data/glade/gthumb_edit.glade.h:24 -msgid "_Levels:" -msgstr "_Нивои:" - -#: ../data/glade/gthumb_edit.glade.h:25 -msgid "_Lightness:" -msgstr "_Осветљеност:" +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:2 +msgid "Compression" +msgstr "Сажимање" -#: ../data/glade/gthumb_edit.glade.h:26 -msgid "_Magenta-Green:" -msgstr "_Љубичаста-зелена:" +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:3 +msgid "_No compression" +msgstr "_Нема сажимања" -#: ../data/glade/gthumb_edit.glade.h:27 -msgid "_Preview" -msgstr "_Приказ" +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:4 +msgid "No_rmal (Deflate)" +msgstr "Но_рмално (Deflate)" -#: ../data/glade/gthumb_edit.glade.h:28 ../data/glade/gthumb_tools.glade.h:38 -msgid "_Reset" -msgstr "_Поново постави" +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:5 +msgid "_Loss compression (JPEG)" +msgstr "_Сажимање са губицима (JPEG)" -#: ../data/glade/gthumb_edit.glade.h:29 -msgid "_Saturation:" -msgstr "_Засићеност:" +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:6 +msgid "Resolution" +msgstr "Размера" -#: ../data/glade/gthumb_edit.glade.h:30 -msgid "_Scale" -msgstr "_Скала" +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:7 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 +msgid "_Horizontal:" +msgstr "_Хоризонтално:" -#: ../data/glade/gthumb_edit.glade.h:32 -msgid "_Yellow-Blue:" -msgstr "_Жута-плава:" +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:8 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 +msgid "_Vertical:" +msgstr "_Вертикално:" -#: ../data/glade/gthumb_png_exporter.glade.h:3 -msgid "112" -msgstr "112" +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:9 +msgid "dpi" +msgstr "тпи" -#: ../data/glade/gthumb_png_exporter.glade.h:4 -msgid "128" -msgstr "128" +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:2 +msgid "_Method:" +msgstr "_Начин:" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:3 +msgid "_Lossless" +msgstr "_Без губљења квалитета" + +#: ../extensions/cairo_io/gth-image-saver-jpeg.c:516 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:140 +msgid "JPEG" +msgstr "JPEG" + +#: ../extensions/cairo_io/gth-image-saver-png.c:353 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:110 +msgid "PNG" +msgstr "PNG" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:257 +#: ../extensions/cairo_io/gth-image-saver-tiff.c:435 +#: ../gthumb/gth-buffer-data.c:84 +msgid "Insufficient memory" +msgstr "Недовољна меморија" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:344 +msgid "TGA" +msgstr "TGA" + +#: ../extensions/cairo_io/gth-image-saver-tiff.c:559 +msgid "TIFF" +msgstr "TIFF" + +#: ../extensions/cairo_io/gth-image-saver-webp.c:382 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:165 +msgid "WebP" +msgstr "WebP" + +#: ../extensions/cairo_io/preferences.c:134 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 +msgid "Saving" +msgstr "Снимање" + +#: ../extensions/catalogs/actions.c:92 ../extensions/catalogs/actions.c:213 +#: ../extensions/catalogs/dlg-add-to-catalog.c:274 +#: ../extensions/catalogs/dlg-add-to-catalog.c:394 +#: ../extensions/file_manager/actions.c:68 +#: ../extensions/list_tools/gth-script-editor-dialog.c:290 +#: ../gthumb/gth-filter-editor-dialog.c:461 +#, c-format +msgid "No name specified" +msgstr "Није одређен назив" + +#: ../extensions/catalogs/actions.c:99 ../extensions/catalogs/actions.c:220 +#: ../extensions/catalogs/dlg-add-to-catalog.c:281 +#: ../extensions/catalogs/dlg-add-to-catalog.c:401 +#: ../extensions/file_manager/actions.c:75 +#, c-format +msgid "Invalid name. The following characters are not allowed: %s" +msgstr "Неисправан назив. Следећи знакови нису дозвољени: %s" + +#: ../extensions/catalogs/actions.c:155 ../extensions/catalogs/actions.c:267 +#: ../extensions/catalogs/dlg-add-to-catalog.c:338 +#: ../extensions/catalogs/dlg-add-to-catalog.c:448 +#: ../extensions/catalogs/gth-file-source-catalogs.c:508 +#: ../extensions/file_manager/actions.c:106 +msgid "Name already used" +msgstr "Назив је већ у употреби" + +#: ../extensions/catalogs/actions.c:178 +#: ../extensions/catalogs/dlg-add-to-catalog.c:359 +msgid "New catalog" +msgstr "Нова збирка" + +#: ../extensions/catalogs/actions.c:179 +#: ../extensions/catalogs/dlg-add-to-catalog.c:360 +msgid "Enter the catalog name:" +msgstr "Унесите назив за збирку:" + +#: ../extensions/catalogs/actions.c:181 ../extensions/catalogs/actions.c:293 +#: ../extensions/catalogs/dlg-add-to-catalog.c:362 +#: ../extensions/catalogs/dlg-add-to-catalog.c:474 +#: ../extensions/file_manager/actions.c:136 +msgid "C_reate" +msgstr "Нап_рави" -#: ../data/glade/gthumb_png_exporter.glade.h:5 -msgid "164" -msgstr "164" +#: ../extensions/catalogs/actions.c:290 +#: ../extensions/catalogs/dlg-add-to-catalog.c:471 +msgid "New library" +msgstr "Нова библиотека" -#: ../data/glade/gthumb_png_exporter.glade.h:6 -msgid "200" -msgstr "200" +#: ../extensions/catalogs/actions.c:291 +#: ../extensions/catalogs/dlg-add-to-catalog.c:472 +msgid "Enter the library name:" +msgstr "Унесите име за библиотеку:" + +#: ../extensions/catalogs/actions.c:326 +msgid "Could not remove the catalog" +msgstr "Нисам успео да уклоним збирку" + +#: ../extensions/catalogs/actions.c:363 +#, c-format +msgid "Are you sure you want to remove \"%s\"?" +msgstr "Да ли сте сигурни да желите да уклоните „%s“?" + +#: ../extensions/catalogs/callbacks.c:102 +msgid "_Add to Catalog" +msgstr "_Додај у збирку" -#: ../data/glade/gthumb_png_exporter.glade.h:7 -msgid "256" -msgstr "256" +#: ../extensions/catalogs/callbacks.c:105 +#: ../extensions/selections/callbacks.c:80 +msgid "Open _Folder" +msgstr "Отвори _фасциклу" -#: ../data/glade/gthumb_png_exporter.glade.h:8 -msgid "48" -msgstr "48" +#: ../extensions/catalogs/callbacks.c:106 +#: ../extensions/selections/callbacks.c:81 +msgid "Go to the folder that contains the selected file" +msgstr "Иди у фасциклу који садржи означену датотеку" + +#: ../extensions/catalogs/callbacks.c:110 +msgid "Other..." +msgstr "Друго..." + +#: ../extensions/catalogs/callbacks.c:111 +msgid "Choose another catalog" +msgstr "Одаберите другу збирку" -#: ../data/glade/gthumb_png_exporter.glade.h:9 -msgid "64" -msgstr "64" +#: ../extensions/catalogs/callbacks.c:115 +msgid "_Add to Catalog..." +msgstr "_Додај у збирку..." -#: ../data/glade/gthumb_png_exporter.glade.h:10 -msgid "75" -msgstr "75" +#: ../extensions/catalogs/callbacks.c:116 +msgid "Add selected images to a catalog" +msgstr "Додати означене слике у збирку" -#: ../data/glade/gthumb_png_exporter.glade.h:11 -msgid "85" -msgstr "85" +#: ../extensions/catalogs/callbacks.c:120 +msgid "Remo_ve from Catalog" +msgstr "Укло_ни из збирке" -#: ../data/glade/gthumb_png_exporter.glade.h:12 -msgid "95" -msgstr "95" +#: ../extensions/catalogs/callbacks.c:121 +msgid "Remove selected images from the catalog" +msgstr "Уклони одабране слике из збирке" -#: ../data/glade/gthumb_png_exporter.glade.h:13 -msgid "Background style" -msgstr "Стил позадине" - -#: ../data/glade/gthumb_png_exporter.glade.h:14 -msgid "Caption" -msgstr "Наслов" - -#: ../data/glade/gthumb_png_exporter.glade.h:15 -msgid "Footer" -msgstr "Подножје" - -#: ../data/glade/gthumb_png_exporter.glade.h:16 -msgid "Header and footer" -msgstr "Заглавље и подножје" - -#: ../data/glade/gthumb_png_exporter.glade.h:17 -msgid "Header" -msgstr "Заглавље" - -#: ../data/glade/gthumb_png_exporter.glade.h:18 -msgid "Index images" -msgstr "Индексирај слике" - -#: ../data/glade/gthumb_png_exporter.glade.h:19 -msgid "Page size" -msgstr "Величина странице" - -#: ../data/glade/gthumb_png_exporter.glade.h:20 -#: ../data/glade/gthumb_web_exporter.glade.h:13 -msgid "Saving" -msgstr "Снимање" - -#: ../data/glade/gthumb_png_exporter.glade.h:21 -msgid "Note: # (enumerator)." -msgstr "Пажња: # (бројач)." +#: ../extensions/catalogs/callbacks.c:125 +msgid "Create _Catalog" +msgstr "Направи нову _збирку" + +#: ../extensions/catalogs/callbacks.c:130 +msgid "Create _Library" +msgstr "Направи _библиотеку" + +#: ../extensions/catalogs/callbacks.c:140 +msgid "Rena_me" +msgstr "Преиме_нуј" -#: ../data/glade/gthumb_png_exporter.glade.h:23 -#, no-c-format -msgid "" -"Note: %p (page number), %n (total number of pages)." -msgstr "" -"Пажња: %p (број стране), %n (укупан број страна)." +#: ../extensions/catalogs/callbacks.c:281 +#: ../extensions/catalogs/callbacks.c:284 +msgid "Command Line" +msgstr "Наредбена линија" -#: ../data/glade/gthumb_png_exporter.glade.h:25 -#: ../data/glade/gthumb_web_exporter.glade.h:20 -msgid "Co_mment" -msgstr "Пре_длог" - -#: ../data/glade/gthumb_png_exporter.glade.h:26 -msgid "Col_umns:" -msgstr "Кол_оне:" - -#: ../data/glade/gthumb_png_exporter.glade.h:27 -msgid "Colo_r:" -msgstr "Бо_ја:" - -#: ../data/glade/gthumb_png_exporter.glade.h:28 -msgid "Create Index Image" -msgstr "Направи индекс слику" +#: ../extensions/catalogs/callbacks.c:496 +#: ../extensions/catalogs/callbacks.c:501 +#: ../extensions/photo_importer/dlg-photo-importer.c:364 +#: ../extensions/photo_importer/dlg-photo-importer.c:404 +#: ../gthumb/gth-file-list.c:43 ../gthumb/gth-folder-tree.c:1093 +msgid "(Empty)" +msgstr "(Празно)" + +#: ../extensions/catalogs/callbacks.c:700 +msgid "Catalog Properties" +msgstr "Поставке збирке" + +#: ../extensions/catalogs/callbacks.c:714 +msgid "Organize" +msgstr "Среди" + +#: ../extensions/catalogs/callbacks.c:715 +msgid "Automatically organize files by date" +msgstr "Сам среди датотеке по датуму" + +#: ../extensions/catalogs/catalogs.extension.in.in.h:1 +#: ../extensions/catalogs/gth-catalog.c:611 +#: ../extensions/catalogs/gth-catalog.c:662 +#: ../extensions/catalogs/gth-catalog.c:1016 +#: ../extensions/catalogs/gth-catalog.c:1017 +msgid "Catalogs" +msgstr "Збирке" + +#: ../extensions/catalogs/catalogs.extension.in.in.h:2 +msgid "Create file collections." +msgstr "Направите збирке датотека." + +#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:1 +msgid "Add to Catalog" +msgstr "Додај у збирку" -#: ../data/glade/gthumb_png_exporter.glade.h:29 -msgid "Create _HTML image map" -msgstr "Направи _HTML мапу слике" +#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:2 +msgid "C_atalogs:" +msgstr "З_бирке:" -#: ../data/glade/gthumb_png_exporter.glade.h:30 -#: ../data/glade/gthumb_web_exporter.glade.h:23 -msgid "F_ooter:" -msgstr "П_одножје:" - -#: ../data/glade/gthumb_png_exporter.glade.h:31 -#: ../data/glade/gthumb_web_exporter.glade.h:24 -msgid "File _name" -msgstr "Име _датотеке" - -#: ../data/glade/gthumb_png_exporter.glade.h:32 -msgid "File pa_th" -msgstr "_Путања до датотеке" - -#: ../data/glade/gthumb_png_exporter.glade.h:33 -#: ../data/glade/gthumb_web_exporter.glade.h:25 -msgid "File si_ze" -msgstr "Ве_личина датотеке" - -#: ../data/glade/gthumb_png_exporter.glade.h:34 -msgid "Frame _style:" -msgstr "_Стил оквира:" - -#: ../data/glade/gthumb_png_exporter.glade.h:35 -msgid "Frame co_lor:" -msgstr "Бо_ја оквира:" - -#: ../data/glade/gthumb_png_exporter.glade.h:36 -#: ../data/glade/gthumb_web_exporter.glade.h:27 -msgid "H_eader:" -msgstr "З_аглавље:" - -#: ../data/glade/gthumb_png_exporter.glade.h:37 -msgid "Header/Footer" -msgstr "Заглавље/Подножје" - -#: ../data/glade/gthumb_png_exporter.glade.h:38 -msgid "Hei_ght:" -msgstr "Ви_сина:" - -#: ../data/glade/gthumb_png_exporter.glade.h:39 -#: ../data/glade/gthumb_web_exporter.glade.h:29 -msgid "Image dim_ensions" -msgstr "В_еличина слике" +#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:3 +msgid "_New Catalog" +msgstr "_Нова збирка" -#: ../data/glade/gthumb_png_exporter.glade.h:40 -msgid "Images" -msgstr "Слике" +#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:4 +msgid "New _Library" +msgstr "Нова _библиотека" -#: ../data/glade/gthumb_png_exporter.glade.h:41 -msgid "Index Image Style" -msgstr "Стил индексиране слике" - -#: ../data/glade/gthumb_png_exporter.glade.h:42 -msgid "Page" -msgstr "Страница" - -#: ../data/glade/gthumb_png_exporter.glade.h:43 -msgid "Pi_xels" -msgstr "Тач_ке" +#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:5 +#: ../extensions/file_manager/actions.c:945 +#: ../extensions/webalbums/gth-web-exporter.c:1840 +msgid "_View the destination" +msgstr "_Погледај одредиште" + +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:1 +#: ../gthumb/gth-file-properties.c:209 +msgid "Properties" +msgstr "Особине" + +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:1 +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:1 +msgid "_Name:" +msgstr "_Назив:" -#: ../data/glade/gthumb_png_exporter.glade.h:44 -#: ../data/glade/gthumb_web_exporter.glade.h:31 -msgid "Re_verse order" -msgstr "О_брнути поредак" +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:4 +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:2 +msgid "_Date:" +msgstr "_Датум:" -#: ../data/glade/gthumb_png_exporter.glade.h:45 -msgid "Rows a_nd columns" -msgstr "Редови и коло_не" +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:5 +msgid "Catalog" +msgstr "Збирка" -#: ../data/glade/gthumb_png_exporter.glade.h:46 -msgid "Select a color" -msgstr "Одабери боју" +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:1 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 +msgid "Organize Files" +msgstr "Средите датотеке" + +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:2 +msgid "Organizing files" +msgstr "Сређивање датотека" + +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 +msgid "Organization:" +msgstr "Сређивање:" + +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:4 +msgid "Select All" +msgstr "Означи све" + +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 +msgid "Select None" +msgstr "Ништа не означуј" + +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 +msgid "Catalog _Preview:" +msgstr "_Преглед збирке:" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:1 +#: ../extensions/edit_metadata/gth-edit-general-page.c:558 +#: ../gthumb/gth-main-default-tests.c:300 +msgid "Date photo was taken" +msgstr "Датум снимања фотографије" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:2 +#: ../gthumb/gth-main-default-tests.c:292 +msgid "File modified date" +msgstr "Датум последње измене" -#: ../data/glade/gthumb_png_exporter.glade.h:47 -msgid "Select a font" -msgstr "Одабери фонт" +#: ../extensions/catalogs/data/ui/organize-files.ui.h:3 +#: ../extensions/comments/main.c:182 +msgid "Tag" +msgstr "Ознака" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:4 +msgid "tag" +msgstr "ознака" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:5 +#: ../gthumb/gth-main-default-tests.c:324 +msgid "Tag (embedded)" +msgstr "Ознака (угњежђена)" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:7 +msgid "_Group files by:" +msgstr "_Здружи датотеке по:" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:8 +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 +#: ../extensions/search/data/ui/search-editor.ui.h:2 +msgid "_Include sub-folders" +msgstr "_Укључи поддиректоријуме" -#: ../data/glade/gthumb_png_exporter.glade.h:48 -msgid "Shadow in" -msgstr "Сенка у" +#: ../extensions/catalogs/data/ui/organize-files.ui.h:9 +msgid "Ignore catalogs with a single file" +msgstr "Занемари збирке са једном датотеком" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:10 +msgid "Put single files in the catalog:" +msgstr "Стави појединачне датотеке у збирку:" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:11 +msgid "Singles" +msgstr "Појединачне" + +#: ../extensions/catalogs/dlg-add-to-catalog.c:105 +#: ../extensions/catalogs/dlg-add-to-catalog.c:136 +msgid "Could not add the files to the catalog" +msgstr "Не могу да додам датотеке у збирку" + +#: ../extensions/catalogs/dlg-add-to-catalog.c:217 +#: ../extensions/search/gth-search-task.c:356 +msgid "Could not create the catalog" +msgstr "Нисам успео да направим збирку" + +#: ../extensions/catalogs/dlg-catalog-properties.c:80 +msgid "Could not save the catalog" +msgstr "Нисам успео да сачувам збирку" + +#: ../extensions/catalogs/dlg-catalog-properties.c:159 +msgid "Could not load the catalog" +msgstr "Нисам успео да учитам збирку" -#: ../data/glade/gthumb_png_exporter.glade.h:49 -msgid "Shadow only" -msgstr "Само сенка" +#: ../extensions/catalogs/dlg-organize-files.c:120 +msgid "Files will be organized in catalogs. No file will be moved on disk." +msgstr "" +"Датотеке ће бити сређене по збиркама. Датотеке неће бити премештене на диск." -#: ../data/glade/gthumb_png_exporter.glade.h:50 -msgid "Shadow out" -msgstr "Сенка из" +#: ../extensions/catalogs/gth-catalog.c:1114 ../extensions/comments/main.c:45 +#: ../extensions/edit_metadata/callbacks.c:106 +#: ../gthumb/gth-main-default-metadata.c:53 +msgid "Tags" +msgstr "Ознаке" -#: ../data/glade/gthumb_png_exporter.glade.h:51 -msgid "Simple" -msgstr "Једноставно" +#: ../extensions/catalogs/gth-file-source-catalogs.c:953 +#, c-format +msgid "The catalog '%s' already exists, do you want to overwrite it?" +msgstr "Збирка са именом „%s“ већ постоји, да ли желите да је препишете?" -#: ../data/glade/gthumb_png_exporter.glade.h:52 -msgid "Simple with shadow" -msgstr "Једноставно са сенком" +#: ../extensions/catalogs/gth-file-source-catalogs.c:955 +#, c-format +msgid "The library '%s' already exists, do you want to overwrite it?" +msgstr "Библиотека са именом „%s“ већ постоји, да ли желите да је препишете?" -#: ../data/glade/gthumb_png_exporter.glade.h:53 -msgid "Slide" -msgstr "Клизај" +#: ../extensions/catalogs/gth-file-source-catalogs.c:963 +msgid "Over_write" +msgstr "_Препиши" -#: ../data/glade/gthumb_png_exporter.glade.h:54 -#: ../data/glade/gthumb_web_exporter.glade.h:34 -msgid "Sor_t:" -msgstr "По_ређај:" - -#: ../data/glade/gthumb_png_exporter.glade.h:55 -msgid "Sort" -msgstr "Поређај" - -#: ../data/glade/gthumb_png_exporter.glade.h:56 -msgid "St_yle" -msgstr "Ст_ил" - -#: ../data/glade/gthumb_png_exporter.glade.h:57 -#: ../data/glade/gthumb_search.glade.h:22 -#: ../data/glade/gthumb_tools.glade.h:33 -msgid "Start _at:" -msgstr "Почни на:" +#: ../extensions/catalogs/gth-file-source-catalogs.c:1081 +msgid "Cannot move the files" +msgstr "Не могу преместити датотеке" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1083 +msgid "Cannot copy the files" +msgstr "Не могу умножити датотеке" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1088 +msgid "Invalid destination." +msgstr "Неисправно одредиште." + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1135 +#, c-format +msgid "Copying files to '%s'" +msgstr "Умножавам датотеке у „%s“" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1322 +msgid "Could not remove the files from the catalog" +msgstr "Нисам успео да уклоним датотеке из збирке" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1380 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:746 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:755 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:785 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:1320 +#: ../extensions/search/gth-search.c:265 +msgid "Invalid file format" +msgstr "Неисправан облик датотеке" + +#: ../extensions/catalogs/gth-organize-task.c:202 +#, c-format +msgid "Operation completed. Catalogs: %d. Images: %d." +msgstr "Поступак завршен. Збирки: %d. Слика: %d." + +#: ../extensions/change_date/callbacks.c:44 +msgid "Change _Date..." +msgstr "Измени _датум..." -#: ../data/glade/gthumb_png_exporter.glade.h:58 -msgid "Style Preview" -msgstr "Стил приказа" +#: ../extensions/change_date/callbacks.c:45 +msgid "Change images last modified date" +msgstr "Промени датум последње измене слика" -#: ../data/glade/gthumb_png_exporter.glade.h:59 -msgid "Wi_dth:" -msgstr "Ши_рина:" +#: ../extensions/change_date/change_date.extension.in.in.h:1 +msgid "Change date" +msgstr "Промени датум" -#: ../data/glade/gthumb_png_exporter.glade.h:60 -msgid "_All pages with the same size" -msgstr "Све стр_анице са истом величином" +#: ../extensions/change_date/change_date.extension.in.in.h:2 +msgid "Change the files date" +msgstr "Промени датум датотека" + +#: ../extensions/change_date/data/ui/change-date.ui.h:1 +msgid "+" +msgstr "+" + +#: ../extensions/change_date/data/ui/change-date.ui.h:2 +msgid "-" +msgstr "-" -#: ../data/glade/gthumb_png_exporter.glade.h:62 -msgid "_Draw frame" -msgstr "_Исцртај оквир" - -#: ../data/glade/gthumb_png_exporter.glade.h:63 -msgid "_Font:" -msgstr "_Писмо:" +#: ../extensions/change_date/data/ui/change-date.ui.h:3 +msgid "Change Date" +msgstr "Промени датум" -#: ../data/glade/gthumb_png_exporter.glade.h:64 -msgid "_Gradient" -msgstr "_Прелаз" +#: ../extensions/change_date/data/ui/change-date.ui.h:4 +msgid "Change the following values:" +msgstr "Измени следеће вредности:" + +#: ../extensions/change_date/data/ui/change-date.ui.h:5 +msgid "_Last modified date" +msgstr "Датум _последње измене" + +#: ../extensions/change_date/data/ui/change-date.ui.h:6 +msgid "Co_mment date" +msgstr "Датум _напомене" + +#: ../extensions/change_date/data/ui/change-date.ui.h:7 +msgid "Change to:" +msgstr "Промени у:" -#: ../data/glade/gthumb_png_exporter.glade.h:66 -msgid "_Image size:" -msgstr "_Величина слике:" +#: ../extensions/change_date/data/ui/change-date.ui.h:8 +msgid "The _following date:" +msgstr "Следећи _датум:" -#: ../data/glade/gthumb_png_exporter.glade.h:67 -msgid "_Rows:" -msgstr "_Редови:" +#: ../extensions/change_date/data/ui/change-date.ui.h:9 +msgid "File _modified date" +msgstr "Датум _последње измене" + +#: ../extensions/change_date/data/ui/change-date.ui.h:10 +msgid "File c_reation date" +msgstr "Датум н_астанка датотеке" + +#: ../extensions/change_date/data/ui/change-date.ui.h:11 +msgid "Date p_hoto was taken" +msgstr "Датум _снимања слике" + +#: ../extensions/change_date/data/ui/change-date.ui.h:12 +msgid "A_djust by" +msgstr "Дотерајте _по" + +#: ../extensions/change_date/data/ui/change-date.ui.h:13 +msgid "hours" +msgstr "сати" + +#: ../extensions/change_date/data/ui/change-date.ui.h:14 +msgid "minutes" +msgstr "минута" -#: ../data/glade/gthumb_png_exporter.glade.h:68 -msgid "_Solid color" -msgstr "_Једнобојна" +#: ../extensions/change_date/data/ui/change-date.ui.h:15 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:6 +msgid "seconds" +msgstr "секунде" -#: ../data/glade/gthumb_png_exporter.glade.h:69 -#: ../data/glade/gthumb_tools.glade.h:41 -msgid "_Template:" -msgstr "_Шаблон:" +#: ../extensions/comments/callbacks.c:46 +msgid "Import Embedded Metadata" +msgstr "Увози угњежђене метаподатке" -#: ../data/glade/gthumb_png_exporter.glade.h:71 -#: ../data/glade/gthumb_web_exporter.glade.h:49 -msgid "by name" -msgstr "по имену" - -#: ../data/glade/gthumb_png_exporter.glade.h:72 -#: ../data/glade/gthumb_web_exporter.glade.h:50 -msgid "by path" -msgstr "по путањи" - -#: ../data/glade/gthumb_png_exporter.glade.h:73 -#: ../data/glade/gthumb_web_exporter.glade.h:51 -msgid "by size" -msgstr "по величини" - -#: ../data/glade/gthumb_png_exporter.glade.h:74 -msgid "by time" -msgstr "по времену" - -#: ../data/glade/gthumb_png_exporter.glade.h:75 -msgid "jpeg" -msgstr "jpeg" - -#: ../data/glade/gthumb_png_exporter.glade.h:76 -msgid "png" -msgstr "png" - -#: ../data/glade/gthumb_preferences.glade.h:3 -msgid "112 x 112" -msgstr "112 x 112" - -#: ../data/glade/gthumb_preferences.glade.h:4 -msgid "128 x 128" -msgstr "128 x 128" - -#: ../data/glade/gthumb_preferences.glade.h:5 -msgid "164 x 164" -msgstr "164 x 164" - -#: ../data/glade/gthumb_preferences.glade.h:6 -msgid "200 x 200" -msgstr "200 x 200" - -#: ../data/glade/gthumb_preferences.glade.h:7 -msgid "256 x 256" -msgstr "256 x 256" - -#: ../data/glade/gthumb_preferences.glade.h:8 -msgid "48 x 48" -msgstr "48 x 48" - -#: ../data/glade/gthumb_preferences.glade.h:9 -msgid "64 x 64" -msgstr "64 x 64" - -#: ../data/glade/gthumb_preferences.glade.h:10 -msgid "85 x 85" -msgstr "85 x 85" - -#: ../data/glade/gthumb_preferences.glade.h:11 -msgid "95 x 95" -msgstr "95 x 95" - -#: ../data/glade/gthumb_preferences.glade.h:12 -msgid "Direction" -msgstr "Правац" - -#: ../data/glade/gthumb_preferences.glade.h:13 -msgid "Hide/Show" -msgstr "Склони/Прикажи" - -#: ../data/glade/gthumb_preferences.glade.h:14 -msgid "Interface" -msgstr "Изглед" - -#: ../data/glade/gthumb_preferences.glade.h:15 -msgid "On startup:" -msgstr "На покретању:" - -#: ../data/glade/gthumb_preferences.glade.h:16 -msgid "Other" -msgstr "Остало" - -#: ../data/glade/gthumb_preferences.glade.h:17 -msgid "Slide show" -msgstr "Покретни приказ" - -#: ../data/glade/gthumb_preferences.glade.h:18 -msgid "View images as" -msgstr "Гледај слике као" - -#: ../data/glade/gthumb_preferences.glade.h:19 -msgid "Viewer" -msgstr "Прегледач" - -#: ../data/glade/gthumb_preferences.glade.h:20 -msgid "Zoom quality" -msgstr "Квалитет увећања" - -#: ../data/glade/gthumb_preferences.glade.h:21 -msgid "Activate items with a double click" -msgstr "Активирај ставке са двоструким притиском миша" - -#: ../data/glade/gthumb_preferences.glade.h:22 -msgid "Activate items with a single click" -msgstr "Активирај ставке са једним притиском миша" - -#: ../data/glade/gthumb_preferences.glade.h:23 -msgid "After _loading an image:" -msgstr "После _учитавања слике:" - -#: ../data/glade/gthumb_preferences.glade.h:24 -msgid "As_k confirmation before deleting images or catalogs" -msgstr "Затржи потврду пре брисања слика или каталога" - -#: ../data/glade/gthumb_preferences.glade.h:25 -msgid "Ask whether to save _modified images" -msgstr "Да питам да ли да сачувам _измењене слике" +#: ../extensions/comments/callbacks.c:47 +msgid "Import the metadata stored inside files into the gThumb comment system" +msgstr "" +"Увози метаподатке сачуване у датотекама у систем напомена Гномовог сличка" -#: ../data/glade/gthumb_preferences.glade.h:26 -msgid "Black" -msgstr "Црна" +#: ../extensions/comments/comments.extension.in.in.h:1 +msgid "Comments and tags" +msgstr "Напомене и ознаке" + +#: ../extensions/comments/comments.extension.in.in.h:2 +msgid "Add comments and tags to any file type." +msgstr "Додај напомене и ознаке у све врсте датотека." + +#: ../extensions/comments/data/ui/comments-preferences.ui.h:1 +#: ../extensions/importer/gth-import-preferences-dialog.c:318 +msgid "Preferences" +msgstr "Поставке" + +#: ../extensions/comments/data/ui/comments-preferences.ui.h:2 +msgid "_Synchronize with the embedded metadata" +msgstr "_Усагласи стање са угњежђеним метаподацима" -#: ../data/glade/gthumb_preferences.glade.h:27 -msgid "Browser" -msgstr "Читач" +#: ../extensions/comments/main.c:35 +#: ../extensions/edit_metadata/callbacks.c:100 +msgid "Comment" +msgstr "Напомена" -#: ../data/glade/gthumb_preferences.glade.h:28 -msgid "C_lick policy:" -msgstr "Политика клика:" +#: ../extensions/comments/main.c:41 ../gthumb/gth-main-default-metadata.c:46 +msgid "Title" +msgstr "Наслов" -#: ../data/glade/gthumb_preferences.glade.h:29 -msgid "Checked" -msgstr "Проверено" +#: ../extensions/comments/main.c:42 ../extensions/comments/main.c:166 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 +#: ../extensions/image_print/data/ui/print-layout.ui.h:8 +#: ../extensions/importer/data/ui/import-preferences.ui.h:6 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 +#: ../gthumb/gth-main-default-metadata.c:52 +msgid "Description" +msgstr "Опис" + +#: ../extensions/comments/main.c:43 ../extensions/comments/main.c:174 +#: ../gthumb/gth-main-default-metadata.c:50 +msgid "Place" +msgstr "Место" -#: ../data/glade/gthumb_preferences.glade.h:30 -msgid "Choose startup folder" -msgstr "Одабери почетни директоријум" +#: ../extensions/comments/main.c:44 ../gthumb/gth-main-default-metadata.c:51 +msgid "Date" +msgstr "Датум" -#: ../data/glade/gthumb_preferences.glade.h:31 -msgid "Co_mments" -msgstr "При_медбе" +#: ../extensions/comments/main.c:46 ../gthumb/gth-main-default-metadata.c:54 +msgid "Rating" +msgstr "Оцена" + +#: ../extensions/contact_sheet/callbacks.c:59 +msgid "Contact _Sheet" +msgstr "_Списак познаника" + +#: ../extensions/contact_sheet/callbacks.c:61 +msgid "Contact _Sheet..." +msgstr "_Списак познаника..." + +#: ../extensions/contact_sheet/callbacks.c:62 +msgid "Create a contact sheet" +msgstr "Направи нови списак познаника" + +#: ../extensions/contact_sheet/callbacks.c:65 +msgid "Image _Wall..." +msgstr "Мозаик _слика..." + +#: ../extensions/contact_sheet/callbacks.c:66 +msgid "Create an image-wall" +msgstr "Направите мозаик слика" + +#: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:1 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:1 +msgid "Contact Sheet" +msgstr "Списак познаника" -#: ../data/glade/gthumb_preferences.glade.h:32 -msgid "D_elay before changing image:" -msgstr "Од_ложи пре промене слике:" +#: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:2 +msgid "Create an index image displaying the thumbnails of the selected files." +msgstr "" +"Направите слику садржаја приказујући умањене сличице означених датотека." -#: ../data/glade/gthumb_preferences.glade.h:33 -msgid "D_etermine image type from content (slower)" -msgstr "Одреди врсту слике из сад_ржаја (спорије)" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:1 +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:446 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 +#: ../extensions/file_tools/gth-file-tool-rotate.c:397 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:14 +#: ../extensions/slideshow/main.c:277 +msgid "None" +msgstr "Ништа" -#: ../data/glade/gthumb_preferences.glade.h:34 -msgid "Do _not change folder" -msgstr "_Не мењај директоријум" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:2 +msgid "Simple" +msgstr "Једноставно" -#: ../data/glade/gthumb_preferences.glade.h:35 -msgid "Fit image to window" -msgstr "Поравнај у прозор" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:3 +msgid "Simple with shadow" +msgstr "Једноставно са сенком" -#: ../data/glade/gthumb_preferences.glade.h:36 -msgid "Fit to window if larger" -msgstr "Поравнај у прозор ако је веће" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:4 +msgid "Shadow only" +msgstr "Само сенка" -#: ../data/glade/gthumb_preferences.glade.h:37 -msgid "Follow Nautilus behaviour" -msgstr "Прати понашање Наутилуса" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:5 +msgid "Slide" +msgstr "Клизај" -#: ../data/glade/gthumb_preferences.glade.h:38 -msgid "For_ward" -msgstr "На_пред" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:6 +msgid "Inward Shadow" +msgstr "Унутрашња сенка" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:7 +msgid "Outward Shadow" +msgstr "Спољашња сенка" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:9 +msgid "Background" +msgstr "Позадина" -#: ../data/glade/gthumb_preferences.glade.h:39 -msgid "General" -msgstr "Опште" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:10 +msgid "_Solid color" +msgstr "_Једнобојна" -#: ../data/glade/gthumb_preferences.glade.h:40 -msgid "Go to last _visited folder or catalog" -msgstr "Иди у последње _посећени директоријум или каталог" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:11 +msgid "_Gradient" +msgstr "_Прелаз" -#: ../data/glade/gthumb_preferences.glade.h:41 -msgid "Go to this _folder:" -msgstr "Иди у овај _директоријум:" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:14 +msgid "Select a color" +msgstr "Одаберите боју" -#: ../data/glade/gthumb_preferences.glade.h:42 -msgid "H_igh" -msgstr "В_исоко" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:15 +msgid "Frame" +msgstr "Оквир" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:16 +msgid "_Style:" +msgstr "_Начин:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:17 +msgid "C_olor:" +msgstr "Б_оја:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:18 +#: ../extensions/rename_series/dlg-rename-series.c:57 +msgid "Text" +msgstr "Текст" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 +#: ../extensions/image_print/data/ui/print-layout.ui.h:3 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 +msgid "_Header:" +msgstr "_Заглавље:" -#: ../data/glade/gthumb_preferences.glade.h:43 -msgid "Icons only" -msgstr "Само иконице" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:20 +msgid "Select a font" +msgstr "Изаберите словни лик" -#: ../data/glade/gthumb_preferences.glade.h:44 -msgid "Keep previous zoom" -msgstr "Задржи претходно увећање" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:21 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 +#: ../extensions/image_print/data/ui/print-layout.ui.h:4 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 +msgid "_Footer:" +msgstr "_Подножје:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:22 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 +msgid "Caption:" +msgstr "Наслов:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:2 +#: ../extensions/image_print/data/ui/print-layout.ui.h:5 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:6 +msgid "The current page number" +msgstr "Тренутни број странице" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:3 +#: ../extensions/image_print/data/ui/print-layout.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 +msgid "The total number of pages" +msgstr "Укупан број страница" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:4 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 +#: ../extensions/image_print/data/ui/print-layout.ui.h:7 +#: ../extensions/importer/data/ui/import-preferences.ui.h:5 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:8 +msgid "Special code" +msgstr "Посебна шифра" + +#. translate only the text in the curly brackets +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:8 +#: ../extensions/image_print/data/ui/print-layout.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 +#, no-c-format +msgid "%D{ format }" +msgstr "%D{ облик }" -#: ../data/glade/gthumb_preferences.glade.h:45 -msgid "Layout:" -msgstr "Распоред:" - -#: ../data/glade/gthumb_preferences.glade.h:46 -msgid "Lo_w" -msgstr "Нис_ко" - -#: ../data/glade/gthumb_preferences.glade.h:48 -msgid "Ran_dom" -msgstr "С_лучајно" - -#: ../data/glade/gthumb_preferences.glade.h:49 -msgid "Re_verse" -msgstr "Об_рнуто" - -#: ../data/glade/gthumb_preferences.glade.h:50 -msgid "Resta_rt when finished" -msgstr "Поново стартуј када заврши" - -#: ../data/glade/gthumb_preferences.glade.h:51 -msgid "Set image to actual size" -msgstr "Постави слику на праву величину" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 +msgid "The current date" +msgstr "Текући датум" -#: ../data/glade/gthumb_preferences.glade.h:52 -msgid "Set to C_urrent" -msgstr "Постави на трен_утно" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:6 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 +msgid "_Destination:" +msgstr "О_дредиште:" -#: ../data/glade/gthumb_preferences.glade.h:53 -msgid "Slide Show" -msgstr "Покретни приказ" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:13 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:3 +#: ../extensions/convert_format/data/ui/convert-format.ui.h:4 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 +msgid "Choose destination folder" +msgstr "Одаберите одредишну фасциклу" -#: ../data/glade/gthumb_preferences.glade.h:54 -msgid "System settings" -msgstr "Системска подешавања" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:14 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 +msgid "File_name:" +msgstr "И_ме датотеке:" -#: ../data/glade/gthumb_preferences.glade.h:55 -msgid "Text below icons" -msgstr "Текст испод иконица" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:8 +msgid "New enumerator digit" +msgstr "Нова потписујућа цифра" -#: ../data/glade/gthumb_preferences.glade.h:56 -msgid "Text beside icons" -msgstr "Текст поред иконица" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:16 +msgid "Create _HTML image map" +msgstr "Направи _HTML мапу слике" -#: ../data/glade/gthumb_preferences.glade.h:57 -msgid "Text only" -msgstr "Само текст" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 +msgid "Create a new theme" +msgstr "Направите нову тему" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:19 +msgid "Edit the selected theme" +msgstr "Уредите обележену тему" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:20 +msgid "Delete the selected theme" +msgstr "Брише изабрану тему" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:21 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 +msgid "Theme" +msgstr "Тема" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:23 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:16 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 +msgid "Columns:" +msgstr "Колоне:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:24 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:10 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 +msgid "Images per page:" +msgstr "Слика по страни:" -#: ../data/glade/gthumb_preferences.glade.h:58 -msgid "Th_umbnail size:" -msgstr "Величина умањено_г приказа:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:25 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 +msgid "All images on a single page" +msgstr "Све слике на једној страници" -#: ../data/glade/gthumb_preferences.glade.h:59 -msgid "Transparency _type:" -msgstr "_Тип провидности:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:26 +msgid "_All pages with the same size" +msgstr "Све стр_анице са истом величином" -#: ../data/glade/gthumb_preferences.glade.h:60 -msgid "Viewer" -msgstr "Прегледач" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:27 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:15 +msgid "Layout" +msgstr "Распоред" -#: ../data/glade/gthumb_preferences.glade.h:61 -msgid "White" -msgstr "Бела" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:28 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:13 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 +msgid "S_ort:" +msgstr "_Разврставање:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:29 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:14 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 +msgid "Re_verse order" +msgstr "О_брнути поредак" -#: ../data/glade/gthumb_preferences.glade.h:62 -msgid "_Filenames" -msgstr "_Имена датотека" - -#: ../data/glade/gthumb_preferences.glade.h:63 -msgid "_List" -msgstr "_Списак" - -#: ../data/glade/gthumb_preferences.glade.h:64 -msgid "_Slides" -msgstr "_Слајдови" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:30 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:15 +msgid "_Size:" +msgstr "_Величина:" -#: ../data/glade/gthumb_preferences.glade.h:65 -#: ../src/gth-browser-actions-entries.h:405 -msgid "_Thumbnails" -msgstr "_Умањени прикази" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 +msgid "Sq_uared" +msgstr "К_вадрирани" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:33 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:16 +msgid "Thumbnails" +msgstr "Умањене сличице" + +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 +msgid "Image Wall" +msgstr "Мозаик слика" + +#: ../extensions/contact_sheet/dlg-contact-sheet.c:481 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:492 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:506 +msgid "Could not save the theme" +msgstr "Нисам успео да сачувам тему" + +#: ../extensions/contact_sheet/dlg-contact-sheet.c:651 +msgid "Could not delete the theme" +msgstr "Нисам успео обрисати тему" + +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:247 +msgid "Creating images" +msgstr "Стварање слика" + +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:896 +msgid "Generating thumbnails" +msgstr "Стварање умањених приказа" -#: ../data/glade/gthumb_preferences.glade.h:66 -msgid "_Toolbar style:" -msgstr "Стил алатке:" +#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:32 +msgid "Header" +msgstr "Заглавље" -#: ../data/glade/gthumb_preferences.glade.h:67 -msgid "gThumb Preferences" -msgstr "gThumb поставке" +#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:33 +msgid "Footer" +msgstr "Подножје" -#: ../data/glade/gthumb_preferences.glade.h:68 -msgid "seconds" -msgstr "секунде" +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:193 +msgid "Theme Properties" +msgstr "Особине теме" + +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:208 +msgid "Copy _From" +msgstr "Умножи _из" + +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:316 +msgid "New theme" +msgstr "Нова тема" + +#: ../extensions/convert_format/callbacks.c:45 +msgid "Convert Format..." +msgstr "Претвори облик..." + +#: ../extensions/convert_format/callbacks.c:46 +msgid "Convert image format" +msgstr "Претвори облик слике" + +#: ../extensions/convert_format/convert_format.extension.in.in.h:1 +msgid "Convert format" +msgstr "Облик претварања" + +#: ../extensions/convert_format/convert_format.extension.in.in.h:2 +msgid "Save images in a different format" +msgstr "Сачувај слике у другом облику" -#: ../data/glade/gthumb_print.glade.h:4 -msgid "1" -msgstr "1" - -#: ../data/glade/gthumb_print.glade.h:5 -msgid "16" -msgstr "16" - -#: ../data/glade/gthumb_print.glade.h:6 -msgid "2" -msgstr "2" - -#: ../data/glade/gthumb_print.glade.h:7 -msgid "4" -msgstr "4" - -#: ../data/glade/gthumb_print.glade.h:8 -msgid "8" -msgstr "8" - -#: ../data/glade/gthumb_print.glade.h:9 -msgid "Margins" -msgstr "Маргине" - -#: ../data/glade/gthumb_print.glade.h:10 -msgid "Orientation" -msgstr "Усмерење" - -#: ../data/glade/gthumb_print.glade.h:11 -msgid "Size" -msgstr "Величина" +#: ../extensions/convert_format/data/ui/convert-format.ui.h:1 +msgid "Convert Format" +msgstr "Облик претварања" + +#: ../extensions/convert_format/data/ui/convert-format.ui.h:2 +msgid "New format" +msgstr "Нови облик" + +#: ../extensions/convert_format/data/ui/convert-format.ui.h:3 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 +msgid "Destination" +msgstr "Одредиште" + +#: ../extensions/convert_format/data/ui/convert-format.ui.h:5 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 +msgid "_Use the original image folder" +msgstr "_Користи изворну фасциклу са сликама" + +#: ../extensions/convert_format/dlg-convert-format.c:95 +msgid "Converting images" +msgstr "Претварање слика" + +#: ../extensions/desktop_background/actions.c:158 +msgid "Could not show the desktop background properties" +msgstr "Нисам успео да прикажем поставке позадине радне површи" + +#: ../extensions/desktop_background/actions.c:224 +#: ../extensions/desktop_background/actions.c:242 +msgid "Could not set the desktop background" +msgstr "Нисам успео да поставим позадину радне површи" + +#: ../extensions/desktop_background/callbacks.c:49 +msgid "Set as Desktop Background" +msgstr "Постави за позадину радне површи" + +#: ../extensions/desktop_background/callbacks.c:50 +#: ../extensions/desktop_background/desktop_background.extension.in.in.h:2 +msgid "Set the image as desktop background" +msgstr "Постави слику за позадину радне површи" + +#: ../extensions/desktop_background/desktop_background.extension.in.in.h:1 +msgid "Desktop background" +msgstr "Позадина радне површи" -#: ../data/glade/gthumb_print.glade.h:12 +#: ../extensions/edit_metadata/actions.c:66 msgid "" -"Note: Drag the image to move it in the page.\n" -"Click on an image to rotate it." +"Are you sure you want to permanently delete the metadata of the selected " +"files?" msgstr "" -"Пажња: Превуците слику да је преместите на страни.\n" -"Кликните на слику да је ротирате." +"Да ли сте сигурни да желите трајно обрисати метаподатке означених датотека?" -#: ../data/glade/gthumb_print.glade.h:14 -msgid "A4" -msgstr "А4" - -#: ../data/glade/gthumb_print.glade.h:15 -msgid "Center _on Page" -msgstr "Центрирај _на страници" - -#: ../data/glade/gthumb_print.glade.h:16 -msgid "Comment _font:" -msgstr "_Фонт за примедбу:" - -#: ../data/glade/gthumb_print.glade.h:18 -msgid "Executive" -msgstr "Извршни" - -#: ../data/glade/gthumb_print.glade.h:19 -msgid "I_nclude comment" -msgstr "У_кључи примедбу" +#: ../extensions/edit_metadata/actions.c:73 +msgid "If you delete the metadata, it will be permanently lost." +msgstr "Ако обришете метаподатке, биће трајно изгубљени." + +#: ../extensions/edit_metadata/callbacks.c:97 +msgid "T_ags" +msgstr "О_знаке" + +#: ../extensions/edit_metadata/callbacks.c:101 +msgid "Edit the comment and other information of the selected files" +msgstr "Уреди напомене и остале податке означених датотека" + +#: ../extensions/edit_metadata/callbacks.c:107 +msgid "Set the tags of the selected files" +msgstr "Додели ознаке изабраним датотекама" + +#: ../extensions/edit_metadata/callbacks.c:112 +msgid "Delete Metadata" +msgstr "Бриши метаподатке" + +#: ../extensions/edit_metadata/callbacks.c:113 +msgid "Delete the comment and the embedded metadata of the selected files" +msgstr "Брише напомене и угњежђене метаподатке означених датотека" + +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:1 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 +msgid "D_escription:" +msgstr "Опи_с:" -#: ../data/glade/gthumb_print.glade.h:20 -msgid "Images per page:" -msgstr "Слика по страни:" +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:3 +msgid "_Place:" +msgstr "_Место:" -#: ../data/glade/gthumb_print.glade.h:21 -msgid "Inches" -msgstr "Инчи" - -#: ../data/glade/gthumb_print.glade.h:22 -msgid "Lan_dscape" -msgstr "Поп_реко" +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 +#: ../extensions/edit_metadata/data/ui/tag-chooser.ui.h:1 +msgid "T_ags:" +msgstr "О_знаке:" + +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:5 +msgid "_Rating:" +msgstr "_Оцена:" + +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:6 +msgid "_Title:" +msgstr "_Наслов:" + +#: ../extensions/edit_metadata/dlg-edit-metadata.c:121 +msgid "Could not save the file metadata" +msgstr "Нисам успео да сачувам метаподатке датотека" + +#: ../extensions/edit_metadata/dlg-edit-metadata.c:234 +#: ../gthumb/gth-overwrite-dialog.c:136 +msgid "Cannot read file information" +msgstr "Нисам успео да прочитам податке о датотеци" + +#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:1 +msgid "Edit metadata" +msgstr "Уредите метаподатке" + +#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 +msgid "Allow to edit files metadata." +msgstr "Дозволи измену метаподатака датотека." + +#. Translators: the %s symbol in the string is a file name +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:63 +#, c-format +msgid "%s Metadata" +msgstr "%s метаподатак" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:66 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:83 +#: ../extensions/facebook/dlg-import-from-facebook.c:319 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:324 +#, c-format +msgid "%d file" +msgid_plural "%d files" +msgstr[0] "%d датотека" +msgstr[1] "%d датотеке" +msgstr[2] "%d датотека" +msgstr[3] "%d датотека" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:144 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:197 +msgid "Sa_ve and Close" +msgstr "Сачу_вај и затвори" -#: ../data/glade/gthumb_print.glade.h:23 -msgid "Layout" -msgstr "Распоред" +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:156 +msgid "Save only cha_nged fields" +msgstr "Сачувај само измење_на поља" -#: ../data/glade/gthumb_print.glade.h:24 -msgid "Legal" -msgstr "Правни" - -#: ../data/glade/gthumb_print.glade.h:25 -msgid "Letter" -msgstr "Писмо" - -#: ../data/glade/gthumb_print.glade.h:26 -msgid "Millimeters" -msgstr "Милиметри" - -#: ../data/glade/gthumb_print.glade.h:27 -msgid "P_ortrait" -msgstr "У_здуж" - -#: ../data/glade/gthumb_print.glade.h:28 -msgid "Paper Details" -msgstr "Детаљи за папир" - -#: ../data/glade/gthumb_print.glade.h:29 -msgid "Postcard" -msgstr "Разгледница" +#: ../extensions/edit_metadata/gth-edit-general-page.c:555 +msgid "No date" +msgstr "Нема датума" -#. -#: ../data/glade/gthumb_print.glade.h:30 ../libgthumb/print-callbacks.c:1667 -#: ../libgthumb/print-callbacks.c:1681 ../libgthumb/print-callbacks.c:2137 -msgid "Print" -msgstr "Штампај" +#: ../extensions/edit_metadata/gth-edit-general-page.c:556 +msgid "The following date" +msgstr "Следећи датум" -#: ../data/glade/gthumb_print.glade.h:31 -msgid "Tabloid" -msgstr "Таблоид" - -#: ../data/glade/gthumb_print.glade.h:32 -msgid "_Bottom:" -msgstr "_Дно:" - -#: ../data/glade/gthumb_print.glade.h:34 -msgid "_Left:" -msgstr "_Лево:" - -#: ../data/glade/gthumb_print.glade.h:35 -msgid "_Right:" -msgstr "_Десно:" - -#: ../data/glade/gthumb_print.glade.h:36 -msgid "_Scale:" -msgstr "_Размера:" - -#: ../data/glade/gthumb_print.glade.h:37 -msgid "_Top:" -msgstr "_Горе:" - -#: ../data/glade/gthumb_print.glade.h:38 -msgid "_Unit:" -msgstr "_Јединица:" - -#: ../data/glade/gthumb_search.glade.h:2 -msgid "Search criteria" -msgstr "Критеријум претраге" - -#: ../data/glade/gthumb_search.glade.h:3 -msgid "Search scope" -msgstr "Досег претраге" - -#: ../data/glade/gthumb_search.glade.h:5 -msgid "After" -msgstr "После" - -#: ../data/glade/gthumb_search.glade.h:6 -msgid "Any" -msgstr "Било које" - -#: ../data/glade/gthumb_search.glade.h:7 -msgid "Before" -msgstr "Пре" - -#: ../data/glade/gthumb_search.glade.h:10 -msgid "Choose categories from the saved list" -msgstr "Одабери категорије из сачуваног списка" - -#: ../data/glade/gthumb_search.glade.h:12 -msgid "Equal to" -msgstr "Једнако са" +#: ../extensions/edit_metadata/gth-edit-general-page.c:557 +#: ../extensions/importer/gth-import-preferences-dialog.c:331 +msgid "Current date" +msgstr "Текући датум" -#: ../data/glade/gthumb_search.glade.h:13 -msgid "File _name:" -msgstr "И_ме датотеке:" +#: ../extensions/edit_metadata/gth-edit-general-page.c:559 +msgid "Last modified date" +msgstr "Датум последње измене" -#: ../data/glade/gthumb_search.glade.h:14 -msgid "Find" -msgstr "Пронађи" +#: ../extensions/edit_metadata/gth-edit-general-page.c:560 +msgid "File creation date" +msgstr "Датум настанка датотеке" -#: ../data/glade/gthumb_search.glade.h:15 -msgid "Found images:" -msgstr "Пронађене слике:" - -#: ../data/glade/gthumb_search.glade.h:16 -msgid "Match a_ll selected categories" -msgstr "Поклапање са с_вим изабраним категоријама" - -#: ../data/glade/gthumb_search.glade.h:17 -msgid "Match a_ny selected category" -msgstr "Поклапање са _било којом изабраном категоријом" - -#: ../data/glade/gthumb_search.glade.h:18 -msgid "New _Search..." -msgstr "Нова _претрага..." - -#: ../data/glade/gthumb_search.glade.h:19 ../src/dlg-photo-importer.c:809 -#: ../src/dlg-photo-importer.c:1428 -msgid "No images found" -msgstr "Слике нису пронађене" - -#: ../data/glade/gthumb_search.glade.h:20 -msgid "Search Progress" -msgstr "НАпредак претраге" - -#: ../data/glade/gthumb_search.glade.h:21 -#: ../data/glade/gthumb_tools.glade.h:32 -msgid "Searching in:" -msgstr "Претраживање у:" - -#: ../data/glade/gthumb_search.glade.h:24 -#: ../src/gth-browser-actions-entries.h:155 -#: ../src/gth-browser-actions-entries.h:190 -msgid "_Edit Search" -msgstr "_Измени претрагу" +#: ../extensions/edit_metadata/gth-edit-general-page.c:561 +msgid "Do not modify" +msgstr "Не мењај" -#: ../data/glade/gthumb_search.glade.h:25 -#: ../data/glade/gthumb_tools.glade.h:36 -msgid "_Include sub-folders" -msgstr "_Укључи поддиректоријуме" +#. Translators: the %s symbol in the string is a file name +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:80 +#, c-format +msgid "%s Tags" +msgstr "%s ознаке" -#: ../data/glade/gthumb_search.glade.h:27 -msgid "_Save" -msgstr "_Сачувај" - -#: ../data/glade/gthumb_search.glade.h:28 -msgid "_Search" -msgstr "_Претражи" - -#: ../data/glade/gthumb_tools.glade.h:3 -msgid "Write to CD" -msgstr "Упиши на ЦД" +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:189 +msgid "Assign Tags" +msgstr "Додели ознаке" + +#: ../extensions/edit_metadata/gth-tag-task.c:119 +#: ../extensions/edit_metadata/gth-tag-task.c:136 +msgid "Assigning tags to the selected files" +msgstr "Додели ознаке изабраним дадотекама" + +#: ../extensions/edit_metadata/gth-tag-task.c:119 +msgid "Writing files" +msgstr "Уписујем датотеке" + +#: ../extensions/edit_metadata/gth-tag-task.c:136 +msgid "Reading files" +msgstr "Учитавам датотеке" + +#: ../extensions/example/src/example.extension.in.in.h:1 +msgid "Example" +msgstr "Пример" + +#: ../extensions/example/src/example.extension.in.in.h:2 +msgid "Extension example." +msgstr "Пример наставка." + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:1 +msgid "C_opyright:" +msgstr "Ауторска _права:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 +msgid "Co_untry:" +msgstr "_Држава:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:3 +msgid "_Code:" +msgstr "_Шифра:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:4 +msgid "Cr_edit:" +msgstr "_Заслуга:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:6 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 +msgid "_Source:" +msgstr "_Извор:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:7 +msgid "_Urgency:" +msgstr "_Важност:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:8 +msgid "_Object Name:" +msgstr "Име _предмета:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:9 +msgid "Byline _Title:" +msgstr "Титула _аутора:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:10 +msgid "_Byline:" +msgstr "_Аутор:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:11 +msgid "_City:" +msgstr "_Град:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:12 +msgid "_Language:" +msgstr "_Језик:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:13 +msgid "State/Province:" +msgstr "Држава/област:" + +#: ../extensions/exiv2_tools/exiv2_tools.extension.in.in.h:1 +msgid "EXIF, IPTC, XMP support" +msgstr "Подршка за Егзиф, ИПТЦ, ИксМП" + +#: ../extensions/exiv2_tools/exiv2_tools.extension.in.in.h:2 +msgid "Read and write exif, iptc and xmp metadata." +msgstr "Читај и пиши егзиф, иптц, и иксмп метаподатке." + +#: ../extensions/exiv2_tools/main.c:33 +msgid "Exif General" +msgstr "Општи егзиф" + +#: ../extensions/exiv2_tools/main.c:34 +msgid "Exif Conditions" +msgstr "Егзиф услови" + +#: ../extensions/exiv2_tools/main.c:35 +msgid "Exif Structure" +msgstr "Егзиф састав" + +#: ../extensions/exiv2_tools/main.c:36 +msgid "Exif Thumbnail" +msgstr "Егзиф умањени прикази" + +#: ../extensions/exiv2_tools/main.c:37 +msgid "Exif GPS" +msgstr "Егзиф ГПС" + +#: ../extensions/exiv2_tools/main.c:38 +msgid "Exif Maker Notes" +msgstr "Егзиф белешке" + +#: ../extensions/exiv2_tools/main.c:39 +msgid "Exif Versions" +msgstr "Егзиф издање" + +#: ../extensions/exiv2_tools/main.c:40 +msgid "Exif Other" +msgstr "Егзиф остало" + +#: ../extensions/exiv2_tools/main.c:41 +msgid "IPTC" +msgstr "ИПТЦ" + +#: ../extensions/exiv2_tools/main.c:42 +msgid "XMP Embedded" +msgstr "ИксМП угњежњен" + +#: ../extensions/exiv2_tools/main.c:43 +msgid "XMP Attached" +msgstr "ИксМП додат" + +#: ../extensions/exiv2_tools/main.c:272 +msgid "date photo was taken" +msgstr "Датум снимања фотографије" + +#: ../extensions/export_tools/callbacks.c:99 +msgid "Share" +msgstr "Дели" + +#: ../extensions/facebook/callbacks.c:59 ../extensions/facebook/callbacks.c:64 +msgid "Face_book..." +msgstr "_Фејсбук..." + +#: ../extensions/facebook/callbacks.c:60 +msgid "Download photos from Facebook" +msgstr "Преузми слике са Фејсбука" + +#: ../extensions/facebook/callbacks.c:65 +msgid "Upload photos to Facebook" +msgstr "Отпреми слике на Фејсбук" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 +msgid "Export to Flickr" +msgstr "Извези у Фликр" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:2 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 +msgid "_Upload" +msgstr "_Отпреми" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:3 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 +msgid "_Account:" +msgstr "_Налог:" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:4 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:3 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 +msgid "Edit accounts" +msgstr "Уреди налоге" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 +msgid "A_lbum:" +msgstr "А_лбум:" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 +msgid "Add a new album" +msgstr "Додајте нови албум" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 +msgid "Resize the images if larger than this size" +msgstr "Промени величину слике ако је већа од ове величине" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:8 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 +msgid "_Resize if larger than:" +msgstr "Промени _величину ако је веће од:" -#: ../data/glade/gthumb_tools.glade.h:4 -msgid "Note: jpeg transformations are lossless." -msgstr "" -"Пажња: JPEG трансформације не умањују квалитет." +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:9 +msgid "720 x 720" +msgstr "720 x 720" -#: ../data/glade/gthumb_tools.glade.h:6 -#, no-c-format -msgid "" -"Special characters: # (enumerator), %f (original filename), " -"%d (image date), %s (image size)." -msgstr "" -"Нарочити знаци: # (бројач), %f (изворно име), %d (датум " -"слике), %s (величина слике)." +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:10 +msgid "1024 x 1024" +msgstr "1024 x 1024" -#: ../data/glade/gthumb_tools.glade.h:7 -msgid "Adjust photo _orientation" -msgstr "Подеси ус_мерење слике" - -#: ../data/glade/gthumb_tools.glade.h:8 -msgid "Apply to _all images" -msgstr "Примени на _све слике" - -#: ../data/glade/gthumb_tools.glade.h:9 -msgid "C_urrent date" -msgstr "Трен_утни датум" - -#: ../data/glade/gthumb_tools.glade.h:10 -#: ../src/gth-browser-actions-entries.h:38 -#: ../src/gth-browser-actions-entries.h:39 -msgid "Ca_talog" -msgstr "Ка_талог" +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:11 +msgid "1280 x 1280" +msgstr "1280 x 1280" -#: ../data/glade/gthumb_tools.glade.h:11 -msgid "Change Date" -msgstr "Промени датум" +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:12 +msgid "1600 x 1600" +msgstr "1600 x 1600" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:13 +msgid "2048 x 2048" +msgstr "2048 x 2048" + +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 +msgid "Public photos" +msgstr "Јавне фотографије" + +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 +msgid "Private photos, visible to friends" +msgstr "Личне фотографије, видљиве пријатељима" + +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:5 +msgid "Private" +msgstr "Личне" + +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:5 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 +msgid "_Visibility:" +msgstr "_Видљивост:" + +#: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:1 +#: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:1 +#: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:1 +#: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:1 +msgid "Files successfully uploaded to the server." +msgstr "Датотека је успешно отпремљена на сервер." + +#: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:2 +#: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:2 +#: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:2 +#: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:2 +#: ../extensions/webalbums/gth-web-exporter.c:1839 +msgid "_Open in the Browser" +msgstr "_Отвори у прегледнику" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 +msgid "Import from Picasa Web Album" +msgstr "Увези из веб албума Пикасе" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:2 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 +msgid "_Import" +msgstr "Ув_ези" -#: ../data/glade/gthumb_tools.glade.h:12 -msgid "Change the last modified date to:" -msgstr "Промени датум последње измене у:" - -#: ../data/glade/gthumb_tools.glade.h:13 -msgid "Check _All" -msgstr "Провери _све" - -#: ../data/glade/gthumb_tools.glade.h:14 -msgid "Check _None" -msgstr "Провери _ништа" - -#: ../data/glade/gthumb_tools.glade.h:15 -msgid "Checking image:" -msgstr "Проверавање слике:" - -#: ../data/glade/gthumb_tools.glade.h:16 -msgid "Current _Folder" -msgstr "Текући _директоријум" - -#: ../data/glade/gthumb_tools.glade.h:17 -msgid "Equal images:" -msgstr "Изједначи слике:" +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:4 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 +#: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 +msgid "A_ccount:" +msgstr "Н_алог:" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:5 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 +msgid "_Album:" +msgstr "_Албум:" + +#: ../extensions/facebook/dlg-export-to-facebook.c:123 +#: ../extensions/facebook/dlg-export-to-facebook.c:326 +#: ../extensions/facebook/dlg-import-from-facebook.c:226 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:138 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:414 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:231 +#: ../extensions/oauth/web-service.c:380 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:131 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:375 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:124 +msgid "Could not connect to the server" +msgstr "Нисам успео да се повежем на сервер" + +#: ../extensions/facebook/dlg-export-to-facebook.c:175 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:246 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:182 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:176 +msgid "Could not upload the files" +msgstr "Нисам успео да отпремим датотеке" + +#: ../extensions/facebook/dlg-export-to-facebook.c:397 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:188 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:223 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:457 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:309 +msgid "Could not create the album" +msgstr "Нисам успео да направим албум" + +#: ../extensions/facebook/dlg-export-to-facebook.c:465 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:528 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:375 +msgid "New Album" +msgstr "Нови албум" + +#: ../extensions/facebook/dlg-export-to-facebook.c:557 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:583 +#: ../extensions/image_print/gth-image-print-job.c:1739 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:607 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:597 +msgid "No valid file selected." +msgstr "Није означена исправна датотека." + +#: ../extensions/facebook/dlg-export-to-facebook.c:558 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:584 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:608 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:598 +msgid "Could not export the files" +msgstr "Нисам успео да извезем датотеке" + +#: ../extensions/facebook/dlg-export-to-facebook.c:566 +#: ../extensions/find_duplicates/gth-find-duplicates.c:277 +#: ../extensions/find_duplicates/gth-find-duplicates.c:470 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:592 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:616 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:605 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:254 +#: ../gthumb/gth-browser.c:1116 +#, c-format +msgid "%d file (%s)" +msgid_plural "%d files (%s)" +msgstr[0] "%d датотека (%s)" +msgstr[1] "%d датотеке (%s)" +msgstr[2] "%d датотека (%s)" +msgstr[3] "%d датотека (%s)" + +#: ../extensions/facebook/dlg-export-to-facebook.c:587 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:615 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:635 +#, c-format +msgid "Export to %s" +msgstr "Извези у %s" + +#: ../extensions/facebook/dlg-import-from-facebook.c:344 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:349 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:279 +msgid "Could not get the photo list" +msgstr "Нисам успео да добавим списак слика" + +#: ../extensions/facebook/dlg-import-from-facebook.c:378 +#: ../extensions/facebook/dlg-import-from-facebook.c:533 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:386 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:551 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:313 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:586 +msgid "No album selected" +msgstr "Није одређен албум" + +#: ../extensions/facebook/dlg-import-from-facebook.c:551 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:569 +#, c-format +msgid "Import from %s" +msgstr "Увези из %s" + +#: ../extensions/facebook/dlg-import-from-facebook.c:551 +#: ../extensions/facebook/facebook.extension.in.in.h:1 +msgid "Facebook" +msgstr "Фејсбук" + +#: ../extensions/facebook/facebook.extension.in.in.h:2 +msgid "Upload images to Facebook" +msgstr "Отпреми слике на Фејсбук" + +#: ../extensions/facebook/facebook-service.c:462 +#: ../extensions/flicker_utils/flickr-service.c:863 +#: ../extensions/photobucket/photobucket-service.c:310 +#: ../extensions/picasaweb/picasa-web-service.c:711 +msgid "Getting the album list" +msgstr "Добављам списак албума" + +#: ../extensions/facebook/facebook-service.c:584 +#: ../extensions/flicker_utils/flickr-service.c:965 +#: ../extensions/flicker_utils/flickr-service.c:1087 +#: ../extensions/flicker_utils/flickr-service.c:1126 +#: ../extensions/photobucket/photobucket-service.c:423 +#: ../extensions/picasaweb/picasa-web-service.c:805 +msgid "Creating the new album" +msgstr "Правим нов албум" + +#: ../extensions/facebook/facebook-service.c:645 +#: ../extensions/flicker_utils/flickr-service.c:1176 +#: ../extensions/photobucket/photobucket-service.c:485 +#: ../extensions/picasaweb/picasa-web-service.c:860 +#, c-format +msgid "Could not upload '%s': %s" +msgstr "Нисам успео отпремити „%s“: %s" + +#. Translators: %s is a filename +#: ../extensions/facebook/facebook-service.c:710 +#: ../extensions/flicker_utils/flickr-service.c:1287 +#: ../extensions/photobucket/photobucket-service.c:542 +#: ../extensions/picasaweb/picasa-web-service.c:917 +#, c-format +msgid "Uploading '%s'" +msgstr "Отпремам „%s“" + +#: ../extensions/facebook/facebook-service.c:923 +#: ../extensions/flicker_utils/flickr-service.c:1482 +#: ../extensions/photobucket/photobucket-service.c:714 +#: ../extensions/picasaweb/picasa-web-service.c:1138 +msgid "Uploading the files to the server" +msgstr "Отпремам датотеке на севрер" + +#: ../extensions/facebook/facebook-service.c:1022 +#: ../extensions/flicker_utils/flickr-service.c:1651 +#: ../extensions/picasaweb/picasa-web-service.c:1257 +msgid "Getting the photo list" +msgstr "Добављам списак слика" + +#: ../extensions/file_manager/actions.c:133 +msgid "New folder" +msgstr "Нова фасцикла" + +#: ../extensions/file_manager/actions.c:134 +msgid "Enter the folder name:" +msgstr "Унесите име фасцикле:" + +#: ../extensions/file_manager/actions.c:400 +#: ../extensions/file_manager/callbacks.c:380 +#: ../extensions/file_manager/callbacks.c:838 +msgid "Could not move the files" +msgstr "Нисам успео преместити датотеке" + +#: ../extensions/file_manager/actions.c:401 +#: ../extensions/file_manager/callbacks.c:381 +#: ../extensions/file_manager/callbacks.c:839 +msgid "" +"Files cannot be moved to the current location, as alternative you can choose " +"to copy them." +msgstr "" +"Датотеке не могу бити премештене на тренутно место, у замену, можете " +"изабрати да их умножите." -#: ../data/glade/gthumb_tools.glade.h:18 -msgid "Find Duplicates" -msgstr "Понађи дупликате" +#: ../extensions/file_manager/actions.c:563 +msgid "Could not open the location" +msgstr "Нисам успео да отворим место" -#: ../data/glade/gthumb_tools.glade.h:19 -msgid "Found duplicates:" -msgstr "Пронађени дупликати:" - -#: ../data/glade/gthumb_tools.glade.h:20 -msgid "Image c_reation date" -msgstr "Датум п_рављења слике" - -#: ../data/glade/gthumb_tools.glade.h:21 -msgid "Mirror image horizontally (left-right)" -msgstr "Одрази слику хоризонтално (лево-десно)" - -#: ../data/glade/gthumb_tools.glade.h:22 -msgid "Mirror image vertically (top-bottom)" -msgstr "Одрази слику вертикално (врх-дно)" - -#: ../data/glade/gthumb_tools.glade.h:23 -#: ../src/gth-browser-actions-entries.h:85 -#: ../src/gth-browser-actions-entries.h:110 -#: ../src/gth-browser-actions-entries.h:220 -#: ../src/gth-browser-actions-entries.h:250 -msgid "Move to _Trash" -msgstr "Премести у _Ђубре" - -#: ../data/glade/gthumb_tools.glade.h:24 -msgid "New names _preview:" -msgstr "_Приказ нових имена:" - -#: ../data/glade/gthumb_tools.glade.h:25 -msgid "P_hoto digitalization date (From EXIF data)" -msgstr "Датум _фото дигитализације (из EXIF података)" +#: ../extensions/file_manager/actions.c:696 +msgid "" +"The folder is not empty, do you want to delete the folder and its content " +"permanently?" +msgstr "" +"Фасцикла није празна. Да ли желите трајно обрисати фасциклу и њен садржај?" -#: ../data/glade/gthumb_tools.glade.h:26 -msgid "Re_verse Order" -msgstr "О_брнути редослед" +#: ../extensions/file_manager/actions.c:712 +msgid "Could not delete the folder" +msgstr "Нисам успео да обришем фасциклу" -#: ../data/glade/gthumb_tools.glade.h:27 -msgid "Rename Series" -msgstr "Преименуј серије" - -#: ../data/glade/gthumb_tools.glade.h:28 -msgid "Rotate Images" -msgstr "Ротирај слике" - -#: ../data/glade/gthumb_tools.glade.h:29 -msgid "Rotate image 90 degrees clockwise" -msgstr "Ротирај 90 степени у правцу казаљке на сату" - -#: ../data/glade/gthumb_tools.glade.h:30 -msgid "Rotate image 90 degrees counter-clockwise" -msgstr "Ротирај слику 90 степени супротно кретању казањке на сату" - -#: ../data/glade/gthumb_tools.glade.h:31 -msgid "Search terminated, no duplicates found." -msgstr "Претрага завршена, дупликати нису пронађени." +#: ../extensions/file_manager/actions.c:773 +msgid "" +"The folder cannot be moved to the Trash. Do you want to delete it " +"permanently?" +msgstr "Не могу преместити фасциклу у ђубре. Желите ли је трајно обрисати?" -#: ../data/glade/gthumb_tools.glade.h:34 -msgid "The _following date:" -msgstr "Следећи _датум:" +#: ../extensions/file_manager/actions.c:780 +msgid "Could not move the folder to the Trash" +msgstr "Не могу да преместим фасциклу у ђубре" + +#: ../extensions/file_manager/actions.c:816 +#: ../gthumb/gth-file-source-vfs.c:841 +#, c-format +msgid "Are you sure you want to permanently delete \"%s\"?" +msgstr "Да ли сте сигурни да желите трајно обрисати „%s“?" + +#: ../extensions/file_manager/actions.c:826 +#: ../gthumb/gth-file-source-vfs.c:854 +msgid "If you delete a file, it will be permanently lost." +msgstr "Ако обришете датотеку, биће трајно изгубљена." + +#: ../extensions/file_manager/actions.c:920 +msgid "Move To" +msgstr "Премести у" + +#: ../extensions/file_manager/actions.c:920 +msgid "Copy To" +msgstr "Умножи у" + +#: ../extensions/file_manager/actions.c:924 +msgid "Move" +msgstr "Премести" + +#: ../extensions/file_manager/actions.c:924 +msgid "Copy" +msgstr "Умножи" + +#: ../extensions/file_manager/callbacks.c:163 +#: ../extensions/file_manager/callbacks.c:199 +msgid "Create _Folder" +msgstr "Направи _фасциклу" + +#: ../extensions/file_manager/callbacks.c:164 +#: ../extensions/file_manager/callbacks.c:200 +msgid "Create a new empty folder inside this folder" +msgstr "Направи нову празну фасциклу у овој фасцикли" -#: ../data/glade/gthumb_tools.glade.h:35 -msgid "Write To CD" -msgstr "Упиши на ЦД" - -#: ../data/glade/gthumb_tools.glade.h:37 -#: ../src/gth-browser-actions-callbacks.c:156 -#: ../src/gth-browser-actions-callbacks.c:584 -#: ../src/gth-browser-actions-callbacks.c:1093 -msgid "_Rename" -msgstr "_Промени име" +#: ../extensions/file_manager/callbacks.c:179 +msgid "D_uplicate" +msgstr "_Удвостручи" -#: ../data/glade/gthumb_tools.glade.h:39 -msgid "_Selected Images" -msgstr "_Означене слике" +#: ../extensions/file_manager/callbacks.c:180 +msgid "Duplicate the selected files" +msgstr "Удвостручи одабране датотеке" + +#: ../extensions/file_manager/callbacks.c:183 +#: ../extensions/file_manager/callbacks.c:219 +#: ../gthumb/gth-file-source-vfs.c:813 +msgid "Mo_ve to Trash" +msgstr "Пр_емести у Ђубре" + +#: ../extensions/file_manager/callbacks.c:184 +msgid "Move the selected files to the Trash" +msgstr "Премести означене датотеке у Ђубре" + +#: ../extensions/file_manager/callbacks.c:187 +#: ../extensions/file_manager/callbacks.c:223 +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:5 +#: ../gthumb/gth-tags-entry.c:871 +msgid "_Delete" +msgstr "_Обриши" -#: ../data/glade/gthumb_tools.glade.h:40 -msgid "_Sort:" -msgstr "По_ређај:" +#: ../extensions/file_manager/callbacks.c:188 +msgid "Delete the selected files" +msgstr "Отвори означене датотеке" + +#: ../extensions/file_manager/callbacks.c:191 +#: ../extensions/file_manager/callbacks.c:203 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:2 +msgid "_Rename" +msgstr "_Преименуј" -#: ../data/glade/gthumb_tools.glade.h:43 -msgid "by Modification date" -msgstr "по датуму измене" +#: ../extensions/file_manager/callbacks.c:192 +msgid "Rename the selected files" +msgstr "Промени име означеним датотекама" -#: ../data/glade/gthumb_tools.glade.h:44 -msgid "by Name" -msgstr "по имену" +#: ../extensions/file_manager/callbacks.c:195 +msgid "Open with the _File Manager" +msgstr "Отвори _управником датотека" -#: ../data/glade/gthumb_tools.glade.h:45 -msgid "by Size" -msgstr "по величини" +#: ../extensions/file_manager/callbacks.c:215 +msgid "_Paste Into Folder" +msgstr "_Спусти у фасциклу" + +#: ../extensions/file_manager/callbacks.c:227 +#: ../extensions/file_manager/callbacks.c:236 +msgid "Copy to..." +msgstr "Умножи у..." + +#: ../extensions/file_manager/callbacks.c:228 +msgid "Copy the selected folder to another folder" +msgstr "Умножи означену фасциклу у другу фасциклу" + +#: ../extensions/file_manager/callbacks.c:231 +#: ../extensions/file_manager/callbacks.c:240 +msgid "Move to..." +msgstr "Премести у..." + +#: ../extensions/file_manager/callbacks.c:232 +msgid "Move the selected folder to another folder" +msgstr "Премести означену фасциклу у другу фасциклу" + +#: ../extensions/file_manager/callbacks.c:237 +msgid "Copy the selected files to another folder" +msgstr "Умножи означене датотеке у другу фасциклу" + +#: ../extensions/file_manager/callbacks.c:241 +msgid "Move the selected files to another folder" +msgstr "Премести означене датотеке у другу фасциклу" + +#: ../extensions/file_manager/callbacks.c:999 +#: ../extensions/find_duplicates/gth-find-duplicates.c:766 +#: ../gthumb/gth-browser.c:5234 ../gthumb/gth-browser.c:5268 +#: ../gthumb/gth-progress-dialog.c:406 +msgid "Could not perform the operation" +msgstr "Нисам успео да изведем радњу" + +#: ../extensions/file_manager/file_manager.extension.in.in.h:1 +msgid "File manager" +msgstr "Управник датотека" + +#: ../extensions/file_manager/file_manager.extension.in.in.h:2 +msgid "File manager operations." +msgstr "Радње управника датотека." + +#: ../extensions/file_manager/gth-delete-task.c:62 +msgid "Deleting files" +msgstr "Брисање датотека" -#: ../data/glade/gthumb_web_exporter.glade.h:4 -msgid "1024 x 768" -msgstr "1024 x 768" +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:1 +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:5 +msgid "_Preview" +msgstr "_Преглед" -#: ../data/glade/gthumb_web_exporter.glade.h:4 -msgid "1024 x 1024" -msgstr "1024 x 1024" +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:2 +msgid "B_rightness:" +msgstr "_Светлина:" -#: ../data/glade/gthumb_web_exporter.glade.h:5 -msgid "1280 x 960" -msgstr "1280 x 960" +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:3 +msgid "Con_trast:" +msgstr "Кон_траст:" -#: ../data/glade/gthumb_web_exporter.glade.h:5 -msgid "1280 x 1280" -msgstr "1280 x 1280" +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:4 +msgid "_Saturation:" +msgstr "_Засићеност:" -#: ../data/glade/gthumb_web_exporter.glade.h:6 -msgid "320 x 200" -msgstr "320 x 200" - -#: ../data/glade/gthumb_web_exporter.glade.h:6 -msgid "320 x 320" -msgstr "320 x 320" - -#: ../data/glade/gthumb_web_exporter.glade.h:7 -msgid "640 x 480" -msgstr "640 x 480" - -#: ../data/glade/gthumb_web_exporter.glade.h:7 -msgid "640 x 640" -msgstr "640 x 640" - -#: ../data/glade/gthumb_web_exporter.glade.h:8 -msgid "800 x 600" -msgstr "800 x 600" - -#: ../data/glade/gthumb_web_exporter.glade.h:8 -msgid "800 x 800" -msgstr "800 x 800" - -#: ../data/glade/gthumb_web_exporter.glade.h:9 -msgid "Album" -msgstr "Албум" - -#: ../data/glade/gthumb_web_exporter.glade.h:10 -msgid "Index Layout" -msgstr "Распоред индекса" - -#: ../data/glade/gthumb_web_exporter.glade.h:11 -msgid "Personalize theme" -msgstr "Прилагоди тему" - -#: ../data/glade/gthumb_web_exporter.glade.h:12 -msgid "Photo data" -msgstr "Подаци о фотографији" - -#: ../data/glade/gthumb_web_exporter.glade.h:14 -msgid "Theme" -msgstr "Тема" +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:5 +msgid "G_amma:" +msgstr "_Распон:" -#: ../data/glade/gthumb_web_exporter.glade.h:16 -#, no-c-format -msgid "Note: %d (current date)." -msgstr "Пажња: %d (текући датум)." +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:6 +msgid "Cyan-_Red:" +msgstr "Светло плава-_Црвена:" -#: ../data/glade/gthumb_web_exporter.glade.h:17 -msgid "Came_ra Model" -msgstr "Модел каме_ре" +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:7 +msgid "_Magenta-Green:" +msgstr "_Љубичаста-зелена:" -#: ../data/glade/gthumb_web_exporter.glade.h:18 -msgid "Caption" -msgstr "Наслов" +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:8 +msgid "_Yellow-Blue:" +msgstr "_Жута-плава:" -#: ../data/glade/gthumb_web_exporter.glade.h:21 -msgid "E_xposure mode" -msgstr "Начин е_кспозиције" - -#: ../data/glade/gthumb_web_exporter.glade.h:22 -msgid "Exposure _time" -msgstr "Дужина _експозиције" - -#: ../data/glade/gthumb_web_exporter.glade.h:26 -msgid "Focal _length" -msgstr "Жижна даљ_ина" - -#: ../data/glade/gthumb_web_exporter.glade.h:28 -msgid "I_mage Caption..." -msgstr "Наслов _слике..." - -#: ../data/glade/gthumb_web_exporter.glade.h:30 -msgid "Inde_x file:" -msgstr "Инде_кс датотека:" +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:9 +msgid "Color Levels" +msgstr "Нивои боја" -#: ../data/glade/gthumb_web_exporter.glade.h:32 -msgid "Resi_ze if larger than:" -msgstr "Промени _величину ако је веће од:" +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:10 +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:5 +msgid "_Reset" +msgstr "_Поново постави" -#: ../data/glade/gthumb_web_exporter.glade.h:33 -msgid "Si_ze :" -msgstr "_Величина:" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:1 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +msgid "Selection" +msgstr "Избор" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 +msgid "_Width:" +msgstr "_Ширина:" -#: ../data/glade/gthumb_web_exporter.glade.h:35 -msgid "Th_eme:" -msgstr "Т_ема" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:3 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 +msgid "Heigh_t:" +msgstr "Висин_а:" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:4 +msgid "_Position:" +msgstr "_Положај:" -#: ../data/glade/gthumb_web_exporter.glade.h:36 -msgid "Web Album" -msgstr "Веб албум" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:5 +msgid "Maximize" +msgstr "Увећај" -#: ../data/glade/gthumb_web_exporter.glade.h:37 -msgid "Web Album Theme" -msgstr "Тема веб албума" - -#: ../data/glade/gthumb_web_exporter.glade.h:38 -msgid "_Aperture value" -msgstr "Величина о_твора" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:6 +msgid "Center" +msgstr "По средини" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:5 +msgid "Aspect ratio" +msgstr "Однос висине и ширине" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 +msgid "I_nvert aspect ratio" +msgstr "_Изврни пропорције" + +#. after the colon there is a control to select the size in pixels +#: ../extensions/file_tools/data/ui/crop-options.ui.h:10 +msgid "M_ultiple of:" +msgstr "Умножак _од:" + +#. abbreviation of pixel +#: ../extensions/file_tools/data/ui/crop-options.ui.h:12 +msgid "px" +msgstr "px" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 +#: ../gthumb/gth-file-chooser-dialog.c:252 +msgid "Options" +msgstr "Могућности" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:14 +msgid "_Grid:" +msgstr "_Мрежа:" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:15 +msgid "C_rop" +msgstr "_Острижи" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:1 +msgid "Method" +msgstr "Начин" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:2 +msgid "_Brightness" +msgstr "_Светлина" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:3 +msgid "_Saturation" +msgstr "_Засићеност" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:4 +msgid "_Average" +msgstr "_Просечно" -#: ../data/glade/gthumb_web_exporter.glade.h:39 -msgid "_Copy originals to destination" -msgstr "_Умножи изворне у одредишту" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 +#: ../gthumb/gth-main-default-metadata.c:47 +msgid "Dimensions" +msgstr "Величине" -#: ../data/glade/gthumb_web_exporter.glade.h:40 -msgid "_Date and Time" -msgstr "_Датум и време" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +msgid "Set the image size to this value" +msgstr "Постави величину слике на ову вредност" -#: ../data/glade/gthumb_web_exporter.glade.h:42 -msgid "_Flash" -msgstr "_Блиц" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:8 +msgid "High _quality" +msgstr "Добар _квалитет" -#: ../data/glade/gthumb_web_exporter.glade.h:43 -msgid "_Go to Theme Folder" -msgstr "_Иди у директоријум са темама" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:9 +msgid "Original dimensions:" +msgstr "Изворна величина:" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 +msgid "Scale factor:" +msgstr "Однос сразмерне промене величине:" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 +msgid "New dimensions:" +msgstr "Нова величина:" -#: ../data/glade/gthumb_web_exporter.glade.h:44 -msgid "_Install Theme..." -msgstr "Инсталирај тему..." +#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:29 +msgid "pixels" +msgstr "тачака" -#: ../data/glade/gthumb_web_exporter.glade.h:45 -msgid "_Select" -msgstr "_Изабери" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:14 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:12 +#, no-c-format +msgid "%" +msgstr "%" -#: ../data/glade/gthumb_web_exporter.glade.h:46 -msgid "_Shutter speed" -msgstr "_Брзина затварача" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:1 +msgid "Angle" +msgstr "Угао" -#: ../data/glade/gthumb_web_exporter.glade.h:47 -msgid "_Thumbnail Caption..." -msgstr "_Наслов умањеног приказа" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 +msgid "Align" +msgstr "Поравнај" -#: ../data/glade/gthumb_web_exporter.glade.h:48 -msgid "by modified time" -msgstr "по времену измене" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 +msgid "Image size" +msgstr "Величина слике" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 +msgid "Point 1:" +msgstr "Тачка 1:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 +msgid "Point 2:" +msgstr "Тачка 2:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 +msgid "Keep aspect ratio" +msgstr "Задржи сразмеру" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 +msgid "Grid:" +msgstr "Мрежа:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 +msgid "_Background:" +msgstr "_Позадина:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 +msgid "Pick a background color" +msgstr "Одабери боју позадине" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 +msgid "_Transparent" +msgstr "_Провидан" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:12 +msgid "Reset" +msgstr "Врати на задате вредности" -#: ../data/glade/gthumb_web_exporter.glade.h:52 -msgid "columns" -msgstr "колоне" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:13 +msgid "" +"Draw a line on the image \n" +"to set the alignment." +msgstr "" +"Вуците линију по слици \n" +"за поставку поравнања." -#: ../data/glade/gthumb_web_exporter.glade.h:53 -msgid "index.html" -msgstr "index.html" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:15 +msgid "Parallel" +msgstr "Паралелно" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:16 +msgid "Perpendicular" +msgstr "Нормално" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:17 +msgid "Alignment" +msgstr "Поравнање" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:18 +msgid "Original size" +msgstr "Изворна величина" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:19 +msgid "Bounding box" +msgstr "Гранични оквир" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:20 +msgid "Crop borders" +msgstr "Острижи ивице" + +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:1 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 +msgid "_Preview:" +msgstr "_Преглед:" + +# Праг? +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:2 +msgid "Threshold:" +msgstr "Задршка:" + +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:3 +msgid "Radius:" +msgstr "Полупречник:" + +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:4 +msgid "Amount:" +msgstr "Количина:" + +#: ../extensions/file_tools/file_tools.extension.in.in.h:1 +msgid "Image tools" +msgstr "Алатке за слике" + +#: ../extensions/file_tools/file_tools.extension.in.in.h:2 +msgid "Basic tools to modify images." +msgstr "Основне алатке за измену слика." + +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:372 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:272 +#: ../extensions/file_tools/gth-file-tool-grayscale.c:248 +#: ../extensions/file_tools/gth-file-tool-negative.c:68 +msgid "Applying changes" +msgstr "Примењујем измене" + +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 +msgid "Adjust Colors..." +msgstr "Подеси боје..." + +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 +msgid "Adjust Colors" +msgstr "Подеси боје" + +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:619 +msgid "Change brightness, contrast, saturation and gamma level of the image" +msgstr "Подеси осветљење, супротност, засићење, и распон боја слике" + +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:304 +msgid "Adjust Contrast" +msgstr "Подеси контраст" + +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:305 +msgid "Automatic contrast adjustment" +msgstr "Самостална исправка контраста" -#: ../data/glade/gthumb_web_exporter.glade.h:54 -msgid "rows" -msgstr "реда" +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 +msgid "Square" +msgstr "Квадрирај" -#: ../data/gthumb.desktop.in.h:1 -msgid "View and organize your images" -msgstr "Погледај и организуј своје слике" +#: ../extensions/file_tools/gth-file-tool-crop.c:417 +#: ../extensions/file_tools/gth-file-tool-resize.c:590 +#, c-format +msgid "%d x %d (Image)" +msgstr "%d x %d (слика)" -#: ../data/gthumb.desktop.in.h:2 -msgid "gThumb Image Viewer" -msgstr "gThumb Прегледач слика" +#: ../extensions/file_tools/gth-file-tool-crop.c:420 +#: ../extensions/file_tools/gth-file-tool-resize.c:594 +#, c-format +msgid "%d x %d (Screen)" +msgstr "%d x %d (екран)" -#: ../data/gthumb.schemas.in.h:1 -msgid "" -"Images over this size (in bytes) will not be thumbnailed. Use 0 if you want " -"to generate thumbnails for all images." -msgstr "" -"Слике преко ове величине (у бајтовима) неће имати умањени приказ. Користите " -"0 уколико желите да видите умањени приказ за све слике." +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-resize.c:599 +msgid "5:4" +msgstr "5:4" + +#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-resize.c:600 +msgid "4:3 (DVD, Book)" +msgstr "4:3 (ДВД, слика)" + +#: ../extensions/file_tools/gth-file-tool-crop.c:426 +#: ../extensions/file_tools/gth-file-tool-resize.c:601 +msgid "7:5" +msgstr "7:5" + +#: ../extensions/file_tools/gth-file-tool-crop.c:427 +#: ../extensions/file_tools/gth-file-tool-resize.c:602 +msgid "3:2 (Postcard)" +msgstr "3 x 2 (разгледница)" + +#: ../extensions/file_tools/gth-file-tool-crop.c:428 +#: ../extensions/file_tools/gth-file-tool-resize.c:603 +msgid "16:10" +msgstr "16:10" + +#: ../extensions/file_tools/gth-file-tool-crop.c:429 +#: ../extensions/file_tools/gth-file-tool-resize.c:604 +msgid "16:9 (DVD)" +msgstr "16:9 (ДВД)" + +#: ../extensions/file_tools/gth-file-tool-crop.c:430 +#: ../extensions/file_tools/gth-file-tool-resize.c:605 +msgid "1.85:1" +msgstr "1.85:1" + +#: ../extensions/file_tools/gth-file-tool-crop.c:431 +#: ../extensions/file_tools/gth-file-tool-resize.c:606 +msgid "2.39:1" +msgstr "2.39:1" + +#: ../extensions/file_tools/gth-file-tool-crop.c:432 +#: ../extensions/file_tools/gth-file-tool-resize.c:607 +#: ../extensions/image_print/data/ui/print-layout.ui.h:2 +#: ../extensions/rename_series/gth-template-selector.c:234 +msgid "Custom" +msgstr "Произвољно" -#: ../data/gthumb.schemas.in.h:2 -msgid "Possible values are: 1, 2, 3, 4." -msgstr "Дозвољене вредности су: 1, 2, 3, 4." - -#: ../data/gthumb.schemas.in.h:3 -msgid "Possible values are: actual_size, fit, keep_prev, fit_if_larger." -msgstr "Дозвољене вредности су: actual_size, fit, keep_prev, fit_if_larger." - -#: ../data/gthumb.schemas.in.h:4 -msgid "Possible values are: ascending, descending." -msgstr "Дозвољене вредности су: ascending, descending." - -#: ../data/gthumb.schemas.in.h:5 -msgid "Possible values are: forward, backward, random." -msgstr "Дозвољене вредности су: forward, backward, random." - -#: ../data/gthumb.schemas.in.h:6 -msgid "Possible values are: high, low." -msgstr "Дозвољене вредности су: high, low." - -#: ../data/gthumb.schemas.in.h:7 -msgid "Possible values are: image, data, comment." -msgstr "Дозвољене вредности су: image, data, comment." - -#: ../data/gthumb.schemas.in.h:8 -msgid "Possible values are: jpeg, png, tga, tiff." -msgstr "Дозвољене вредности су: jpeg, png, tga, tiff." - -#: ../data/gthumb.schemas.in.h:9 -msgid "Possible values are: light, midtone, dark." -msgstr "Дозвољене вредности су: light, midtone, dark." - -#: ../data/gthumb.schemas.in.h:10 -msgid "Possible values are: list, thumbnails." -msgstr "Дозвољене вредности су: list, thumbnails." - -#: ../data/gthumb.schemas.in.h:11 -msgid "Possible values are: mm, in." -msgstr "Дозвољене вредности су: mm, in." - -#: ../data/gthumb.schemas.in.h:12 -msgid "Possible values are: name, path, size, time." -msgstr "Дозвољене вредности су: name, path, size, time." - -#: ../data/gthumb.schemas.in.h:13 -msgid "Possible values are: name, size, time." -msgstr "Дозвољене вредности су: name, size, time." - -#: ../data/gthumb.schemas.in.h:14 -msgid "Possible values are: nautilus, single, double." -msgstr "Дозвољене вредности су: nautilus, single, double." - -#: ../data/gthumb.schemas.in.h:15 -msgid "Possible values are: none, deflate, jpeg." -msgstr "Дозвољене вредности су: none, deflate, jpeg." - -#: ../data/gthumb.schemas.in.h:16 -msgid "Possible values are: none, name, path, size, time." -msgstr "Дозвољене вредности су: none, name, path, size, time." +#: ../extensions/file_tools/gth-file-tool-crop.c:447 +#: ../extensions/file_tools/gth-file-tool-rotate.c:398 +msgid "Rule of Thirds" +msgstr "Правило трећине" + +#: ../extensions/file_tools/gth-file-tool-crop.c:448 +#: ../extensions/file_tools/gth-file-tool-rotate.c:399 +msgid "Golden Sections" +msgstr "Златни пресек" + +#: ../extensions/file_tools/gth-file-tool-crop.c:449 +#: ../extensions/file_tools/gth-file-tool-rotate.c:400 +msgid "Center Lines" +msgstr "Симетрале" + +#: ../extensions/file_tools/gth-file-tool-crop.c:450 +#: ../extensions/file_tools/gth-file-tool-rotate.c:401 +msgid "Uniform" +msgstr "Једнообразно" + +#: ../extensions/file_tools/gth-file-tool-crop.c:608 +msgid "Crop..." +msgstr "Острижи ивице..." -#: ../data/gthumb.schemas.in.h:17 -msgid "" -"Possible values are: none, simple, simple_with_shadow, shadow, slide, " -"shadow_in, shadow_out." -msgstr "" -"Дозвољене вредности су: none, simple, simple_with_shadow, shadow, slide, " -"shadow_in, shadow_out." +#: ../extensions/file_tools/gth-file-tool-crop.c:608 +msgid "Crop" +msgstr "Острижи ивице" -#: ../data/gthumb.schemas.in.h:18 -msgid "" -"Possible values are: none, square, image, display, 4x3, 4x6, 5x7, 8x10, " -"custom." -msgstr "" -"Дозвољене вредности су: none, square, image, display, 4x3, 4x6, 5x7, 8x10, " -"custom." +#: ../extensions/file_tools/gth-file-tool-equalize.c:45 +msgid "Equalizing image histogram" +msgstr "Изједначавање хистограма слике" -#: ../data/gthumb.schemas.in.h:19 -msgid "Possible values are: pixels, percentage." -msgstr "Дозвољене вредности су: pixels, percentage." +#: ../extensions/file_tools/gth-file-tool-equalize.c:230 +msgid "Equalize" +msgstr "Изједначи" -#: ../data/gthumb.schemas.in.h:20 -msgid "Possible values are: png, jpeg." -msgstr "Дозвољене вредности су: png, jpeg." +#: ../extensions/file_tools/gth-file-tool-equalize.c:231 +msgid "Equalize image histogram" +msgstr "Изједначи хистограм слике" -#: ../data/gthumb.schemas.in.h:21 -msgid "Possible values are: skip, rename, ask, overwrite." -msgstr "Дозвољене вредности су: skip, rename, ask, overwrite." - -#: ../data/gthumb.schemas.in.h:22 -msgid "Possible values are: small, medium, large." -msgstr "Дозвољене вредности су: small, medium, large." +#: ../extensions/file_tools/gth-file-tool-flip.c:87 +msgid "Flip" +msgstr "Преокрени" -#: ../data/gthumb.schemas.in.h:23 -msgid "" -"Possible values are: system, text_below, text_beside, text_only, icons_only." -msgstr "" -"Дозвољене вредности су: system, text_below, text_beside, text_only, " -"icons_only." +#: ../extensions/file_tools/gth-file-tool-flip.c:88 +msgid "Flip the image vertically" +msgstr "Преокрени слику усправно" + +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale..." +msgstr "Тонови сиве..." + +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale" +msgstr "Тонови сиве" -#: ../data/gthumb.schemas.in.h:24 -msgid "Possible values are: white, black, checked, none." -msgstr "Дозвољене вредности су: white, black, checked, none." +#: ../extensions/file_tools/gth-file-tool-mirror.c:87 +msgid "Mirror" +msgstr "Одраз" -#: ../data/gthumb.schemas.in.h:25 -msgid "Whether to always use a black background." -msgstr "Да ли да увек користи црну позадину." +#: ../extensions/file_tools/gth-file-tool-mirror.c:88 +msgid "Mirror the image horizontally" +msgstr "Одрази слику водоравно (лево-десно)" + +#: ../extensions/file_tools/gth-file-tool-negative.c:197 +msgid "Negative" +msgstr "Негатив" + +#: ../extensions/file_tools/gth-file-tool-redo.c:75 +msgid "Redo" +msgstr "Напред" + +#: ../extensions/file_tools/gth-file-tool-resize.c:214 +#: ../extensions/resize_images/dlg-resize-images.c:180 +msgid "Resizing images" +msgstr "Промени величину слике" -#: ../libgthumb/catalog.c:89 -msgid "Library not empty" -msgstr "Библиотека није празна" +#: ../extensions/file_tools/gth-file-tool-resize.c:808 +msgid "Resize..." +msgstr "Промени величину..." + +#: ../extensions/file_tools/gth-file-tool-resize.c:808 +msgid "Resize" +msgstr "Промени величину" + +#: ../extensions/file_tools/gth-file-tool-rotate.c:628 +msgid "Rotate..." +msgstr "Окрени..." -#: ../libgthumb/catalog.c:98 -#, c-format -msgid "Cannot remove library \"%s\": %s" -msgstr "Не могу да уклоним библиотеку „%s“: %s" +#: ../extensions/file_tools/gth-file-tool-rotate.c:628 +msgid "Rotate" +msgstr "Окрени" -#: ../libgthumb/catalog.c:125 -#, c-format -msgid "Cannot remove catalog \"%s\": %s" -msgstr "Не могу да уклоним каталог „%s“: %s" +#: ../extensions/file_tools/gth-file-tool-rotate.c:629 +msgid "Freely rotate the image" +msgstr "Слободно окрећи слику" + +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:87 +#: ../extensions/image_rotation/callbacks.c:55 +msgid "Rotate Left" +msgstr "Окрећи лево" + +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:88 +msgid "Rotate the image by 90 degrees counterclockwise" +msgstr "Окрећи слику 90 степени супротно кретању казаљке на сату" + +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:87 +#: ../extensions/image_rotation/callbacks.c:49 +msgid "Rotate Right" +msgstr "Окрећи десно" + +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:88 +msgid "Rotate the image by 90 degrees clockwise" +msgstr "Окрећи 90 степени у правцу казаљке на сату" + +#: ../extensions/file_tools/gth-file-tool-save-as.c:70 +msgid "Save As" +msgstr "Сачувај као" + +#: ../extensions/file_tools/gth-file-tool-save.c:66 +msgid "Save" +msgstr "Сачувај" + +#: ../extensions/file_tools/gth-file-tool-sharpen.c:101 +msgid "Sharpening image" +msgstr "Изоштравање слике" + +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 +msgid "Enhance Focus..." +msgstr "Побољшај жижу..." + +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 +msgid "Enhance Focus" +msgstr "Побољшај жижу" + +#: ../extensions/file_tools/gth-file-tool-undo.c:75 +msgid "Undo" +msgstr "Опозови" + +#: ../extensions/find_duplicates/callbacks.c:48 +msgid "Find _Duplicates..." +msgstr "Нађи _двојнике..." + +#: ../extensions/find_duplicates/callbacks.c:49 +msgid "Find duplicated files in the current location" +msgstr "Нађи удвостручене датотеке на тренутној путањи" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-choose-folders.ui.h:1 +msgid "_Folders:" +msgstr "_Фасцикле:" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:1 +msgid "Search for Duplicates" +msgstr "Тражи удвостручене датотеке" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 +msgid "Duplicates:" +msgstr "Двојници:" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 +msgid "Files:" +msgstr "Датотеке:" -#: ../libgthumb/catalog.c:250 ../libgthumb/catalog.c:418 -#, c-format -msgid "Cannot open catalog \"%s\": %s" -msgstr "Не могу да отворим каталог „%s“: %s" +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:4 +#: ../gthumb/gth-browser-actions-entries.h:33 +msgid "_View" +msgstr "П_реглед" -#: ../libgthumb/catalog.c:395 -#, c-format -msgid "Cannot save catalog \"%s\": %s" -msgstr "Не могу да сачувам каталог „%s“: %s" +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 +msgid "No duplicates found." +msgstr "Нисам пронашао двојнике." -#: ../libgthumb/comments.c:429 -msgid "Deleting all comments, wait please..." -msgstr "Брисање свих предлога, сачекајте..." +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:1 +#: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:1 +msgid "Find Duplicates" +msgstr "Пронађи двојнике" -#: ../libgthumb/comments.c:431 -msgid "Deleting old comments, wait please..." -msgstr "Брисање старих предлога, молим сачекајте..." +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:2 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 +#: ../extensions/search/data/ui/search-editor.ui.h:1 +msgid "Start _at:" +msgstr "Почни _са:" -#: ../libgthumb/comments.c:942 -msgid "%d %B %Y" -msgstr "%d %B %Y" +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 +msgid "_Filter:" +msgstr "_Услов:" + +#: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:2 +msgid "Find duplicated files." +msgstr "Проналази удвостручене датотеке." + +#: ../extensions/find_duplicates/gth-find-duplicates.c:65 +msgid "leave the newest duplicates" +msgstr "остави најновије двојнике" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:66 +msgid "leave the oldest duplicates" +msgstr "оставите најстарије двојнике" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:67 +msgid "by folder..." +msgstr "по фасцикли..." + +#: ../extensions/find_duplicates/gth-find-duplicates.c:68 +msgid "all files" +msgstr "све датотеке" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:69 +msgid "no file" +msgstr "нема датотека" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:560 +#: ../extensions/find_duplicates/gth-find-duplicates.c:668 +#, c-format +msgid "%d duplicate" +msgid_plural "%d duplicates" +msgstr[0] "%d двојник" +msgstr[1] "%d двојника" +msgstr[2] "%d двојника" +msgstr[3] "%d двојник" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:712 +msgid "Search completed" +msgstr "Претрага је завршена" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:725 +msgid "Searching for duplicates" +msgstr "Тражим двојнике" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:728 +#: ../gthumb/gth-load-file-data-task.c:106 +#: ../gthumb/gth-save-file-data-task.c:100 +#, c-format +msgid "%d file remaining" +msgid_plural "%d files remaining" +msgstr[0] "преостала је %d датотека" +msgstr[1] "преостале су %d датотеке" +msgstr[2] "преостало је %d датотека" +msgstr[3] "преостала је %d датотека" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:830 +msgid "Getting the file list" +msgstr "Добављање списка датотека" -#: ../libgthumb/comments.c:944 ../src/catalog-web-exporter.c:51 -#: ../src/dlg-duplicates.c:553 ../src/dlg-image-prop.c:445 -#: ../src/gth-browser.c:470 ../src/gth-exif-data-viewer.c:472 -#: ../src/gth-fullscreen.c:663 ../src/gth-viewer.c:537 -msgid "%d %B %Y, %H:%M" -msgstr "%d %B %Y, %H:%M" +#: ../extensions/find_duplicates/gth-find-duplicates.c:1016 +msgid "Duplicates" +msgstr "Двојници" -#: ../libgthumb/comments.c:954 ../libgthumb/comments.c:956 -msgid "(No Comment)" -msgstr "(Без коментара)" +#: ../extensions/find_duplicates/gth-find-duplicates.c:1306 +msgid "Select" +msgstr "Изабери" + +#: ../extensions/flicker/callbacks.c:59 ../extensions/flicker/callbacks.c:64 +msgid "_Flickr..." +msgstr "_Фликр..." + +#: ../extensions/flicker/callbacks.c:60 +msgid "Download photos from Flickr" +msgstr "преузми фотографије са Фликра" + +#: ../extensions/flicker/callbacks.c:65 +msgid "Upload photos to Flickr" +msgstr "Отпреми фотографије на Фликр" + +#: ../extensions/flicker/flicker.extension.in.in.h:1 +msgid "Flicker" +msgstr "Трептање" + +#: ../extensions/flicker/flicker.extension.in.in.h:2 +msgid "Upload images to Flickr" +msgstr "Отпреми фотографије на Фликр" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 +msgid "Free space:" +msgstr "Слободног места:" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:5 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 +msgid "Ph_otoset:" +msgstr "Низ _фотографија:" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:6 +msgid "_Privacy:" +msgstr "_Приватност:" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:7 +msgid "Hi_de from public searches" +msgstr "Сакриј од _јавне претраге" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:8 +msgid "_Safety:" +msgstr "_Безбедност:" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 +msgid "Private photos, visible to family and friends" +msgstr "Личне фотографије, видљиве породици и пријатељима" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 +msgid "Private photos, visible to family" +msgstr "Личне фотографије, видљиве породици" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 +msgid "Private photos" +msgstr "Личне фотографије" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 +msgid "Safe content" +msgstr "Безбедан садржај" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 +msgid "Moderate content" +msgstr "Умерени садржај" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:17 +msgid "Restricted content" +msgstr "Ограничени садржај" + +#: ../extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui.h:1 +msgid "C_ontinue" +msgstr "_Настави" + +#: ../extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui.h:2 +msgid "_Authorize..." +msgstr "_Овласти..." + +#: ../extensions/flicker_utils/flickr-consumer.c:124 +#: ../extensions/flicker_utils/flickr-service.c:237 +#: ../extensions/flicker_utils/flickr-service.c:348 +#: ../extensions/flicker_utils/flickr-service.c:672 +#: ../extensions/flicker_utils/flickr-service.c:937 +#: ../extensions/oauth/oauth-service.c:154 +#: ../extensions/photobucket/photobucket-consumer.c:74 +#: ../extensions/photobucket/photobucket-consumer.c:82 +#: ../extensions/photobucket/photobucket-consumer.c:149 +#: ../extensions/photobucket/photobucket-service.c:132 +msgid "Unknown error" +msgstr "Непозната грешка" -#: ../libgthumb/dlg-save-image.c:111 ../src/dlg-file-utils.c:118 -#: ../src/dlg-jpegtran.c:772 ../src/dlg-photo-importer.c:1453 +#: ../extensions/flicker_utils/flickr-service.c:502 #, c-format msgid "" -"You don't have the right permissions to create images in the folder \"%s\"" -msgstr "Немате одговарајућа овлашћења да направите слике у „%s“ директоријуму" +"Return to this window when you have finished the authorization process on %s" +msgstr "Вратите се на овај прозор кад будете завршили поступак пријаве на %s" -#: ../libgthumb/dlg-save-image.c:126 ../src/dlg-convert.c:311 -#: ../src/gth-browser-actions-callbacks.c:190 -#, c-format -msgid "An image named \"%s\" is already present. Do you want to overwrite it?" -msgstr "Слика са именом „%s“ већ постоји. Желите ли је преснимити?" +#: ../extensions/flicker_utils/flickr-service.c:503 +msgid "Once you're done, click the 'Continue' button below." +msgstr "Кад завршите, кликните на дугме испод „Настави“." -#: ../libgthumb/dlg-save-image.c:170 +#: ../extensions/flicker_utils/flickr-service.c:571 #, c-format -msgid "Image type not supported: %s" -msgstr "Врста слике није подржана: %s" +msgid "gThumb requires your authorization to upload the photos to %s" +msgstr "Гномов сличко захтева ваше одобрење за отпремање слика на %s" -#: ../libgthumb/dlg-save-image.c:252 -msgid "Determine by extension" -msgstr "Одреди по екстензији" +#: ../extensions/flicker_utils/flickr-service.c:572 +#, c-format +msgid "" +"Click 'Authorize' to open your web browser and authorize gthumb to upload " +"photos to %s. When you're finished, return to this window to complete the " +"authorization." +msgstr "" +"Кликните на „Овласти“ да отворите ваш веб прегледник и овластите Гномовог " +"сличка за отпремање слика на %s. Кад будете завршили, вратите се на овај " +"прозор да довршите овлашћења." + +#: ../extensions/gstreamer_tools/actions.c:66 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1072 +#: ../gthumb/gth-browser.c:2175 +msgid "Could not save the file" +msgstr "Нисам успео да сачувам датотеку" + +#: ../extensions/gstreamer_tools/actions.c:130 +msgid "Could not take a screenshot" +msgstr "Нисам успео да сликам екран" -#: ../libgthumb/dlg-save-image.c:287 +#: ../extensions/gstreamer_tools/actions.c:136 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1245 msgid "Save Image" msgstr "Сачувај слику" -#: ../libgthumb/dlg-save-image.c:304 -msgid "Image type:" -msgstr "Врста слике:" - -#: ../libgthumb/gnome-print-font-dialog.c:113 -msgid "_Insert a new preview phrase." -msgstr "_Убаци нову фразу за приказ." - -#: ../libgthumb/gnome-print-font-dialog.c:119 -msgid "Modify preview phrase..." -msgstr "Измени фразу за приказ..." - -#: ../libgthumb/gnome-print-font-dialog.c:173 -msgid "Preview" -msgstr "Приказ" - -#: ../libgthumb/gnome-print-font-dialog.c:186 -msgid "_Modify preview phrase..." -msgstr "_Измени фразу за приказ..." +#: ../extensions/gstreamer_tools/actions.c:156 +msgctxt "Filename" +msgid "Screenshot" +msgstr "Снимак екрана" + +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:1 +msgid "Slower" +msgstr "Спорије" + +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:699 +msgid "Play" +msgstr "Изведи" + +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:3 +msgid "Faster" +msgstr "Брже" + +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 +msgid "Time:" +msgstr "Време:" + +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 +msgid "--:--" +msgstr "--:--" + +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 +msgid "Toggle volume" +msgstr "Прекидач гласноће" + +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 +msgid "Change volume level" +msgstr "Промени гласноћу" + +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 +#: ../extensions/photo_importer/actions.c:67 +#: ../extensions/photo_importer/dlg-photo-importer.c:620 +msgid "Choose a folder" +msgstr "Изаберите фасциклу" + +#: ../extensions/gstreamer_tools/gstreamer_tools.extension.in.in.h:1 +msgid "Audio/Video support" +msgstr "Звучна/видео подршка" + +#: ../extensions/gstreamer_tools/gstreamer_tools.extension.in.in.h:2 +msgid "Play audio and video files." +msgstr "Изведи звучне и видео датотеке." + +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:104 +msgid "Screenshot" +msgstr "Снимак екрана" + +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:105 +msgid "Take a screenshot" +msgstr "Направи снимак екрана" + +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 +msgid "Playing video" +msgstr "Извођење видеа" -#: ../libgthumb/gnome-print-font-dialog.c:247 -msgid "Font Selection" -msgstr "Избор фонта" - -#: ../libgthumb/gnome-print-font-picker.c:87 -msgid "Sans Regular 12" -msgstr "Sans Regular 12" +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:689 +msgid "Pause" +msgstr "Застој" -#: ../libgthumb/gnome-print-font-picker.c:88 -msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz" -msgstr "АаБбВвГгДдЂђЕеЖжЗзИиЈјКкЛлЉљМмНнЊњОоПпРрСсТтЋћУуФфХхЦцЧчЏџШшDdFfGgQqWwYy" +#: ../extensions/gstreamer_tools/main.c:31 +#: ../gthumb/gth-main-default-tests.c:247 +msgid "Video" +msgstr "Видео" + +#: ../extensions/gstreamer_tools/main.c:32 +#: ../gthumb/gth-main-default-tests.c:254 +msgid "Audio" +msgstr "Звук" + +#: ../extensions/gstreamer_tools/main.c:39 +msgid "Artist" +msgstr "Извођач" + +#: ../extensions/gstreamer_tools/main.c:40 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 +msgid "Album" +msgstr "Албум" + +#: ../extensions/gstreamer_tools/main.c:41 +msgid "Bitrate" +msgstr "Проток бита" + +#: ../extensions/gstreamer_tools/main.c:42 +msgid "Encoder" +msgstr "Шифрарник" + +#: ../extensions/gstreamer_tools/main.c:44 +#: ../extensions/gstreamer_tools/main.c:49 +msgid "Codec" +msgstr "Кодек" + +#: ../extensions/gstreamer_tools/main.c:45 +msgid "Framerate" +msgstr "Проток кадрова" + +#: ../extensions/gstreamer_tools/main.c:46 +#: ../extensions/image_print/data/ui/print-layout.ui.h:24 +#: ../extensions/image_viewer/gth-image-viewer-page.c:209 +msgid "Width" +msgstr "Ширина" + +#: ../extensions/gstreamer_tools/main.c:47 +#: ../extensions/image_print/data/ui/print-layout.ui.h:25 +msgid "Height" +msgstr "Висина" + +#: ../extensions/gstreamer_tools/main.c:50 +msgid "Channels" +msgstr "Канали" + +#: ../extensions/gstreamer_tools/main.c:51 +msgid "Sample rate" +msgstr "Проток узорка" + +#: ../extensions/gstreamer_utils/gstreamer-utils.c:362 +msgid "Stereo" +msgstr "Стерео" + +#: ../extensions/gstreamer_utils/gstreamer-utils.c:362 +msgid "Mono" +msgstr "Моно" + +#. Translators: this is an image size, such as 1024 × 768 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:395 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1300 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:209 +#: ../extensions/webalbums/gth-web-exporter.c:2446 ../gthumb/gtk-utils.c:1037 +#, c-format +msgid "%d × %d" +msgstr "%d × %d" + +#: ../extensions/image_print/actions.c:69 +msgid "Could not print the selected files" +msgstr "Нисам успео да штампам означене датотеке" + +#: ../extensions/image_print/callbacks.c:65 +msgid "Print the selected images" +msgstr "Штампај означене слике" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:1 +msgid "Centered" +msgstr "На средини" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:13 +msgid "The total number of files" +msgstr "Укупан број датотека" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:14 +#: ../extensions/importer/data/ui/import-preferences.ui.h:4 +msgid "The event description" +msgstr "Опис догађаја" -#: ../libgthumb/gnome-print-font-picker.c:89 -msgid "Pick a Font" -msgstr "Изаберите фонт" +#: ../extensions/image_print/data/ui/print-layout.ui.h:17 +msgid "_Rows:" +msgstr "_Редови:" -#: ../libgthumb/gnome-print-font-picker.c:174 -msgid "Title" -msgstr "Наслов" +#: ../extensions/image_print/data/ui/print-layout.ui.h:19 +msgid "Image" +msgstr "Слика" -#: ../libgthumb/gnome-print-font-picker.c:175 -msgid "The title of the selection dialog box" -msgstr "Наслов прозорчета за избор" - -#: ../libgthumb/gnome-print-font-picker.c:195 -msgid "Font name" -msgstr "Име фонта" - -#: ../libgthumb/gnome-print-font-picker.c:196 -msgid "Name of the selected font" -msgstr "Име изабраног фонта" - -#: ../libgthumb/gnome-print-font-picker.c:204 -msgid "Preview text" -msgstr "Текст за приказ" - -#: ../libgthumb/gnome-print-font-picker.c:205 -msgid "Preview text shown in the dialog" -msgstr "Текст за приказ који се појављује у прозорчету" - -#: ../libgthumb/gnome-print-font-picker.c:213 -msgid "Use font in label" -msgstr "Користи фонт у ознаци" - -#: ../libgthumb/gnome-print-font-picker.c:214 -msgid "Use font in the label in font info mode" -msgstr "Користи фонт у ознаци у режиму за приказ података о фонту" - -#: ../libgthumb/gnome-print-font-picker.c:222 -msgid "Font size for label" -msgstr "Величина фонта за ознаку" - -#: ../libgthumb/gnome-print-font-picker.c:223 -msgid "Font size for label in font info mode" -msgstr "Величина фонта за ознаку у режиму за приказ података о фонту" - -#: ../libgthumb/gnome-print-font-picker.c:233 -msgid "Show size" -msgstr "Прикажи величину" - -#: ../libgthumb/gnome-print-font-picker.c:234 -msgid "Show size in font info mode" -msgstr "Прикажи величину у режиму за приказ података о фонту" - -#: ../libgthumb/gnome-print-font-picker.c:1013 -msgid "Font" -msgstr "Фонт" - -#: ../libgthumb/gth-file-list.c:523 ../src/gth-browser.c:8453 -#: ../src/gth-viewer.c:1892 -msgid "Wait please..." -msgstr "Молим сачекајте..." - -#: ../libgthumb/gth-file-list.c:617 ../libgthumb/gth-file-list.c:638 -#: ../libgthumb/gth-image-list.c:3443 ../src/gth-browser.c:699 -#: ../src/gth-viewer.c:681 -msgid "No image" -msgstr "Нема слике" +#: ../extensions/image_print/data/ui/print-layout.ui.h:20 +msgid "Position:" +msgstr "Положај:" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:21 +msgid "Left" +msgstr "Лево" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:22 +msgid "Top" +msgstr "Врх" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:26 +msgid "Rotation:" +msgstr "Обртање:" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:27 +msgid "Unit:" +msgstr "Јединица:" -#: ../libgthumb/gth-file-view-list.c:1378 ../src/dlg-duplicates.c:373 -#: ../src/dlg-image-prop.c:601 ../src/gth-exif-data-viewer.c:483 -msgid "Name" -msgstr "Име" +#: ../extensions/image_print/data/ui/print-layout.ui.h:28 +msgid "Preview" +msgstr "Преглед" -#: ../libgthumb/gtk-utils.c:628 ../libgthumb/gtk-utils.c:662 -#: ../src/bookmark-list.c:173 ../src/catalog-list.c:438 -#: ../src/catalog-list.c:470 ../src/dir-list.c:245 ../src/dir-list.c:499 -#: ../src/dlg-rename-series.c:290 ../src/dlg-rename-series.c:294 -#: ../src/gth-browser.c:621 ../src/gth-browser.c:1313 -#: ../src/gth-browser.c:1319 ../src/gth-browser.c:1325 -msgid "(Invalid Name)" -msgstr "(Неисправно име)" +#: ../extensions/image_print/data/ui/print-layout.ui.h:30 +msgid "millimeters" +msgstr "милиметри" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:31 +msgid "inches" +msgstr "инчи" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:4 +msgid "Select Caption Font" +msgstr "Одаберите словни лик натписа" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:5 +msgid "Select Header Font" +msgstr "Одаберите словни лик заглавља" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 +msgid "Select Footer Font" +msgstr "Одаберите словни лик подножја" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 +msgid "Fonts" +msgstr "Словни ликови" -#: ../libgthumb/print-callbacks.c:662 +#: ../extensions/image_print/gth-image-print-job.c:914 +#: ../extensions/webalbums/data/albumthemes/text.h:31 #, c-format msgid "Page %d of %d" msgstr "Страна %d од %d" -#: ../libgthumb/print-callbacks.c:1740 ../src/catalog-png-exporter.c:1336 -#, c-format -msgid "Loading image: %s" -msgstr "Учитавање слике: %s" +#: ../extensions/image_print/gth-image-print-job.c:1680 +#: ../extensions/image_print/gth-image-print-job.c:1845 +#: ../extensions/image_print/gth-image-print-job.c:1888 +msgid "Could not print" +msgstr "Нисам успео штампати" -#: ../libgthumb/thumb-cache.c:486 -msgid "Deleting all thumbnails, wait please..." -msgstr "Брисање свих умањених слика, сачекајте..." +#: ../extensions/image_print/gth-image-print-job.c:1746 +#: ../gthumb/gth-main-default-tests.c:240 +msgid "Images" +msgstr "Слике" -#: ../libgthumb/thumb-cache.c:488 -msgid "Deleting old thumbnails, wait please..." -msgstr "Брисање старих умањених слика, сачекајте..." +#: ../extensions/image_print/gth-image-print-job.c:1847 +#: ../gthumb/gth-image-loader.c:197 ../gthumb/gth-image-loader.c:304 +#: ../gthumb/gth-image-utils.c:131 ../gthumb/gth-image-utils.c:137 +msgid "No suitable loader available for this file type" +msgstr "Нема одговарајућег утоваривача за ову врсту датотеке" -#: ../src/catalog-png-exporter.c:1565 +#. translators: %s is a filename +#: ../extensions/image_print/gth-load-image-info-task.c:164 #, c-format -msgid "Creating image: %s.%s" -msgstr "Стварање слике: %s.%s" +msgid "Loading \"%s\"" +msgstr "Учитавам „%s“" -#: ../src/catalog-web-exporter.c:1669 -msgid "Saving thumbnails" -msgstr "Снимање умањених приказа" +#: ../extensions/image_print/gth-load-image-info-task.c:166 +#: ../extensions/webalbums/gth-web-exporter.c:2719 +msgid "Loading images" +msgstr "Учитавање слика" -#: ../src/catalog-web-exporter.c:1735 -msgid "Saving HTML pages: Images" -msgstr "Снимање HTML страница: слике" +#: ../extensions/image_print/image_print.extension.in.in.h:1 +msgid "Image print" +msgstr "Штампање слика" + +#: ../extensions/image_print/image_print.extension.in.in.h:2 +msgid "Allow to print images choosing the page layout." +msgstr "Дозволи штампање слика користећи распоред стране." -#: ../src/catalog-web-exporter.c:1810 -msgid "Saving HTML pages: Indexes" -msgstr "Снимање HTML страница: индекси" +#: ../extensions/image_print/preferences.c:79 +msgid "Print" +msgstr "Штампај" -#: ../src/catalog-web-exporter.c:1933 ../src/catalog-web-exporter.c:1992 -#: ../src/catalog-web-exporter.c:2162 +#: ../extensions/image_rotation/callbacks.c:50 +msgid "Rotate the selected images 90° to the right" +msgstr "Окрени означене слике 90° у десно" + +#: ../extensions/image_rotation/callbacks.c:56 +msgid "Rotate the selected images 90° to the left" +msgstr "Обрни означене слике 90° у лево" + +#: ../extensions/image_rotation/callbacks.c:61 +msgid "Rotate Physically" +msgstr "Окрени физички" + +#: ../extensions/image_rotation/callbacks.c:62 +msgid "Rotate the selected images according to the embedded orientation" +msgstr "Окрени одабране слике према угњежђеном усмерењу" + +#: ../extensions/image_rotation/callbacks.c:67 +msgid "Reset the EXIF Orientation" +msgstr "Поништи ЕГЗИФ усмерење" + +#: ../extensions/image_rotation/callbacks.c:68 +msgid "Reset the embedded orientation without rotating the images" +msgstr "Поништи угњежђено усмерење без окретања слика" + +#: ../extensions/image_rotation/gth-reset-orientation-task.c:111 +#: ../extensions/image_rotation/gth-transform-task.c:141 +#: ../extensions/webalbums/gth-web-exporter.c:2338 +#: ../extensions/webalbums/gth-web-exporter.c:2423 msgid "Saving images" msgstr "Снима слике" -#: ../src/catalog-web-exporter.c:2371 -msgid "Could not create a temporary folder" -msgstr "Не могу направити привремени директоријум" - -#. Load thumbnails. -#: ../src/catalog-web-exporter.c:2404 -msgid "Loading images" -msgstr "Учитавање слика" - -#: ../src/dlg-catalog.c:83 ../src/gth-browser-actions-callbacks.c:799 -msgid "Enter the catalog name: " -msgstr "Унети име каталога:" - -#: ../src/dlg-catalog.c:87 ../src/dlg-catalog.c:138 -#: ../src/dlg-categories.c:243 ../src/dlg-file-utils.c:90 -#: ../src/gth-browser-actions-callbacks.c:885 -msgid "C_reate" -msgstr "Нап_рави" +#: ../extensions/image_rotation/image_rotation.extension.in.in.h:1 +msgid "Image rotation" +msgstr "Обртање слике" -#: ../src/dlg-catalog.c:134 ../src/gth-browser-actions-callbacks.c:941 -msgid "Enter the library name: " -msgstr "Унесите име библиотеке:" - -#: ../src/dlg-catalog.c:475 -msgid "Move Catalog to..." -msgstr "Пребаци каталог у ..." - -#: ../src/dlg-categories.c:239 -msgid "Enter the new category name" -msgstr "Унети ново име за категорију" +#: ../extensions/image_rotation/image_rotation.extension.in.in.h:2 +msgid "Rotate images without data loss." +msgstr "Обрћи слике без губитка на квалитету." -#: ../src/dlg-categories.c:250 +#: ../extensions/image_rotation/rotation-utils.c:117 #, c-format +msgid "Problem transforming the image: %s" +msgstr "Грешка приликом измене слике: %s" + +#: ../extensions/image_rotation/rotation-utils.c:122 msgid "" -"The name \"%s\" is not valid because it contains the character \",\". Please " -"use a different name." +"This transformation may introduce small image distortions along one or more " +"edges, because the image dimensions are not multiples of 8.\n" +"\n" +"The distortion is reversible, however. If the resulting image is " +"unacceptable, simply apply the reverse transformation to return to the " +"original image.\n" +"\n" +"You can also choose to discard (or trim) any untransformable edge pixels. " +"For practical use, this mode gives the best looking results, but the " +"transformation is not strictly lossless anymore." msgstr "" -"Име „%s“ није добро зато што садржи знак „/“. Молим користите неко друго име." +"Ово претварање може довести до малих изобличења дуж једне или више ивица, " +"јер размере слике нису умножак броја 8.\n" +"\n" +"Међутим, изобличења се могу поништити. Ако излазна слика није прихатљива, " +"само примените повратно претварање да би вратили изворну слику.\n" +"\n" +"Можете такође уклонити (или обрзати) било које неизмењиве ивичне тачке. За " +"примењиву употребу, овај начин даје излазе најлепшег изгледа, али претварање " +"више није строго без губитка вредности." + +#: ../extensions/image_rotation/rotation-utils.c:128 +msgid "_Trim" +msgstr "_Обрежи" + +#: ../extensions/image_rotation/rotation-utils.c:130 +msgid "_Accept distortion" +msgstr "_Прихвати изобличења" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:1 +msgid "Set to actual size" +msgstr "Постави на праву величину" -#: ../src/dlg-categories.c:255 -#, c-format -msgid "The category \"%s\" is already present. Please use a different name." -msgstr "Категорија „%s“ већ постоји. Молим користите неко друго име." +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:2 +msgid "Keep previous zoom" +msgstr "Задржи претходно увећање" -#: ../src/dlg-categories.c:369 ../src/dlg-change-date.c:154 -#: ../src/dlg-comment.c:306 ../src/dlg-convert.c:437 -#: ../src/dlg-jpegtran.c:1017 ../src/dlg-preferences.c:180 -#: ../src/dlg-rename-series.c:333 ../src/dlg-search.c:468 -#: ../src/gth-window-actions-callbacks.c:700 -#, c-format -msgid "Could not display help: %s" -msgstr "Не могу приказати помоћ: %s" +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:3 +msgid "Fit to window" +msgstr "Поравнај по прозору" -#: ../src/dlg-convert.c:165 -#, c-format -msgid "Converting image: %s" -msgstr "Претварање слике: %s" +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 +msgid "Fit to window if larger" +msgstr "Поравнај по прозору ако је већа" -#: ../src/dlg-convert.c:188 -#, c-format -msgid "" -"An image named \"%s\" is already present. Please specify a different name." -msgstr "Слика са именом „%s“ већ постоји. Молим наведите неко друго име." +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:5 +msgid "Fit to width" +msgstr "Поравнај по ширини" -#: ../src/dlg-convert.c:317 ../src/gth-browser-actions-callbacks.c:197 -msgid "_Overwrite" -msgstr "_Препиши" +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:6 +msgid "Fit to width if larger" +msgstr "Поравнај по ширини ако је већа" -#: ../src/dlg-crop.c:371 -#, c-format -msgid "%d x %d (Image)" -msgstr "%d x %d (слика)" +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:7 +msgid "Reset scrollbar positions" +msgstr "Поништи положај шина премицања" -#: ../src/dlg-crop.c:379 -#, c-format -msgid "%d x %d (Display)" -msgstr "%d x %d (екран)" +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:8 +msgid "After loading an image:" +msgstr "После учитавања слике:" -#: ../src/dlg-duplicates.c:280 ../src/dlg-duplicates.c:654 -msgid "Duplicates" -msgstr "Дупликати" +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:9 +msgid "_Zoom quality:" +msgstr "_Квалитет увећања:" -#: ../src/dlg-duplicates.c:295 -msgid "Duplicates Size" -msgstr "Величина дупликата" - -#: ../src/dlg-duplicates.c:402 -msgid "Last modified" -msgstr "Последњи пут мењано" +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:10 +msgid "Transparency _type:" +msgstr "_Тип провидности:" -#: ../src/dlg-duplicates.c:417 ../src/dlg-image-prop.c:621 -msgid "Location" -msgstr "Место" +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:11 +msgid "High" +msgstr "Високо" -#: ../src/dlg-duplicates.c:759 -msgid "Checked images will be moved to the Trash, are you sure?" -msgstr "Одабране слике ће бити пребачене у Ђубре, да ли сте сигурни?" +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:12 +msgid "Low" +msgstr "Ниско" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:13 +msgid "White" +msgstr "Бела" -#: ../src/dlg-file-utils.c:88 -msgid "The destination folder does not exist. Do you want to create it?" -msgstr "Одредишни директоријум не постоји. Желите ли да направити?" +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:15 +msgid "Black" +msgstr "Црна" -#: ../src/dlg-file-utils.c:104 -#, c-format -msgid "Could not create folder \"%s\": %s." -msgstr "Не могу да направим директоријум „%s“: %s." +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:16 +msgid "Checked" +msgstr "Проверено" -#: ../src/dlg-file-utils.c:201 -msgid "Could not delete the images:" -msgstr "Не могу обрисати слике:" +#: ../extensions/image_viewer/gth-image-histogram.c:84 +msgid "Histogram" +msgstr "Хистограм" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:179 +msgid "Copy Image" +msgstr "Умножи слику" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:180 +msgid "Copy the image to the clipboard" +msgstr "Умножите слику у оставу исечака" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:184 +msgid "Paste Image" +msgstr "Налепи слику" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:185 +msgid "Paste the image from the clipboard" +msgstr "Налепи слику из оставе исечака" -#: ../src/dlg-file-utils.c:224 -msgid "" -"The images cannot be moved to the Trash. Do you want to delete them " -"permanently?" -msgstr "Слике не могу бити пребачене у Ђубре. Желите ли их трајно обрисати?" +#: ../extensions/image_viewer/gth-image-viewer-page.c:189 +msgid "In" +msgstr "Увећај" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:190 +msgid "Zoom in" +msgstr "Увећај" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:194 +msgid "Out" +msgstr "Умањи" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:195 +msgid "Zoom out" +msgstr "Умањи" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:199 +msgid "1:1" +msgstr "1:1" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:200 +msgid "Actual size" +msgstr "Стварна величина" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:204 +msgid "Fit" +msgstr "Поравнај" -#: ../src/dlg-file-utils.c:227 ../src/gth-browser-actions-callbacks.c:1250 -#: ../src/gth-browser.c:1846 ../src/gth-viewer.c:793 -msgid "_Do not display this message again" -msgstr "_Не приказуј више ову поруку" - -#: ../src/dlg-file-utils.c:281 ../src/gth-browser-actions-callbacks.c:1288 -msgid "_Move" -msgstr "_Пребацити" - -#: ../src/dlg-file-utils.c:368 ../src/dlg-file-utils.c:458 -#: ../src/gth-browser-actions-callbacks.c:1497 -msgid "Choose the destination folder" -msgstr "Одабрати одредишни директоријум" - -#: ../src/dlg-file-utils.c:762 ../src/dlg-file-utils.c:863 -msgid "You didn't enter the new name" -msgstr "Нисте унели ново име" +#: ../extensions/image_viewer/gth-image-viewer-page.c:205 +msgid "Zoom to fit window" +msgstr "Увећај до поравнања прозора" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:210 +msgid "Zoom to fit width" +msgstr "Увећај до поравнања ширине" + +#: ../extensions/image_viewer/image_viewer.extension.in.in.h:1 +msgid "Image viewer" +msgstr "Прегледник слика" + +#: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 +msgid "Basic image viewing." +msgstr "Основни преглед слика." + +#: ../extensions/image_viewer/preferences.c:125 +msgid "Viewer" +msgstr "Прегледач" -#: ../src/dlg-file-utils.c:774 ../src/dlg-file-utils.c:875 +#: ../extensions/importer/data/ui/import-preferences.ui.h:1 +msgid "_Destination" +msgstr "О_дредиште" + +#: ../extensions/importer/data/ui/import-preferences.ui.h:2 +msgid "_Automatic subfolder" +msgstr "_Самостална подфасцикла" + +#: ../extensions/importer/data/ui/import-preferences.ui.h:3 +msgid "as _single subfolder" +msgstr "као _једна подфасцикла" + +#: ../extensions/importer/data/ui/import-preferences.ui.h:7 +msgid "The year" +msgstr "Година" + +#: ../extensions/importer/data/ui/import-preferences.ui.h:8 +msgid "The month" +msgstr "Месец" + +#: ../extensions/importer/data/ui/import-preferences.ui.h:9 +msgid "The day of the month" +msgstr "Дан у месецу" + +#: ../extensions/importer/data/ui/import-preferences.ui.h:10 +msgid "The hour" +msgstr "Час" + +#: ../extensions/importer/data/ui/import-preferences.ui.h:11 +msgid "The minutes" +msgstr "Минути" + +#: ../extensions/importer/data/ui/import-preferences.ui.h:12 +msgid "The seconds" +msgstr "Секунде" + +#: ../extensions/importer/gth-import-destination-button.c:183 +msgid "Invalid Destination" +msgstr "Неисправно одредиште" + +#: ../extensions/importer/gth-import-preferences-dialog.c:198 +#, c-format +msgid "example: %s" +msgstr "пример; %s" + +#. subfolder type +#: ../extensions/importer/gth-import-preferences-dialog.c:330 +msgid "File date" +msgstr "Датум датотеке" + +#. gtk_label_set_mnemonic_widget (GTK_LABEL (GET_WIDGET ("subfolder_label")), self->priv->subfolder_type_list); +#. subfolder format +#: ../extensions/importer/gth-import-preferences-dialog.c:340 +msgid "year-month-day" +msgstr "година-месец-дан" + +#: ../extensions/importer/gth-import-preferences-dialog.c:341 +msgid "year-month" +msgstr "година-месец" + +#: ../extensions/importer/gth-import-preferences-dialog.c:342 +msgid "year" +msgstr "година" + +#: ../extensions/importer/gth-import-preferences-dialog.c:343 +msgid "custom format" +msgstr "пролагођени облик" + +#: ../extensions/importer/gth-import-task.c:426 +#: ../extensions/importer/gth-import-task.c:461 +#: ../extensions/importer/gth-import-task.c:671 +msgid "Importing files" +msgstr "Увоз датотека" + +#: ../extensions/importer/gth-import-task.c:620 +msgid "No file imported" +msgstr "Нема увежених датотека" + +#: ../extensions/importer/gth-import-task.c:621 +msgid "The selected files are already present in the destination." +msgstr "Означене датотеке су већ присутне на одредишту." + +#: ../extensions/importer/gth-import-task.c:644 +#: ../gthumb/gth-file-source-vfs.c:694 +msgid "Could not delete the files" +msgstr "Нисам успео обрисати слике" + +#: ../extensions/importer/gth-import-task.c:645 +msgid "Delete operation not supported." +msgstr "Радња брисања није подржана." + +#: ../extensions/importer/gth-import-task.c:732 +msgid "Last imported" +msgstr "Последње увезено" + +#: ../extensions/importer/gth-import-task.c:838 +msgid "No file specified." +msgstr "Нема назначених датотека." + +#. Translators: For example: Not enough free space in '/home/user/Images'.\n1.3 GB of space is required but only 300 MB is available. +#: ../extensions/importer/gth-import-task.c:875 #, c-format msgid "" -"The name \"%s\" is already used in this folder. Please use a different name." +"Not enough free space in '%s'.\n" +"%s of space is required but only %s is available." msgstr "" -"Име „%s“ је већ у употреби у овом директоријуму. Молим користите другачије " -"име." +"Нема довољно расположивог простора у „%s“.\n" +"Потребно је %s простора, али је доступно само %s." -#: ../src/dlg-file-utils.c:1014 -msgid "Could not rename the image:" -msgstr "Не могу променити име слике:" - -#: ../src/dlg-file-utils.c:1016 -msgid "Could not rename the following images:" -msgstr "Немогу променити име следећих слика:" - -#: ../src/dlg-file-utils.c:1150 -msgid "Could not move the image:" -msgstr "Не могу пребацити слику:" - -#: ../src/dlg-file-utils.c:1152 -msgid "Could not copy the image:" -msgstr "Не могу умножити слику:" - -#: ../src/dlg-file-utils.c:1176 ../src/dlg-file-utils.c:2441 -msgid "_Abort" -msgstr "_Одустати" +#: ../extensions/list_tools/callbacks.c:76 ../gthumb/gth-filterbar.c:311 +msgid "Personalize..." +msgstr "Прилагодите..." + +#: ../extensions/list_tools/callbacks.c:320 +msgid "Tools" +msgstr "Алатке" + +#: ../extensions/list_tools/callbacks.c:321 +msgid "Batch tools for multiple files" +msgstr "Прибори за масовну обраду датотека" + +#: ../extensions/list_tools/data/ui/ask-value.ui.h:1 +msgid "_Skip" +msgstr "_Прескочи" + +#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:1 +msgid "Commands" +msgstr "Наредбе" + +#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:2 +msgid "Co_mmands:" +msgstr "_Наредбе:" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:2 +msgid "_Wait for the command to finish" +msgstr "_Сачекајте да се наредба изврши" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:3 +msgid "E_xecute command once for every file" +msgstr "_Извршите наредбу једном за сваку датотеку" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:4 +msgid "_Terminal command (shell script)" +msgstr "_Наредба терминала (скрипте љуске)" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:5 +msgid "Sh_ortcut:" +msgstr "Пре_чица:" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:6 +msgid "The file uri" +msgstr "Адреса датотеке" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:7 +msgid "The file path" +msgstr "Путања до датотеке" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:8 +msgid "The file basename" +msgstr "Основни назив датотеке" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:9 +msgid "The parent folder path" +msgstr "Путања родитељске фасцикле" -#: ../src/dlg-file-utils.c:1177 ../src/dlg-file-utils.c:2442 -msgid "_Continue" -msgstr "_Наставити" +#. Translate only 'message' and 'default_value'. +#: ../extensions/list_tools/data/ui/script-editor.ui.h:14 +#, no-c-format +msgid "%ask{ message }{ default value }" +msgstr "%ask{ порука }{ задата вредност }" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:15 +msgid "Ask an input value" +msgstr "Затражи улазну вредност" + +#. Translate only 'attribute name' +#: ../extensions/list_tools/data/ui/script-editor.ui.h:18 +#, no-c-format +msgid "%attr{ attribute name }" +msgstr "%attr{ назив својства }" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:19 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 +msgid "A file attribute" +msgstr "Својство датотеке" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:21 +#, no-c-format +msgid "%N" +msgstr "%N" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:22 +msgid "The file basename without extension" +msgstr "Основни назив датотеке без наставка" -#: ../src/dlg-file-utils.c:1351 -#, c-format -msgid "Copying file %d of %d" -msgstr "Умножавање датотеке %d од %d" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:24 +#, no-c-format +msgid "%E" +msgstr "%E" -#: ../src/dlg-file-utils.c:1767 ../src/dlg-file-utils.c:1995 -msgid "Collecting images info" -msgstr "Сакуљање информација о сликама" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:25 +msgid "The file extension" +msgstr "Наставак датотека" -#: ../src/dlg-file-utils.c:1770 ../src/dlg-file-utils.c:2008 -#, c-format -msgid "Deleting file %ld of %ld" -msgstr "Брисање датотеке %ld од %ld" +#. Translate only 'text'. +#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 +#, no-c-format +msgid "%quote{ text }" +msgstr "%quote{ текст }" -#: ../src/dlg-file-utils.c:1998 -#, c-format -msgid "Copying file %ld of %ld" -msgstr "Умножавање датотеке %ld од %ld" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:29 +msgid "Quote the text " +msgstr "Наведи текст " + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:30 +msgid "_Command:" +msgstr "_Наредба:" + +#: ../extensions/list_tools/dlg-personalize-scripts.c:257 +msgid "Script" +msgstr "Скрипта" + +#: ../extensions/list_tools/dlg-personalize-scripts.c:271 +msgid "Shortcut" +msgstr "Пречица" + +#: ../extensions/list_tools/dlg-personalize-scripts.c:285 +#: ../gthumb/dlg-personalize-filters.c:252 +msgid "Show" +msgstr "Прикажи" + +#: ../extensions/list_tools/dlg-personalize-scripts.c:355 +msgid "Could not save the script" +msgstr "Нисам успео сачувати скрипту" + +#: ../extensions/list_tools/dlg-personalize-scripts.c:406 +msgid "New Command" +msgstr "Нова наредба" + +#: ../extensions/list_tools/dlg-personalize-scripts.c:433 +msgid "Edit Command" +msgstr "Измени наредбу" + +#: ../extensions/list_tools/dlg-personalize-scripts.c:461 +msgid "Are you sure you want to delete the selected command?" +msgstr "Да ли сте сигурни да желите брисати означену наредбу?" + +#: ../extensions/list_tools/gth-script.c:610 +msgid "Enter a value:" +msgstr "Унесите вредност:" + +#: ../extensions/list_tools/gth-script.c:745 +#: ../extensions/webalbums/gth-web-exporter.c:558 +#: ../extensions/webalbums/gth-web-exporter.c:570 +#: ../extensions/webalbums/gth-web-exporter.c:578 +msgid "Malformed command" +msgstr "Лоше обликована наредба" + +#: ../extensions/list_tools/gth-script-editor-dialog.c:147 +msgid "none" +msgstr "без" + +#: ../extensions/list_tools/gth-script-editor-dialog.c:153 +#, c-format +msgid "key %d on the numeric keypad" +msgstr "дугме %d на бројчаној тастатури" + +#: ../extensions/list_tools/gth-script-editor-dialog.c:296 +#, c-format +msgid "No command specified" +msgstr "Није одређена наредба" + +#: ../extensions/list_tools/gth-script-task.c:83 +#, c-format +msgid "Command exited abnormally with status %d" +msgstr "Наредба је изишла неправилно са стањем %d" + +#: ../extensions/list_tools/list_tools.extension.in.in.h:1 +msgid "File list tools" +msgstr "Прибори за спискове датотека" + +#: ../extensions/list_tools/list_tools.extension.in.in.h:2 +msgid "Scripting and batch manipulation of files." +msgstr "Скриптовање и масовна обрада датотека." + +#: ../extensions/map_view/gth-map-view.c:130 +msgctxt "Cardinal point" +msgid "S" +msgstr "Ј" + +#: ../extensions/map_view/gth-map-view.c:130 +msgctxt "Cardinal point" +msgid "N" +msgstr "С" + +#: ../extensions/map_view/gth-map-view.c:132 +msgctxt "Cardinal point" +msgid "W" +msgstr "З" + +#: ../extensions/map_view/gth-map-view.c:132 +msgctxt "Cardinal point" +msgid "E" +msgstr "И" + +#: ../extensions/map_view/gth-map-view.c:205 +#: ../extensions/map_view/map_view.extension.in.in.h:1 +msgid "Map" +msgstr "Карта" + +#. No GPS label +#: ../extensions/map_view/gth-map-view.c:276 +msgid "The geographical position information is not available for this image." +msgstr "Подаци о земљописном положају нису доступни за ову слику." + +#: ../extensions/map_view/map_view.extension.in.in.h:2 +msgid "View the photo position on the map" +msgstr "Преглед положаја слике на карти" + +#: ../extensions/oauth/data/ui/oauth-account-manager.ui.h:1 +msgid "A_ccounts:" +msgstr "_Налози:" + +#: ../extensions/oauth/data/ui/oauth-ask-authorization.ui.h:1 +#: ../gthumb/gth-folder-tree.c:1067 +msgid "Loading..." +msgstr "Учитавам..." + +#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 +msgid "New authentication..." +msgstr "Нова пријава..." + +#: ../extensions/oauth/oauth-ask-authorization-dialog.c:191 +msgid "Authorization Required" +msgstr "Потребна је пријава" + +#: ../extensions/oauth/web-service.c:382 +msgid "Choose _Account..." +msgstr "Изаберите _налог..." + +#: ../extensions/oauth/web-service.c:660 +msgid "Choose Account" +msgstr "Изаберите налог" + +#: ../extensions/oauth/web-service.c:777 +msgid "Edit Accounts" +msgstr "Уредите налог" + +#: ../extensions/oauth/web-service.c:795 ../extensions/oauth/web-service.c:812 +msgid "Connecting to the server" +msgstr "Повезивање на сервер" + +#: ../extensions/oauth/web-service.c:796 +msgid "Asking authorization" +msgstr "Требовање овлашћења" + +#: ../extensions/oauth/web-service.c:813 +msgid "Getting account information" +msgstr "Добављам податке о налогу" + +#: ../extensions/photobucket/callbacks.c:54 +msgid "Photobucket..." +msgstr "Фотобукет..." + +#: ../extensions/photobucket/callbacks.c:55 +msgid "Upload photos to Photobucket" +msgstr "Отпреми фотке на Фотобукет" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +msgid "_Scramble filenames" +msgstr "_Шифруј имена датотека" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 +msgid "Tiny ( 100 x 75 )" +msgstr "мајушна ( 100 x 75 )" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 +msgid "Small ( 160 x 120 )" +msgstr "мала ( 160 x 120 )" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 +msgid "Medium ( 320 x 240 )" +msgstr "средња ( 320 x 240 )" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 +msgid "Large ( 640 x 480 )" +msgstr "велика ( 640 x 480 )" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 +msgid "15ʺ screen ( 800 x 600 )" +msgstr "15ʺ екран ( 800 x 600 )" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 +msgid "17ʺ screen ( 1024 x 768 )" +msgstr "17ʺ екран ( 1024 x 768 )" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 +msgid "1 megabyte file size" +msgstr "Величина датотеке 1 мегабајт" + +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 +msgid "_Container:" +msgstr "_Садржалац:" + +#: ../extensions/photobucket/dlg-export-to-photobucket.c:290 +msgid "Tiny ( 100 × 75 )" +msgstr "мајушан ( 100 × 75 )" + +#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 +msgid "Small ( 160 × 120 )" +msgstr "мали ( 160 × 120 )" + +#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 +msgid "Medium ( 320 × 240 )" +msgstr "средњи ( 320 × 240 )" + +#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 +msgid "Large ( 640 × 480 )" +msgstr "велики ( 640 × 480 )" + +#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 +msgid "15ʺ screen ( 800 × 600 )" +msgstr "15ʺ екран ( 800 × 600 )" + +#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 +msgid "17ʺ screen ( 1024 × 768 )" +msgstr "17ʺ екран ( 1024 × 768 )" + +#: ../extensions/photobucket/dlg-export-to-photobucket.c:303 +msgid "2 megabyte file size" +msgstr "Величина датотеке 2 мегабајта" + +#: ../extensions/photobucket/photobucket.extension.in.in.h:1 +msgid "PhotoBucket" +msgstr "Фотобукет" + +#: ../extensions/photobucket/photobucket.extension.in.in.h:2 +msgid "Upload images to PhotoBucket" +msgstr "Отпреми слике на Фотобукет" + +#: ../extensions/photo_importer/actions.c:71 +msgid "Import" +msgstr "Увези" + +#: ../extensions/photo_importer/callbacks.c:52 +msgid "_Removable Device..." +msgstr "_Уклоњиви уређаји..." + +#: ../extensions/photo_importer/callbacks.c:53 +msgid "Import photos and other files from a removable device" +msgstr "Увези фотографије и друге датотеке са уклоњивог уређаја" + +#: ../extensions/photo_importer/callbacks.c:56 +msgid "F_older..." +msgstr "_Фасцикла..." + +#: ../extensions/photo_importer/callbacks.c:57 +msgid "Import photos and other files from a folder" +msgstr "Увези слике и друге датотеке из фасцикле" + +#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:1 +msgid "_Rotate the images physically" +msgstr "_Окрените слике физички" + +#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 +msgid "After importing from a device:" +msgstr "После увоза са уређаја:" + +#. view label +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 +#: ../gthumb/gth-filterbar.c:421 +msgid "S_how:" +msgstr "П_рикажи:" + +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:4 +msgid "_Tags:" +msgstr "_Ознаке:" + +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 +msgid "_Event:" +msgstr "_Догађај:" + +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:7 +msgid "_Delete the imported files from the source" +msgstr "О_бриши увезене слике са извора" + +#: ../extensions/photo_importer/dlg-photo-importer.c:227 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:149 +msgid "Could not import the files" +msgstr "Не могу да увезем датотеке" + +#. translators: %d is the number of files, %s the total size +#: ../extensions/photo_importer/dlg-photo-importer.c:299 +#, c-format +msgid "Files to import: %d (%s)" +msgstr "Датотеке за увоз: %d (%s)" + +#: ../extensions/photo_importer/dlg-photo-importer.c:339 +msgid "Could not load the folder" +msgstr "Нисам успео да учитам фасциклу" + +#: ../extensions/photo_importer/dlg-photo-importer.c:369 +#: ../gthumb/gth-browser.c:2089 +msgid "Getting folder listing..." +msgstr "Прибављање списка фасцикли..." + +#: ../extensions/photo_importer/dlg-photo-importer.c:415 +msgid "Empty" +msgstr "Празно" + +#: ../extensions/photo_importer/dlg-photo-importer.c:586 +msgid "Import from Removable Device" +msgstr "Увоз са уклоњивог уређаја" + +#: ../extensions/photo_importer/dlg-photo-importer.c:618 +msgid "Import from Folder" +msgstr "Увоз из фасцикле" -#: ../src/dlg-file-utils.c:2003 -#, c-format -msgid "Moving file %ld of %ld" -msgstr "Пребацивање датотеке %ld од %ld" +#: ../extensions/photo_importer/photo_importer.extension.in.in.h:1 +msgid "Import photos" +msgstr "Увези слике" -#: ../src/dlg-file-utils.c:2418 ../src/dlg-file-utils.c:2420 -#: ../src/gth-browser-actions-callbacks.c:1389 -#, c-format -msgid "Could not move the folder \"%s\": %s" -msgstr "Не могу да преместим директоријум „%s“: %s" +#: ../extensions/photo_importer/photo_importer.extension.in.in.h:2 +msgid "Import photos from removable devices." +msgstr "Увези слике са уклоњивих уређаја." + +#: ../extensions/picasaweb/callbacks.c:59 +#: ../extensions/picasaweb/callbacks.c:64 +msgid "_Picasa Web Album..." +msgstr "Веб албум _Пикаса..." + +#: ../extensions/picasaweb/callbacks.c:60 +msgid "Download photos from Picasa Web Album" +msgstr "Преузми слике са Пикаса веб албума" + +#: ../extensions/picasaweb/callbacks.c:65 +msgid "Upload photos to Picasa Web Album" +msgstr "Отпреми слике на веб албум Пикаса" + +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 +msgid "Export to Picasa Web Albums" +msgstr "Извози у Пикаса веб албуме" + +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 +msgid "_Albums:" +msgstr "_Албуми:" + +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 +msgid "Public" +msgstr "Јавно" + +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:458 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:469 +msgid "Could not get the album list" +msgstr "Не могу да добавим списак албума" + +#: ../extensions/picasaweb/picasaweb.extension.in.in.h:1 +msgid "Picasa Web Albums" +msgstr "Веб албум Пикаса" + +#: ../extensions/picasaweb/picasaweb.extension.in.in.h:2 +msgid "Upload images to Picasa Web Albums" +msgstr "Отпреми слике на веб албуме Пикасе" + +#: ../extensions/raw_files/raw_files.extension.in.in.h:1 +msgid "Raw format support" +msgstr "Подршка сировог облика" + +#: ../extensions/raw_files/raw_files.extension.in.in.h:2 +msgid "Allow to load raw format images." +msgstr "Дозволи учитавање слика у raw облику." -#: ../src/dlg-image-prop.c:606 ../src/gth-exif-data-viewer.c:490 -msgid "Size" -msgstr "Величина" +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 +msgid "_X:" +msgstr "_X:" -#: ../src/dlg-image-prop.c:611 -msgid "Type" -msgstr "Тип" +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 +msgid "_Y:" +msgstr "_Y:" -#: ../src/dlg-image-prop.c:626 ../src/gth-browser.c:486 -#: ../src/gth-exif-data-viewer.c:504 ../src/gth-viewer.c:553 -msgid "Modified" -msgstr "Измењено" +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 +msgid "Red Eye Removal..." +msgstr "Уклањање црвених очију..." + +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 +msgid "Red Eye Removal" +msgstr "Уклањање црвених очију" + +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:511 +msgid "Remove the red eye effect caused by camera flashes" +msgstr "Уклоните утиске црвених очију насталих због бљескалица камера" + +#: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:1 +msgid "Red-eye removal" +msgstr "Уклањање црвених очију" + +#: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:2 +msgid "Tool to remove the red-eye effect from a photo." +msgstr "Прибор за уклањање утиска црвених очију са фотографија." + +#: ../extensions/rename_series/data/ui/code-selector.ui.h:1 +msgid "digits" +msgstr "цифре" + +#: ../extensions/rename_series/data/ui/code-selector.ui.h:2 +msgid "format:" +msgstr "облик:" + +#: ../extensions/rename_series/data/ui/code-selector.ui.h:3 +msgid "remove" +msgstr "уклони" + +#: ../extensions/rename_series/data/ui/code-selector.ui.h:4 +msgid "add" +msgstr "додај" -#: ../src/dlg-image-prop.c:631 -msgid "Information on Channel" -msgstr "Информација о каналу" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:1 +msgid "Rename" +msgstr "Промени име" -#: ../src/dlg-image-prop.c:746 -#, c-format -msgid "%s Properties" -msgstr "%s Поставке" +#. Translators: this is the text case (upper or lower case). +#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 +msgid "Cas_e:" +msgstr "_Величина слова:" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:7 +msgid "Edit template" +msgstr "Уредите предлошке" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 +msgid "The original filename" +msgstr "Задржи изворна имена датотека" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 +msgid "The original extension" +msgstr "Изворни наставак" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:13 +msgid "The original enumerator" +msgstr "Изворни бројач" -#: ../src/dlg-photo-importer.c:876 ../src/dlg-photo-importer.c:1378 -#: ../src/dlg-photo-importer.c:1427 ../src/dlg-photo-importer.c:1439 -#: ../src/dlg-photo-importer.c:1455 ../src/dlg-photo-importer.c:1484 -msgid "Could not import photos" -msgstr "Не могу да увезем слике" +#. translate only the text in the curly brackets +#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 +#, no-c-format +msgid "%M{ format }" +msgstr "%M{ облик }" -#: ../src/dlg-photo-importer.c:1221 ../src/main.c:1126 -msgid "Film" -msgstr "Филм" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 +msgid "The modification date" +msgstr "Датум измене" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:21 +msgid "The digitalization date" +msgstr "Датум дигитализације" -#: ../src/dlg-photo-importer.c:1436 -#: ../src/gth-browser-actions-callbacks.c:1700 -#, c-format -msgid "Could not create the folder \"%s\": %s" -msgstr "Не могу да направим директоријум „%s“: %s" +#. translate only the text in the curly brackets +#: ../extensions/rename_series/data/ui/rename-series.ui.h:24 +#, no-c-format +msgid "%A{ identifier }" +msgstr "%A{ одредник }" -#: ../src/dlg-png-exporter.c:931 -msgid "Image Caption" -msgstr "Наслов слике" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 +msgid "_Template:" +msgstr "_Предложак:" -#: ../src/dlg-png-exporter.c:985 -msgid "Header" -msgstr "Заглавље" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +msgid "Re_verse Order" +msgstr "О_брнути редослед" -#: ../src/dlg-png-exporter.c:998 ../src/dlg-png-exporter.c:1004 -msgid "Footer" -msgstr "Подножје" +#: ../extensions/rename_series/dlg-rename-series.c:58 +msgid "Enumerator" +msgstr "Бројач" + +#: ../extensions/rename_series/dlg-rename-series.c:59 +msgid "Original filename" +msgstr "Изворна имена датотека" + +#: ../extensions/rename_series/dlg-rename-series.c:60 +msgid "Original extension" +msgstr "Изворни наставак" + +#: ../extensions/rename_series/dlg-rename-series.c:61 +msgid "Original enumerator" +msgstr "Изворни бројач" + +#: ../extensions/rename_series/dlg-rename-series.c:62 +msgid "Modification date" +msgstr "Датум измене" + +#: ../extensions/rename_series/dlg-rename-series.c:63 +msgid "Digitalization date" +msgstr "Датум дигитализације" + +#: ../extensions/rename_series/dlg-rename-series.c:64 +msgid "File attribute" +msgstr "Својство датотеке" + +#: ../extensions/rename_series/dlg-rename-series.c:558 +#: ../extensions/rename_series/dlg-rename-series.c:689 +msgid "Could not rename the files" +msgstr "Нисам успео променити имена датотекама" + +#: ../extensions/rename_series/dlg-rename-series.c:786 +msgid "Could not save the template" +msgstr "Не могу да сачувам шаблон" + +#: ../extensions/rename_series/dlg-rename-series.c:804 +msgid "Edit Template" +msgstr "Уреди шаблон" -#: ../src/dlg-rename-series.c:403 +#: ../extensions/rename_series/dlg-rename-series.c:862 msgid "Old Name" msgstr "Старо име" -#: ../src/dlg-rename-series.c:411 +#: ../extensions/rename_series/dlg-rename-series.c:873 msgid "New Name" msgstr "Ново име" -#: ../src/dlg-search.c:356 +#: ../extensions/rename_series/dlg-rename-series.c:950 +msgid "Keep original case" +msgstr "Задржи изворну величину слова" + +#: ../extensions/rename_series/dlg-rename-series.c:951 +msgid "Convert to lower-case" +msgstr "Претвори у мала слова" + +#: ../extensions/rename_series/dlg-rename-series.c:952 +msgid "Convert to upper-case" +msgstr "Претвори у велика слова" + +#: ../extensions/rename_series/gth-rename-task.c:167 +msgid "Renaming files" +msgstr "Преименовање датотека" + +#: ../extensions/rename_series/rename_series.extension.in.in.h:1 +msgid "Rename files" +msgstr "Преименуј датотеке" + +#: ../extensions/rename_series/rename_series.extension.in.in.h:2 +msgid "Rename series of files." +msgstr "Преименуј низове датотека." + +#: ../extensions/resize_images/callbacks.c:45 +msgid "Resize Images..." +msgstr "Промени величину слика..." + +#: ../extensions/resize_images/callbacks.c:46 +msgid "Resize the selected images" +msgstr "Промени величину означеним сликама" + +#: ../extensions/resize_images/data/ui/resize-images.ui.h:1 +msgid "Resize Images" +msgstr "Промени величину сликама" + +#: ../extensions/resize_images/data/ui/resize-images.ui.h:2 +msgid "New dimensions" +msgstr "Нова размера" + +#: ../extensions/resize_images/data/ui/resize-images.ui.h:4 +msgid "_Height:" +msgstr "_Висина:" + +#: ../extensions/resize_images/data/ui/resize-images.ui.h:5 +msgid "_Preserve original aspect ratios" +msgstr "_Задржавај изворне сразмере" + +#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 +#: ../gthumb/gth-main-default-metadata.c:49 +msgid "Format" +msgstr "Облик" + +#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 +msgid "pixel" +msgstr "тачка" + +#: ../extensions/resize_images/dlg-resize-images.c:423 +msgid "Keep the original format" +msgstr "Задржи изворни облик" + +#: ../extensions/resize_images/resize_images.extension.in.in.h:1 +msgid "Resize images" +msgstr "Промени величину сликама" + +#: ../extensions/resize_images/resize_images.extension.in.in.h:2 +msgid "Resize series of images." +msgstr "Промени величину низу слика." + +#: ../extensions/search/actions.c:49 ../extensions/search/actions.c:117 +#: ../extensions/search/actions.c:123 +msgid "Could not perform the search" +msgstr "Нисам успео извршити претрагу" + +#: ../extensions/search/actions.c:54 msgid "Search Result" msgstr "Резултат претраге" -#: ../src/dlg-search.c:680 -msgid "Filename" -msgstr "Име датотеке" +#: ../extensions/search/actions.c:76 +msgid "Find" +msgstr "Пронађи" -#: ../src/dlg-search.c:689 ../src/gth-folder-selection-dialog.c:383 -msgid "Folder" -msgstr "Директоријум" - -#: ../src/dlg-web-exporter.c:702 -msgid "Select Album Theme" -msgstr "Одаберите тему албума" - -#: ../src/dlg-write-to-cd.c:79 ../src/gth-browser.c:3631 -msgid "Could not move the items:" -msgstr "Не могу преместити ставке:" - -#: ../src/gth-browser-actions-callbacks.c:152 -#: ../src/gth-browser-actions-callbacks.c:580 -#: ../src/gth-browser-actions-callbacks.c:1089 -msgid "Enter the new name: " -msgstr "Унети ново име датотеке:" - -#: ../src/gth-browser-actions-callbacks.c:170 -#: ../src/gth-browser-actions-callbacks.c:600 -#: ../src/gth-browser-actions-callbacks.c:815 -#: ../src/gth-browser-actions-callbacks.c:898 -#: ../src/gth-browser-actions-callbacks.c:1107 +#: ../extensions/search/callbacks.c:59 +msgid "Find files" +msgstr "Нађи датотеке" + +#: ../extensions/search/callbacks.c:132 +msgid "Search again" +msgstr "Претражи опет" + +#. Translators: This is not a verb, it's a name as in "the search properties". +#: ../extensions/search/callbacks.c:174 +#: ../extensions/search/search.extension.in.in.h:1 +msgid "Search" +msgstr "Претражи" + +#: ../extensions/search/gth-search-editor.c:112 +#: ../gthumb/gth-filter-editor-dialog.c:165 +msgid "all the following rules" +msgstr "сва следећа правила" + +#: ../extensions/search/gth-search-editor.c:113 +#: ../gthumb/gth-filter-editor-dialog.c:166 +msgid "any of the following rules" +msgstr "било које следеће правило" + +#: ../extensions/search/gth-search-task.c:181 +#, c-format +msgid "Files found until now: %s" +msgstr "Пронађених датотека до сад: %s" + +#: ../extensions/search/gth-search-task.c:271 +msgid "Searching..." +msgstr "Претраживање..." + +#: ../extensions/search/gth-search-task.c:277 +msgid "Cancel the operation" +msgstr "Обустави радњу" + +#: ../extensions/search/search.extension.in.in.h:2 +msgid "File search tool." +msgstr "Алат претраге." + +#: ../extensions/selections/callbacks.c:77 +msgid "Add to _Selection" +msgstr "Додај у _избор" + +#: ../extensions/selections/callbacks.c:86 +msgid "Selection 1" +msgstr "Избор 1" + +#: ../extensions/selections/callbacks.c:91 +msgid "Selection 2" +msgstr "Избор 2" + +#: ../extensions/selections/callbacks.c:96 +msgid "Selection 3" +msgstr "Избор 3" + +#: ../extensions/selections/callbacks.c:285 #, c-format msgid "" -"The name \"%s\" is not valid because it contains the character \"/\". Please " -"use a different name." +"Use Alt-%d to add files to this selection, Ctrl-%d to view this selection." msgstr "" -"Име „%s“ није добро зато што садржи знак „/“. Молим користите неко друго име." +"Користите Мења-%d за додавање датотека у овај избор, Ктрл-%d за преглед " +"избора." -#: ../src/gth-browser-actions-callbacks.c:217 -#: ../src/gth-browser-actions-callbacks.c:232 +#: ../extensions/selections/gth-selections-manager.c:239 #, c-format -msgid "Could not rename the image \"%s\": %s" -msgstr "Не могу да преименујем слику „%s“: %s" +msgid "Selection %d" +msgstr "Избор %d" -#: ../src/gth-browser-actions-callbacks.c:219 -#: ../src/gth-browser-actions-callbacks.c:1129 -#: ../src/gth-browser-actions-callbacks.c:1399 -msgid "source and destination are the same" -msgstr "извор и одредиште су исти" +#: ../extensions/selections/gth-selections-manager.c:242 +#: ../extensions/selections/selections.extension.in.in.h:1 +msgid "Selections" +msgstr "Избори" -#: ../src/gth-browser-actions-callbacks.c:276 ../src/gth-fullscreen.c:898 -msgid "The image will be moved to the Trash, are you sure?" -msgstr "Слика ће бити пребачена у Ђубре, да ли сте сигурни?" +#: ../extensions/selections/selections.extension.in.in.h:2 +msgid "Advanced file selection." +msgstr "Напредни одабир датотека." -#: ../src/gth-browser-actions-callbacks.c:389 -#, c-format -msgid "Could not duplicate the image \"%s\": %s" -msgstr "Не могу да дуплирам слику „%s“: %s" +#: ../extensions/slideshow/callbacks.c:56 +msgid "_Slideshow" +msgstr "По_кретни приказ" -#: ../src/gth-browser-actions-callbacks.c:397 -msgid "Stop" -msgstr "Заустави" +#: ../extensions/slideshow/callbacks.c:57 +msgid "View as a slideshow" +msgstr "Прегледај у покретном приказу" + +#: ../extensions/slideshow/callbacks.c:410 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 +#: ../extensions/slideshow/preferences.c:162 +#: ../extensions/slideshow/slideshow.extension.in.in.h:1 +msgid "Slideshow" +msgstr "Покретни приказ" -#: ../src/gth-browser-actions-callbacks.c:398 -msgid "Continue" -msgstr "Настави" +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:1 +msgid "_Personalize" +msgstr "_Прилагодите" + +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:3 +msgid "_Transition effect:" +msgstr "Утисци _прелаза:" + +#. This is the first part of the phrase "change automatically, every x seconds", where x is an input control that let the user choose a value. +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 +msgid "_Change automatically, every" +msgstr "Самостално _мењај, сваких" + +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 +msgid "_Restart when finished" +msgstr "_Поново покрени када се заврши" + +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:8 +msgid "R_andom order" +msgstr "Насумични _распоред" + +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:9 +msgid "Playlist" +msgstr "Списак за извођење" + +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:10 +msgid "Add files to the playlist" +msgstr "Додај датотке у списак за извођење" + +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:11 +msgid "Remove the selected files" +msgstr "Уклони одабране датотеке" + +#: ../extensions/slideshow/gth-slideshow.c:231 +msgid "Playing slideshow" +msgstr "Извођење покретног приказа" + +#: ../extensions/slideshow/gth-slideshow-preferences.c:184 +msgid "Choose the files to play" +msgstr "Одаберите датотеке за извођење" + +#: ../extensions/slideshow/gth-slideshow-preferences.c:193 +msgid "Audio files" +msgstr "Звучне датотеке" + +#: ../extensions/slideshow/gth-slideshow-preferences.c:259 +msgid "Random" +msgstr "Насумично" + +#: ../extensions/slideshow/main.c:283 +msgid "Push from right" +msgstr "Гурај с десна" + +#: ../extensions/slideshow/main.c:289 +msgid "Push from bottom" +msgstr "Гурај одоздо" + +#: ../extensions/slideshow/main.c:295 +msgid "Slide from right" +msgstr "Клизај с десна" + +#: ../extensions/slideshow/main.c:301 +msgid "Slide from bottom" +msgstr "Клизај одоздо" + +#: ../extensions/slideshow/main.c:307 +msgid "Fade in" +msgstr "Појави се" + +#: ../extensions/slideshow/main.c:313 +msgid "Flip page" +msgstr "Изврни страну" + +#: ../extensions/slideshow/main.c:319 +msgid "Cube from right" +msgstr "Коцкај с десна" + +#: ../extensions/slideshow/main.c:325 +msgid "Cube from bottom" +msgstr "Коцкај с лева" + +#: ../extensions/slideshow/slideshow.extension.in.in.h:2 +msgid "View images as a slideshow." +msgstr "Погледај слике у покретном приказу." + +#: ../extensions/webalbums/callbacks.c:71 +msgid "_Web Album..." +msgstr "_Веб албум..." + +#: ../extensions/webalbums/callbacks.c:72 +msgid "Create a static web album" +msgstr "Направи непроменљив веб албум" + +#: ../extensions/webalbums/data/albumthemes/text.h:26 +msgid "Click to view the image" +msgstr "Кликните за преглед слике" + +#: ../extensions/webalbums/data/albumthemes/text.h:27 +msgid "Go back to the index" +msgstr "Врати се на садржај" + +#: ../extensions/webalbums/data/albumthemes/text.h:28 +#, c-format +msgid "Image %d of %d" +msgstr "Слика %d од %d" + +#: ../extensions/webalbums/data/albumthemes/text.h:29 +msgid "Index" +msgstr "Садржај" -#: ../src/gth-browser-actions-callbacks.c:450 -msgid "The selected images will be moved to the Trash, are you sure?" -msgstr "Ознечене слике ће бити пребачене у Ђубре, да ли сте сигурни?" +#: ../extensions/webalbums/data/albumthemes/text.h:30 +#: ../gthumb/gth-browser-actions-entries.h:125 +msgid "Next" +msgstr "Следеће" -#: ../src/gth-browser-actions-callbacks.c:622 -#: ../src/gth-browser-actions-callbacks.c:834 -#: ../src/gth-browser-actions-callbacks.c:914 -#: ../src/gth-browser-actions-callbacks.c:1137 -#, c-format -msgid "The name \"%s\" is already used. Please use a different name." -msgstr "Име „%s“ је већ у употреби. Молим користите неко друго име." +#: ../extensions/webalbums/data/albumthemes/text.h:32 +#: ../gthumb/gth-browser-actions-entries.h:119 +msgid "Previous" +msgstr "Претходно" -#: ../src/gth-browser-actions-callbacks.c:633 +#: ../extensions/webalbums/data/albumthemes/text.h:33 #, c-format -msgid "Could not rename the library \"%s\": %s" -msgstr "Не могу да преименујем библиотеку „%s“: %s" +msgid "View page %d" +msgstr "Погледај страницу %d" -#: ../src/gth-browser-actions-callbacks.c:633 -#, c-format -msgid "Could not rename the catalog \"%s\": %s" -msgstr "Не могу да применујем каталог „%s“: %s" +#: ../extensions/webalbums/data/albumthemes/text.h:34 +msgid "View the next image" +msgstr "Погледај следећу слику" -#: ../src/gth-browser-actions-callbacks.c:703 -msgid "The selected library will be removed, are you sure?" -msgstr "Означена библиотека ће бити уклоњена, да ли сте сигурни?" +#: ../extensions/webalbums/data/albumthemes/text.h:35 +msgid "View the next page" +msgstr "Погледај следећу страну" -#: ../src/gth-browser-actions-callbacks.c:705 -msgid "The selected catalog will be removed, are you sure?" -msgstr "Означени каталог ће бити уклоњен, да ли сте сигурни?" +#: ../extensions/webalbums/data/albumthemes/text.h:36 +msgid "View the previous image" +msgstr "Погледај претходну слику" -#: ../src/gth-browser-actions-callbacks.c:800 -msgid "New Catalog" -msgstr "Нови каталог" +#: ../extensions/webalbums/data/albumthemes/text.h:37 +msgid "View the previous page" +msgstr "Погледај претходну слику" -#: ../src/gth-browser-actions-callbacks.c:846 -#, c-format -msgid "Could not create the catalog \"%s\": %s" -msgstr "Не могу да направим каталог „%s“: %s" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:1 +msgid "All images on a single image" +msgstr "Све слике у једној слици" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:2 +msgid "Adapts to the window width" +msgstr "Прилагоди висини прозора" -#: ../src/gth-browser-actions-callbacks.c:940 -msgid "New Library" -msgstr "Нова библиотека" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 +msgid "Web Album" +msgstr "Веб албум" -#: ../src/gth-browser-actions-callbacks.c:942 -#, c-format -msgid "Could not create the library \"%s\": %s" -msgstr "Не могу да направим библиотеку „%s“: %s" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:5 +#, no-c-format +msgid "%P" +msgstr "%P" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 +msgid "_Copy originals to destination" +msgstr "_Умножи изворне у одредиште" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 +msgid "_Adapt to the window width " +msgstr "_Прилагоди ширини прозора " + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 +msgid "Index Page" +msgstr "Страница садржаја" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 +msgid "Thumbnail Caption" +msgstr "Наслов умањеног приказа" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 +msgid "The current image number" +msgstr "Број тренутне слике" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 +msgid "The total number of images" +msgstr "Укупан број слика" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 +msgid "The file comment" +msgstr "Напомена слике" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 +msgid "Image Page" +msgstr "Страна слике" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 +msgid "Show the description, if available" +msgstr "Приказује опис, ако је доступан" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 +msgid "Show the following attributes:" +msgstr "Приказује следећа својства:" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:39 +msgid "Image Attributes" +msgstr "Својства слика" + +#: ../extensions/webalbums/gth-web-exporter.c:1800 +msgid "Could not show the destination" +msgstr "Нисам успео да прикажем одредиште" + +#: ../extensions/webalbums/gth-web-exporter.c:1836 +msgid "The album has been created successfully." +msgstr "Албум је успешно направљен." + +#: ../extensions/webalbums/gth-web-exporter.c:2104 +#: ../extensions/webalbums/gth-web-exporter.c:2132 +msgid "Saving thumbnails" +msgstr "Снимање умањених приказа" + +#: ../extensions/webalbums/gth-web-exporter.c:2160 +msgid "Saving HTML pages: Images" +msgstr "Снимање HTML страница: слике" + +#: ../extensions/webalbums/gth-web-exporter.c:2218 +msgid "Saving HTML pages: Indexes" +msgstr "Снимање HTML страница: садржаји" + +#: ../extensions/webalbums/gth-web-exporter.c:2503 +msgid "Copying original images" +msgstr "Умножавам изворне слике" + +#: ../extensions/webalbums/gth-web-exporter.c:2963 +msgid "Could not find the style folder" +msgstr "Нисам успео да пронађем фасциклу за начине" + +#: ../extensions/webalbums/gth-web-exporter.c:3001 +msgid "Could not create a temporary folder" +msgstr "Не могу направити привремени директоријум" + +#: ../extensions/webalbums/webalbums.extension.in.in.h:1 +msgid "Web Albums" +msgstr "Веб албуми" + +#: ../extensions/webalbums/webalbums.extension.in.in.h:2 +msgid "Create static web albums." +msgstr "Направи неизменљиве веб албуме." + +#: ../gthumb/dlg-location.c:200 ../gthumb/gth-browser.c:1396 +#: ../gthumb/gth-browser.c:1969 ../gthumb/gth-browser.c:6214 +#: ../gthumb/gth-browser.c:6233 ../gthumb/gth-browser.c:6257 +#, c-format +msgid "Could not load the position \"%s\"" +msgstr "Нисам успео да учитам положај „%s“" + +#: ../gthumb/dlg-personalize-filters.c:237 +msgid "Filter" +msgstr "Услов" + +#: ../gthumb/dlg-personalize-filters.c:315 +msgid "Could not save the filter" +msgstr "Нисам успео да сачувам услов" + +#: ../gthumb/dlg-personalize-filters.c:358 +msgid "New Filter" +msgstr "Нови услов" + +#: ../gthumb/dlg-personalize-filters.c:387 +msgid "Edit Filter" +msgstr "Измени услов" + +#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:277 +msgid "All" +msgstr "Све" + +#: ../gthumb/dlg-preferences-extensions.c:68 +msgid "Enabled" +msgstr "Омогућен" + +#: ../gthumb/dlg-preferences-extensions.c:69 +msgid "Disabled" +msgstr "Онемогућен" + +#: ../gthumb/dlg-preferences-extensions.c:72 +msgid "Viewers" +msgstr "Прегледачи" + +#: ../gthumb/dlg-preferences-extensions.c:73 +msgid "Metadata" +msgstr "Метаподаци" + +#: ../gthumb/dlg-preferences-extensions.c:74 +msgid "File tools" +msgstr "Алатке за датотеке" + +#: ../gthumb/dlg-preferences-extensions.c:75 +msgid "List tools" +msgstr "Алатке за спискове" + +#: ../gthumb/dlg-preferences-extensions.c:76 +msgid "Importers" +msgstr "Увозници" + +#: ../gthumb/dlg-preferences-extensions.c:77 +msgid "Exporters" +msgstr "Извозници" + +#: ../gthumb/dlg-preferences-extensions.c:216 +msgid "Could not activate the extension" +msgstr "Нисам успео да покренем проширење" + +#: ../gthumb/dlg-preferences-extensions.c:226 +msgid "Could not deactivate the extension" +msgstr "Нисам успео да искључим проширење" + +#. add the page to the preferences dialog +#: ../gthumb/dlg-preferences-extensions.c:772 +msgid "Extensions" +msgstr "Проширења" + +#: ../gthumb/dlg-preferences-extensions.c:819 +msgid "Restart required" +msgstr "Потребно је поновно покретање" + +#: ../gthumb/dlg-preferences-extensions.c:820 +msgid "You need to restart gthumb for these changes to take effect" +msgstr "" +"Треба поново да покренете Гномовог сличка да би ове промене ступиле на снагу" -#: ../src/gth-browser-actions-callbacks.c:1127 -#: ../src/gth-browser-actions-callbacks.c:1161 +#: ../gthumb/dlg-preferences-extensions.c:821 +msgid "_Continue" +msgstr "_Настави" + +#: ../gthumb/dlg-preferences-extensions.c:822 +msgid "_Restart" +msgstr "_Поново покрени" + +#. For translators: This is a progress size indicator, for example: 230.4 MB of 512.8 MB +#: ../gthumb/gio-utils.c:1351 #, c-format -msgid "Could not rename the folder \"%s\": %s" -msgstr "Не могу да променим име директоријума „%s“: %s" +msgid "%s of %s" +msgstr "%s од %s" -#: ../src/gth-browser-actions-callbacks.c:1211 +#: ../gthumb/gio-utils.c:1386 #, c-format -msgid "Could not delete the folder \"%s\": %s" -msgstr "Не могу да обришем директоријум „%s“: %s" +msgid "Moving \"%s\" to \"%s\"" +msgstr "Премештање „%s“ у „%s“" -#: ../src/gth-browser-actions-callbacks.c:1242 +#: ../gthumb/gio-utils.c:1388 #, c-format -msgid "" -"\"%s\" cannot be moved to the Trash. Do you want to delete it permanently?" -msgstr "„%s“ не може бити пребачен у смеће. Желите ли да га трајно обришете?" +msgid "Copying \"%s\" to \"%s\"" +msgstr "Умножавање „%s“ у „%s“" -#: ../src/gth-browser-actions-callbacks.c:1286 -msgid "The selected folder will be moved to the Trash, are you sure?" -msgstr "Означени директоријум ће бити пребачен у Ђубре, да ли сте сигурни?" +#: ../gthumb/gio-utils.c:1750 +msgid "Moving files" +msgstr "Премештање датотека" -#: ../src/gth-browser-actions-callbacks.c:1334 -#: ../src/gth-browser-actions-callbacks.c:1389 +#: ../gthumb/gio-utils.c:1750 +msgid "Copying files" +msgstr "Умножавање датотека" + +#: ../gthumb/gio-utils.c:1751 +msgid "Getting file information" +msgstr "Добављам податке о датотеци" + +#. hour:minutes:seconds +#. Translators: This is a time format, like "9:05:02" for 9 +#. * hours, 5 minutes, and 2 seconds. You may change ":" to +#. * the separator that your locale uses or use "%Id" instead +#. * of "%d" if your locale uses localized digits. +#. +#: ../gthumb/glib-utils.c:3068 +#, c-format +msgctxt "long time format" +msgid "%d:%02d:%02d" +msgstr "%d:%02d:%02d" + +#. minutes:seconds +#. Translators: This is a time format, like "5:02" for 5 +#. * minutes and 2 seconds. You may change ":" to the +#. * separator that your locale uses or use "%Id" instead of +#. * "%d" if your locale uses localized digits. +#. +#: ../gthumb/glib-utils.c:3077 #, c-format -msgid "Could not copy the folder \"%s\": %s" -msgstr "Не могу да умножим директоријум „%s“: %s" +msgctxt "short time format" +msgid "%d:%02d" +msgstr "%d:%02d" + +#: ../gthumb/gth-browser-actions-callbacks.c:414 +msgid "" +"gthumb is free software; you can redistribute it and/or modify it under the " +"terms of the GNU General Public License as published by the Free Software " +"Foundation; either version 2 of the License, or (at your option) any later " +"version." +msgstr "" +"Гномов сличко је слободна мекотворина; можете је раздељивати и/или мењати " +"под условима ГНУ Опште јавне лиценце коју је објавила Задужбина слободног " +"софтвера; било издања 2 лиценце или (по вашем избору) било којег новијег " +"издања." -#: ../src/gth-browser-actions-callbacks.c:1410 -msgid "source contains destination" -msgstr "извор садржи одредиште" +#: ../gthumb/gth-browser-actions-callbacks.c:418 +msgid "" +"gthumb is distributed in the hope that it will be useful, but WITHOUT ANY " +"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " +"details." +msgstr "" +"Гномов сличко се расподељује у нади да ће бити користан, али БЕЗ ИКАКВОГ " +"ЈЕМСТВА; чак и без примењеног јемства ТРЖИШНЕ ВРЕДНОСТИ или ПРИЛАГОЂЕНОСТИ " +"ОДРЕЂЕНОЈ НАМЕНИ. Погледајте ГНУ Општу јавну лиценцу за више појединости." -#: ../src/gth-browser-actions-callbacks.c:1421 -msgid "a folder with that name is already present." -msgstr "директоријум са тим именом већ постоји." +#: ../gthumb/gth-browser-actions-callbacks.c:422 +msgid "" +"You should have received a copy of the GNU General Public License along with " +"gthumb. If not, see http://www.gnu.org/licenses/." +msgstr "" +"Требали сте да примите примерак Гнуове опште јавне лиценце уз Гномовог " +"сличка. Ако нисте, погледајте http://www.gnu.org/licenses/." -#: ../src/gth-browser-actions-callbacks.c:1698 -msgid "New Folder" -msgstr "Нови директоријум" +#: ../gthumb/gth-browser-actions-callbacks.c:441 +msgid "An image viewer and browser for GNOME." +msgstr "Прегледач и претраживач слика за Гном." -#: ../src/gth-browser-actions-callbacks.c:1699 -msgid "Enter the folder name: " -msgstr "Унесите име директоријума:" +#: ../gthumb/gth-browser-actions-callbacks.c:444 +msgid "translator_credits" +msgstr "" +"Душан Живојнов \n" +"Данило Шеган \n" +"Саша Петровић \n" +"\n" +"http://prevod.org — превод на српски језик." -#: ../src/gth-browser-actions-entries.h:36 -#: ../src/gth-viewer-actions-entries.h:35 +#: ../gthumb/gth-browser-actions-entries.h:31 msgid "_File" msgstr "_Датотека" -#: ../src/gth-browser-actions-entries.h:37 -msgid "_Folder" -msgstr "_Директоријум" - -#: ../src/gth-browser-actions-entries.h:40 -#: ../src/gth-viewer-actions-entries.h:36 +#: ../gthumb/gth-browser-actions-entries.h:32 msgid "_Edit" msgstr "_Уреди" -#: ../src/gth-browser-actions-entries.h:42 -#: ../src/gth-viewer-actions-entries.h:38 -msgid "Show/_Hide" -msgstr "Прикажи/_Склони" - -#: ../src/gth-browser-actions-entries.h:43 -msgid "S_ort Images" -msgstr "П_оређај слике" - -#: ../src/gth-browser-actions-entries.h:44 -#: ../src/gth-viewer-actions-entries.h:39 -msgid "_Zoom" -msgstr "У_већање" - -#: ../src/gth-browser-actions-entries.h:45 +#: ../gthumb/gth-browser-actions-entries.h:34 msgid "_Go" msgstr "_Иди" -#: ../src/gth-browser-actions-entries.h:47 -#: ../src/gth-viewer-actions-entries.h:41 -msgid "_Transform" -msgstr "_Трансформиши" - -#: ../src/gth-browser-actions-entries.h:48 -#: ../src/gth-viewer-actions-entries.h:42 -msgid "Auto" -msgstr "Сам" - -#: ../src/gth-browser-actions-entries.h:49 -msgid "_Bookmarks" -msgstr "_Обележивачи" - -#: ../src/gth-browser-actions-entries.h:50 -#: ../src/gth-viewer-actions-entries.h:43 -msgid "_Tools" -msgstr "_Алати" - -#: ../src/gth-browser-actions-entries.h:51 -#: ../src/gth-viewer-actions-entries.h:44 -msgid "Set Image as _Wallpaper" -msgstr "Постави слику као _Тапет" - -#: ../src/gth-browser-actions-entries.h:52 -#: ../src/gth-viewer-actions-entries.h:45 +#: ../gthumb/gth-browser-actions-entries.h:35 msgid "_Help" msgstr "_Помоћ" -#: ../src/gth-browser-actions-entries.h:55 -#: ../src/gth-viewer-actions-entries.h:48 -msgid "New _Window" -msgstr "Нови _прозор" - -#: ../src/gth-browser-actions-entries.h:56 -#: ../src/gth-viewer-actions-entries.h:49 -msgid "Create a new window" -msgstr "Направи нови прозор" - -#: ../src/gth-browser-actions-entries.h:61 -msgid "Open the selecte image in a new window" -msgstr "Отвори одабрану слику у новом прозору" - -#: ../src/gth-browser-actions-entries.h:65 -msgid "Proper_ties" -msgstr "Осо_бине" - -#: ../src/gth-browser-actions-entries.h:66 -msgid "View image properties" -msgstr "Погледај особине слике" - -#: ../src/gth-browser-actions-entries.h:70 -msgid "_Import Photos..." -msgstr "_Увези слике..." - -#: ../src/gth-browser-actions-entries.h:71 -msgid "Import photos from a digital camera" -msgstr "Увези слике из дигиталног фотоапарата" - -#: ../src/gth-browser-actions-entries.h:75 -msgid "_Write To CD" -msgstr "Упиши на _ЦД" - -#: ../src/gth-browser-actions-entries.h:76 -msgid "Write selection to CD" -msgstr "Упиши избор на ЦД" - -#: ../src/gth-browser-actions-entries.h:80 -#: ../src/gth-browser-actions-entries.h:100 -#: ../src/gth-browser-actions-entries.h:140 -#: ../src/gth-browser-actions-entries.h:175 -#: ../src/gth-browser-actions-entries.h:215 -#: ../src/gth-browser-actions-entries.h:245 -msgid "_Rename..." -msgstr "_Промени име..." - -#: ../src/gth-browser-actions-entries.h:81 -msgid "Rename this image" -msgstr "Промени име ове слике" - -#: ../src/gth-browser-actions-entries.h:86 -msgid "Move this image to the Trash" -msgstr "Премести ову слику у Ђубре" - -#: ../src/gth-browser-actions-entries.h:90 -#: ../src/gth-browser-actions-entries.h:115 -#: ../src/gth-browser-actions-entries.h:225 -#: ../src/gth-browser-actions-entries.h:255 -msgid "_Copy..." -msgstr "_Умножи..." - -#: ../src/gth-browser-actions-entries.h:91 -msgid "Copy this image to another location" -msgstr "Умножи ову слику на друго место" - -#: ../src/gth-browser-actions-entries.h:95 -#: ../src/gth-browser-actions-entries.h:120 -#: ../src/gth-browser-actions-entries.h:150 -#: ../src/gth-browser-actions-entries.h:185 -#: ../src/gth-browser-actions-entries.h:230 -#: ../src/gth-browser-actions-entries.h:260 -msgid "_Move..." -msgstr "_Премести..." - -#: ../src/gth-browser-actions-entries.h:96 -msgid "Move this image to another location" -msgstr "Премести ову слику на друго место" - -#: ../src/gth-browser-actions-entries.h:101 -msgid "Rename selected image" -msgstr "Промени име одабране слике" - -#: ../src/gth-browser-actions-entries.h:105 -msgid "D_uplicate" -msgstr "Д_уплирај" - -#: ../src/gth-browser-actions-entries.h:106 -msgid "Duplicate selected image" -msgstr "Дуплирај одабрану слику" - -#: ../src/gth-browser-actions-entries.h:111 -msgid "Move the selected images to the Trash" -msgstr "Премести одабране слике у Ђубре" - -#: ../src/gth-browser-actions-entries.h:116 -msgid "Copy selected images to another location" -msgstr "Умножи означене слике на друго место" - -#: ../src/gth-browser-actions-entries.h:121 -msgid "Move selected images to another location" -msgstr "Премести одабране слике на друго место" - -#: ../src/gth-browser-actions-entries.h:125 -msgid "_Select All" -msgstr "_Означи све" - -#: ../src/gth-browser-actions-entries.h:126 -msgid "Select all images" -msgstr "Означи све слике" - -#: ../src/gth-browser-actions-entries.h:130 -#: ../src/gth-viewer-actions-entries.h:58 -msgid "_Add to Catalog..." -msgstr "_Додај у каталог" - -#: ../src/gth-browser-actions-entries.h:131 -#: ../src/gth-viewer-actions-entries.h:59 -msgid "Add selected images to a catalog" -msgstr "Додати означене слике у каталог" +#: ../gthumb/gth-browser-actions-entries.h:36 +msgid "Open _With" +msgstr "_Отвори са" -#: ../src/gth-browser-actions-entries.h:135 -msgid "Remo_ve from Catalog" -msgstr "Укло_ни из каталога" +#: ../gthumb/gth-browser-actions-entries.h:37 +msgid "I_mport From" +msgstr "У_вези из" + +#: ../gthumb/gth-browser-actions-entries.h:38 +msgid "E_xport To" +msgstr "Извези _у" -#: ../src/gth-browser-actions-entries.h:136 -msgid "Remove selected images from the catalog" -msgstr "Уклони одабране слике иза каталога" +#: ../gthumb/gth-browser-actions-entries.h:41 +msgid "New _Window" +msgstr "Нови _прозор" -#: ../src/gth-browser-actions-entries.h:141 -msgid "Rename selected catalog" -msgstr "Промени име одабраног каталога" - -#: ../src/gth-browser-actions-entries.h:145 -#: ../src/gth-browser-actions-entries.h:180 -msgid "Rem_ove" -msgstr "Укл_они" - -#: ../src/gth-browser-actions-entries.h:146 -msgid "Remove selected catalog" -msgstr "Уклони одабрани каталог" - -#: ../src/gth-browser-actions-entries.h:151 -msgid "Move selected catalog to another location" -msgstr "Премести тренутни каталог на друго место" - -#: ../src/gth-browser-actions-entries.h:156 -#: ../src/gth-browser-actions-entries.h:191 -msgid "Modify search criteria" -msgstr "Измени критеријум претраге" - -#: ../src/gth-browser-actions-entries.h:160 -#: ../src/gth-browser-actions-entries.h:195 -msgid "Redo _Search" -msgstr "Понови _претрагу" - -#: ../src/gth-browser-actions-entries.h:161 -#: ../src/gth-browser-actions-entries.h:196 -msgid "Redo the search" -msgstr "Понови претрагу" - -#: ../src/gth-browser-actions-entries.h:165 -msgid "_New Catalog..." -msgstr "_Нови каталог..." - -#: ../src/gth-browser-actions-entries.h:166 -msgid "Create a new catalog" -msgstr "Направи нови каталог" - -#: ../src/gth-browser-actions-entries.h:170 -msgid "New _Library..." -msgstr "Нова _библиотека..." - -#: ../src/gth-browser-actions-entries.h:171 -msgid "Create a new catalog library" -msgstr "Направи нову библиотеку каталога" - -#: ../src/gth-browser-actions-entries.h:176 -msgid "Rename current catalog" -msgstr "Промени име тренутног каталога" - -#: ../src/gth-browser-actions-entries.h:181 -msgid "Remove current catalog" -msgstr "Уклони тренутни каталог" - -#: ../src/gth-browser-actions-entries.h:186 -msgid "Move current catalog to another location" -msgstr "Премести тренутни директоријум на друго место" +#: ../gthumb/gth-browser-actions-entries.h:42 +msgid "Open another window" +msgstr "Отвори још један прозор" -#: ../src/gth-browser-actions-entries.h:200 +#: ../gthumb/gth-browser-actions-entries.h:71 msgid "Open" msgstr "Отвори" -#: ../src/gth-browser-actions-entries.h:201 -msgid "Open the selected folder" -msgstr "Отвори одабрани директоријум" - -#: ../src/gth-browser-actions-entries.h:205 +#: ../gthumb/gth-browser-actions-entries.h:77 msgid "Open in New Window" msgstr "Отвори у новом прозору" -#: ../src/gth-browser-actions-entries.h:206 -msgid "Open the selected folder in a new window" -msgstr "Отвори одабрани директоријум у новом прозору" +#: ../gthumb/gth-browser-actions-entries.h:84 +msgid "Edit various preferences" +msgstr "Измени разна подешавања" -#: ../src/gth-browser-actions-entries.h:210 -#: ../src/gth-browser-actions-entries.h:240 -msgid "Open with the _File Manager" -msgstr "Отвори са _управником датотека" +#: ../gthumb/gth-browser-actions-entries.h:95 +msgid "_Sort By..." +msgstr "_Разврстај по..." + +#: ../gthumb/gth-browser-actions-entries.h:101 +msgid "_Filter..." +msgstr "_Услов..." -#: ../src/gth-browser-actions-entries.h:211 -msgid "Open the selected folder with the Nautilus file manager" -msgstr "Отвори означени директоријум са Наутилусом управником датотека" - -#: ../src/gth-browser-actions-entries.h:216 -msgid "Rename selected folder" -msgstr "Промени име одабраног директоријума" - -#: ../src/gth-browser-actions-entries.h:221 -msgid "Move the selected folder to the Trash" -msgstr "Премести одабрани директоријум у Ђубре" - -#: ../src/gth-browser-actions-entries.h:226 -msgid "Copy selected folder" -msgstr "Умножи означени директоријум" - -#: ../src/gth-browser-actions-entries.h:231 -msgid "Move selected folder" -msgstr "Премести одабрани директоријум" - -#: ../src/gth-browser-actions-entries.h:235 -#: ../src/gth-browser-actions-entries.h:265 -#: ../src/gth-window-actions-entries.h:81 -msgid "Ca_tegories" -msgstr "Ка_тегорија" - -#: ../src/gth-browser-actions-entries.h:236 -msgid "Assign categories to the selected folder" -msgstr "Додели категорије изабраном директоријуму" - -#: ../src/gth-browser-actions-entries.h:241 -msgid "Open current folder with the Nautilus file manager" -msgstr "Отвори тренутни директоријум са Наутилус управником датотека" - -#: ../src/gth-browser-actions-entries.h:246 -msgid "Rename current folder" -msgstr "Промени име треунтог директоријума" - -#: ../src/gth-browser-actions-entries.h:251 -msgid "Move the current folder to the Trash" -msgstr "Премести тренутни тиректоријум у Ђубре" - -#: ../src/gth-browser-actions-entries.h:256 -msgid "Copy current folder" -msgstr "Умножи тренутни директоријум" - -#: ../src/gth-browser-actions-entries.h:261 -msgid "Move current folder" -msgstr "Премести тренутни директоријум" - -#: ../src/gth-browser-actions-entries.h:266 -msgid "Assign categories to the current folder" -msgstr "Додели категорије текућем директоријуму" - -#: ../src/gth-browser-actions-entries.h:270 -msgid "_New Folder..." -msgstr "_Нови директоријум..." - -#: ../src/gth-browser-actions-entries.h:271 -msgid "Create a new folder" -msgstr "Направи нови директоријум" +#: ../gthumb/gth-browser-actions-entries.h:108 +msgid "Stop loading the current location" +msgstr "Прекини учитавање тренутне путање" -#. next image -#: ../src/gth-browser-actions-entries.h:275 ../src/gth-fullscreen.c:1256 -msgid "Next" -msgstr "Следеће" +#: ../gthumb/gth-browser-actions-entries.h:114 +msgid "Reload the current location" +msgstr "Поново учитај тренутно место" + +#: ../gthumb/gth-browser-actions-entries.h:120 +msgid "View previous image" +msgstr "Погледај претходну слику" -#: ../src/gth-browser-actions-entries.h:276 +#: ../gthumb/gth-browser-actions-entries.h:126 msgid "View next image" msgstr "Погледај следећу слику" -#. previous image -#: ../src/gth-browser-actions-entries.h:280 ../src/gth-fullscreen.c:1247 -msgid "Previous" -msgstr "Претходно" - -#: ../src/gth-browser-actions-entries.h:281 -msgid "View previous image" -msgstr "Погледај претходну слику" +#: ../gthumb/gth-browser-actions-entries.h:132 +msgid "Switch to fullscreen" +msgstr "Пребаци на цео екран" + +#: ../gthumb/gth-browser-actions-entries.h:138 +msgid "Leave Fullscreen" +msgstr "Напусти цео екран" -#: ../src/gth-browser-actions-entries.h:286 ../src/gth-browser.c:4876 +#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3841 msgid "Go to the previous visited location" msgstr "Иди на претходно посећено место" -#: ../src/gth-browser-actions-entries.h:291 +#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3859 msgid "Go to the next visited location" msgstr "Иди на следеће посећено место" -#: ../src/gth-browser-actions-entries.h:296 +#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3877 msgid "Go up one level" msgstr "Иди горе за један ниво" -#: ../src/gth-browser-actions-entries.h:300 -#: ../src/gth-viewer-actions-entries.h:63 -msgid "_Reload" -msgstr "_Поново учитај" - -#: ../src/gth-browser-actions-entries.h:301 -#: ../src/gth-viewer-actions-entries.h:64 -msgid "Reload the current location" -msgstr "Поново учитај тренутно место" - -#: ../src/gth-browser-actions-entries.h:306 -msgid "Stop loading current location" -msgstr "Прекини учитавање тренутне путање" +#: ../gthumb/gth-browser-actions-entries.h:161 +msgid "_Location..." +msgstr "_Место..." -#: ../src/gth-browser-actions-entries.h:311 -msgid "Go to the home folder" -msgstr "Иди у лични директоријум" - -#: ../src/gth-browser-actions-entries.h:315 -msgid "_Go to the Image Folder" -msgstr "_Иди у директоријум са сликама" - -#: ../src/gth-browser-actions-entries.h:316 -msgid "Go to the folder that contains the selected image" -msgstr "Иди у директоријум који садржи означену слику" +#: ../gthumb/gth-browser-actions-entries.h:162 +msgid "Specify a location to open" +msgstr "Наведи место за отварање" -#: ../src/gth-browser-actions-entries.h:320 +#: ../gthumb/gth-browser-actions-entries.h:173 ../gthumb/gth-browser.c:721 msgid "_Delete History" msgstr "_Обриши историјат" -#: ../src/gth-browser-actions-entries.h:321 +#: ../gthumb/gth-browser-actions-entries.h:174 msgid "Delete the list of visited locations" -msgstr "Обриши листу посећених места" +msgstr "Обриши списак посећених места" -#: ../src/gth-browser-actions-entries.h:325 -msgid "_Location..." -msgstr "_Место..." - -#: ../src/gth-browser-actions-entries.h:326 -msgid "Specify a location to visit" -msgstr "Наведи место за посету" - -#: ../src/gth-browser-actions-entries.h:330 -msgid "_Add Bookmark" -msgstr "_Додај обележивач" - -#: ../src/gth-browser-actions-entries.h:331 -msgid "Add current location to bookmarks" -msgstr "Додати тренутно место у обележиваче" - -#: ../src/gth-browser-actions-entries.h:335 -msgid "_Edit Bookmarks" -msgstr "_Измени обележиваче" - -#: ../src/gth-browser-actions-entries.h:336 -msgid "Edit bookmarks" -msgstr "Исмени обележиваче" +#: ../gthumb/gth-browser-actions-entries.h:180 +msgid "View the folders" +msgstr "Погледај фасцикле" -#: ../src/gth-browser-actions-entries.h:340 -msgid "_Slide Show" -msgstr "По_кретни приказ" +#: ../gthumb/gth-browser-actions-entries.h:186 +msgid "Show information about gthumb" +msgstr "Приказује информације о Гномовом сличку" -#: ../src/gth-browser-actions-entries.h:341 -msgid "View as a slide show" -msgstr "Погледај као покретни приказ" - -#: ../src/gth-browser-actions-entries.h:346 -msgid "Find images" -msgstr "Нађи слике" - -#: ../src/gth-browser-actions-entries.h:350 -msgid "Create _Index Image" -msgstr "Направи _индекс слике" - -#: ../src/gth-browser-actions-entries.h:355 -msgid "Create _Web Album" -msgstr "Направи _веб албум" - -#: ../src/gth-browser-actions-entries.h:360 -msgid "_Rename Series" -msgstr "Преименуј _серије" - -#: ../src/gth-browser-actions-entries.h:365 -msgid "Convert F_ormat" -msgstr "Ф_ормат претварања" - -#: ../src/gth-browser-actions-entries.h:370 -msgid "Fi_nd Duplicates..." -msgstr "_Нађи дупликате..." - -#: ../src/gth-browser-actions-entries.h:375 -msgid "Ro_tate Images" -msgstr "Ро_тирај слике" - -#: ../src/gth-browser-actions-entries.h:376 -msgid "Rotate images without loss of quality" -msgstr "Ротирај слике без губитка на квалитету" +#: ../gthumb/gth-browser-actions-entries.h:191 +msgid "Contents" +msgstr "Сaдржај" -#: ../src/gth-browser-actions-entries.h:381 -msgid "Edit various preferences" -msgstr "Измени разна подешавања" +#: ../gthumb/gth-browser-actions-entries.h:192 +msgid "Display the gthumb Manual" +msgstr "Приказује упутство Гномовог сличка" -#: ../src/gth-browser-actions-entries.h:385 -msgid "Change _Date" -msgstr "Промени _датум" +#: ../gthumb/gth-browser-actions-entries.h:197 +msgid "_Keyboard Shortcuts" +msgstr "Пречице на _тастатури" -#: ../src/gth-browser-actions-entries.h:386 -msgid "Change images last modified date" -msgstr "Промени датум последње измене слике" +#: ../gthumb/gth-browser-actions-entries.h:203 +#: ../gthumb/gth-browser-actions-entries.h:257 +msgid "Edit" +msgstr "Уреди" + +#: ../gthumb/gth-browser-actions-entries.h:204 +#: ../gthumb/gth-browser-actions-entries.h:258 +msgid "Edit file" +msgstr "Уреди датотеку" -#: ../src/gth-browser-actions-entries.h:395 -#: ../src/gth-viewer-actions-entries.h:73 +#: ../gthumb/gth-browser-actions-entries.h:212 msgid "_Toolbar" -msgstr "_Алатке" +msgstr "Трака _алатки" -#: ../src/gth-browser-actions-entries.h:396 -#: ../src/gth-viewer-actions-entries.h:74 +#: ../gthumb/gth-browser-actions-entries.h:213 msgid "View or hide the toolbar of this window" -msgstr "Погледај или склони алатке овог прозора" +msgstr "Погледај или склони траку алатки овог прозора" -#: ../src/gth-browser-actions-entries.h:400 -#: ../src/gth-viewer-actions-entries.h:78 +#: ../gthumb/gth-browser-actions-entries.h:217 msgid "_Statusbar" msgstr "_Линија са стањем" -#: ../src/gth-browser-actions-entries.h:401 -#: ../src/gth-viewer-actions-entries.h:79 +#: ../gthumb/gth-browser-actions-entries.h:218 msgid "View or hide the statusbar of this window" -msgstr "Погледај или склони линију са стањем овог прозора" +msgstr "Погледај или склони траку стања овог прозора" + +#: ../gthumb/gth-browser-actions-entries.h:222 +msgid "_Filterbar" +msgstr "_Трака услова" + +#: ../gthumb/gth-browser-actions-entries.h:223 +msgid "View or hide the filterbar of this window" +msgstr "Погледај или склони траку услова овог прозора" + +#: ../gthumb/gth-browser-actions-entries.h:227 +msgid "_Sidebar" +msgstr "_Бочна трака" + +#: ../gthumb/gth-browser-actions-entries.h:228 +msgid "View or hide the sidebar of this window" +msgstr "Погледај или склони бочну траку овог прозора" + +#: ../gthumb/gth-browser-actions-entries.h:232 +msgid "_Thumbnail Pane" +msgstr "Окно _умањених приказа" -#: ../src/gth-browser-actions-entries.h:406 +#: ../gthumb/gth-browser-actions-entries.h:233 +msgid "View or hide the thumbnail pane in viewer mode" +msgstr "Погледај или склони окно умањених приказа у начину прегледа" + +#: ../gthumb/gth-browser-actions-entries.h:237 +msgid "_Thumbnails" +msgstr "_Умањени прикази" + +#: ../gthumb/gth-browser-actions-entries.h:238 msgid "View thumbnails" msgstr "Погледај умањене слике" -#: ../src/gth-browser-actions-entries.h:410 -msgid "_Image Preview" -msgstr "Пре_глед слике" - -#: ../src/gth-browser-actions-entries.h:411 -#: ../src/gth-browser-actions-entries.h:454 -msgid "View the image" -msgstr "Погледај слику" - -#: ../src/gth-browser-actions-entries.h:415 -#: ../src/gth-viewer-actions-entries.h:83 -msgid "Image _Comment" -msgstr "_Примедба уз слику" - -#: ../src/gth-browser-actions-entries.h:416 -#: ../src/gth-viewer-actions-entries.h:84 -msgid "View image comment" -msgstr "Погледај примедбу уз слику" - -#: ../src/gth-browser-actions-entries.h:420 -msgid "_Reversed Order" -msgstr "_Обрнути редослед" - -#: ../src/gth-browser-actions-entries.h:421 -msgid "Reverse images order" -msgstr "Обрни поредак слика" - -#: ../src/gth-browser-actions-entries.h:430 -msgid "by _Name" -msgstr "по _имену" - -#: ../src/gth-browser-actions-entries.h:431 -msgid "Sort images by name" -msgstr "Поређај слике по имену" - -#: ../src/gth-browser-actions-entries.h:433 -msgid "by _Path" -msgstr "по _путањи" - -#: ../src/gth-browser-actions-entries.h:434 -msgid "Sort images by path" -msgstr "Поређај слике по путањи" - -#: ../src/gth-browser-actions-entries.h:436 -msgid "by _Size" -msgstr "по _величини" - -#: ../src/gth-browser-actions-entries.h:437 -msgid "Sort images by file size" -msgstr "Поређај слике по величини датотеке" - -#: ../src/gth-browser-actions-entries.h:439 -msgid "by _Time" -msgstr "по в_ремену" - -#: ../src/gth-browser-actions-entries.h:440 -msgid "Sort images by modification time" -msgstr "Поређеј слике по времену измене" - -#: ../src/gth-browser-actions-entries.h:447 -msgid "_Folders" -msgstr "_Директоријуми" +#: ../gthumb/gth-browser-actions-entries.h:242 +msgid "_Hidden Files" +msgstr "_Сакривене датотеке" -#: ../src/gth-browser-actions-entries.h:448 -msgid "View the folders" -msgstr "Погледај директоријуме" +#: ../gthumb/gth-browser-actions-entries.h:243 +msgid "Show hidden files and folders" +msgstr "Прикажи скривене датотеке и фасцикле" + +#: ../gthumb/gth-browser-actions-entries.h:248 +#: ../gthumb/gth-browser-actions-entries.h:253 +msgid "View file properties" +msgstr "Погледај особине датотеке" + +#: ../gthumb/gth-browser-actions-entries.h:262 +msgid "_Fit Window to Image" +msgstr "_Прилагоди величину прозора слици" + +#: ../gthumb/gth-browser-actions-entries.h:263 +msgid "Resize the window to the size of the image" +msgstr "Подеси величину прозора величини слике" -#: ../src/gth-browser-actions-entries.h:450 -msgid "_Catalogs" -msgstr "_Каталози" - -#: ../src/gth-browser-actions-entries.h:451 -msgid "View the catalogs" -msgstr "Погледај каталоге" - -#: ../src/gth-browser.c:521 ../src/gth-viewer.c:588 -msgid "[Press 'c' to add a comment]" -msgstr "[Притисните „ц“ да додате примедбу]" +#: ../gthumb/gth-browser.c:418 +#, c-format +msgid "Open %s" +msgstr "Отвори %s" -#: ../src/gth-browser.c:595 ../src/gth-browser.c:614 ../src/gth-viewer.c:657 -#: ../src/gth-viewer.c:678 +#: ../gthumb/gth-browser.c:558 msgid "[modified]" msgstr "[измењено]" -#: ../src/gth-browser.c:639 ../src/gth-window-actions-callbacks.c:660 -#: ../src/main.c:126 -msgid "gThumb" -msgstr "gThumb" - -#: ../src/gth-browser.c:701 +#: ../gthumb/gth-browser.c:1117 #, c-format -msgid "1 image (%s)" -msgstr "1 слика (%s)" +msgid "%d file selected (%s)" +msgid_plural "%d files selected (%s)" +msgstr[0] "%d означена датотека (%s)" +msgstr[1] "%d означене датотеке (%s)" +msgstr[2] "%d означених датотека (%s)" +msgstr[3] "%d означена датотека (%s)" -#: ../src/gth-browser.c:704 +#: ../gthumb/gth-browser.c:1152 #, c-format -msgid "%d images (%s)" -msgstr "%d слика (%s)" +msgid "%s of free space" +msgstr "%s слободног простора" -#: ../src/gth-browser.c:711 +#: ../gthumb/gth-browser.c:2073 ../gthumb/gth-browser.c:2100 #, c-format -msgid "1 selected (%s)" -msgstr "1 одабранa (%s)" +msgid "No suitable module found for %s" +msgstr "Није пронађена одговарајућа јединица за %s" -#: ../src/gth-browser.c:714 +#: ../gthumb/gth-browser.c:2219 #, c-format -msgid "%d selected (%s)" -msgstr "%d одабраних (%s)" +msgid "Save changes to file '%s'?" +msgstr "Сачувај измене на датотеци „%s“?" -#: ../src/gth-browser.c:1843 ../src/gth-viewer.c:790 -msgid "The current image has been modified, do you want to save it?" -msgstr "Текућа слика је измењена, желите ли да је сачувате?" +#: ../gthumb/gth-browser.c:2224 +msgid "If you don't save, changes to the file will be permanently lost." +msgstr "Ако не сачувате, измене на датотеци ће бити заувек изгубљене." -#: ../src/gth-browser.c:1844 ../src/gth-viewer.c:791 -msgid "Do Not Save" -msgstr "Не чувај" +#: ../gthumb/gth-browser.c:2225 +msgid "Do _Not Save" +msgstr "Не _чувај" -#: ../src/gth-browser.c:3422 -msgid "Dragged Images" -msgstr "Превучене слике" +#: ../gthumb/gth-browser.c:3020 ../gthumb/gth-source-tree.c:182 +msgid "Could not change name" +msgstr "Не могу изменити назив" -#: ../src/gth-browser.c:4875 -msgid "Back" -msgstr "Назад" +#: ../gthumb/gth-browser.c:3451 ../gthumb/gth-main-default-metadata.c:41 +msgid "Modified" +msgstr "Измењено" -#: ../src/gth-browser.c:5473 -msgid "Close" -msgstr "Затвори" +#: ../gthumb/gth-browser.c:3842 ../gthumb/gth-browser.c:3860 +msgid "View the list of visited locations" +msgstr "Погледајте списак посећених места" -#: ../src/gth-browser.c:5487 ../src/gth-viewer.c:1487 -msgid "Image comment" -msgstr "Примедба за слику" +#: ../gthumb/gth-browser.c:3878 +msgid "View the list of upper locations" +msgstr "Прегледај списак родитељских места" -#: ../src/gth-browser.c:5501 -msgid "Image data" -msgstr "Подаци слике" +#: ../gthumb/gth-browser.c:6215 +#, c-format +msgid "File type not supported" +msgstr "Врста датотеке није подржана" -#: ../src/gth-browser.c:5515 -msgid "Image preview" -msgstr "Преглед слике" +#: ../gthumb/gth-browser.c:6258 +#, c-format +msgid "No suitable module found" +msgstr "Није пронађен одговарајућа јединица" -#: ../src/gth-browser.c:6778 +#: ../gthumb/gth-extensions.c:203 #, c-format -msgid "Cannot load folder \"%s\": %s\n" -msgstr "Не могу да учитам директоријум „%s“: %s\n" +msgid "Could not open the module `%s`: %s" +msgstr "Нисам успео да отворим јединицу „%s“: %s" -#: ../src/gth-browser.c:7053 -msgid "The specified catalog does not exist." -msgstr "Наведени каталог не постоји." +#: ../gthumb/gth-extensions.c:754 +#, c-format +msgid "The extension '%1$s' is required by the extension '%2$s'" +msgstr "Наставак „%1$s“ је потребан за наставак „%2$s“" -#: ../src/gth-exif-data-viewer.c:131 -msgid "Field" -msgstr "Поље" +#: ../gthumb/gth-file-chooser-dialog.c:144 +msgid "All Supported Files" +msgstr "Све подржане датотеке" -#: ../src/gth-exif-data-viewer.c:141 -msgid "Value " -msgstr "Вредност " +#: ../gthumb/gth-file-source-vfs.c:121 +msgid "Home Folder" +msgstr "Лична фасцикла" -#: ../src/gth-folder-selection-dialog.c:405 -msgid "_Browse..." -msgstr "_Претражи..." +#: ../gthumb/gth-file-source-vfs.c:126 +msgid "File System" +msgstr "Систем датотека" -#: ../src/gth-folder-selection-dialog.c:414 -msgid "_Recents:" -msgstr "_Скорије:" +#: ../gthumb/gth-file-source-vfs.c:739 +msgid "" +"The files cannot be moved to the Trash. Do you want to delete them " +"permanently?" +msgstr "Датотеке не могу бити пребачене у Ђубре. Желите ли их трајно обрисати?" -#. restore normal view -#: ../src/gth-fullscreen.c:1238 ../src/gth-window-actions-entries.h:206 -msgid "Restore Normal View" -msgstr "Врати нормални преглед" +#: ../gthumb/gth-file-source-vfs.c:750 +msgid "Could not move the files to the Trash" +msgstr "Не могу преместити датотеке у смеће" + +#: ../gthumb/gth-file-source-vfs.c:797 +#, c-format +msgid "Are you sure you want to move \"%s\" to trash?" +msgstr "Да ли сигурно желите послати датотеку „%s“ у смеће?" + +#: ../gthumb/gth-file-source-vfs.c:801 +#, c-format +msgid "Are you sure you want to move to trash the %'d selected file?" +msgid_plural "Are you sure you want to move to trash the %'d selected files?" +msgstr[0] "Да ли сигурно желите да пошаљете у смеће %'d изабрану датотеку?" +msgstr[1] "Да ли сигурно желите да пошаљете у смеће %'d изабране датотеке?" +msgstr[2] "Да ли сигурно желите да пошаљете у смеће %'d изабраних датотека?" +msgstr[3] "Да ли сигурно желите да пошаљете у смеће %'d изабрану датотеку?" + +#: ../gthumb/gth-file-source-vfs.c:844 +#, c-format +msgid "Are you sure you want to permanently delete the %'d selected file?" +msgid_plural "" +"Are you sure you want to permanently delete the %'d selected files?" +msgstr[0] "Да ли сигурно желите да трајно обришете %'d изабрану датотеку?" +msgstr[1] "Да ли сигурно желите да трајно обришете %'d изабранe датотекe?" +msgstr[2] "Да ли сигурно желите да трајно обришете %'d изабраних датотека?" +msgstr[3] "Да ли сигурно желите да трајно обришете %'d изабрану датотеку?" + +#: ../gthumb/gth-filterbar.c:413 +msgid "Hide the filterbar" +msgstr "Сакриј траку услова" + +#: ../gthumb/gth-filter.c:43 ../gthumb/gth-filter-editor-dialog.c:178 +#: ../gthumb/gth-test-simple.c:75 +msgid "kB" +msgstr "kB" + +#: ../gthumb/gth-filter.c:44 ../gthumb/gth-filter-editor-dialog.c:179 +#: ../gthumb/gth-test-simple.c:76 +msgid "MB" +msgstr "MB" + +#: ../gthumb/gth-filter.c:45 ../gthumb/gth-filter-editor-dialog.c:180 +#: ../gthumb/gth-test-simple.c:77 +msgid "GB" +msgstr "GB" + +#. "files" label +#: ../gthumb/gth-filter.c:286 ../gthumb/gth-filter-editor-dialog.c:177 +msgid "files" +msgstr "датотеке" + +#: ../gthumb/gth-filter-editor-dialog.c:224 +msgid "ascending" +msgstr "узлазно" + +#: ../gthumb/gth-filter-editor-dialog.c:225 +msgid "descending" +msgstr "силазно" + +#: ../gthumb/gth-filter-editor-dialog.c:515 +#, c-format +msgid "No limit specified" +msgstr "Није наведено ограничење" + +#: ../gthumb/gth-folder-tree.c:1369 +msgid "(Open Parent)" +msgstr "(Отвори надфасциклу)" + +#: ../gthumb/gth-histogram-view.c:825 +msgid "Linear scale" +msgstr "Редна лествица" + +#: ../gthumb/gth-histogram-view.c:837 +msgid "Logarithmic scale" +msgstr "Логаритамска лествица" + +#: ../gthumb/gth-histogram-view.c:857 +msgid "Channel:" +msgstr "Канал:" -#. image comment -#: ../src/gth-fullscreen.c:1265 -msgid "Image Info" -msgstr "Подаци о слици" +#: ../gthumb/gth-histogram-view.c:878 +msgid "Value" +msgstr "Вредност" -#. pause slideshow -#: ../src/gth-fullscreen.c:1275 -msgid "Pause" -msgstr "Пауза" +#: ../gthumb/gth-histogram-view.c:883 +msgid "Red" +msgstr "Црвена" -#: ../src/gth-viewer-actions-entries.h:53 -msgid "Open _Folder" -msgstr "Отвори _директоријум" +#: ../gthumb/gth-histogram-view.c:888 +msgid "Green" +msgstr "Зелена" -#: ../src/gth-viewer-actions-entries.h:54 -msgid "Browse the image folder" -msgstr "Разгледај директоријум са сликама" +#: ../gthumb/gth-histogram-view.c:893 +msgid "Blue" +msgstr "Плава" -#: ../src/gth-window-actions-callbacks.c:649 -msgid "translator_credits" -msgstr "" -"Душан Живојнов \n" -"Данило Шеган \n" -"\n" -"Prevod.org — превод на српски језик." +#: ../gthumb/gth-histogram-view.c:898 +msgid "Alpha" +msgstr "Алфа" -#: ../src/gth-window-actions-callbacks.c:663 -msgid "An image viewer and browser for GNOME." -msgstr "Прегледач и претрживач слика за Гном." +#: ../gthumb/gth-histogram-view.c:904 +msgid "RGB" +msgstr "РГБ" -#: ../src/gth-window-actions-entries.h:37 -msgid "Close this window" -msgstr "Затвори овај прозор" +#: ../gthumb/gth-image-list-task.c:141 +msgid "Could not rename the file" +msgstr "Не могу променити име слике" -#: ../src/gth-window-actions-entries.h:41 -#: ../src/gth-window-actions-entries.h:66 -msgid "_Open With" -msgstr "_Отвори са" +#: ../gthumb/gth-image-saver.c:39 +msgid "No options available for this file type" +msgstr "Нема доступних могућности за ову врсту датотеке" -#: ../src/gth-window-actions-entries.h:42 -msgid "Open selected images with an application" -msgstr "Отвори означене слике програмом" - -#: ../src/gth-window-actions-entries.h:57 -msgid "Revert to saved image" -msgstr "Врати на сачувану слику" - -#: ../src/gth-window-actions-entries.h:67 -msgid "Open this image with an application" -msgstr "Отвори ову слику са програмом" - -#: ../src/gth-window-actions-entries.h:72 -msgid "Add a comment to selected images" -msgstr "Додати коментар означеним сликама" - -#: ../src/gth-window-actions-entries.h:76 -msgid "Rem_ove Comment" -msgstr "Укл_они коментар" - -#: ../src/gth-window-actions-entries.h:77 -msgid "Remove comments of selected images" -msgstr "Уклони коментаре одабраних слика" - -#: ../src/gth-window-actions-entries.h:82 -msgid "Assign categories to selected images" -msgstr "Додели категорије одабраним сликама" - -#: ../src/gth-window-actions-entries.h:86 -msgid "Rotate Ri_ght" -msgstr "Ротирај де_сно" - -#: ../src/gth-window-actions-entries.h:87 -msgid "View the image rotated clockwise" -msgstr "Погледај слику ротирану у правцу кретања казаљке на сату" - -#: ../src/gth-window-actions-entries.h:91 -msgid "Rotate _Left" -msgstr "Ротирај _лево" - -#: ../src/gth-window-actions-entries.h:92 -msgid "View the image rotated counter-clockwise" -msgstr "Погледај слику ротирану у супротном правцу кретања казаљке на сату" - -#: ../src/gth-window-actions-entries.h:97 -msgid "View the image flipped" -msgstr "Погледај преокренуту слику" - -#: ../src/gth-window-actions-entries.h:102 -msgid "View the image mirrored" -msgstr "Погледај слику у одразу" - -#: ../src/gth-window-actions-entries.h:106 -msgid "_Desaturate" -msgstr "_Незасићен" - -#: ../src/gth-window-actions-entries.h:107 -msgid "View the image in black and white" -msgstr "Погледај слику као црно-белу" - -#: ../src/gth-window-actions-entries.h:111 -msgid "_Negative" -msgstr "_Негатив" - -#: ../src/gth-window-actions-entries.h:112 -msgid "View the image with negative colors" -msgstr "Погледај слику са бојама негатива" - -#: ../src/gth-window-actions-entries.h:116 -msgid "_Enhance" -msgstr "_Побољшај" - -#: ../src/gth-window-actions-entries.h:117 -msgid "Automatically adjust the color levels" -msgstr "Сам прилагоди нивое боја" - -#: ../src/gth-window-actions-entries.h:121 -msgid "_Equalize" -msgstr "Из_једначи" - -#: ../src/gth-window-actions-entries.h:122 -msgid "Automatically equalize the image histogram" -msgstr "Сам изједначи хистограм слике" - -#: ../src/gth-window-actions-entries.h:126 -msgid "_Normalize" -msgstr "_Нормализуј" - -#: ../src/gth-window-actions-entries.h:127 -msgid "Automatically normalize the contrast" -msgstr "Сам нормализуј контраст" - -#: ../src/gth-window-actions-entries.h:131 -msgid "_Stretch Contrast" -msgstr "_Развуци контраст" - -#: ../src/gth-window-actions-entries.h:132 -msgid "Automatically stretch the contrast" -msgstr "Аутоматски развући контраст" - -#: ../src/gth-window-actions-entries.h:136 -msgid "_Posterize" -msgstr "_Направи плакат" - -#: ../src/gth-window-actions-entries.h:137 -msgid "Reduce the number of colors" -msgstr "Смањи број боја" - -#: ../src/gth-window-actions-entries.h:141 -msgid "_Brightness-Contrast" -msgstr "_Светлина-контраст" - -#: ../src/gth-window-actions-entries.h:142 -msgid "Adjust brightness and contrast" -msgstr "Подесити светлину и контраст" - -#: ../src/gth-window-actions-entries.h:146 -msgid "_Hue-Saturation" -msgstr "_Нијанса-засићеност" - -#: ../src/gth-window-actions-entries.h:147 -msgid "Adjust hue and saturation" -msgstr "Подеси нијансу и засићеност" - -#: ../src/gth-window-actions-entries.h:151 -msgid "_Color Balance" -msgstr "_Однос боја" - -#: ../src/gth-window-actions-entries.h:152 -msgid "Adjust color balance" -msgstr "Подеси однос боје" - -#: ../src/gth-window-actions-entries.h:156 -msgid "_Threshold" -msgstr "_Праг" - -#: ../src/gth-window-actions-entries.h:157 -msgid "Apply threshold" -msgstr "Примени праг" - -#: ../src/gth-window-actions-entries.h:161 -msgid "_Resize" -msgstr "_Промени величину" +#: ../gthumb/gth-image-saver.c:185 +#, c-format +msgid "Could not find a suitable module to save the image as \"%s\"" +msgstr "Не могу пронађем одговарајућу јединицу за чување слике као„%s“" -#: ../src/gth-window-actions-entries.h:162 -msgid "Resize image" -msgstr "Промени величину слике" +#: ../gthumb/gth-load-file-data-task.c:108 +msgid "Reading file information" +msgstr "Читање података датотека" -#: ../src/gth-window-actions-entries.h:166 -msgid "_Rotate" -msgstr "_Ротирај" - -#: ../src/gth-window-actions-entries.h:167 -msgid "Rotate image" -msgstr "Ротирај слику" - -#: ../src/gth-window-actions-entries.h:172 -msgid "Crop image" -msgstr "Исечак слике" +#: ../gthumb/gth-main-default-metadata.c:32 +msgid "File" +msgstr "Датотека" -#: ../src/gth-window-actions-entries.h:176 -#: ../src/gth-window-actions-entries.h:253 -msgid "In" -msgstr "Увећај" +#: ../gthumb/gth-main-default-metadata.c:39 +msgid "Name" +msgstr "Име" -#: ../src/gth-window-actions-entries.h:177 -msgid "Zoom in" -msgstr "Увећај" +#: ../gthumb/gth-main-default-metadata.c:40 +#: ../gthumb/gth-main-default-tests.c:284 +msgid "Size" +msgstr "Величина" -#: ../src/gth-window-actions-entries.h:181 -msgid "Out" -msgstr "Умањи" +#: ../gthumb/gth-main-default-metadata.c:42 +msgid "Type" +msgstr "Врста" -#: ../src/gth-window-actions-entries.h:182 -msgid "Zoom out" -msgstr "Умањи" +#: ../gthumb/gth-main-default-metadata.c:44 +msgid "Full Name" +msgstr "Потпуно име" -#: ../src/gth-window-actions-entries.h:186 -msgid "1:1" -msgstr "1:1" +#: ../gthumb/gth-main-default-metadata.c:48 +msgid "Duration" +msgstr "Трајање" -#: ../src/gth-window-actions-entries.h:187 -msgid "Actual size" -msgstr "Стварна величина" +#: ../gthumb/gth-main-default-sort-types.c:131 +msgid "file name" +msgstr "назив датотеке" -#: ../src/gth-window-actions-entries.h:191 -msgid "Fit" -msgstr "Поравнај" +#: ../gthumb/gth-main-default-sort-types.c:132 +msgid "file path" +msgstr "путања датотеке" -#: ../src/gth-window-actions-entries.h:192 -msgid "Zoom to fit window" -msgstr "Увећај до поравнања прозора" +#: ../gthumb/gth-main-default-sort-types.c:133 +msgid "file size" +msgstr "величина датотеке" -#: ../src/gth-window-actions-entries.h:196 -msgid "Step A_nimation" -msgstr "А_нимација у корацима" - -#: ../src/gth-window-actions-entries.h:201 -msgid "_Full Screen" -msgstr "_Цео екран" - -#: ../src/gth-window-actions-entries.h:202 -#: ../src/gth-window-actions-entries.h:207 -msgid "View image in fullscreen mode" -msgstr "Погледај слику преко целог екрана" - -#: ../src/gth-window-actions-entries.h:211 -msgid "_Centered" -msgstr "_Центрирано" - -#: ../src/gth-window-actions-entries.h:212 -msgid "Set the image as desktop background (centered)" -msgstr "Намести слику у позадину радне површине (центирано)" - -#: ../src/gth-window-actions-entries.h:216 -msgid "_Tiled" -msgstr "_Поравнато" - -#: ../src/gth-window-actions-entries.h:217 -msgid "Set the image as desktop background (tiled)" -msgstr "Намести слику у позадину радне површине (поравнато)" - -#: ../src/gth-window-actions-entries.h:221 -msgid "_Scaled" -msgstr "_Пропорционално" +#: ../gthumb/gth-main-default-sort-types.c:134 +msgid "file modified date" +msgstr "датум последње измене" -#: ../src/gth-window-actions-entries.h:222 -msgid "Set the image as desktop background (scaled keeping aspect ratio)" -msgstr "" -"Намести слику у позадину радне површине (пропорционално задржати пропорције)" +#: ../gthumb/gth-main-default-sort-types.c:135 +msgid "no sorting" +msgstr "без разврставања" -#: ../src/gth-window-actions-entries.h:226 -msgid "Str_etched" -msgstr "Рашир_ено" +#: ../gthumb/gth-main-default-sort-types.c:136 +msgid "dimensions" +msgstr "величина" -#: ../src/gth-window-actions-entries.h:227 -msgid "Set the image as desktop background (stretched)" -msgstr "Намести слику у позадину радне површине (раширено)" +#: ../gthumb/gth-main-default-tests.c:233 +msgid "All Files" +msgstr "Све датотеке" -#: ../src/gth-window-actions-entries.h:231 -msgid "_Restore" -msgstr "_Поврати" +#: ../gthumb/gth-main-default-tests.c:261 +msgid "Media" +msgstr "Носач садржаја" -#: ../src/gth-window-actions-entries.h:232 -msgid "Restore the original desktop wallpaper" -msgstr "Врати оригинални тапет на радној површини" +#: ../gthumb/gth-main-default-tests.c:268 +msgid "Text Files" +msgstr "Текст датотеке" -#: ../src/gth-window-actions-entries.h:237 -msgid "Show information about gThumb" -msgstr "Прикажи информације о gThumb-у" +#: ../gthumb/gth-main-default-tests.c:276 +msgid "Filename" +msgstr "Назив датотеке" -#: ../src/gth-window-actions-entries.h:246 -msgid "_Keyboard Shortcuts" -msgstr "Пречице на _тастатури" +#: ../gthumb/gth-main-default-tests.c:308 +msgid "Title (embedded)" +msgstr "Наслов (угњежђен)" -#: ../src/gth-window-actions-entries.h:262 -msgid "Play _Animation" -msgstr "Пусти _анимацију" - -#: ../src/gth-window-actions-entries.h:272 -msgid "_High Quality" -msgstr "_Добар квалитет" - -#: ../src/gth-window-actions-entries.h:273 -msgid "Use high quality zoom" -msgstr "Користи увећање доброг квалитета" - -#: ../src/gth-window-actions-entries.h:275 -msgid "_Low Quality" -msgstr "_Лош квалитет" - -#: ../src/gth-window-actions-entries.h:276 -msgid "Use low quality zoom" -msgstr "Користи увећање лошег квалитета" +#: ../gthumb/gth-main-default-tests.c:316 +msgid "Description (embedded)" +msgstr "Опис (угњежђен)" -#: ../src/main.c:85 -msgid "Start in fullscreen mode" -msgstr "Почни у целом екрану" +#: ../gthumb/gth-progress-dialog.c:146 +msgid "Cancel operation" +msgstr "Обустави радњу" -#: ../src/main.c:88 -msgid "Automatically start a slideshow" -msgstr "Аутоматски стартовати низ слика" +#: ../gthumb/gth-save-file-data-task.c:102 +msgid "Saving file information" +msgstr "Чување података датотеке" -#: ../src/main.c:91 -msgid "Automatically import digital camera photos" -msgstr "Сам увези слике са дигиталног фотоапарата" +#. Translators: %s is a filename +#: ../gthumb/gth-save-image-task.c:160 +#, c-format +#| msgid "Starting %s" +msgid "Saving '%s'" +msgstr "Чувам „%s“" -#: ../src/main.c:162 +#: ../gthumb/gth-tags-entry.c:390 +#, c-format +msgid "Create tag «%s»" +msgstr "Направи ознаку «%s»" + +#: ../gthumb/gth-tags-entry.c:814 +msgid "Show all the tags" +msgstr "Прикажи све ознаке" + +#: ../gthumb/gth-tags-file.c:235 msgid "Holidays" -msgstr "Одмор" +msgstr "Одмори" -#: ../src/main.c:163 +#: ../gthumb/gth-tags-file.c:236 msgid "Temporary" msgstr "Привемено" -#: ../src/main.c:164 +#: ../gthumb/gth-tags-file.c:237 msgid "Screenshots" msgstr "Снимци екрана" -#: ../src/main.c:165 +#: ../gthumb/gth-tags-file.c:238 msgid "Science" msgstr "Наука" -#: ../src/main.c:166 -msgid "Favourite" +#: ../gthumb/gth-tags-file.c:239 +msgid "Favorite" msgstr "Омиљено" -#: ../src/main.c:167 +#: ../gthumb/gth-tags-file.c:240 msgid "Important" msgstr "Важно" -#: ../src/main.c:168 +#: ../gthumb/gth-tags-file.c:241 msgid "GNOME" msgstr "Гном" -#: ../src/main.c:169 +#: ../gthumb/gth-tags-file.c:242 msgid "Games" msgstr "Игре" -#: ../src/main.c:170 +#: ../gthumb/gth-tags-file.c:243 msgid "Party" msgstr "Забава" -#: ../src/main.c:171 +#: ../gthumb/gth-tags-file.c:244 msgid "Birthday" msgstr "Рођендан" -#: ../src/main.c:172 +#: ../gthumb/gth-tags-file.c:245 msgid "Astronomy" msgstr "Астрономија" -#: ../src/main.c:173 +#: ../gthumb/gth-tags-file.c:246 msgid "Family" msgstr "Породица" -#: ../src/main.c:353 ../src/main.c:483 -msgid "Command Line" -msgstr "Наредбна линија" +#: ../gthumb/gth-test-category.c:46 ../gthumb/gth-test-simple.c:49 +#: ../gthumb/gth-test-simple.c:64 +msgid "is" +msgstr "је" + +#: ../gthumb/gth-test-category.c:47 +msgid "is only" +msgstr "је само" + +#: ../gthumb/gth-test-category.c:48 ../gthumb/gth-test-simple.c:50 +#: ../gthumb/gth-test-simple.c:65 +msgid "is not" +msgstr "није" + +#: ../gthumb/gth-test-category.c:407 ../gthumb/gth-test-simple.c:812 +#: ../gthumb/gth-test-simple.c:838 ../gthumb/gth-test-simple.c:859 +#: ../gthumb/gth-test-simple.c:885 +#, c-format +msgid "The test definition is incomplete" +msgstr "Опис пробе је непотпун" + +#: ../gthumb/gth-test-selector.c:252 +msgid "Add a new rule" +msgstr "Додај ново правило" + +#: ../gthumb/gth-test-selector.c:263 +msgid "Remove this rule" +msgstr "Уклони ово правило" + +#: ../gthumb/gth-test-simple.c:46 +msgid "contains" +msgstr "садржи" + +#: ../gthumb/gth-test-simple.c:47 +msgid "starts with" +msgstr "почиње са" + +#: ../gthumb/gth-test-simple.c:48 +msgid "ends with" +msgstr "завршава са" + +#: ../gthumb/gth-test-simple.c:51 +msgid "does not contain" +msgstr "не садржи" + +#: ../gthumb/gth-test-simple.c:52 +msgid "matches" +msgstr "поклапа се" + +#: ../gthumb/gth-test-simple.c:56 +msgid "is lower than" +msgstr "је ниже од" + +#: ../gthumb/gth-test-simple.c:57 +msgid "is greater than" +msgstr "је веће од" + +#: ../gthumb/gth-test-simple.c:58 +msgid "is equal to" +msgstr "је једнако са" + +#: ../gthumb/gth-test-simple.c:62 +msgid "is before" +msgstr "је пре" + +#: ../gthumb/gth-test-simple.c:63 +msgid "is after" +msgstr "је након" + +#: ../gthumb/gth-time-selector.c:478 +msgid "Today" +msgstr "Данас" + +#: ../gthumb/gth-time-selector.c:486 +msgid "Now" +msgstr "Сада" + +#: ../gthumb/gth-window-actions-entries.h:32 +msgid "Close this window" +msgstr "Затвори овај прозор" + +#: ../gthumb/gth-window-actions-entries.h:36 +msgid "Close _All Windows" +msgstr "Затвори _све прозоре" + +#: ../gthumb/gtk-utils.c:490 +msgid "Could not display help" +msgstr "Не могу приказати помоћ" + +#: ../gthumb/gtk-utils.c:810 ../gthumb/gtk-utils.c:817 +msgid "Could not launch the application" +msgstr "Не могу покренути програм" + +#: ../gthumb/gtk-utils.c:920 +msgid "_Copy Here" +msgstr "Умножи _овде" + +#: ../gthumb/gtk-utils.c:925 +msgid "_Move Here" +msgstr "_Премести овде" + +#: ../gthumb/gtk-utils.c:930 +msgid "_Link Here" +msgstr "_Повежи овде" + +#: ../gthumb/gtk-utils.c:939 +msgid "Cancel" +msgstr "Откажи" + +#: ../gthumb/main.c:61 +msgid "Open a new window" +msgstr "Отвори нови прозор" + +#: ../gthumb/main.c:65 +msgid "Start in fullscreen mode" +msgstr "Почни у целом екрану" + +#: ../gthumb/main.c:69 +msgid "Automatically start a slideshow" +msgstr "Самостално покрени низ слика" + +#: ../gthumb/main.c:73 +msgid "Automatically import digital camera photos" +msgstr "Сам увези слике са дигиталног фотоапарата" -#~ msgid "Open the selected image in a new window" -#~ msgstr "Отвори одабрану слику у новом прозору" +#: ../gthumb/main.c:77 +msgid "Show version" +msgstr "Приказује издање" + +#: ../gthumb/main.c:483 +msgid "- Image browser and viewer" +msgstr " — Прегледник и претраживач слика" diff -Nru gthumb-3.0.2/po/sr@latin.po gthumb-3.2.3/po/sr@latin.po --- gthumb-3.0.2/po/sr@latin.po 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/po/sr@latin.po 2013-04-30 16:56:13.000000000 +0000 @@ -0,0 +1,5526 @@ +# Serbian translation of gthumb +# Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005. +# This file is distributed under the same license as the gthumb package. +# Maintainer: Dušan Živojnov +# Saša Petrović , 2013. +# Miroslav Nikolić , 2013. +msgid "" +msgstr "" +"Project-Id-Version: gThumb\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gthumb" +"&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-02-16 21:21+0000\n" +"PO-Revision-Date: 2013-02-20 20:15+0200\n" +"Last-Translator: Miroslav Nikolić \n" +"Language-Team: Serbian \n" +"Language: sr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : " +"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Project-Style: gnome\n" + +#: ../copy-n-paste/eggdesktopfile.c:165 +#, c-format +msgid "File is not a valid .desktop file" +msgstr "Ovo nije ispravna datoteka radne površi" + +#. translators: 'Version' is from a desktop file, and +#. * should not be translated. '%s' would probably be a +#. * version number. +#: ../copy-n-paste/eggdesktopfile.c:191 +#, c-format +msgid "Unrecognized desktop file Version '%s'" +msgstr "Nepoznato izdanje datoteke radne površi „%s“" + +#: ../copy-n-paste/eggdesktopfile.c:974 +#, c-format +msgid "Starting %s" +msgstr "Pokrećem %s" + +#: ../copy-n-paste/eggdesktopfile.c:1116 +#, c-format +msgid "Application does not accept documents on command line" +msgstr "Program ne prihvata dokumente u liniji naredbi" + +#: ../copy-n-paste/eggdesktopfile.c:1184 +#, c-format +msgid "Unrecognized launch option: %d" +msgstr "Nisam prepoznao mogućnost pokretanja: %d" + +#. translators: The 'Type=Link' string is found in a +#. * desktop file, and should not be translated. +#: ../copy-n-paste/eggdesktopfile.c:1391 +#, c-format +msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +msgstr "" +"Ne mogu da prosledim adrese dokumenata na „Type=Link“ ulaz radne površi" + +#: ../copy-n-paste/eggdesktopfile.c:1412 +#, c-format +msgid "Not a launchable item" +msgstr "Nije stavka koja se može pokrenuti" + +#: ../copy-n-paste/eggsmclient.c:226 +msgid "Disable connection to session manager" +msgstr "Onemogući vezu sa upravnikom sesije" + +#: ../copy-n-paste/eggsmclient.c:229 +msgid "Specify file containing saved configuration" +msgstr "Navedite datoteku koja sadrži sačuvana podešavanja" + +#: ../copy-n-paste/eggsmclient.c:229 +msgid "FILE" +msgstr "DATOTEKA" + +#: ../copy-n-paste/eggsmclient.c:232 +msgid "Specify session management ID" +msgstr "Navodi IB upravnika sesije" + +#: ../copy-n-paste/eggsmclient.c:232 +msgid "ID" +msgstr "IB" + +#: ../copy-n-paste/eggsmclient.c:253 +msgid "Session management options:" +msgstr "Mogućnosti upravljanja sesijom:" + +#: ../copy-n-paste/eggsmclient.c:254 +msgid "Show session management options" +msgstr "Prikazuje mogućnosti upravljanja sesijom" + +#. manually set name and icon +#: ../data/gthumb.desktop.in.in.h:1 ../gthumb/gth-browser.c:578 +#: ../gthumb/gth-progress-dialog.c:390 ../gthumb/main.c:315 +msgid "gThumb" +msgstr "Gnomov sličko" + +#: ../data/gthumb.desktop.in.in.h:2 +msgid "Image Viewer" +msgstr "Preglednik slika" + +#: ../data/gthumb.desktop.in.in.h:3 +msgid "gThumb Image Viewer" +msgstr "Pregledač slika Gnomov sličko" + +#: ../data/gthumb.desktop.in.in.h:4 +msgid "View and organize your images" +msgstr "Pogledajte i sredite svoje slike" + +#: ../data/gthumb-import.desktop.in.in.h:1 +msgid "Import with gThumb" +msgstr "Uvezite sa Gnomovim sličkom" + +#: ../data/gthumb-import.desktop.in.in.h:2 +msgid "Photo Import Tool" +msgstr "Alatka za uvoz slika" + +#: ../data/gthumb-import.desktop.in.in.h:3 +msgid "gThumb Photo Import Tool" +msgstr "Alatka za uvoz slika Gnomov sličko" + +#: ../data/gthumb-import.desktop.in.in.h:4 +msgid "Import the photos on your camera card" +msgstr "Uvezi slike iz kartice fotoaparata" + +#: ../data/org.gnome.gthumb.gschema.xml.in.h:1 +msgid "" +"Images over this size (in bytes) will not be thumbnailed. Use 0 if you want " +"to generate thumbnails for all images." +msgstr "" +"Slike preko ove veličine (u bajtovima) neće imati umanjeni prikaz. Koristite " +"0 ukoliko želite da vidite umanjeni prikaz za sve slike." + +#: ../data/org.gnome.gthumb.gschema.xml.in.h:2 +msgid "Whether to resize the window to fit the size of the image" +msgstr "Da li izmeniti prozor da se uklopi sa veličinom slike" + +#: ../data/org.gnome.gthumb.gschema.xml.in.h:3 +msgid "Open files in the active window" +msgstr "Otvori datoteke u radnom prozoru" + +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:1 +msgid "Possible values are: white, black, checked, none." +msgstr "Dozvoljene vrednosti su: white, black, checked, none." + +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:2 +msgid "Whether to reset the scrollbars position after changing image" +msgstr "Da li vratiti položaj šine premicanja na početni posle izmene slike" + +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:3 +msgid "Whether to always use a black background." +msgstr "Da li da uvek koristi crnu pozadinu." + +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:1 +msgid "Possible values are: jpeg, jpg." +msgstr "Dozvoljene vrednosti su: png, jpeg." + +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:2 +msgid "Possible values are: tiff, tif." +msgstr "Dozvoljene vrednosti su: tiff, tif." + +#: ../data/org.gnome.gthumb.rename-series.gschema.xml.in.h:1 +msgid "" +"Possible values include: general::unsorted, file::name, file::size, file::" +"mtime, exif::photo::datetimeoriginal" +msgstr "" +"U moguće vrednosti spadaju: general::unsorted, file::name, file::size, file::" +"mtime, exif::photo::datetimeoriginal" + +#: ../data/ui/extensions-preferences.ui.h:1 +msgid "_Extensions:" +msgstr "_Proširenja:" + +#: ../data/ui/extensions-preferences.ui.h:2 +msgid "More extensions..." +msgstr "Još proširenja..." + +#: ../data/ui/extensions-preferences.ui.h:3 +msgid "Some extensions are configurable." +msgstr "Neka proširenja se mogu podešavati." + +#: ../data/ui/filter-editor.ui.h:1 +msgid "Filter _Name:" +msgstr "Uslov je _naziv:" + +#: ../data/ui/filter-editor.ui.h:2 +#: ../extensions/search/data/ui/search-editor.ui.h:3 +msgid "_Match" +msgstr "_Poklapanje" + +#. limit label +#: ../data/ui/filter-editor.ui.h:3 ../gthumb/gth-filter.c:269 +#: ../gthumb/gth-filter.c:337 +msgid "_Limit to" +msgstr "_Ograniči na" + +#: ../data/ui/filter-editor.ui.h:4 +msgid "selected by" +msgstr "odabrana po" + +#: ../data/ui/histogram-info.ui.h:1 +msgid "Mean:" +msgstr "Znači:" + +#. Short for "Standard deviation". Try to keep it under the 12 characters in the translation or it will be ellipsizied at the end. +#: ../data/ui/histogram-info.ui.h:3 +msgid "Std dev:" +msgstr "Std odstupanje:" + +#: ../data/ui/histogram-info.ui.h:4 +msgid "Median:" +msgstr "Srednja vrednost:" + +#. After the colon there is the total number of pixels +#: ../data/ui/histogram-info.ui.h:6 +msgid "Pixels:" +msgstr "Tačkice:" + +#. After the colon there is a percentile. +#: ../data/ui/histogram-info.ui.h:8 +msgctxt "Pixels" +msgid "Max:" +msgstr "Najviše:" + +#. After the colon there is the percentile of selected pixels. +#: ../data/ui/histogram-info.ui.h:10 +msgctxt "Pixels" +msgid "Selected:" +msgstr "Označeno:" + +#: ../data/ui/location.ui.h:1 +msgid "_Location:" +msgstr "_Mesto:" + +#: ../data/ui/overwrite-dialog.ui.h:1 +msgid "Overwrite the old file with the new one?" +msgstr "Zameniti staru datoteku sa novom?" + +#: ../data/ui/overwrite-dialog.ui.h:2 +msgid "Old File:" +msgstr "Stara datoteka:" + +#: ../data/ui/overwrite-dialog.ui.h:3 +msgid "Filename:" +msgstr "Naziv datoteke:" + +#: ../data/ui/overwrite-dialog.ui.h:4 +#: ../extensions/image_print/data/ui/print-layout.ui.h:23 +msgid "Size:" +msgstr "Veličina:" + +#: ../data/ui/overwrite-dialog.ui.h:5 +msgid "Modified:" +msgstr "Izmenjena:" + +#: ../data/ui/overwrite-dialog.ui.h:6 +msgid "New File:" +msgstr "Nova datoteka:" + +#: ../data/ui/overwrite-dialog.ui.h:7 +msgid "Over_write the old file" +msgstr "Prepiši _staru datoteku" + +#: ../data/ui/overwrite-dialog.ui.h:8 +msgid "Do not overwrite _the old file" +msgstr "Nemoj prepisati _staru datoteku" + +#: ../data/ui/overwrite-dialog.ui.h:9 +msgid "Overwrite _all files" +msgstr "Prepiši _sve datoteke" + +#: ../data/ui/overwrite-dialog.ui.h:10 +msgid "_Do not overwrite any file" +msgstr "_Nemoj prepisati ni jednu datoteku" + +#: ../data/ui/overwrite-dialog.ui.h:11 +msgid "_Save the new file as:" +msgstr "_Sačuvaj novu datoteku kao:" + +#: ../data/ui/personalize-filters.ui.h:1 +msgid "Filters" +msgstr "Uslovi" + +#: ../data/ui/personalize-filters.ui.h:2 +msgid "_General filter:" +msgstr "_Opšti uslovi:" + +#: ../data/ui/personalize-filters.ui.h:3 +msgid "_Other filters:" +msgstr "Drugi _uslovi:" + +#: ../data/ui/preferences.ui.h:1 +msgid "below the folder list" +msgstr "ispod spiska fascikli" + +#: ../data/ui/preferences.ui.h:2 +msgid "on the right" +msgstr "s’ desna" + +#: ../data/ui/preferences.ui.h:3 +msgid "gThumb Preferences" +msgstr "Postavke Gnomovog slička" + +#: ../data/ui/preferences.ui.h:4 +msgid "_Toolbar style:" +msgstr "Izgled _trake alata:" + +#: ../data/ui/preferences.ui.h:5 +msgid "T_humbnails in viewer:" +msgstr "Umanjen_i prikaz u pregledniku:" + +#: ../data/ui/preferences.ui.h:6 +msgid "System settings" +msgstr "Sistemska podešavanja" + +#: ../data/ui/preferences.ui.h:7 +msgid "Text below icons" +msgstr "Tekst ispod ikonica" + +#: ../data/ui/preferences.ui.h:8 +msgid "Text beside icons" +msgstr "Tekst pored ikonica" + +#: ../data/ui/preferences.ui.h:9 +msgid "Icons only" +msgstr "Samo ikonice" + +#: ../data/ui/preferences.ui.h:10 +msgid "Text only" +msgstr "Samo tekst" + +#: ../data/ui/preferences.ui.h:11 +msgid "on the bottom" +msgstr "na dnu" + +#: ../data/ui/preferences.ui.h:12 +msgid "on the side" +msgstr "bočno" + +#: ../data/ui/preferences.ui.h:13 +msgid "File _properties in browser:" +msgstr "Osobine datoteke u _pregledniku:" + +#: ../data/ui/preferences.ui.h:14 +msgid "Appearance" +msgstr "Izgled" + +#: ../data/ui/preferences.ui.h:15 +msgid "Go to last _visited location" +msgstr "Idi na _zadnje posećeno mesto" + +#: ../data/ui/preferences.ui.h:16 +msgid "Go to this _folder:" +msgstr "Idi u ovu _fasciklu:" + +#: ../data/ui/preferences.ui.h:17 +msgid "Choose startup folder" +msgstr "Odaberi početnu fasciklu" + +#: ../data/ui/preferences.ui.h:18 +msgid "Set to C_urrent" +msgstr "Postavi na tren_utno" + +#: ../data/ui/preferences.ui.h:19 +msgid "_Reuse the active window to open files" +msgstr "_Ponovo koristi radni prozor za otvaranje datoteka" + +#: ../data/ui/preferences.ui.h:20 +msgid "On startup:" +msgstr "Na pokretanju:" + +#: ../data/ui/preferences.ui.h:21 +msgid "As_k confirmation before deleting files or catalogs" +msgstr "Zat_raži potvrdu pre brisanja datoteka ili zbirki" + +#: ../data/ui/preferences.ui.h:22 +msgid "Ask whether to save _modified files" +msgstr "Da pitam da li da sačuvam _izmenjene datoteke" + +#: ../data/ui/preferences.ui.h:23 +msgid "_Store metadata inside files if possible" +msgstr "_Čuvaj metapodatke u datotekama ukoliko je moguće" + +#: ../data/ui/preferences.ui.h:24 +#: ../extensions/exiv2_tools/gth-edit-iptc-page.c:198 +#: ../extensions/gstreamer_tools/main.c:33 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:17 +msgid "Other" +msgstr "Drugo" + +#: ../data/ui/preferences.ui.h:25 +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 +#: ../extensions/edit_metadata/gth-edit-general-page.c:481 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 +#: ../gthumb/gth-main-default-metadata.c:33 +msgid "General" +msgstr "Opšte" + +#: ../data/ui/preferences.ui.h:26 +#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 +#: ../extensions/image_print/data/ui/print-layout.ui.h:18 +msgid "Caption" +msgstr "Naslov" + +#: ../data/ui/preferences.ui.h:27 +msgid "Thumbnail _size:" +msgstr "Veličina umanjenog _prikaza:" + +#: ../data/ui/preferences.ui.h:28 +msgid "48" +msgstr "48" + +#: ../data/ui/preferences.ui.h:29 +msgid "64" +msgstr "64" + +#: ../data/ui/preferences.ui.h:30 +msgid "85" +msgstr "85" + +#: ../data/ui/preferences.ui.h:31 +msgid "95" +msgstr "95" + +#: ../data/ui/preferences.ui.h:32 +msgid "112" +msgstr "112" + +#: ../data/ui/preferences.ui.h:33 +msgid "128" +msgstr "128" + +#: ../data/ui/preferences.ui.h:34 +msgid "164" +msgstr "164" + +#: ../data/ui/preferences.ui.h:35 +msgid "200" +msgstr "200" + +#: ../data/ui/preferences.ui.h:36 +msgid "256" +msgstr "256" + +#: ../data/ui/preferences.ui.h:37 +msgid "D_etermine image type from content (slower)" +msgstr "Odredi vrstu slike iz _sadržaja (sporije)" + +#: ../data/ui/preferences.ui.h:38 ../gthumb/dlg-preferences-extensions.c:71 +#: ../gthumb/gth-browser-actions-entries.h:179 +msgid "Browser" +msgstr "Preglednik" + +#: ../data/ui/sort-order.ui.h:1 +msgid "Sort By" +msgstr "Poređaj po" + +#: ../data/ui/sort-order.ui.h:2 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:4 +msgid "_Sort by:" +msgstr "_Poređaj po:" + +#: ../data/ui/sort-order.ui.h:3 +msgid "_Inverse order" +msgstr "_Obrnuti poredak" + +#: ../extensions/23hq/23hq.extension.in.in.h:1 +msgid "23" +msgstr "23" + +#: ../extensions/23hq/23hq.extension.in.in.h:2 +msgid "Upload images to 23hq.com" +msgstr "Otpremi slike na 23hq.com" + +#: ../extensions/23hq/callbacks.c:68 +msgid "_23..." +msgstr "_23..." + +#: ../extensions/23hq/callbacks.c:69 +msgid "Upload photos to 23" +msgstr "Otpremi slike na 23" + +#: ../extensions/bookmarks/bookmarks.extension.in.in.h:1 +#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:1 +msgid "Bookmarks" +msgstr "Obeleživači" + +#: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 +msgid "Add bookmarks support." +msgstr "Dodaj podršku obeleživača." + +#: ../extensions/bookmarks/bookmarks.extension.in.in.h:3 +#: ../extensions/burn_disc/burn_disc.extension.in.in.h:3 +#: ../extensions/catalogs/catalogs.extension.in.in.h:3 +#: ../extensions/change_date/change_date.extension.in.in.h:3 +#: ../extensions/comments/comments.extension.in.in.h:3 +#: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:3 +#: ../extensions/convert_format/convert_format.extension.in.in.h:3 +#: ../extensions/desktop_background/desktop_background.extension.in.in.h:3 +#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:3 +#: ../extensions/exiv2_tools/exiv2_tools.extension.in.in.h:3 +#: ../extensions/file_manager/file_manager.extension.in.in.h:3 +#: ../extensions/file_tools/file_tools.extension.in.in.h:3 +#: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:3 +#: ../extensions/gstreamer_tools/gstreamer_tools.extension.in.in.h:3 +#: ../extensions/image_print/image_print.extension.in.in.h:3 +#: ../extensions/image_rotation/image_rotation.extension.in.in.h:3 +#: ../extensions/image_viewer/image_viewer.extension.in.in.h:3 +#: ../extensions/list_tools/list_tools.extension.in.in.h:3 +#: ../extensions/photo_importer/photo_importer.extension.in.in.h:3 +#: ../extensions/raw_files/raw_files.extension.in.in.h:3 +#: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:3 +#: ../extensions/rename_series/rename_series.extension.in.in.h:3 +#: ../extensions/resize_images/resize_images.extension.in.in.h:3 +#: ../extensions/search/search.extension.in.in.h:3 +#: ../extensions/selections/selections.extension.in.in.h:3 +#: ../extensions/slideshow/slideshow.extension.in.in.h:3 +#: ../extensions/webalbums/webalbums.extension.in.in.h:3 +msgid "gthumb development team" +msgstr "Razvojna družina Gnomovog slička" + +#: ../extensions/bookmarks/callbacks.c:54 +msgid "_Bookmarks" +msgstr "_Obeleživači" + +#: ../extensions/bookmarks/callbacks.c:55 +msgid "_System Bookmarks" +msgstr "_Sistemski obeleživači" + +#: ../extensions/bookmarks/callbacks.c:58 +msgid "_Add Bookmark" +msgstr "_Dodaj obeleživač" + +#: ../extensions/bookmarks/callbacks.c:59 +msgid "Add current location to bookmarks" +msgstr "Dodati trenutno mesto u obeleživače" + +#: ../extensions/bookmarks/callbacks.c:63 +msgid "_Edit Bookmarks..." +msgstr "_Uredi obeleživače..." + +#: ../extensions/bookmarks/callbacks.c:64 +msgid "Edit bookmarks" +msgstr "Uredi obeleživače" + +#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:2 +msgid "_Bookmarks:" +msgstr "_Obeleživači:" + +#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:3 +msgid "_Name" +msgstr "_Naziv" + +#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:4 +msgid "_Location" +msgstr "_Mesto" + +#: ../extensions/bookmarks/dlg-bookmarks.c:70 +msgid "Could not remove the bookmark" +msgstr "Ne mogu ukloniti obeleživač" + +#: ../extensions/burn_disc/burn_disc.extension.in.in.h:1 +msgid "Burn CD/DVD" +msgstr "Nareži CD/DVD" + +#: ../extensions/burn_disc/burn_disc.extension.in.in.h:2 +msgid "Save files to an optical disc." +msgstr "Sačuvajte datoteke na optički disk." + +#: ../extensions/burn_disc/callbacks.c:55 +msgid "_Optical Disc..." +msgstr "_Optički disk..." + +#: ../extensions/burn_disc/callbacks.c:56 +msgid "Write files to an optical disc" +msgstr "Upiši datoteke na optički disk" + +#: ../extensions/burn_disc/data/ui/burn-disc-options.ui.h:1 +msgid "Disc Name" +msgstr "Naziv diska" + +#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:1 +msgid "Current _folder" +msgstr "Trenutna _fascikla" + +#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:2 +msgid "Current folder and its s_ub-folders" +msgstr "Trenutna fascikla i njene pod_fascikle" + +#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:3 +msgid "_Selected files" +msgstr "_Označene datoteke" + +#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:4 +msgid "Source" +msgstr "Izvor" + +#: ../extensions/burn_disc/gth-burn-task.c:238 +#: ../extensions/burn_disc/gth-burn-task.c:259 +#: ../extensions/burn_disc/gth-burn-task.c:397 +msgid "Write to Disc" +msgstr "Upiši na disk" + +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:62 +#, c-format +msgid "Error interpreting JPEG image file: %s" +msgstr "Greška prilikom tumačenja JPEG slikovne datoteke: %s" + +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:483 +#, c-format +msgid "Unknown JPEG color space (%d)" +msgstr "Nepoznato JPEG okruženje boja (%d)" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:1 +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:1 +msgid "_Default extension:" +msgstr "_Podrazumevani nastavak:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:2 +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:1 +msgid "_Quality:" +msgstr "_Kvalitet:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:3 +msgid "_Smoothing:" +msgstr "_Uglačavanje:" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:4 +msgid "Opti_mize" +msgstr "Opti_mizuj" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:5 +msgid "_Progressive" +msgstr "_Progresivno" + +#: ../extensions/cairo_io/data/ui/png-options.ui.h:1 +msgid "Compression _level:" +msgstr "_Nivo sažimanja:" + +#: ../extensions/cairo_io/data/ui/save-options-preferences.ui.h:1 +msgid "Default options:" +msgstr "Predodređene mogućnosti:" + +#: ../extensions/cairo_io/data/ui/tga-options.ui.h:1 +msgid "_RLE compression" +msgstr "_RLE sažimanje" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:2 +msgid "Compression" +msgstr "Sažimanje" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:3 +msgid "_No compression" +msgstr "_Nema sažimanja" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:4 +msgid "No_rmal (Deflate)" +msgstr "No_rmalno (Deflate)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:5 +msgid "_Loss compression (JPEG)" +msgstr "_Sažimanje sa gubicima (JPEG)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:6 +msgid "Resolution" +msgstr "Razmera" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:7 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 +msgid "_Horizontal:" +msgstr "_Horizontalno:" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:8 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 +msgid "_Vertical:" +msgstr "_Vertikalno:" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:9 +msgid "dpi" +msgstr "tpi" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:2 +msgid "_Method:" +msgstr "_Način:" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:3 +msgid "_Lossless" +msgstr "_Bez gubljenja kvaliteta" + +#: ../extensions/cairo_io/gth-image-saver-jpeg.c:516 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:140 +msgid "JPEG" +msgstr "JPEG" + +#: ../extensions/cairo_io/gth-image-saver-png.c:353 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:110 +msgid "PNG" +msgstr "PNG" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:257 +#: ../extensions/cairo_io/gth-image-saver-tiff.c:435 +#: ../gthumb/gth-buffer-data.c:84 +msgid "Insufficient memory" +msgstr "Nedovoljna memorija" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:344 +msgid "TGA" +msgstr "TGA" + +#: ../extensions/cairo_io/gth-image-saver-tiff.c:559 +msgid "TIFF" +msgstr "TIFF" + +#: ../extensions/cairo_io/gth-image-saver-webp.c:382 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:165 +msgid "WebP" +msgstr "WebP" + +#: ../extensions/cairo_io/preferences.c:134 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 +msgid "Saving" +msgstr "Snimanje" + +#: ../extensions/catalogs/actions.c:92 ../extensions/catalogs/actions.c:213 +#: ../extensions/catalogs/dlg-add-to-catalog.c:274 +#: ../extensions/catalogs/dlg-add-to-catalog.c:394 +#: ../extensions/file_manager/actions.c:68 +#: ../extensions/list_tools/gth-script-editor-dialog.c:290 +#: ../gthumb/gth-filter-editor-dialog.c:461 +#, c-format +msgid "No name specified" +msgstr "Nije određen naziv" + +#: ../extensions/catalogs/actions.c:99 ../extensions/catalogs/actions.c:220 +#: ../extensions/catalogs/dlg-add-to-catalog.c:281 +#: ../extensions/catalogs/dlg-add-to-catalog.c:401 +#: ../extensions/file_manager/actions.c:75 +#, c-format +msgid "Invalid name. The following characters are not allowed: %s" +msgstr "Neispravan naziv. Sledeći znakovi nisu dozvoljeni: %s" + +#: ../extensions/catalogs/actions.c:155 ../extensions/catalogs/actions.c:267 +#: ../extensions/catalogs/dlg-add-to-catalog.c:338 +#: ../extensions/catalogs/dlg-add-to-catalog.c:448 +#: ../extensions/catalogs/gth-file-source-catalogs.c:508 +#: ../extensions/file_manager/actions.c:106 +msgid "Name already used" +msgstr "Naziv je već u upotrebi" + +#: ../extensions/catalogs/actions.c:178 +#: ../extensions/catalogs/dlg-add-to-catalog.c:359 +msgid "New catalog" +msgstr "Nova zbirka" + +#: ../extensions/catalogs/actions.c:179 +#: ../extensions/catalogs/dlg-add-to-catalog.c:360 +msgid "Enter the catalog name:" +msgstr "Unesite naziv za zbirku:" + +#: ../extensions/catalogs/actions.c:181 ../extensions/catalogs/actions.c:293 +#: ../extensions/catalogs/dlg-add-to-catalog.c:362 +#: ../extensions/catalogs/dlg-add-to-catalog.c:474 +#: ../extensions/file_manager/actions.c:136 +msgid "C_reate" +msgstr "Nap_ravi" + +#: ../extensions/catalogs/actions.c:290 +#: ../extensions/catalogs/dlg-add-to-catalog.c:471 +msgid "New library" +msgstr "Nova biblioteka" + +#: ../extensions/catalogs/actions.c:291 +#: ../extensions/catalogs/dlg-add-to-catalog.c:472 +msgid "Enter the library name:" +msgstr "Unesite ime za biblioteku:" + +#: ../extensions/catalogs/actions.c:326 +msgid "Could not remove the catalog" +msgstr "Nisam uspeo da uklonim zbirku" + +#: ../extensions/catalogs/actions.c:363 +#, c-format +msgid "Are you sure you want to remove \"%s\"?" +msgstr "Da li ste sigurni da želite da uklonite „%s“?" + +#: ../extensions/catalogs/callbacks.c:102 +msgid "_Add to Catalog" +msgstr "_Dodaj u zbirku" + +#: ../extensions/catalogs/callbacks.c:105 +#: ../extensions/selections/callbacks.c:80 +msgid "Open _Folder" +msgstr "Otvori _fasciklu" + +#: ../extensions/catalogs/callbacks.c:106 +#: ../extensions/selections/callbacks.c:81 +msgid "Go to the folder that contains the selected file" +msgstr "Idi u fasciklu koji sadrži označenu datoteku" + +#: ../extensions/catalogs/callbacks.c:110 +msgid "Other..." +msgstr "Drugo..." + +#: ../extensions/catalogs/callbacks.c:111 +msgid "Choose another catalog" +msgstr "Odaberite drugu zbirku" + +#: ../extensions/catalogs/callbacks.c:115 +msgid "_Add to Catalog..." +msgstr "_Dodaj u zbirku..." + +#: ../extensions/catalogs/callbacks.c:116 +msgid "Add selected images to a catalog" +msgstr "Dodati označene slike u zbirku" + +#: ../extensions/catalogs/callbacks.c:120 +msgid "Remo_ve from Catalog" +msgstr "Uklo_ni iz zbirke" + +#: ../extensions/catalogs/callbacks.c:121 +msgid "Remove selected images from the catalog" +msgstr "Ukloni odabrane slike iz zbirke" + +#: ../extensions/catalogs/callbacks.c:125 +msgid "Create _Catalog" +msgstr "Napravi novu _zbirku" + +#: ../extensions/catalogs/callbacks.c:130 +msgid "Create _Library" +msgstr "Napravi _biblioteku" + +#: ../extensions/catalogs/callbacks.c:140 +msgid "Rena_me" +msgstr "Preime_nuj" + +#: ../extensions/catalogs/callbacks.c:281 +#: ../extensions/catalogs/callbacks.c:284 +msgid "Command Line" +msgstr "Naredbena linija" + +#: ../extensions/catalogs/callbacks.c:496 +#: ../extensions/catalogs/callbacks.c:501 +#: ../extensions/photo_importer/dlg-photo-importer.c:364 +#: ../extensions/photo_importer/dlg-photo-importer.c:404 +#: ../gthumb/gth-file-list.c:43 ../gthumb/gth-folder-tree.c:1093 +msgid "(Empty)" +msgstr "(Prazno)" + +#: ../extensions/catalogs/callbacks.c:700 +msgid "Catalog Properties" +msgstr "Postavke zbirke" + +#: ../extensions/catalogs/callbacks.c:714 +msgid "Organize" +msgstr "Sredi" + +#: ../extensions/catalogs/callbacks.c:715 +msgid "Automatically organize files by date" +msgstr "Sam sredi datoteke po datumu" + +#: ../extensions/catalogs/catalogs.extension.in.in.h:1 +#: ../extensions/catalogs/gth-catalog.c:611 +#: ../extensions/catalogs/gth-catalog.c:662 +#: ../extensions/catalogs/gth-catalog.c:1016 +#: ../extensions/catalogs/gth-catalog.c:1017 +msgid "Catalogs" +msgstr "Zbirke" + +#: ../extensions/catalogs/catalogs.extension.in.in.h:2 +msgid "Create file collections." +msgstr "Napravite zbirke datoteka." + +#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:1 +msgid "Add to Catalog" +msgstr "Dodaj u zbirku" + +#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:2 +msgid "C_atalogs:" +msgstr "Z_birke:" + +#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:3 +msgid "_New Catalog" +msgstr "_Nova zbirka" + +#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:4 +msgid "New _Library" +msgstr "Nova _biblioteka" + +#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:5 +#: ../extensions/file_manager/actions.c:945 +#: ../extensions/webalbums/gth-web-exporter.c:1840 +msgid "_View the destination" +msgstr "_Pogledaj odredište" + +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:1 +#: ../gthumb/gth-file-properties.c:209 +msgid "Properties" +msgstr "Osobine" + +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:1 +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:1 +msgid "_Name:" +msgstr "_Naziv:" + +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:4 +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:2 +msgid "_Date:" +msgstr "_Datum:" + +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:5 +msgid "Catalog" +msgstr "Zbirka" + +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:1 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 +msgid "Organize Files" +msgstr "Sredite datoteke" + +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:2 +msgid "Organizing files" +msgstr "Sređivanje datoteka" + +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 +msgid "Organization:" +msgstr "Sređivanje:" + +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:4 +msgid "Select All" +msgstr "Označi sve" + +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 +msgid "Select None" +msgstr "Ništa ne označuj" + +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 +msgid "Catalog _Preview:" +msgstr "_Pregled zbirke:" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:1 +#: ../extensions/edit_metadata/gth-edit-general-page.c:558 +#: ../gthumb/gth-main-default-tests.c:300 +msgid "Date photo was taken" +msgstr "Datum snimanja fotografije" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:2 +#: ../gthumb/gth-main-default-tests.c:292 +msgid "File modified date" +msgstr "Datum poslednje izmene" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:3 +#: ../extensions/comments/main.c:182 +msgid "Tag" +msgstr "Oznaka" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:4 +msgid "tag" +msgstr "oznaka" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:5 +#: ../gthumb/gth-main-default-tests.c:324 +msgid "Tag (embedded)" +msgstr "Oznaka (ugnježđena)" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:7 +msgid "_Group files by:" +msgstr "_Združi datoteke po:" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:8 +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 +#: ../extensions/search/data/ui/search-editor.ui.h:2 +msgid "_Include sub-folders" +msgstr "_Uključi poddirektorijume" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:9 +msgid "Ignore catalogs with a single file" +msgstr "Zanemari zbirke sa jednom datotekom" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:10 +msgid "Put single files in the catalog:" +msgstr "Stavi pojedinačne datoteke u zbirku:" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:11 +msgid "Singles" +msgstr "Pojedinačne" + +#: ../extensions/catalogs/dlg-add-to-catalog.c:105 +#: ../extensions/catalogs/dlg-add-to-catalog.c:136 +msgid "Could not add the files to the catalog" +msgstr "Ne mogu da dodam datoteke u zbirku" + +#: ../extensions/catalogs/dlg-add-to-catalog.c:217 +#: ../extensions/search/gth-search-task.c:356 +msgid "Could not create the catalog" +msgstr "Nisam uspeo da napravim zbirku" + +#: ../extensions/catalogs/dlg-catalog-properties.c:80 +msgid "Could not save the catalog" +msgstr "Nisam uspeo da sačuvam zbirku" + +#: ../extensions/catalogs/dlg-catalog-properties.c:159 +msgid "Could not load the catalog" +msgstr "Nisam uspeo da učitam zbirku" + +#: ../extensions/catalogs/dlg-organize-files.c:120 +msgid "Files will be organized in catalogs. No file will be moved on disk." +msgstr "" +"Datoteke će biti sređene po zbirkama. Datoteke neće biti premeštene na disk." + +#: ../extensions/catalogs/gth-catalog.c:1114 ../extensions/comments/main.c:45 +#: ../extensions/edit_metadata/callbacks.c:106 +#: ../gthumb/gth-main-default-metadata.c:53 +msgid "Tags" +msgstr "Oznake" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:953 +#, c-format +msgid "The catalog '%s' already exists, do you want to overwrite it?" +msgstr "Zbirka sa imenom „%s“ već postoji, da li želite da je prepišete?" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:955 +#, c-format +msgid "The library '%s' already exists, do you want to overwrite it?" +msgstr "Biblioteka sa imenom „%s“ već postoji, da li želite da je prepišete?" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:963 +msgid "Over_write" +msgstr "_Prepiši" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1081 +msgid "Cannot move the files" +msgstr "Ne mogu premestiti datoteke" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1083 +msgid "Cannot copy the files" +msgstr "Ne mogu umnožiti datoteke" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1088 +msgid "Invalid destination." +msgstr "Neispravno odredište." + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1135 +#, c-format +msgid "Copying files to '%s'" +msgstr "Umnožavam datoteke u „%s“" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1322 +msgid "Could not remove the files from the catalog" +msgstr "Nisam uspeo da uklonim datoteke iz zbirke" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1380 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:746 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:755 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:785 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:1320 +#: ../extensions/search/gth-search.c:265 +msgid "Invalid file format" +msgstr "Neispravan oblik datoteke" + +#: ../extensions/catalogs/gth-organize-task.c:202 +#, c-format +msgid "Operation completed. Catalogs: %d. Images: %d." +msgstr "Postupak završen. Zbirki: %d. Slika: %d." + +#: ../extensions/change_date/callbacks.c:44 +msgid "Change _Date..." +msgstr "Izmeni _datum..." + +#: ../extensions/change_date/callbacks.c:45 +msgid "Change images last modified date" +msgstr "Promeni datum poslednje izmene slika" + +#: ../extensions/change_date/change_date.extension.in.in.h:1 +msgid "Change date" +msgstr "Promeni datum" + +#: ../extensions/change_date/change_date.extension.in.in.h:2 +msgid "Change the files date" +msgstr "Promeni datum datoteka" + +#: ../extensions/change_date/data/ui/change-date.ui.h:1 +msgid "+" +msgstr "+" + +#: ../extensions/change_date/data/ui/change-date.ui.h:2 +msgid "-" +msgstr "-" + +#: ../extensions/change_date/data/ui/change-date.ui.h:3 +msgid "Change Date" +msgstr "Promeni datum" + +#: ../extensions/change_date/data/ui/change-date.ui.h:4 +msgid "Change the following values:" +msgstr "Izmeni sledeće vrednosti:" + +#: ../extensions/change_date/data/ui/change-date.ui.h:5 +msgid "_Last modified date" +msgstr "Datum _poslednje izmene" + +#: ../extensions/change_date/data/ui/change-date.ui.h:6 +msgid "Co_mment date" +msgstr "Datum _napomene" + +#: ../extensions/change_date/data/ui/change-date.ui.h:7 +msgid "Change to:" +msgstr "Promeni u:" + +#: ../extensions/change_date/data/ui/change-date.ui.h:8 +msgid "The _following date:" +msgstr "Sledeći _datum:" + +#: ../extensions/change_date/data/ui/change-date.ui.h:9 +msgid "File _modified date" +msgstr "Datum _poslednje izmene" + +#: ../extensions/change_date/data/ui/change-date.ui.h:10 +msgid "File c_reation date" +msgstr "Datum n_astanka datoteke" + +#: ../extensions/change_date/data/ui/change-date.ui.h:11 +msgid "Date p_hoto was taken" +msgstr "Datum _snimanja slike" + +#: ../extensions/change_date/data/ui/change-date.ui.h:12 +msgid "A_djust by" +msgstr "Doterajte _po" + +#: ../extensions/change_date/data/ui/change-date.ui.h:13 +msgid "hours" +msgstr "sati" + +#: ../extensions/change_date/data/ui/change-date.ui.h:14 +msgid "minutes" +msgstr "minuta" + +#: ../extensions/change_date/data/ui/change-date.ui.h:15 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:6 +msgid "seconds" +msgstr "sekunde" + +#: ../extensions/comments/callbacks.c:46 +msgid "Import Embedded Metadata" +msgstr "Uvozi ugnježđene metapodatke" + +#: ../extensions/comments/callbacks.c:47 +msgid "Import the metadata stored inside files into the gThumb comment system" +msgstr "" +"Uvozi metapodatke sačuvane u datotekama u sistem napomena Gnomovog slička" + +#: ../extensions/comments/comments.extension.in.in.h:1 +msgid "Comments and tags" +msgstr "Napomene i oznake" + +#: ../extensions/comments/comments.extension.in.in.h:2 +msgid "Add comments and tags to any file type." +msgstr "Dodaj napomene i oznake u sve vrste datoteka." + +#: ../extensions/comments/data/ui/comments-preferences.ui.h:1 +#: ../extensions/importer/gth-import-preferences-dialog.c:318 +msgid "Preferences" +msgstr "Postavke" + +#: ../extensions/comments/data/ui/comments-preferences.ui.h:2 +msgid "_Synchronize with the embedded metadata" +msgstr "_Usaglasi stanje sa ugnježđenim metapodacima" + +#: ../extensions/comments/main.c:35 +#: ../extensions/edit_metadata/callbacks.c:100 +msgid "Comment" +msgstr "Napomena" + +#: ../extensions/comments/main.c:41 ../gthumb/gth-main-default-metadata.c:46 +msgid "Title" +msgstr "Naslov" + +#: ../extensions/comments/main.c:42 ../extensions/comments/main.c:166 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 +#: ../extensions/image_print/data/ui/print-layout.ui.h:8 +#: ../extensions/importer/data/ui/import-preferences.ui.h:6 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 +#: ../gthumb/gth-main-default-metadata.c:52 +msgid "Description" +msgstr "Opis" + +#: ../extensions/comments/main.c:43 ../extensions/comments/main.c:174 +#: ../gthumb/gth-main-default-metadata.c:50 +msgid "Place" +msgstr "Mesto" + +#: ../extensions/comments/main.c:44 ../gthumb/gth-main-default-metadata.c:51 +msgid "Date" +msgstr "Datum" + +#: ../extensions/comments/main.c:46 ../gthumb/gth-main-default-metadata.c:54 +msgid "Rating" +msgstr "Ocena" + +#: ../extensions/contact_sheet/callbacks.c:59 +msgid "Contact _Sheet" +msgstr "_Spisak poznanika" + +#: ../extensions/contact_sheet/callbacks.c:61 +msgid "Contact _Sheet..." +msgstr "_Spisak poznanika..." + +#: ../extensions/contact_sheet/callbacks.c:62 +msgid "Create a contact sheet" +msgstr "Napravi novi spisak poznanika" + +#: ../extensions/contact_sheet/callbacks.c:65 +msgid "Image _Wall..." +msgstr "Mozaik _slika..." + +#: ../extensions/contact_sheet/callbacks.c:66 +msgid "Create an image-wall" +msgstr "Napravite mozaik slika" + +#: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:1 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:1 +msgid "Contact Sheet" +msgstr "Spisak poznanika" + +#: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:2 +msgid "Create an index image displaying the thumbnails of the selected files." +msgstr "" +"Napravite sliku sadržaja prikazujući umanjene sličice označenih datoteka." + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:1 +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:446 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 +#: ../extensions/file_tools/gth-file-tool-rotate.c:397 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:14 +#: ../extensions/slideshow/main.c:277 +msgid "None" +msgstr "Ništa" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:2 +msgid "Simple" +msgstr "Jednostavno" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:3 +msgid "Simple with shadow" +msgstr "Jednostavno sa senkom" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:4 +msgid "Shadow only" +msgstr "Samo senka" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:5 +msgid "Slide" +msgstr "Klizaj" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:6 +msgid "Inward Shadow" +msgstr "Unutrašnja senka" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:7 +msgid "Outward Shadow" +msgstr "Spoljašnja senka" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:9 +msgid "Background" +msgstr "Pozadina" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:10 +msgid "_Solid color" +msgstr "_Jednobojna" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:11 +msgid "_Gradient" +msgstr "_Prelaz" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:14 +msgid "Select a color" +msgstr "Odaberite boju" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:15 +msgid "Frame" +msgstr "Okvir" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:16 +msgid "_Style:" +msgstr "_Način:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:17 +msgid "C_olor:" +msgstr "B_oja:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:18 +#: ../extensions/rename_series/dlg-rename-series.c:57 +msgid "Text" +msgstr "Tekst" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 +#: ../extensions/image_print/data/ui/print-layout.ui.h:3 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 +msgid "_Header:" +msgstr "_Zaglavlje:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:20 +msgid "Select a font" +msgstr "Izaberite slovni lik" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:21 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 +#: ../extensions/image_print/data/ui/print-layout.ui.h:4 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 +msgid "_Footer:" +msgstr "_Podnožje:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:22 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 +msgid "Caption:" +msgstr "Naslov:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:2 +#: ../extensions/image_print/data/ui/print-layout.ui.h:5 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:6 +msgid "The current page number" +msgstr "Trenutni broj stranice" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:3 +#: ../extensions/image_print/data/ui/print-layout.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 +msgid "The total number of pages" +msgstr "Ukupan broj stranica" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:4 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 +#: ../extensions/image_print/data/ui/print-layout.ui.h:7 +#: ../extensions/importer/data/ui/import-preferences.ui.h:5 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:8 +msgid "Special code" +msgstr "Posebna šifra" + +#. translate only the text in the curly brackets +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:8 +#: ../extensions/image_print/data/ui/print-layout.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 +#, no-c-format +msgid "%D{ format }" +msgstr "%D{ oblik }" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 +msgid "The current date" +msgstr "Tekući datum" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:6 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 +msgid "_Destination:" +msgstr "O_dredište:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:13 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:3 +#: ../extensions/convert_format/data/ui/convert-format.ui.h:4 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 +msgid "Choose destination folder" +msgstr "Odaberite odredišnu fasciklu" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:14 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 +msgid "File_name:" +msgstr "I_me datoteke:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:8 +msgid "New enumerator digit" +msgstr "Nova potpisujuća cifra" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:16 +msgid "Create _HTML image map" +msgstr "Napravi _HTML mapu slike" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 +msgid "Create a new theme" +msgstr "Napravite novu temu" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:19 +msgid "Edit the selected theme" +msgstr "Uredite obeleženu temu" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:20 +msgid "Delete the selected theme" +msgstr "Briše izabranu temu" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:21 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 +msgid "Theme" +msgstr "Tema" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:23 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:16 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 +msgid "Columns:" +msgstr "Kolone:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:24 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:10 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 +msgid "Images per page:" +msgstr "Slika po strani:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:25 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 +msgid "All images on a single page" +msgstr "Sve slike na jednoj stranici" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:26 +msgid "_All pages with the same size" +msgstr "Sve str_anice sa istom veličinom" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:27 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:15 +msgid "Layout" +msgstr "Raspored" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:28 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:13 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 +msgid "S_ort:" +msgstr "_Razvrstavanje:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:29 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:14 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 +msgid "Re_verse order" +msgstr "O_brnuti poredak" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:30 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:15 +msgid "_Size:" +msgstr "_Veličina:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 +msgid "Sq_uared" +msgstr "K_vadrirani" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:33 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:16 +msgid "Thumbnails" +msgstr "Umanjene sličice" + +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 +msgid "Image Wall" +msgstr "Mozaik slika" + +#: ../extensions/contact_sheet/dlg-contact-sheet.c:481 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:492 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:506 +msgid "Could not save the theme" +msgstr "Nisam uspeo da sačuvam temu" + +#: ../extensions/contact_sheet/dlg-contact-sheet.c:651 +msgid "Could not delete the theme" +msgstr "Nisam uspeo obrisati temu" + +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:247 +msgid "Creating images" +msgstr "Stvaranje slika" + +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:896 +msgid "Generating thumbnails" +msgstr "Stvaranje umanjenih prikaza" + +#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:32 +msgid "Header" +msgstr "Zaglavlje" + +#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:33 +msgid "Footer" +msgstr "Podnožje" + +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:193 +msgid "Theme Properties" +msgstr "Osobine teme" + +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:208 +msgid "Copy _From" +msgstr "Umnoži _iz" + +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:316 +msgid "New theme" +msgstr "Nova tema" + +#: ../extensions/convert_format/callbacks.c:45 +msgid "Convert Format..." +msgstr "Pretvori oblik..." + +#: ../extensions/convert_format/callbacks.c:46 +msgid "Convert image format" +msgstr "Pretvori oblik slike" + +#: ../extensions/convert_format/convert_format.extension.in.in.h:1 +msgid "Convert format" +msgstr "Oblik pretvaranja" + +#: ../extensions/convert_format/convert_format.extension.in.in.h:2 +msgid "Save images in a different format" +msgstr "Sačuvaj slike u drugom obliku" + +#: ../extensions/convert_format/data/ui/convert-format.ui.h:1 +msgid "Convert Format" +msgstr "Oblik pretvaranja" + +#: ../extensions/convert_format/data/ui/convert-format.ui.h:2 +msgid "New format" +msgstr "Novi oblik" + +#: ../extensions/convert_format/data/ui/convert-format.ui.h:3 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 +msgid "Destination" +msgstr "Odredište" + +#: ../extensions/convert_format/data/ui/convert-format.ui.h:5 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 +msgid "_Use the original image folder" +msgstr "_Koristi izvornu fasciklu sa slikama" + +#: ../extensions/convert_format/dlg-convert-format.c:95 +msgid "Converting images" +msgstr "Pretvaranje slika" + +#: ../extensions/desktop_background/actions.c:158 +msgid "Could not show the desktop background properties" +msgstr "Nisam uspeo da prikažem postavke pozadine radne površi" + +#: ../extensions/desktop_background/actions.c:224 +#: ../extensions/desktop_background/actions.c:242 +msgid "Could not set the desktop background" +msgstr "Nisam uspeo da postavim pozadinu radne površi" + +#: ../extensions/desktop_background/callbacks.c:49 +msgid "Set as Desktop Background" +msgstr "Postavi za pozadinu radne površi" + +#: ../extensions/desktop_background/callbacks.c:50 +#: ../extensions/desktop_background/desktop_background.extension.in.in.h:2 +msgid "Set the image as desktop background" +msgstr "Postavi sliku za pozadinu radne površi" + +#: ../extensions/desktop_background/desktop_background.extension.in.in.h:1 +msgid "Desktop background" +msgstr "Pozadina radne površi" + +#: ../extensions/edit_metadata/actions.c:66 +msgid "" +"Are you sure you want to permanently delete the metadata of the selected " +"files?" +msgstr "" +"Da li ste sigurni da želite trajno obrisati metapodatke označenih datoteka?" + +#: ../extensions/edit_metadata/actions.c:73 +msgid "If you delete the metadata, it will be permanently lost." +msgstr "Ako obrišete metapodatke, biće trajno izgubljeni." + +#: ../extensions/edit_metadata/callbacks.c:97 +msgid "T_ags" +msgstr "O_znake" + +#: ../extensions/edit_metadata/callbacks.c:101 +msgid "Edit the comment and other information of the selected files" +msgstr "Uredi napomene i ostale podatke označenih datoteka" + +#: ../extensions/edit_metadata/callbacks.c:107 +msgid "Set the tags of the selected files" +msgstr "Dodeli oznake izabranim datotekama" + +#: ../extensions/edit_metadata/callbacks.c:112 +msgid "Delete Metadata" +msgstr "Briši metapodatke" + +#: ../extensions/edit_metadata/callbacks.c:113 +msgid "Delete the comment and the embedded metadata of the selected files" +msgstr "Briše napomene i ugnježđene metapodatke označenih datoteka" + +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:1 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 +msgid "D_escription:" +msgstr "Opi_s:" + +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:3 +msgid "_Place:" +msgstr "_Mesto:" + +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 +#: ../extensions/edit_metadata/data/ui/tag-chooser.ui.h:1 +msgid "T_ags:" +msgstr "O_znake:" + +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:5 +msgid "_Rating:" +msgstr "_Ocena:" + +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:6 +msgid "_Title:" +msgstr "_Naslov:" + +#: ../extensions/edit_metadata/dlg-edit-metadata.c:121 +msgid "Could not save the file metadata" +msgstr "Nisam uspeo da sačuvam metapodatke datoteka" + +#: ../extensions/edit_metadata/dlg-edit-metadata.c:234 +#: ../gthumb/gth-overwrite-dialog.c:136 +msgid "Cannot read file information" +msgstr "Nisam uspeo da pročitam podatke o datoteci" + +#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:1 +msgid "Edit metadata" +msgstr "Uredite metapodatke" + +#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 +msgid "Allow to edit files metadata." +msgstr "Dozvoli izmenu metapodataka datoteka." + +#. Translators: the %s symbol in the string is a file name +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:63 +#, c-format +msgid "%s Metadata" +msgstr "%s metapodatak" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:66 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:83 +#: ../extensions/facebook/dlg-import-from-facebook.c:319 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:324 +#, c-format +msgid "%d file" +msgid_plural "%d files" +msgstr[0] "%d datoteka" +msgstr[1] "%d datoteke" +msgstr[2] "%d datoteka" +msgstr[3] "%d datoteka" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:144 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:197 +msgid "Sa_ve and Close" +msgstr "Saču_vaj i zatvori" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:156 +msgid "Save only cha_nged fields" +msgstr "Sačuvaj samo izmenje_na polja" + +#: ../extensions/edit_metadata/gth-edit-general-page.c:555 +msgid "No date" +msgstr "Nema datuma" + +#: ../extensions/edit_metadata/gth-edit-general-page.c:556 +msgid "The following date" +msgstr "Sledeći datum" + +#: ../extensions/edit_metadata/gth-edit-general-page.c:557 +#: ../extensions/importer/gth-import-preferences-dialog.c:331 +msgid "Current date" +msgstr "Tekući datum" + +#: ../extensions/edit_metadata/gth-edit-general-page.c:559 +msgid "Last modified date" +msgstr "Datum poslednje izmene" + +#: ../extensions/edit_metadata/gth-edit-general-page.c:560 +msgid "File creation date" +msgstr "Datum nastanka datoteke" + +#: ../extensions/edit_metadata/gth-edit-general-page.c:561 +msgid "Do not modify" +msgstr "Ne menjaj" + +#. Translators: the %s symbol in the string is a file name +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:80 +#, c-format +msgid "%s Tags" +msgstr "%s oznake" + +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:189 +msgid "Assign Tags" +msgstr "Dodeli oznake" + +#: ../extensions/edit_metadata/gth-tag-task.c:119 +#: ../extensions/edit_metadata/gth-tag-task.c:136 +msgid "Assigning tags to the selected files" +msgstr "Dodeli oznake izabranim dadotekama" + +#: ../extensions/edit_metadata/gth-tag-task.c:119 +msgid "Writing files" +msgstr "Upisujem datoteke" + +#: ../extensions/edit_metadata/gth-tag-task.c:136 +msgid "Reading files" +msgstr "Učitavam datoteke" + +#: ../extensions/example/src/example.extension.in.in.h:1 +msgid "Example" +msgstr "Primer" + +#: ../extensions/example/src/example.extension.in.in.h:2 +msgid "Extension example." +msgstr "Primer nastavka." + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:1 +msgid "C_opyright:" +msgstr "Autorska _prava:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 +msgid "Co_untry:" +msgstr "_Država:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:3 +msgid "_Code:" +msgstr "_Šifra:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:4 +msgid "Cr_edit:" +msgstr "_Zasluga:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:6 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 +msgid "_Source:" +msgstr "_Izvor:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:7 +msgid "_Urgency:" +msgstr "_Važnost:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:8 +msgid "_Object Name:" +msgstr "Ime _predmeta:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:9 +msgid "Byline _Title:" +msgstr "Titula _autora:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:10 +msgid "_Byline:" +msgstr "_Autor:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:11 +msgid "_City:" +msgstr "_Grad:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:12 +msgid "_Language:" +msgstr "_Jezik:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:13 +msgid "State/Province:" +msgstr "Država/oblast:" + +#: ../extensions/exiv2_tools/exiv2_tools.extension.in.in.h:1 +msgid "EXIF, IPTC, XMP support" +msgstr "Podrška za Egzif, IPTC, IksMP" + +#: ../extensions/exiv2_tools/exiv2_tools.extension.in.in.h:2 +msgid "Read and write exif, iptc and xmp metadata." +msgstr "Čitaj i piši egzif, iptc, i iksmp metapodatke." + +#: ../extensions/exiv2_tools/main.c:33 +msgid "Exif General" +msgstr "Opšti egzif" + +#: ../extensions/exiv2_tools/main.c:34 +msgid "Exif Conditions" +msgstr "Egzif uslovi" + +#: ../extensions/exiv2_tools/main.c:35 +msgid "Exif Structure" +msgstr "Egzif sastav" + +#: ../extensions/exiv2_tools/main.c:36 +msgid "Exif Thumbnail" +msgstr "Egzif umanjeni prikazi" + +#: ../extensions/exiv2_tools/main.c:37 +msgid "Exif GPS" +msgstr "Egzif GPS" + +#: ../extensions/exiv2_tools/main.c:38 +msgid "Exif Maker Notes" +msgstr "Egzif beleške" + +#: ../extensions/exiv2_tools/main.c:39 +msgid "Exif Versions" +msgstr "Egzif izdanje" + +#: ../extensions/exiv2_tools/main.c:40 +msgid "Exif Other" +msgstr "Egzif ostalo" + +#: ../extensions/exiv2_tools/main.c:41 +msgid "IPTC" +msgstr "IPTC" + +#: ../extensions/exiv2_tools/main.c:42 +msgid "XMP Embedded" +msgstr "IksMP ugnježnjen" + +#: ../extensions/exiv2_tools/main.c:43 +msgid "XMP Attached" +msgstr "IksMP dodat" + +#: ../extensions/exiv2_tools/main.c:272 +msgid "date photo was taken" +msgstr "Datum snimanja fotografije" + +#: ../extensions/export_tools/callbacks.c:99 +msgid "Share" +msgstr "Deli" + +#: ../extensions/facebook/callbacks.c:59 ../extensions/facebook/callbacks.c:64 +msgid "Face_book..." +msgstr "_Fejsbuk..." + +#: ../extensions/facebook/callbacks.c:60 +msgid "Download photos from Facebook" +msgstr "Preuzmi slike sa Fejsbuka" + +#: ../extensions/facebook/callbacks.c:65 +msgid "Upload photos to Facebook" +msgstr "Otpremi slike na Fejsbuk" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 +msgid "Export to Flickr" +msgstr "Izvezi u Flikr" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:2 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 +msgid "_Upload" +msgstr "_Otpremi" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:3 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 +msgid "_Account:" +msgstr "_Nalog:" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:4 +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:3 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 +msgid "Edit accounts" +msgstr "Uredi naloge" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 +msgid "A_lbum:" +msgstr "A_lbum:" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 +msgid "Add a new album" +msgstr "Dodajte novi album" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 +msgid "Resize the images if larger than this size" +msgstr "Promeni veličinu slike ako je veća od ove veličine" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:8 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 +msgid "_Resize if larger than:" +msgstr "Promeni _veličinu ako je veće od:" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:9 +msgid "720 x 720" +msgstr "720 x 720" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:10 +msgid "1024 x 1024" +msgstr "1024 x 1024" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:11 +msgid "1280 x 1280" +msgstr "1280 x 1280" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:12 +msgid "1600 x 1600" +msgstr "1600 x 1600" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:13 +msgid "2048 x 2048" +msgstr "2048 x 2048" + +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 +msgid "Public photos" +msgstr "Javne fotografije" + +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 +msgid "Private photos, visible to friends" +msgstr "Lične fotografije, vidljive prijateljima" + +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:5 +msgid "Private" +msgstr "Lične" + +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:5 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 +msgid "_Visibility:" +msgstr "_Vidljivost:" + +#: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:1 +#: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:1 +#: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:1 +#: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:1 +msgid "Files successfully uploaded to the server." +msgstr "Datoteka je uspešno otpremljena na server." + +#: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:2 +#: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:2 +#: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:2 +#: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:2 +#: ../extensions/webalbums/gth-web-exporter.c:1839 +msgid "_Open in the Browser" +msgstr "_Otvori u pregledniku" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 +msgid "Import from Picasa Web Album" +msgstr "Uvezi iz veb albuma Pikase" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:2 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 +msgid "_Import" +msgstr "Uv_ezi" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:4 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 +#: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 +msgid "A_ccount:" +msgstr "N_alog:" + +#: ../extensions/facebook/data/ui/import-from-facebook.ui.h:5 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 +msgid "_Album:" +msgstr "_Album:" + +#: ../extensions/facebook/dlg-export-to-facebook.c:123 +#: ../extensions/facebook/dlg-export-to-facebook.c:326 +#: ../extensions/facebook/dlg-import-from-facebook.c:226 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:138 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:414 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:231 +#: ../extensions/oauth/web-service.c:380 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:131 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:375 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:124 +msgid "Could not connect to the server" +msgstr "Nisam uspeo da se povežem na server" + +#: ../extensions/facebook/dlg-export-to-facebook.c:175 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:246 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:182 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:176 +msgid "Could not upload the files" +msgstr "Nisam uspeo da otpremim datoteke" + +#: ../extensions/facebook/dlg-export-to-facebook.c:397 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:188 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:223 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:457 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:309 +msgid "Could not create the album" +msgstr "Nisam uspeo da napravim album" + +#: ../extensions/facebook/dlg-export-to-facebook.c:465 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:528 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:375 +msgid "New Album" +msgstr "Novi album" + +#: ../extensions/facebook/dlg-export-to-facebook.c:557 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:583 +#: ../extensions/image_print/gth-image-print-job.c:1739 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:607 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:597 +msgid "No valid file selected." +msgstr "Nije označena ispravna datoteka." + +#: ../extensions/facebook/dlg-export-to-facebook.c:558 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:584 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:608 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:598 +msgid "Could not export the files" +msgstr "Nisam uspeo da izvezem datoteke" + +#: ../extensions/facebook/dlg-export-to-facebook.c:566 +#: ../extensions/find_duplicates/gth-find-duplicates.c:277 +#: ../extensions/find_duplicates/gth-find-duplicates.c:470 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:592 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:616 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:605 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:254 +#: ../gthumb/gth-browser.c:1116 +#, c-format +msgid "%d file (%s)" +msgid_plural "%d files (%s)" +msgstr[0] "%d datoteka (%s)" +msgstr[1] "%d datoteke (%s)" +msgstr[2] "%d datoteka (%s)" +msgstr[3] "%d datoteka (%s)" + +#: ../extensions/facebook/dlg-export-to-facebook.c:587 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:615 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:635 +#, c-format +msgid "Export to %s" +msgstr "Izvezi u %s" + +#: ../extensions/facebook/dlg-import-from-facebook.c:344 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:349 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:279 +msgid "Could not get the photo list" +msgstr "Nisam uspeo da dobavim spisak slika" + +#: ../extensions/facebook/dlg-import-from-facebook.c:378 +#: ../extensions/facebook/dlg-import-from-facebook.c:533 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:386 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:551 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:313 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:586 +msgid "No album selected" +msgstr "Nije određen album" + +#: ../extensions/facebook/dlg-import-from-facebook.c:551 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:569 +#, c-format +msgid "Import from %s" +msgstr "Uvezi iz %s" + +#: ../extensions/facebook/dlg-import-from-facebook.c:551 +#: ../extensions/facebook/facebook.extension.in.in.h:1 +msgid "Facebook" +msgstr "Fejsbuk" + +#: ../extensions/facebook/facebook.extension.in.in.h:2 +msgid "Upload images to Facebook" +msgstr "Otpremi slike na Fejsbuk" + +#: ../extensions/facebook/facebook-service.c:462 +#: ../extensions/flicker_utils/flickr-service.c:863 +#: ../extensions/photobucket/photobucket-service.c:310 +#: ../extensions/picasaweb/picasa-web-service.c:711 +msgid "Getting the album list" +msgstr "Dobavljam spisak albuma" + +#: ../extensions/facebook/facebook-service.c:584 +#: ../extensions/flicker_utils/flickr-service.c:965 +#: ../extensions/flicker_utils/flickr-service.c:1087 +#: ../extensions/flicker_utils/flickr-service.c:1126 +#: ../extensions/photobucket/photobucket-service.c:423 +#: ../extensions/picasaweb/picasa-web-service.c:805 +msgid "Creating the new album" +msgstr "Pravim nov album" + +#: ../extensions/facebook/facebook-service.c:645 +#: ../extensions/flicker_utils/flickr-service.c:1176 +#: ../extensions/photobucket/photobucket-service.c:485 +#: ../extensions/picasaweb/picasa-web-service.c:860 +#, c-format +msgid "Could not upload '%s': %s" +msgstr "Nisam uspeo otpremiti „%s“: %s" + +#. Translators: %s is a filename +#: ../extensions/facebook/facebook-service.c:710 +#: ../extensions/flicker_utils/flickr-service.c:1287 +#: ../extensions/photobucket/photobucket-service.c:542 +#: ../extensions/picasaweb/picasa-web-service.c:917 +#, c-format +msgid "Uploading '%s'" +msgstr "Otpremam „%s“" + +#: ../extensions/facebook/facebook-service.c:923 +#: ../extensions/flicker_utils/flickr-service.c:1482 +#: ../extensions/photobucket/photobucket-service.c:714 +#: ../extensions/picasaweb/picasa-web-service.c:1138 +msgid "Uploading the files to the server" +msgstr "Otpremam datoteke na sevrer" + +#: ../extensions/facebook/facebook-service.c:1022 +#: ../extensions/flicker_utils/flickr-service.c:1651 +#: ../extensions/picasaweb/picasa-web-service.c:1257 +msgid "Getting the photo list" +msgstr "Dobavljam spisak slika" + +#: ../extensions/file_manager/actions.c:133 +msgid "New folder" +msgstr "Nova fascikla" + +#: ../extensions/file_manager/actions.c:134 +msgid "Enter the folder name:" +msgstr "Unesite ime fascikle:" + +#: ../extensions/file_manager/actions.c:400 +#: ../extensions/file_manager/callbacks.c:380 +#: ../extensions/file_manager/callbacks.c:838 +msgid "Could not move the files" +msgstr "Nisam uspeo premestiti datoteke" + +#: ../extensions/file_manager/actions.c:401 +#: ../extensions/file_manager/callbacks.c:381 +#: ../extensions/file_manager/callbacks.c:839 +msgid "" +"Files cannot be moved to the current location, as alternative you can choose " +"to copy them." +msgstr "" +"Datoteke ne mogu biti premeštene na trenutno mesto, u zamenu, možete " +"izabrati da ih umnožite." + +#: ../extensions/file_manager/actions.c:563 +msgid "Could not open the location" +msgstr "Nisam uspeo da otvorim mesto" + +#: ../extensions/file_manager/actions.c:696 +msgid "" +"The folder is not empty, do you want to delete the folder and its content " +"permanently?" +msgstr "" +"Fascikla nije prazna. Da li želite trajno obrisati fasciklu i njen sadržaj?" + +#: ../extensions/file_manager/actions.c:712 +msgid "Could not delete the folder" +msgstr "Nisam uspeo da obrišem fasciklu" + +#: ../extensions/file_manager/actions.c:773 +msgid "" +"The folder cannot be moved to the Trash. Do you want to delete it " +"permanently?" +msgstr "Ne mogu premestiti fasciklu u đubre. Želite li je trajno obrisati?" + +#: ../extensions/file_manager/actions.c:780 +msgid "Could not move the folder to the Trash" +msgstr "Ne mogu da premestim fasciklu u đubre" + +#: ../extensions/file_manager/actions.c:816 +#: ../gthumb/gth-file-source-vfs.c:841 +#, c-format +msgid "Are you sure you want to permanently delete \"%s\"?" +msgstr "Da li ste sigurni da želite trajno obrisati „%s“?" + +#: ../extensions/file_manager/actions.c:826 +#: ../gthumb/gth-file-source-vfs.c:854 +msgid "If you delete a file, it will be permanently lost." +msgstr "Ako obrišete datoteku, biće trajno izgubljena." + +#: ../extensions/file_manager/actions.c:920 +msgid "Move To" +msgstr "Premesti u" + +#: ../extensions/file_manager/actions.c:920 +msgid "Copy To" +msgstr "Umnoži u" + +#: ../extensions/file_manager/actions.c:924 +msgid "Move" +msgstr "Premesti" + +#: ../extensions/file_manager/actions.c:924 +msgid "Copy" +msgstr "Umnoži" + +#: ../extensions/file_manager/callbacks.c:163 +#: ../extensions/file_manager/callbacks.c:199 +msgid "Create _Folder" +msgstr "Napravi _fasciklu" + +#: ../extensions/file_manager/callbacks.c:164 +#: ../extensions/file_manager/callbacks.c:200 +msgid "Create a new empty folder inside this folder" +msgstr "Napravi novu praznu fasciklu u ovoj fascikli" + +#: ../extensions/file_manager/callbacks.c:179 +msgid "D_uplicate" +msgstr "_Udvostruči" + +#: ../extensions/file_manager/callbacks.c:180 +msgid "Duplicate the selected files" +msgstr "Udvostruči odabrane datoteke" + +#: ../extensions/file_manager/callbacks.c:183 +#: ../extensions/file_manager/callbacks.c:219 +#: ../gthumb/gth-file-source-vfs.c:813 +msgid "Mo_ve to Trash" +msgstr "Pr_emesti u Đubre" + +#: ../extensions/file_manager/callbacks.c:184 +msgid "Move the selected files to the Trash" +msgstr "Premesti označene datoteke u Đubre" + +#: ../extensions/file_manager/callbacks.c:187 +#: ../extensions/file_manager/callbacks.c:223 +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:5 +#: ../gthumb/gth-tags-entry.c:871 +msgid "_Delete" +msgstr "_Obriši" + +#: ../extensions/file_manager/callbacks.c:188 +msgid "Delete the selected files" +msgstr "Otvori označene datoteke" + +#: ../extensions/file_manager/callbacks.c:191 +#: ../extensions/file_manager/callbacks.c:203 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:2 +msgid "_Rename" +msgstr "_Preimenuj" + +#: ../extensions/file_manager/callbacks.c:192 +msgid "Rename the selected files" +msgstr "Promeni ime označenim datotekama" + +#: ../extensions/file_manager/callbacks.c:195 +msgid "Open with the _File Manager" +msgstr "Otvori _upravnikom datoteka" + +#: ../extensions/file_manager/callbacks.c:215 +msgid "_Paste Into Folder" +msgstr "_Spusti u fasciklu" + +#: ../extensions/file_manager/callbacks.c:227 +#: ../extensions/file_manager/callbacks.c:236 +msgid "Copy to..." +msgstr "Umnoži u..." + +#: ../extensions/file_manager/callbacks.c:228 +msgid "Copy the selected folder to another folder" +msgstr "Umnoži označenu fasciklu u drugu fasciklu" + +#: ../extensions/file_manager/callbacks.c:231 +#: ../extensions/file_manager/callbacks.c:240 +msgid "Move to..." +msgstr "Premesti u..." + +#: ../extensions/file_manager/callbacks.c:232 +msgid "Move the selected folder to another folder" +msgstr "Premesti označenu fasciklu u drugu fasciklu" + +#: ../extensions/file_manager/callbacks.c:237 +msgid "Copy the selected files to another folder" +msgstr "Umnoži označene datoteke u drugu fasciklu" + +#: ../extensions/file_manager/callbacks.c:241 +msgid "Move the selected files to another folder" +msgstr "Premesti označene datoteke u drugu fasciklu" + +#: ../extensions/file_manager/callbacks.c:999 +#: ../extensions/find_duplicates/gth-find-duplicates.c:766 +#: ../gthumb/gth-browser.c:5234 ../gthumb/gth-browser.c:5268 +#: ../gthumb/gth-progress-dialog.c:406 +msgid "Could not perform the operation" +msgstr "Nisam uspeo da izvedem radnju" + +#: ../extensions/file_manager/file_manager.extension.in.in.h:1 +msgid "File manager" +msgstr "Upravnik datoteka" + +#: ../extensions/file_manager/file_manager.extension.in.in.h:2 +msgid "File manager operations." +msgstr "Radnje upravnika datoteka." + +#: ../extensions/file_manager/gth-delete-task.c:62 +msgid "Deleting files" +msgstr "Brisanje datoteka" + +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:1 +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:5 +msgid "_Preview" +msgstr "_Pregled" + +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:2 +msgid "B_rightness:" +msgstr "_Svetlina:" + +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:3 +msgid "Con_trast:" +msgstr "Kon_trast:" + +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:4 +msgid "_Saturation:" +msgstr "_Zasićenost:" + +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:5 +msgid "G_amma:" +msgstr "_Raspon:" + +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:6 +msgid "Cyan-_Red:" +msgstr "Svetlo plava-_Crvena:" + +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:7 +msgid "_Magenta-Green:" +msgstr "_Ljubičasta-zelena:" + +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:8 +msgid "_Yellow-Blue:" +msgstr "_Žuta-plava:" + +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:9 +msgid "Color Levels" +msgstr "Nivoi boja" + +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:10 +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:5 +msgid "_Reset" +msgstr "_Ponovo postavi" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:1 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +msgid "Selection" +msgstr "Izbor" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 +msgid "_Width:" +msgstr "_Širina:" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:3 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 +msgid "Heigh_t:" +msgstr "Visin_a:" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:4 +msgid "_Position:" +msgstr "_Položaj:" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:5 +msgid "Maximize" +msgstr "Uvećaj" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:6 +msgid "Center" +msgstr "Po sredini" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:5 +msgid "Aspect ratio" +msgstr "Odnos visine i širine" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 +msgid "I_nvert aspect ratio" +msgstr "_Izvrni proporcije" + +#. after the colon there is a control to select the size in pixels +#: ../extensions/file_tools/data/ui/crop-options.ui.h:10 +msgid "M_ultiple of:" +msgstr "Umnožak _od:" + +#. abbreviation of pixel +#: ../extensions/file_tools/data/ui/crop-options.ui.h:12 +msgid "px" +msgstr "px" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 +#: ../gthumb/gth-file-chooser-dialog.c:252 +msgid "Options" +msgstr "Mogućnosti" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:14 +msgid "_Grid:" +msgstr "_Mreža:" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:15 +msgid "C_rop" +msgstr "_Ostriži" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:1 +msgid "Method" +msgstr "Način" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:2 +msgid "_Brightness" +msgstr "_Svetlina" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:3 +msgid "_Saturation" +msgstr "_Zasićenost" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:4 +msgid "_Average" +msgstr "_Prosečno" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 +#: ../gthumb/gth-main-default-metadata.c:47 +msgid "Dimensions" +msgstr "Veličine" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +msgid "Set the image size to this value" +msgstr "Postavi veličinu slike na ovu vrednost" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:8 +msgid "High _quality" +msgstr "Dobar _kvalitet" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:9 +msgid "Original dimensions:" +msgstr "Izvorna veličina:" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 +msgid "Scale factor:" +msgstr "Odnos srazmerne promene veličine:" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 +msgid "New dimensions:" +msgstr "Nova veličina:" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:29 +msgid "pixels" +msgstr "tačaka" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:14 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:12 +#, no-c-format +msgid "%" +msgstr "%" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:1 +msgid "Angle" +msgstr "Ugao" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 +msgid "Align" +msgstr "Poravnaj" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 +msgid "Image size" +msgstr "Veličina slike" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 +msgid "Point 1:" +msgstr "Tačka 1:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 +msgid "Point 2:" +msgstr "Tačka 2:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 +msgid "Keep aspect ratio" +msgstr "Zadrži srazmeru" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 +msgid "Grid:" +msgstr "Mreža:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 +msgid "_Background:" +msgstr "_Pozadina:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 +msgid "Pick a background color" +msgstr "Odaberi boju pozadine" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 +msgid "_Transparent" +msgstr "_Providan" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:12 +msgid "Reset" +msgstr "Vrati na zadate vrednosti" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:13 +msgid "" +"Draw a line on the image \n" +"to set the alignment." +msgstr "" +"Vucite liniju po slici \n" +"za postavku poravnanja." + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:15 +msgid "Parallel" +msgstr "Paralelno" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:16 +msgid "Perpendicular" +msgstr "Normalno" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:17 +msgid "Alignment" +msgstr "Poravnanje" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:18 +msgid "Original size" +msgstr "Izvorna veličina" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:19 +msgid "Bounding box" +msgstr "Granični okvir" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:20 +msgid "Crop borders" +msgstr "Ostriži ivice" + +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:1 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 +msgid "_Preview:" +msgstr "_Pregled:" + +# Prag? +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:2 +msgid "Threshold:" +msgstr "Zadrška:" + +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:3 +msgid "Radius:" +msgstr "Poluprečnik:" + +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:4 +msgid "Amount:" +msgstr "Količina:" + +#: ../extensions/file_tools/file_tools.extension.in.in.h:1 +msgid "Image tools" +msgstr "Alatke za slike" + +#: ../extensions/file_tools/file_tools.extension.in.in.h:2 +msgid "Basic tools to modify images." +msgstr "Osnovne alatke za izmenu slika." + +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:372 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:272 +#: ../extensions/file_tools/gth-file-tool-grayscale.c:248 +#: ../extensions/file_tools/gth-file-tool-negative.c:68 +msgid "Applying changes" +msgstr "Primenjujem izmene" + +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 +msgid "Adjust Colors..." +msgstr "Podesi boje..." + +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 +msgid "Adjust Colors" +msgstr "Podesi boje" + +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:619 +msgid "Change brightness, contrast, saturation and gamma level of the image" +msgstr "Podesi osvetljenje, suprotnost, zasićenje, i raspon boja slike" + +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:304 +msgid "Adjust Contrast" +msgstr "Podesi kontrast" + +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:305 +msgid "Automatic contrast adjustment" +msgstr "Samostalna ispravka kontrasta" + +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 +msgid "Square" +msgstr "Kvadriraj" + +#: ../extensions/file_tools/gth-file-tool-crop.c:417 +#: ../extensions/file_tools/gth-file-tool-resize.c:590 +#, c-format +msgid "%d x %d (Image)" +msgstr "%d x %d (slika)" + +#: ../extensions/file_tools/gth-file-tool-crop.c:420 +#: ../extensions/file_tools/gth-file-tool-resize.c:594 +#, c-format +msgid "%d x %d (Screen)" +msgstr "%d x %d (ekran)" + +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-resize.c:599 +msgid "5:4" +msgstr "5:4" + +#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-resize.c:600 +msgid "4:3 (DVD, Book)" +msgstr "4:3 (DVD, slika)" + +#: ../extensions/file_tools/gth-file-tool-crop.c:426 +#: ../extensions/file_tools/gth-file-tool-resize.c:601 +msgid "7:5" +msgstr "7:5" + +#: ../extensions/file_tools/gth-file-tool-crop.c:427 +#: ../extensions/file_tools/gth-file-tool-resize.c:602 +msgid "3:2 (Postcard)" +msgstr "3 x 2 (razglednica)" + +#: ../extensions/file_tools/gth-file-tool-crop.c:428 +#: ../extensions/file_tools/gth-file-tool-resize.c:603 +msgid "16:10" +msgstr "16:10" + +#: ../extensions/file_tools/gth-file-tool-crop.c:429 +#: ../extensions/file_tools/gth-file-tool-resize.c:604 +msgid "16:9 (DVD)" +msgstr "16:9 (DVD)" + +#: ../extensions/file_tools/gth-file-tool-crop.c:430 +#: ../extensions/file_tools/gth-file-tool-resize.c:605 +msgid "1.85:1" +msgstr "1.85:1" + +#: ../extensions/file_tools/gth-file-tool-crop.c:431 +#: ../extensions/file_tools/gth-file-tool-resize.c:606 +msgid "2.39:1" +msgstr "2.39:1" + +#: ../extensions/file_tools/gth-file-tool-crop.c:432 +#: ../extensions/file_tools/gth-file-tool-resize.c:607 +#: ../extensions/image_print/data/ui/print-layout.ui.h:2 +#: ../extensions/rename_series/gth-template-selector.c:234 +msgid "Custom" +msgstr "Proizvoljno" + +#: ../extensions/file_tools/gth-file-tool-crop.c:447 +#: ../extensions/file_tools/gth-file-tool-rotate.c:398 +msgid "Rule of Thirds" +msgstr "Pravilo trećine" + +#: ../extensions/file_tools/gth-file-tool-crop.c:448 +#: ../extensions/file_tools/gth-file-tool-rotate.c:399 +msgid "Golden Sections" +msgstr "Zlatni presek" + +#: ../extensions/file_tools/gth-file-tool-crop.c:449 +#: ../extensions/file_tools/gth-file-tool-rotate.c:400 +msgid "Center Lines" +msgstr "Simetrale" + +#: ../extensions/file_tools/gth-file-tool-crop.c:450 +#: ../extensions/file_tools/gth-file-tool-rotate.c:401 +msgid "Uniform" +msgstr "Jednoobrazno" + +#: ../extensions/file_tools/gth-file-tool-crop.c:608 +msgid "Crop..." +msgstr "Ostriži ivice..." + +#: ../extensions/file_tools/gth-file-tool-crop.c:608 +msgid "Crop" +msgstr "Ostriži ivice" + +#: ../extensions/file_tools/gth-file-tool-equalize.c:45 +msgid "Equalizing image histogram" +msgstr "Izjednačavanje histograma slike" + +#: ../extensions/file_tools/gth-file-tool-equalize.c:230 +msgid "Equalize" +msgstr "Izjednači" + +#: ../extensions/file_tools/gth-file-tool-equalize.c:231 +msgid "Equalize image histogram" +msgstr "Izjednači histogram slike" + +#: ../extensions/file_tools/gth-file-tool-flip.c:87 +msgid "Flip" +msgstr "Preokreni" + +#: ../extensions/file_tools/gth-file-tool-flip.c:88 +msgid "Flip the image vertically" +msgstr "Preokreni sliku uspravno" + +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale..." +msgstr "Tonovi sive..." + +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale" +msgstr "Tonovi sive" + +#: ../extensions/file_tools/gth-file-tool-mirror.c:87 +msgid "Mirror" +msgstr "Odraz" + +#: ../extensions/file_tools/gth-file-tool-mirror.c:88 +msgid "Mirror the image horizontally" +msgstr "Odrazi sliku vodoravno (levo-desno)" + +#: ../extensions/file_tools/gth-file-tool-negative.c:197 +msgid "Negative" +msgstr "Negativ" + +#: ../extensions/file_tools/gth-file-tool-redo.c:75 +msgid "Redo" +msgstr "Napred" + +#: ../extensions/file_tools/gth-file-tool-resize.c:214 +#: ../extensions/resize_images/dlg-resize-images.c:180 +msgid "Resizing images" +msgstr "Promeni veličinu slike" + +#: ../extensions/file_tools/gth-file-tool-resize.c:808 +msgid "Resize..." +msgstr "Promeni veličinu..." + +#: ../extensions/file_tools/gth-file-tool-resize.c:808 +msgid "Resize" +msgstr "Promeni veličinu" + +#: ../extensions/file_tools/gth-file-tool-rotate.c:628 +msgid "Rotate..." +msgstr "Okreni..." + +#: ../extensions/file_tools/gth-file-tool-rotate.c:628 +msgid "Rotate" +msgstr "Okreni" + +#: ../extensions/file_tools/gth-file-tool-rotate.c:629 +msgid "Freely rotate the image" +msgstr "Slobodno okreći sliku" + +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:87 +#: ../extensions/image_rotation/callbacks.c:55 +msgid "Rotate Left" +msgstr "Okreći levo" + +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:88 +msgid "Rotate the image by 90 degrees counterclockwise" +msgstr "Okreći sliku 90 stepeni suprotno kretanju kazaljke na satu" + +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:87 +#: ../extensions/image_rotation/callbacks.c:49 +msgid "Rotate Right" +msgstr "Okreći desno" + +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:88 +msgid "Rotate the image by 90 degrees clockwise" +msgstr "Okreći 90 stepeni u pravcu kazaljke na satu" + +#: ../extensions/file_tools/gth-file-tool-save-as.c:70 +msgid "Save As" +msgstr "Sačuvaj kao" + +#: ../extensions/file_tools/gth-file-tool-save.c:66 +msgid "Save" +msgstr "Sačuvaj" + +#: ../extensions/file_tools/gth-file-tool-sharpen.c:101 +msgid "Sharpening image" +msgstr "Izoštravanje slike" + +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 +msgid "Enhance Focus..." +msgstr "Poboljšaj žižu..." + +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 +msgid "Enhance Focus" +msgstr "Poboljšaj žižu" + +#: ../extensions/file_tools/gth-file-tool-undo.c:75 +msgid "Undo" +msgstr "Opozovi" + +#: ../extensions/find_duplicates/callbacks.c:48 +msgid "Find _Duplicates..." +msgstr "Nađi _dvojnike..." + +#: ../extensions/find_duplicates/callbacks.c:49 +msgid "Find duplicated files in the current location" +msgstr "Nađi udvostručene datoteke na trenutnoj putanji" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-choose-folders.ui.h:1 +msgid "_Folders:" +msgstr "_Fascikle:" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:1 +msgid "Search for Duplicates" +msgstr "Traži udvostručene datoteke" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 +msgid "Duplicates:" +msgstr "Dvojnici:" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 +msgid "Files:" +msgstr "Datoteke:" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:4 +#: ../gthumb/gth-browser-actions-entries.h:33 +msgid "_View" +msgstr "P_regled" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 +msgid "No duplicates found." +msgstr "Nisam pronašao dvojnike." + +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:1 +#: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:1 +msgid "Find Duplicates" +msgstr "Pronađi dvojnike" + +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:2 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 +#: ../extensions/search/data/ui/search-editor.ui.h:1 +msgid "Start _at:" +msgstr "Počni _sa:" + +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 +msgid "_Filter:" +msgstr "_Uslov:" + +#: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:2 +msgid "Find duplicated files." +msgstr "Pronalazi udvostručene datoteke." + +#: ../extensions/find_duplicates/gth-find-duplicates.c:65 +msgid "leave the newest duplicates" +msgstr "ostavi najnovije dvojnike" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:66 +msgid "leave the oldest duplicates" +msgstr "ostavite najstarije dvojnike" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:67 +msgid "by folder..." +msgstr "po fascikli..." + +#: ../extensions/find_duplicates/gth-find-duplicates.c:68 +msgid "all files" +msgstr "sve datoteke" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:69 +msgid "no file" +msgstr "nema datoteka" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:560 +#: ../extensions/find_duplicates/gth-find-duplicates.c:668 +#, c-format +msgid "%d duplicate" +msgid_plural "%d duplicates" +msgstr[0] "%d dvojnik" +msgstr[1] "%d dvojnika" +msgstr[2] "%d dvojnika" +msgstr[3] "%d dvojnik" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:712 +msgid "Search completed" +msgstr "Pretraga je završena" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:725 +msgid "Searching for duplicates" +msgstr "Tražim dvojnike" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:728 +#: ../gthumb/gth-load-file-data-task.c:106 +#: ../gthumb/gth-save-file-data-task.c:100 +#, c-format +msgid "%d file remaining" +msgid_plural "%d files remaining" +msgstr[0] "preostala je %d datoteka" +msgstr[1] "preostale su %d datoteke" +msgstr[2] "preostalo je %d datoteka" +msgstr[3] "preostala je %d datoteka" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:830 +msgid "Getting the file list" +msgstr "Dobavljanje spiska datoteka" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:1016 +msgid "Duplicates" +msgstr "Dvojnici" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:1306 +msgid "Select" +msgstr "Izaberi" + +#: ../extensions/flicker/callbacks.c:59 ../extensions/flicker/callbacks.c:64 +msgid "_Flickr..." +msgstr "_Flikr..." + +#: ../extensions/flicker/callbacks.c:60 +msgid "Download photos from Flickr" +msgstr "preuzmi fotografije sa Flikra" + +#: ../extensions/flicker/callbacks.c:65 +msgid "Upload photos to Flickr" +msgstr "Otpremi fotografije na Flikr" + +#: ../extensions/flicker/flicker.extension.in.in.h:1 +msgid "Flicker" +msgstr "Treptanje" + +#: ../extensions/flicker/flicker.extension.in.in.h:2 +msgid "Upload images to Flickr" +msgstr "Otpremi fotografije na Flikr" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 +msgid "Free space:" +msgstr "Slobodnog mesta:" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:5 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 +msgid "Ph_otoset:" +msgstr "Niz _fotografija:" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:6 +msgid "_Privacy:" +msgstr "_Privatnost:" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:7 +msgid "Hi_de from public searches" +msgstr "Sakrij od _javne pretrage" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:8 +msgid "_Safety:" +msgstr "_Bezbednost:" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 +msgid "Private photos, visible to family and friends" +msgstr "Lične fotografije, vidljive porodici i prijateljima" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 +msgid "Private photos, visible to family" +msgstr "Lične fotografije, vidljive porodici" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 +msgid "Private photos" +msgstr "Lične fotografije" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 +msgid "Safe content" +msgstr "Bezbedan sadržaj" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 +msgid "Moderate content" +msgstr "Umereni sadržaj" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:17 +msgid "Restricted content" +msgstr "Ograničeni sadržaj" + +#: ../extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui.h:1 +msgid "C_ontinue" +msgstr "_Nastavi" + +#: ../extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui.h:2 +msgid "_Authorize..." +msgstr "_Ovlasti..." + +#: ../extensions/flicker_utils/flickr-consumer.c:124 +#: ../extensions/flicker_utils/flickr-service.c:237 +#: ../extensions/flicker_utils/flickr-service.c:348 +#: ../extensions/flicker_utils/flickr-service.c:672 +#: ../extensions/flicker_utils/flickr-service.c:937 +#: ../extensions/oauth/oauth-service.c:154 +#: ../extensions/photobucket/photobucket-consumer.c:74 +#: ../extensions/photobucket/photobucket-consumer.c:82 +#: ../extensions/photobucket/photobucket-consumer.c:149 +#: ../extensions/photobucket/photobucket-service.c:132 +msgid "Unknown error" +msgstr "Nepoznata greška" + +#: ../extensions/flicker_utils/flickr-service.c:502 +#, c-format +msgid "" +"Return to this window when you have finished the authorization process on %s" +msgstr "Vratite se na ovaj prozor kad budete završili postupak prijave na %s" + +#: ../extensions/flicker_utils/flickr-service.c:503 +msgid "Once you're done, click the 'Continue' button below." +msgstr "Kad završite, kliknite na dugme ispod „Nastavi“." + +#: ../extensions/flicker_utils/flickr-service.c:571 +#, c-format +msgid "gThumb requires your authorization to upload the photos to %s" +msgstr "Gnomov sličko zahteva vaše odobrenje za otpremanje slika na %s" + +#: ../extensions/flicker_utils/flickr-service.c:572 +#, c-format +msgid "" +"Click 'Authorize' to open your web browser and authorize gthumb to upload " +"photos to %s. When you're finished, return to this window to complete the " +"authorization." +msgstr "" +"Kliknite na „Ovlasti“ da otvorite vaš veb preglednik i ovlastite Gnomovog " +"slička za otpremanje slika na %s. Kad budete završili, vratite se na ovaj " +"prozor da dovršite ovlašćenja." + +#: ../extensions/gstreamer_tools/actions.c:66 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1072 +#: ../gthumb/gth-browser.c:2175 +msgid "Could not save the file" +msgstr "Nisam uspeo da sačuvam datoteku" + +#: ../extensions/gstreamer_tools/actions.c:130 +msgid "Could not take a screenshot" +msgstr "Nisam uspeo da slikam ekran" + +#: ../extensions/gstreamer_tools/actions.c:136 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1245 +msgid "Save Image" +msgstr "Sačuvaj sliku" + +#: ../extensions/gstreamer_tools/actions.c:156 +msgctxt "Filename" +msgid "Screenshot" +msgstr "Snimak ekrana" + +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:1 +msgid "Slower" +msgstr "Sporije" + +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:699 +msgid "Play" +msgstr "Izvedi" + +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:3 +msgid "Faster" +msgstr "Brže" + +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 +msgid "Time:" +msgstr "Vreme:" + +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 +msgid "--:--" +msgstr "--:--" + +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 +msgid "Toggle volume" +msgstr "Prekidač glasnoće" + +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 +msgid "Change volume level" +msgstr "Promeni glasnoću" + +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 +#: ../extensions/photo_importer/actions.c:67 +#: ../extensions/photo_importer/dlg-photo-importer.c:620 +msgid "Choose a folder" +msgstr "Izaberite fasciklu" + +#: ../extensions/gstreamer_tools/gstreamer_tools.extension.in.in.h:1 +msgid "Audio/Video support" +msgstr "Zvučna/video podrška" + +#: ../extensions/gstreamer_tools/gstreamer_tools.extension.in.in.h:2 +msgid "Play audio and video files." +msgstr "Izvedi zvučne i video datoteke." + +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:104 +msgid "Screenshot" +msgstr "Snimak ekrana" + +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:105 +msgid "Take a screenshot" +msgstr "Napravi snimak ekrana" + +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 +msgid "Playing video" +msgstr "Izvođenje videa" + +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:689 +msgid "Pause" +msgstr "Zastoj" + +#: ../extensions/gstreamer_tools/main.c:31 +#: ../gthumb/gth-main-default-tests.c:247 +msgid "Video" +msgstr "Video" + +#: ../extensions/gstreamer_tools/main.c:32 +#: ../gthumb/gth-main-default-tests.c:254 +msgid "Audio" +msgstr "Zvuk" + +#: ../extensions/gstreamer_tools/main.c:39 +msgid "Artist" +msgstr "Izvođač" + +#: ../extensions/gstreamer_tools/main.c:40 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 +msgid "Album" +msgstr "Album" + +#: ../extensions/gstreamer_tools/main.c:41 +msgid "Bitrate" +msgstr "Protok bita" + +#: ../extensions/gstreamer_tools/main.c:42 +msgid "Encoder" +msgstr "Šifrarnik" + +#: ../extensions/gstreamer_tools/main.c:44 +#: ../extensions/gstreamer_tools/main.c:49 +msgid "Codec" +msgstr "Kodek" + +#: ../extensions/gstreamer_tools/main.c:45 +msgid "Framerate" +msgstr "Protok kadrova" + +#: ../extensions/gstreamer_tools/main.c:46 +#: ../extensions/image_print/data/ui/print-layout.ui.h:24 +#: ../extensions/image_viewer/gth-image-viewer-page.c:209 +msgid "Width" +msgstr "Širina" + +#: ../extensions/gstreamer_tools/main.c:47 +#: ../extensions/image_print/data/ui/print-layout.ui.h:25 +msgid "Height" +msgstr "Visina" + +#: ../extensions/gstreamer_tools/main.c:50 +msgid "Channels" +msgstr "Kanali" + +#: ../extensions/gstreamer_tools/main.c:51 +msgid "Sample rate" +msgstr "Protok uzorka" + +#: ../extensions/gstreamer_utils/gstreamer-utils.c:362 +msgid "Stereo" +msgstr "Stereo" + +#: ../extensions/gstreamer_utils/gstreamer-utils.c:362 +msgid "Mono" +msgstr "Mono" + +#. Translators: this is an image size, such as 1024 × 768 +#: ../extensions/gstreamer_utils/gstreamer-utils.c:395 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1300 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:209 +#: ../extensions/webalbums/gth-web-exporter.c:2446 ../gthumb/gtk-utils.c:1037 +#, c-format +msgid "%d × %d" +msgstr "%d × %d" + +#: ../extensions/image_print/actions.c:69 +msgid "Could not print the selected files" +msgstr "Nisam uspeo da štampam označene datoteke" + +#: ../extensions/image_print/callbacks.c:65 +msgid "Print the selected images" +msgstr "Štampaj označene slike" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:1 +msgid "Centered" +msgstr "Na sredini" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:13 +msgid "The total number of files" +msgstr "Ukupan broj datoteka" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:14 +#: ../extensions/importer/data/ui/import-preferences.ui.h:4 +msgid "The event description" +msgstr "Opis događaja" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:17 +msgid "_Rows:" +msgstr "_Redovi:" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:19 +msgid "Image" +msgstr "Slika" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:20 +msgid "Position:" +msgstr "Položaj:" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:21 +msgid "Left" +msgstr "Levo" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:22 +msgid "Top" +msgstr "Vrh" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:26 +msgid "Rotation:" +msgstr "Obrtanje:" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:27 +msgid "Unit:" +msgstr "Jedinica:" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:28 +msgid "Preview" +msgstr "Pregled" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:30 +msgid "millimeters" +msgstr "milimetri" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:31 +msgid "inches" +msgstr "inči" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:4 +msgid "Select Caption Font" +msgstr "Odaberite slovni lik natpisa" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:5 +msgid "Select Header Font" +msgstr "Odaberite slovni lik zaglavlja" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 +msgid "Select Footer Font" +msgstr "Odaberite slovni lik podnožja" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 +msgid "Fonts" +msgstr "Slovni likovi" + +#: ../extensions/image_print/gth-image-print-job.c:914 +#: ../extensions/webalbums/data/albumthemes/text.h:31 +#, c-format +msgid "Page %d of %d" +msgstr "Strana %d od %d" + +#: ../extensions/image_print/gth-image-print-job.c:1680 +#: ../extensions/image_print/gth-image-print-job.c:1845 +#: ../extensions/image_print/gth-image-print-job.c:1888 +msgid "Could not print" +msgstr "Nisam uspeo štampati" + +#: ../extensions/image_print/gth-image-print-job.c:1746 +#: ../gthumb/gth-main-default-tests.c:240 +msgid "Images" +msgstr "Slike" + +#: ../extensions/image_print/gth-image-print-job.c:1847 +#: ../gthumb/gth-image-loader.c:197 ../gthumb/gth-image-loader.c:304 +#: ../gthumb/gth-image-utils.c:131 ../gthumb/gth-image-utils.c:137 +msgid "No suitable loader available for this file type" +msgstr "Nema odgovarajućeg utovarivača za ovu vrstu datoteke" + +#. translators: %s is a filename +#: ../extensions/image_print/gth-load-image-info-task.c:164 +#, c-format +msgid "Loading \"%s\"" +msgstr "Učitavam „%s“" + +#: ../extensions/image_print/gth-load-image-info-task.c:166 +#: ../extensions/webalbums/gth-web-exporter.c:2719 +msgid "Loading images" +msgstr "Učitavanje slika" + +#: ../extensions/image_print/image_print.extension.in.in.h:1 +msgid "Image print" +msgstr "Štampanje slika" + +#: ../extensions/image_print/image_print.extension.in.in.h:2 +msgid "Allow to print images choosing the page layout." +msgstr "Dozvoli štampanje slika koristeći raspored strane." + +#: ../extensions/image_print/preferences.c:79 +msgid "Print" +msgstr "Štampaj" + +#: ../extensions/image_rotation/callbacks.c:50 +msgid "Rotate the selected images 90° to the right" +msgstr "Okreni označene slike 90° u desno" + +#: ../extensions/image_rotation/callbacks.c:56 +msgid "Rotate the selected images 90° to the left" +msgstr "Obrni označene slike 90° u levo" + +#: ../extensions/image_rotation/callbacks.c:61 +msgid "Rotate Physically" +msgstr "Okreni fizički" + +#: ../extensions/image_rotation/callbacks.c:62 +msgid "Rotate the selected images according to the embedded orientation" +msgstr "Okreni odabrane slike prema ugnježđenom usmerenju" + +#: ../extensions/image_rotation/callbacks.c:67 +msgid "Reset the EXIF Orientation" +msgstr "Poništi EGZIF usmerenje" + +#: ../extensions/image_rotation/callbacks.c:68 +msgid "Reset the embedded orientation without rotating the images" +msgstr "Poništi ugnježđeno usmerenje bez okretanja slika" + +#: ../extensions/image_rotation/gth-reset-orientation-task.c:111 +#: ../extensions/image_rotation/gth-transform-task.c:141 +#: ../extensions/webalbums/gth-web-exporter.c:2338 +#: ../extensions/webalbums/gth-web-exporter.c:2423 +msgid "Saving images" +msgstr "Snima slike" + +#: ../extensions/image_rotation/image_rotation.extension.in.in.h:1 +msgid "Image rotation" +msgstr "Obrtanje slike" + +#: ../extensions/image_rotation/image_rotation.extension.in.in.h:2 +msgid "Rotate images without data loss." +msgstr "Obrći slike bez gubitka na kvalitetu." + +#: ../extensions/image_rotation/rotation-utils.c:117 +#, c-format +msgid "Problem transforming the image: %s" +msgstr "Greška prilikom izmene slike: %s" + +#: ../extensions/image_rotation/rotation-utils.c:122 +msgid "" +"This transformation may introduce small image distortions along one or more " +"edges, because the image dimensions are not multiples of 8.\n" +"\n" +"The distortion is reversible, however. If the resulting image is " +"unacceptable, simply apply the reverse transformation to return to the " +"original image.\n" +"\n" +"You can also choose to discard (or trim) any untransformable edge pixels. " +"For practical use, this mode gives the best looking results, but the " +"transformation is not strictly lossless anymore." +msgstr "" +"Ovo pretvaranje može dovesti do malih izobličenja duž jedne ili više ivica, " +"jer razmere slike nisu umnožak broja 8.\n" +"\n" +"Međutim, izobličenja se mogu poništiti. Ako izlazna slika nije prihatljiva, " +"samo primenite povratno pretvaranje da bi vratili izvornu sliku.\n" +"\n" +"Možete takođe ukloniti (ili obrzati) bilo koje neizmenjive ivične tačke. Za " +"primenjivu upotrebu, ovaj način daje izlaze najlepšeg izgleda, ali pretvaranje " +"više nije strogo bez gubitka vrednosti." + +#: ../extensions/image_rotation/rotation-utils.c:128 +msgid "_Trim" +msgstr "_Obreži" + +#: ../extensions/image_rotation/rotation-utils.c:130 +msgid "_Accept distortion" +msgstr "_Prihvati izobličenja" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:1 +msgid "Set to actual size" +msgstr "Postavi na pravu veličinu" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:2 +msgid "Keep previous zoom" +msgstr "Zadrži prethodno uvećanje" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:3 +msgid "Fit to window" +msgstr "Poravnaj po prozoru" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 +msgid "Fit to window if larger" +msgstr "Poravnaj po prozoru ako je veća" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:5 +msgid "Fit to width" +msgstr "Poravnaj po širini" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:6 +msgid "Fit to width if larger" +msgstr "Poravnaj po širini ako je veća" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:7 +msgid "Reset scrollbar positions" +msgstr "Poništi položaj šina premicanja" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:8 +msgid "After loading an image:" +msgstr "Posle učitavanja slike:" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:9 +msgid "_Zoom quality:" +msgstr "_Kvalitet uvećanja:" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:10 +msgid "Transparency _type:" +msgstr "_Tip providnosti:" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:11 +msgid "High" +msgstr "Visoko" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:12 +msgid "Low" +msgstr "Nisko" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:13 +msgid "White" +msgstr "Bela" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:15 +msgid "Black" +msgstr "Crna" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:16 +msgid "Checked" +msgstr "Provereno" + +#: ../extensions/image_viewer/gth-image-histogram.c:84 +msgid "Histogram" +msgstr "Histogram" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:179 +msgid "Copy Image" +msgstr "Umnoži sliku" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:180 +msgid "Copy the image to the clipboard" +msgstr "Umnožite sliku u ostavu isečaka" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:184 +msgid "Paste Image" +msgstr "Nalepi sliku" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:185 +msgid "Paste the image from the clipboard" +msgstr "Nalepi sliku iz ostave isečaka" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:189 +msgid "In" +msgstr "Uvećaj" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:190 +msgid "Zoom in" +msgstr "Uvećaj" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:194 +msgid "Out" +msgstr "Umanji" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:195 +msgid "Zoom out" +msgstr "Umanji" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:199 +msgid "1:1" +msgstr "1:1" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:200 +msgid "Actual size" +msgstr "Stvarna veličina" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:204 +msgid "Fit" +msgstr "Poravnaj" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:205 +msgid "Zoom to fit window" +msgstr "Uvećaj do poravnanja prozora" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:210 +msgid "Zoom to fit width" +msgstr "Uvećaj do poravnanja širine" + +#: ../extensions/image_viewer/image_viewer.extension.in.in.h:1 +msgid "Image viewer" +msgstr "Preglednik slika" + +#: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 +msgid "Basic image viewing." +msgstr "Osnovni pregled slika." + +#: ../extensions/image_viewer/preferences.c:125 +msgid "Viewer" +msgstr "Pregledač" + +#: ../extensions/importer/data/ui/import-preferences.ui.h:1 +msgid "_Destination" +msgstr "O_dredište" + +#: ../extensions/importer/data/ui/import-preferences.ui.h:2 +msgid "_Automatic subfolder" +msgstr "_Samostalna podfascikla" + +#: ../extensions/importer/data/ui/import-preferences.ui.h:3 +msgid "as _single subfolder" +msgstr "kao _jedna podfascikla" + +#: ../extensions/importer/data/ui/import-preferences.ui.h:7 +msgid "The year" +msgstr "Godina" + +#: ../extensions/importer/data/ui/import-preferences.ui.h:8 +msgid "The month" +msgstr "Mesec" + +#: ../extensions/importer/data/ui/import-preferences.ui.h:9 +msgid "The day of the month" +msgstr "Dan u mesecu" + +#: ../extensions/importer/data/ui/import-preferences.ui.h:10 +msgid "The hour" +msgstr "Čas" + +#: ../extensions/importer/data/ui/import-preferences.ui.h:11 +msgid "The minutes" +msgstr "Minuti" + +#: ../extensions/importer/data/ui/import-preferences.ui.h:12 +msgid "The seconds" +msgstr "Sekunde" + +#: ../extensions/importer/gth-import-destination-button.c:183 +msgid "Invalid Destination" +msgstr "Neispravno odredište" + +#: ../extensions/importer/gth-import-preferences-dialog.c:198 +#, c-format +msgid "example: %s" +msgstr "primer; %s" + +#. subfolder type +#: ../extensions/importer/gth-import-preferences-dialog.c:330 +msgid "File date" +msgstr "Datum datoteke" + +#. gtk_label_set_mnemonic_widget (GTK_LABEL (GET_WIDGET ("subfolder_label")), self->priv->subfolder_type_list); +#. subfolder format +#: ../extensions/importer/gth-import-preferences-dialog.c:340 +msgid "year-month-day" +msgstr "godina-mesec-dan" + +#: ../extensions/importer/gth-import-preferences-dialog.c:341 +msgid "year-month" +msgstr "godina-mesec" + +#: ../extensions/importer/gth-import-preferences-dialog.c:342 +msgid "year" +msgstr "godina" + +#: ../extensions/importer/gth-import-preferences-dialog.c:343 +msgid "custom format" +msgstr "prolagođeni oblik" + +#: ../extensions/importer/gth-import-task.c:426 +#: ../extensions/importer/gth-import-task.c:461 +#: ../extensions/importer/gth-import-task.c:671 +msgid "Importing files" +msgstr "Uvoz datoteka" + +#: ../extensions/importer/gth-import-task.c:620 +msgid "No file imported" +msgstr "Nema uveženih datoteka" + +#: ../extensions/importer/gth-import-task.c:621 +msgid "The selected files are already present in the destination." +msgstr "Označene datoteke su već prisutne na odredištu." + +#: ../extensions/importer/gth-import-task.c:644 +#: ../gthumb/gth-file-source-vfs.c:694 +msgid "Could not delete the files" +msgstr "Nisam uspeo obrisati slike" + +#: ../extensions/importer/gth-import-task.c:645 +msgid "Delete operation not supported." +msgstr "Radnja brisanja nije podržana." + +#: ../extensions/importer/gth-import-task.c:732 +msgid "Last imported" +msgstr "Poslednje uvezeno" + +#: ../extensions/importer/gth-import-task.c:838 +msgid "No file specified." +msgstr "Nema naznačenih datoteka." + +#. Translators: For example: Not enough free space in '/home/user/Images'.\n1.3 GB of space is required but only 300 MB is available. +#: ../extensions/importer/gth-import-task.c:875 +#, c-format +msgid "" +"Not enough free space in '%s'.\n" +"%s of space is required but only %s is available." +msgstr "" +"Nema dovoljno raspoloživog prostora u „%s“.\n" +"Potrebno je %s prostora, ali je dostupno samo %s." + +#: ../extensions/list_tools/callbacks.c:76 ../gthumb/gth-filterbar.c:311 +msgid "Personalize..." +msgstr "Prilagodite..." + +#: ../extensions/list_tools/callbacks.c:320 +msgid "Tools" +msgstr "Alatke" + +#: ../extensions/list_tools/callbacks.c:321 +msgid "Batch tools for multiple files" +msgstr "Pribori za masovnu obradu datoteka" + +#: ../extensions/list_tools/data/ui/ask-value.ui.h:1 +msgid "_Skip" +msgstr "_Preskoči" + +#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:1 +msgid "Commands" +msgstr "Naredbe" + +#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:2 +msgid "Co_mmands:" +msgstr "_Naredbe:" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:2 +msgid "_Wait for the command to finish" +msgstr "_Sačekajte da se naredba izvrši" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:3 +msgid "E_xecute command once for every file" +msgstr "_Izvršite naredbu jednom za svaku datoteku" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:4 +msgid "_Terminal command (shell script)" +msgstr "_Naredba terminala (skripte ljuske)" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:5 +msgid "Sh_ortcut:" +msgstr "Pre_čica:" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:6 +msgid "The file uri" +msgstr "Adresa datoteke" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:7 +msgid "The file path" +msgstr "Putanja do datoteke" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:8 +msgid "The file basename" +msgstr "Osnovni naziv datoteke" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:9 +msgid "The parent folder path" +msgstr "Putanja roditeljske fascikle" + +#. Translate only 'message' and 'default_value'. +#: ../extensions/list_tools/data/ui/script-editor.ui.h:14 +#, no-c-format +msgid "%ask{ message }{ default value }" +msgstr "%ask{ poruka }{ zadata vrednost }" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:15 +msgid "Ask an input value" +msgstr "Zatraži ulaznu vrednost" + +#. Translate only 'attribute name' +#: ../extensions/list_tools/data/ui/script-editor.ui.h:18 +#, no-c-format +msgid "%attr{ attribute name }" +msgstr "%attr{ naziv svojstva }" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:19 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 +msgid "A file attribute" +msgstr "Svojstvo datoteke" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:21 +#, no-c-format +msgid "%N" +msgstr "%N" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:22 +msgid "The file basename without extension" +msgstr "Osnovni naziv datoteke bez nastavka" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:24 +#, no-c-format +msgid "%E" +msgstr "%E" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:25 +msgid "The file extension" +msgstr "Nastavak datoteka" + +#. Translate only 'text'. +#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 +#, no-c-format +msgid "%quote{ text }" +msgstr "%quote{ tekst }" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:29 +msgid "Quote the text " +msgstr "Navedi tekst " + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:30 +msgid "_Command:" +msgstr "_Naredba:" + +#: ../extensions/list_tools/dlg-personalize-scripts.c:257 +msgid "Script" +msgstr "Skripta" + +#: ../extensions/list_tools/dlg-personalize-scripts.c:271 +msgid "Shortcut" +msgstr "Prečica" + +#: ../extensions/list_tools/dlg-personalize-scripts.c:285 +#: ../gthumb/dlg-personalize-filters.c:252 +msgid "Show" +msgstr "Prikaži" + +#: ../extensions/list_tools/dlg-personalize-scripts.c:355 +msgid "Could not save the script" +msgstr "Nisam uspeo sačuvati skriptu" + +#: ../extensions/list_tools/dlg-personalize-scripts.c:406 +msgid "New Command" +msgstr "Nova naredba" + +#: ../extensions/list_tools/dlg-personalize-scripts.c:433 +msgid "Edit Command" +msgstr "Izmeni naredbu" + +#: ../extensions/list_tools/dlg-personalize-scripts.c:461 +msgid "Are you sure you want to delete the selected command?" +msgstr "Da li ste sigurni da želite brisati označenu naredbu?" + +#: ../extensions/list_tools/gth-script.c:610 +msgid "Enter a value:" +msgstr "Unesite vrednost:" + +#: ../extensions/list_tools/gth-script.c:745 +#: ../extensions/webalbums/gth-web-exporter.c:558 +#: ../extensions/webalbums/gth-web-exporter.c:570 +#: ../extensions/webalbums/gth-web-exporter.c:578 +msgid "Malformed command" +msgstr "Loše oblikovana naredba" + +#: ../extensions/list_tools/gth-script-editor-dialog.c:147 +msgid "none" +msgstr "bez" + +#: ../extensions/list_tools/gth-script-editor-dialog.c:153 +#, c-format +msgid "key %d on the numeric keypad" +msgstr "dugme %d na brojčanoj tastaturi" + +#: ../extensions/list_tools/gth-script-editor-dialog.c:296 +#, c-format +msgid "No command specified" +msgstr "Nije određena naredba" + +#: ../extensions/list_tools/gth-script-task.c:83 +#, c-format +msgid "Command exited abnormally with status %d" +msgstr "Naredba je izišla nepravilno sa stanjem %d" + +#: ../extensions/list_tools/list_tools.extension.in.in.h:1 +msgid "File list tools" +msgstr "Pribori za spiskove datoteka" + +#: ../extensions/list_tools/list_tools.extension.in.in.h:2 +msgid "Scripting and batch manipulation of files." +msgstr "Skriptovanje i masovna obrada datoteka." + +#: ../extensions/map_view/gth-map-view.c:130 +msgctxt "Cardinal point" +msgid "S" +msgstr "J" + +#: ../extensions/map_view/gth-map-view.c:130 +msgctxt "Cardinal point" +msgid "N" +msgstr "S" + +#: ../extensions/map_view/gth-map-view.c:132 +msgctxt "Cardinal point" +msgid "W" +msgstr "Z" + +#: ../extensions/map_view/gth-map-view.c:132 +msgctxt "Cardinal point" +msgid "E" +msgstr "I" + +#: ../extensions/map_view/gth-map-view.c:205 +#: ../extensions/map_view/map_view.extension.in.in.h:1 +msgid "Map" +msgstr "Karta" + +#. No GPS label +#: ../extensions/map_view/gth-map-view.c:276 +msgid "The geographical position information is not available for this image." +msgstr "Podaci o zemljopisnom položaju nisu dostupni za ovu sliku." + +#: ../extensions/map_view/map_view.extension.in.in.h:2 +msgid "View the photo position on the map" +msgstr "Pregled položaja slike na karti" + +#: ../extensions/oauth/data/ui/oauth-account-manager.ui.h:1 +msgid "A_ccounts:" +msgstr "_Nalozi:" + +#: ../extensions/oauth/data/ui/oauth-ask-authorization.ui.h:1 +#: ../gthumb/gth-folder-tree.c:1067 +msgid "Loading..." +msgstr "Učitavam..." + +#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 +msgid "New authentication..." +msgstr "Nova prijava..." + +#: ../extensions/oauth/oauth-ask-authorization-dialog.c:191 +msgid "Authorization Required" +msgstr "Potrebna je prijava" + +#: ../extensions/oauth/web-service.c:382 +msgid "Choose _Account..." +msgstr "Izaberite _nalog..." + +#: ../extensions/oauth/web-service.c:660 +msgid "Choose Account" +msgstr "Izaberite nalog" + +#: ../extensions/oauth/web-service.c:777 +msgid "Edit Accounts" +msgstr "Uredite nalog" + +#: ../extensions/oauth/web-service.c:795 ../extensions/oauth/web-service.c:812 +msgid "Connecting to the server" +msgstr "Povezivanje na server" + +#: ../extensions/oauth/web-service.c:796 +msgid "Asking authorization" +msgstr "Trebovanje ovlašćenja" + +#: ../extensions/oauth/web-service.c:813 +msgid "Getting account information" +msgstr "Dobavljam podatke o nalogu" + +#: ../extensions/photobucket/callbacks.c:54 +msgid "Photobucket..." +msgstr "Fotobuket..." + +#: ../extensions/photobucket/callbacks.c:55 +msgid "Upload photos to Photobucket" +msgstr "Otpremi fotke na Fotobuket" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +msgid "_Scramble filenames" +msgstr "_Šifruj imena datoteka" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 +msgid "Tiny ( 100 x 75 )" +msgstr "majušna ( 100 x 75 )" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 +msgid "Small ( 160 x 120 )" +msgstr "mala ( 160 x 120 )" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 +msgid "Medium ( 320 x 240 )" +msgstr "srednja ( 320 x 240 )" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 +msgid "Large ( 640 x 480 )" +msgstr "velika ( 640 x 480 )" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 +msgid "15ʺ screen ( 800 x 600 )" +msgstr "15ʺ ekran ( 800 x 600 )" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 +msgid "17ʺ screen ( 1024 x 768 )" +msgstr "17ʺ ekran ( 1024 x 768 )" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 +msgid "1 megabyte file size" +msgstr "Veličina datoteke 1 megabajt" + +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 +msgid "_Container:" +msgstr "_Sadržalac:" + +#: ../extensions/photobucket/dlg-export-to-photobucket.c:290 +msgid "Tiny ( 100 × 75 )" +msgstr "majušan ( 100 × 75 )" + +#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 +msgid "Small ( 160 × 120 )" +msgstr "mali ( 160 × 120 )" + +#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 +msgid "Medium ( 320 × 240 )" +msgstr "srednji ( 320 × 240 )" + +#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 +msgid "Large ( 640 × 480 )" +msgstr "veliki ( 640 × 480 )" + +#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 +msgid "15ʺ screen ( 800 × 600 )" +msgstr "15ʺ ekran ( 800 × 600 )" + +#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 +msgid "17ʺ screen ( 1024 × 768 )" +msgstr "17ʺ ekran ( 1024 × 768 )" + +#: ../extensions/photobucket/dlg-export-to-photobucket.c:303 +msgid "2 megabyte file size" +msgstr "Veličina datoteke 2 megabajta" + +#: ../extensions/photobucket/photobucket.extension.in.in.h:1 +msgid "PhotoBucket" +msgstr "Fotobuket" + +#: ../extensions/photobucket/photobucket.extension.in.in.h:2 +msgid "Upload images to PhotoBucket" +msgstr "Otpremi slike na Fotobuket" + +#: ../extensions/photo_importer/actions.c:71 +msgid "Import" +msgstr "Uvezi" + +#: ../extensions/photo_importer/callbacks.c:52 +msgid "_Removable Device..." +msgstr "_Uklonjivi uređaji..." + +#: ../extensions/photo_importer/callbacks.c:53 +msgid "Import photos and other files from a removable device" +msgstr "Uvezi fotografije i druge datoteke sa uklonjivog uređaja" + +#: ../extensions/photo_importer/callbacks.c:56 +msgid "F_older..." +msgstr "_Fascikla..." + +#: ../extensions/photo_importer/callbacks.c:57 +msgid "Import photos and other files from a folder" +msgstr "Uvezi slike i druge datoteke iz fascikle" + +#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:1 +msgid "_Rotate the images physically" +msgstr "_Okrenite slike fizički" + +#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 +msgid "After importing from a device:" +msgstr "Posle uvoza sa uređaja:" + +#. view label +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 +#: ../gthumb/gth-filterbar.c:421 +msgid "S_how:" +msgstr "P_rikaži:" + +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:4 +msgid "_Tags:" +msgstr "_Oznake:" + +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 +msgid "_Event:" +msgstr "_Događaj:" + +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:7 +msgid "_Delete the imported files from the source" +msgstr "O_briši uvezene slike sa izvora" + +#: ../extensions/photo_importer/dlg-photo-importer.c:227 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:149 +msgid "Could not import the files" +msgstr "Ne mogu da uvezem datoteke" + +#. translators: %d is the number of files, %s the total size +#: ../extensions/photo_importer/dlg-photo-importer.c:299 +#, c-format +msgid "Files to import: %d (%s)" +msgstr "Datoteke za uvoz: %d (%s)" + +#: ../extensions/photo_importer/dlg-photo-importer.c:339 +msgid "Could not load the folder" +msgstr "Nisam uspeo da učitam fasciklu" + +#: ../extensions/photo_importer/dlg-photo-importer.c:369 +#: ../gthumb/gth-browser.c:2089 +msgid "Getting folder listing..." +msgstr "Pribavljanje spiska fascikli..." + +#: ../extensions/photo_importer/dlg-photo-importer.c:415 +msgid "Empty" +msgstr "Prazno" + +#: ../extensions/photo_importer/dlg-photo-importer.c:586 +msgid "Import from Removable Device" +msgstr "Uvoz sa uklonjivog uređaja" + +#: ../extensions/photo_importer/dlg-photo-importer.c:618 +msgid "Import from Folder" +msgstr "Uvoz iz fascikle" + +#: ../extensions/photo_importer/photo_importer.extension.in.in.h:1 +msgid "Import photos" +msgstr "Uvezi slike" + +#: ../extensions/photo_importer/photo_importer.extension.in.in.h:2 +msgid "Import photos from removable devices." +msgstr "Uvezi slike sa uklonjivih uređaja." + +#: ../extensions/picasaweb/callbacks.c:59 +#: ../extensions/picasaweb/callbacks.c:64 +msgid "_Picasa Web Album..." +msgstr "Veb album _Pikasa..." + +#: ../extensions/picasaweb/callbacks.c:60 +msgid "Download photos from Picasa Web Album" +msgstr "Preuzmi slike sa Pikasa veb albuma" + +#: ../extensions/picasaweb/callbacks.c:65 +msgid "Upload photos to Picasa Web Album" +msgstr "Otpremi slike na veb album Pikasa" + +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 +msgid "Export to Picasa Web Albums" +msgstr "Izvozi u Pikasa veb albume" + +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 +msgid "_Albums:" +msgstr "_Albumi:" + +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 +msgid "Public" +msgstr "Javno" + +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:458 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:469 +msgid "Could not get the album list" +msgstr "Ne mogu da dobavim spisak albuma" + +#: ../extensions/picasaweb/picasaweb.extension.in.in.h:1 +msgid "Picasa Web Albums" +msgstr "Veb album Pikasa" + +#: ../extensions/picasaweb/picasaweb.extension.in.in.h:2 +msgid "Upload images to Picasa Web Albums" +msgstr "Otpremi slike na veb albume Pikase" + +#: ../extensions/raw_files/raw_files.extension.in.in.h:1 +msgid "Raw format support" +msgstr "Podrška sirovog oblika" + +#: ../extensions/raw_files/raw_files.extension.in.in.h:2 +msgid "Allow to load raw format images." +msgstr "Dozvoli učitavanje slika u raw obliku." + +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 +msgid "_X:" +msgstr "_X:" + +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 +msgid "_Y:" +msgstr "_Y:" + +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 +msgid "Red Eye Removal..." +msgstr "Uklanjanje crvenih očiju..." + +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 +msgid "Red Eye Removal" +msgstr "Uklanjanje crvenih očiju" + +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:511 +msgid "Remove the red eye effect caused by camera flashes" +msgstr "Uklonite utiske crvenih očiju nastalih zbog bljeskalica kamera" + +#: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:1 +msgid "Red-eye removal" +msgstr "Uklanjanje crvenih očiju" + +#: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:2 +msgid "Tool to remove the red-eye effect from a photo." +msgstr "Pribor za uklanjanje utiska crvenih očiju sa fotografija." + +#: ../extensions/rename_series/data/ui/code-selector.ui.h:1 +msgid "digits" +msgstr "cifre" + +#: ../extensions/rename_series/data/ui/code-selector.ui.h:2 +msgid "format:" +msgstr "oblik:" + +#: ../extensions/rename_series/data/ui/code-selector.ui.h:3 +msgid "remove" +msgstr "ukloni" + +#: ../extensions/rename_series/data/ui/code-selector.ui.h:4 +msgid "add" +msgstr "dodaj" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:1 +msgid "Rename" +msgstr "Promeni ime" + +#. Translators: this is the text case (upper or lower case). +#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 +msgid "Cas_e:" +msgstr "_Veličina slova:" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:7 +msgid "Edit template" +msgstr "Uredite predloške" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 +msgid "The original filename" +msgstr "Zadrži izvorna imena datoteka" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 +msgid "The original extension" +msgstr "Izvorni nastavak" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:13 +msgid "The original enumerator" +msgstr "Izvorni brojač" + +#. translate only the text in the curly brackets +#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 +#, no-c-format +msgid "%M{ format }" +msgstr "%M{ oblik }" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 +msgid "The modification date" +msgstr "Datum izmene" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:21 +msgid "The digitalization date" +msgstr "Datum digitalizacije" + +#. translate only the text in the curly brackets +#: ../extensions/rename_series/data/ui/rename-series.ui.h:24 +#, no-c-format +msgid "%A{ identifier }" +msgstr "%A{ odrednik }" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 +msgid "_Template:" +msgstr "_Predložak:" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +msgid "Re_verse Order" +msgstr "O_brnuti redosled" + +#: ../extensions/rename_series/dlg-rename-series.c:58 +msgid "Enumerator" +msgstr "Brojač" + +#: ../extensions/rename_series/dlg-rename-series.c:59 +msgid "Original filename" +msgstr "Izvorna imena datoteka" + +#: ../extensions/rename_series/dlg-rename-series.c:60 +msgid "Original extension" +msgstr "Izvorni nastavak" + +#: ../extensions/rename_series/dlg-rename-series.c:61 +msgid "Original enumerator" +msgstr "Izvorni brojač" + +#: ../extensions/rename_series/dlg-rename-series.c:62 +msgid "Modification date" +msgstr "Datum izmene" + +#: ../extensions/rename_series/dlg-rename-series.c:63 +msgid "Digitalization date" +msgstr "Datum digitalizacije" + +#: ../extensions/rename_series/dlg-rename-series.c:64 +msgid "File attribute" +msgstr "Svojstvo datoteke" + +#: ../extensions/rename_series/dlg-rename-series.c:558 +#: ../extensions/rename_series/dlg-rename-series.c:689 +msgid "Could not rename the files" +msgstr "Nisam uspeo promeniti imena datotekama" + +#: ../extensions/rename_series/dlg-rename-series.c:786 +msgid "Could not save the template" +msgstr "Ne mogu da sačuvam šablon" + +#: ../extensions/rename_series/dlg-rename-series.c:804 +msgid "Edit Template" +msgstr "Uredi šablon" + +#: ../extensions/rename_series/dlg-rename-series.c:862 +msgid "Old Name" +msgstr "Staro ime" + +#: ../extensions/rename_series/dlg-rename-series.c:873 +msgid "New Name" +msgstr "Novo ime" + +#: ../extensions/rename_series/dlg-rename-series.c:950 +msgid "Keep original case" +msgstr "Zadrži izvornu veličinu slova" + +#: ../extensions/rename_series/dlg-rename-series.c:951 +msgid "Convert to lower-case" +msgstr "Pretvori u mala slova" + +#: ../extensions/rename_series/dlg-rename-series.c:952 +msgid "Convert to upper-case" +msgstr "Pretvori u velika slova" + +#: ../extensions/rename_series/gth-rename-task.c:167 +msgid "Renaming files" +msgstr "Preimenovanje datoteka" + +#: ../extensions/rename_series/rename_series.extension.in.in.h:1 +msgid "Rename files" +msgstr "Preimenuj datoteke" + +#: ../extensions/rename_series/rename_series.extension.in.in.h:2 +msgid "Rename series of files." +msgstr "Preimenuj nizove datoteka." + +#: ../extensions/resize_images/callbacks.c:45 +msgid "Resize Images..." +msgstr "Promeni veličinu slika..." + +#: ../extensions/resize_images/callbacks.c:46 +msgid "Resize the selected images" +msgstr "Promeni veličinu označenim slikama" + +#: ../extensions/resize_images/data/ui/resize-images.ui.h:1 +msgid "Resize Images" +msgstr "Promeni veličinu slikama" + +#: ../extensions/resize_images/data/ui/resize-images.ui.h:2 +msgid "New dimensions" +msgstr "Nova razmera" + +#: ../extensions/resize_images/data/ui/resize-images.ui.h:4 +msgid "_Height:" +msgstr "_Visina:" + +#: ../extensions/resize_images/data/ui/resize-images.ui.h:5 +msgid "_Preserve original aspect ratios" +msgstr "_Zadržavaj izvorne srazmere" + +#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 +#: ../gthumb/gth-main-default-metadata.c:49 +msgid "Format" +msgstr "Oblik" + +#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 +msgid "pixel" +msgstr "tačka" + +#: ../extensions/resize_images/dlg-resize-images.c:423 +msgid "Keep the original format" +msgstr "Zadrži izvorni oblik" + +#: ../extensions/resize_images/resize_images.extension.in.in.h:1 +msgid "Resize images" +msgstr "Promeni veličinu slikama" + +#: ../extensions/resize_images/resize_images.extension.in.in.h:2 +msgid "Resize series of images." +msgstr "Promeni veličinu nizu slika." + +#: ../extensions/search/actions.c:49 ../extensions/search/actions.c:117 +#: ../extensions/search/actions.c:123 +msgid "Could not perform the search" +msgstr "Nisam uspeo izvršiti pretragu" + +#: ../extensions/search/actions.c:54 +msgid "Search Result" +msgstr "Rezultat pretrage" + +#: ../extensions/search/actions.c:76 +msgid "Find" +msgstr "Pronađi" + +#: ../extensions/search/callbacks.c:59 +msgid "Find files" +msgstr "Nađi datoteke" + +#: ../extensions/search/callbacks.c:132 +msgid "Search again" +msgstr "Pretraži opet" + +#. Translators: This is not a verb, it's a name as in "the search properties". +#: ../extensions/search/callbacks.c:174 +#: ../extensions/search/search.extension.in.in.h:1 +msgid "Search" +msgstr "Pretraži" + +#: ../extensions/search/gth-search-editor.c:112 +#: ../gthumb/gth-filter-editor-dialog.c:165 +msgid "all the following rules" +msgstr "sva sledeća pravila" + +#: ../extensions/search/gth-search-editor.c:113 +#: ../gthumb/gth-filter-editor-dialog.c:166 +msgid "any of the following rules" +msgstr "bilo koje sledeće pravilo" + +#: ../extensions/search/gth-search-task.c:181 +#, c-format +msgid "Files found until now: %s" +msgstr "Pronađenih datoteka do sad: %s" + +#: ../extensions/search/gth-search-task.c:271 +msgid "Searching..." +msgstr "Pretraživanje..." + +#: ../extensions/search/gth-search-task.c:277 +msgid "Cancel the operation" +msgstr "Obustavi radnju" + +#: ../extensions/search/search.extension.in.in.h:2 +msgid "File search tool." +msgstr "Alat pretrage." + +#: ../extensions/selections/callbacks.c:77 +msgid "Add to _Selection" +msgstr "Dodaj u _izbor" + +#: ../extensions/selections/callbacks.c:86 +msgid "Selection 1" +msgstr "Izbor 1" + +#: ../extensions/selections/callbacks.c:91 +msgid "Selection 2" +msgstr "Izbor 2" + +#: ../extensions/selections/callbacks.c:96 +msgid "Selection 3" +msgstr "Izbor 3" + +#: ../extensions/selections/callbacks.c:285 +#, c-format +msgid "" +"Use Alt-%d to add files to this selection, Ctrl-%d to view this selection." +msgstr "" +"Koristite Menja-%d za dodavanje datoteka u ovaj izbor, Ktrl-%d za pregled " +"izbora." + +#: ../extensions/selections/gth-selections-manager.c:239 +#, c-format +msgid "Selection %d" +msgstr "Izbor %d" + +#: ../extensions/selections/gth-selections-manager.c:242 +#: ../extensions/selections/selections.extension.in.in.h:1 +msgid "Selections" +msgstr "Izbori" + +#: ../extensions/selections/selections.extension.in.in.h:2 +msgid "Advanced file selection." +msgstr "Napredni odabir datoteka." + +#: ../extensions/slideshow/callbacks.c:56 +msgid "_Slideshow" +msgstr "Po_kretni prikaz" + +#: ../extensions/slideshow/callbacks.c:57 +msgid "View as a slideshow" +msgstr "Pregledaj u pokretnom prikazu" + +#: ../extensions/slideshow/callbacks.c:410 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 +#: ../extensions/slideshow/preferences.c:162 +#: ../extensions/slideshow/slideshow.extension.in.in.h:1 +msgid "Slideshow" +msgstr "Pokretni prikaz" + +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:1 +msgid "_Personalize" +msgstr "_Prilagodite" + +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:3 +msgid "_Transition effect:" +msgstr "Utisci _prelaza:" + +#. This is the first part of the phrase "change automatically, every x seconds", where x is an input control that let the user choose a value. +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 +msgid "_Change automatically, every" +msgstr "Samostalno _menjaj, svakih" + +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 +msgid "_Restart when finished" +msgstr "_Ponovo pokreni kada se završi" + +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:8 +msgid "R_andom order" +msgstr "Nasumični _raspored" + +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:9 +msgid "Playlist" +msgstr "Spisak za izvođenje" + +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:10 +msgid "Add files to the playlist" +msgstr "Dodaj datotke u spisak za izvođenje" + +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:11 +msgid "Remove the selected files" +msgstr "Ukloni odabrane datoteke" + +#: ../extensions/slideshow/gth-slideshow.c:231 +msgid "Playing slideshow" +msgstr "Izvođenje pokretnog prikaza" + +#: ../extensions/slideshow/gth-slideshow-preferences.c:184 +msgid "Choose the files to play" +msgstr "Odaberite datoteke za izvođenje" + +#: ../extensions/slideshow/gth-slideshow-preferences.c:193 +msgid "Audio files" +msgstr "Zvučne datoteke" + +#: ../extensions/slideshow/gth-slideshow-preferences.c:259 +msgid "Random" +msgstr "Nasumično" + +#: ../extensions/slideshow/main.c:283 +msgid "Push from right" +msgstr "Guraj s desna" + +#: ../extensions/slideshow/main.c:289 +msgid "Push from bottom" +msgstr "Guraj odozdo" + +#: ../extensions/slideshow/main.c:295 +msgid "Slide from right" +msgstr "Klizaj s desna" + +#: ../extensions/slideshow/main.c:301 +msgid "Slide from bottom" +msgstr "Klizaj odozdo" + +#: ../extensions/slideshow/main.c:307 +msgid "Fade in" +msgstr "Pojavi se" + +#: ../extensions/slideshow/main.c:313 +msgid "Flip page" +msgstr "Izvrni stranu" + +#: ../extensions/slideshow/main.c:319 +msgid "Cube from right" +msgstr "Kockaj s desna" + +#: ../extensions/slideshow/main.c:325 +msgid "Cube from bottom" +msgstr "Kockaj s leva" + +#: ../extensions/slideshow/slideshow.extension.in.in.h:2 +msgid "View images as a slideshow." +msgstr "Pogledaj slike u pokretnom prikazu." + +#: ../extensions/webalbums/callbacks.c:71 +msgid "_Web Album..." +msgstr "_Veb album..." + +#: ../extensions/webalbums/callbacks.c:72 +msgid "Create a static web album" +msgstr "Napravi nepromenljiv veb album" + +#: ../extensions/webalbums/data/albumthemes/text.h:26 +msgid "Click to view the image" +msgstr "Kliknite za pregled slike" + +#: ../extensions/webalbums/data/albumthemes/text.h:27 +msgid "Go back to the index" +msgstr "Vrati se na sadržaj" + +#: ../extensions/webalbums/data/albumthemes/text.h:28 +#, c-format +msgid "Image %d of %d" +msgstr "Slika %d od %d" + +#: ../extensions/webalbums/data/albumthemes/text.h:29 +msgid "Index" +msgstr "Sadržaj" + +#: ../extensions/webalbums/data/albumthemes/text.h:30 +#: ../gthumb/gth-browser-actions-entries.h:125 +msgid "Next" +msgstr "Sledeće" + +#: ../extensions/webalbums/data/albumthemes/text.h:32 +#: ../gthumb/gth-browser-actions-entries.h:119 +msgid "Previous" +msgstr "Prethodno" + +#: ../extensions/webalbums/data/albumthemes/text.h:33 +#, c-format +msgid "View page %d" +msgstr "Pogledaj stranicu %d" + +#: ../extensions/webalbums/data/albumthemes/text.h:34 +msgid "View the next image" +msgstr "Pogledaj sledeću sliku" + +#: ../extensions/webalbums/data/albumthemes/text.h:35 +msgid "View the next page" +msgstr "Pogledaj sledeću stranu" + +#: ../extensions/webalbums/data/albumthemes/text.h:36 +msgid "View the previous image" +msgstr "Pogledaj prethodnu sliku" + +#: ../extensions/webalbums/data/albumthemes/text.h:37 +msgid "View the previous page" +msgstr "Pogledaj prethodnu sliku" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:1 +msgid "All images on a single image" +msgstr "Sve slike u jednoj slici" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:2 +msgid "Adapts to the window width" +msgstr "Prilagodi visini prozora" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 +msgid "Web Album" +msgstr "Veb album" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:5 +#, no-c-format +msgid "%P" +msgstr "%P" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 +msgid "_Copy originals to destination" +msgstr "_Umnoži izvorne u odredište" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 +msgid "_Adapt to the window width " +msgstr "_Prilagodi širini prozora " + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 +msgid "Index Page" +msgstr "Stranica sadržaja" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 +msgid "Thumbnail Caption" +msgstr "Naslov umanjenog prikaza" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 +msgid "The current image number" +msgstr "Broj trenutne slike" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 +msgid "The total number of images" +msgstr "Ukupan broj slika" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 +msgid "The file comment" +msgstr "Napomena slike" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 +msgid "Image Page" +msgstr "Strana slike" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 +msgid "Show the description, if available" +msgstr "Prikazuje opis, ako je dostupan" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 +msgid "Show the following attributes:" +msgstr "Prikazuje sledeća svojstva:" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:39 +msgid "Image Attributes" +msgstr "Svojstva slika" + +#: ../extensions/webalbums/gth-web-exporter.c:1800 +msgid "Could not show the destination" +msgstr "Nisam uspeo da prikažem odredište" + +#: ../extensions/webalbums/gth-web-exporter.c:1836 +msgid "The album has been created successfully." +msgstr "Album je uspešno napravljen." + +#: ../extensions/webalbums/gth-web-exporter.c:2104 +#: ../extensions/webalbums/gth-web-exporter.c:2132 +msgid "Saving thumbnails" +msgstr "Snimanje umanjenih prikaza" + +#: ../extensions/webalbums/gth-web-exporter.c:2160 +msgid "Saving HTML pages: Images" +msgstr "Snimanje HTML stranica: slike" + +#: ../extensions/webalbums/gth-web-exporter.c:2218 +msgid "Saving HTML pages: Indexes" +msgstr "Snimanje HTML stranica: sadržaji" + +#: ../extensions/webalbums/gth-web-exporter.c:2503 +msgid "Copying original images" +msgstr "Umnožavam izvorne slike" + +#: ../extensions/webalbums/gth-web-exporter.c:2963 +msgid "Could not find the style folder" +msgstr "Nisam uspeo da pronađem fasciklu za načine" + +#: ../extensions/webalbums/gth-web-exporter.c:3001 +msgid "Could not create a temporary folder" +msgstr "Ne mogu napraviti privremeni direktorijum" + +#: ../extensions/webalbums/webalbums.extension.in.in.h:1 +msgid "Web Albums" +msgstr "Veb albumi" + +#: ../extensions/webalbums/webalbums.extension.in.in.h:2 +msgid "Create static web albums." +msgstr "Napravi neizmenljive veb albume." + +#: ../gthumb/dlg-location.c:200 ../gthumb/gth-browser.c:1396 +#: ../gthumb/gth-browser.c:1969 ../gthumb/gth-browser.c:6214 +#: ../gthumb/gth-browser.c:6233 ../gthumb/gth-browser.c:6257 +#, c-format +msgid "Could not load the position \"%s\"" +msgstr "Nisam uspeo da učitam položaj „%s“" + +#: ../gthumb/dlg-personalize-filters.c:237 +msgid "Filter" +msgstr "Uslov" + +#: ../gthumb/dlg-personalize-filters.c:315 +msgid "Could not save the filter" +msgstr "Nisam uspeo da sačuvam uslov" + +#: ../gthumb/dlg-personalize-filters.c:358 +msgid "New Filter" +msgstr "Novi uslov" + +#: ../gthumb/dlg-personalize-filters.c:387 +msgid "Edit Filter" +msgstr "Izmeni uslov" + +#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:277 +msgid "All" +msgstr "Sve" + +#: ../gthumb/dlg-preferences-extensions.c:68 +msgid "Enabled" +msgstr "Omogućen" + +#: ../gthumb/dlg-preferences-extensions.c:69 +msgid "Disabled" +msgstr "Onemogućen" + +#: ../gthumb/dlg-preferences-extensions.c:72 +msgid "Viewers" +msgstr "Pregledači" + +#: ../gthumb/dlg-preferences-extensions.c:73 +msgid "Metadata" +msgstr "Metapodaci" + +#: ../gthumb/dlg-preferences-extensions.c:74 +msgid "File tools" +msgstr "Alatke za datoteke" + +#: ../gthumb/dlg-preferences-extensions.c:75 +msgid "List tools" +msgstr "Alatke za spiskove" + +#: ../gthumb/dlg-preferences-extensions.c:76 +msgid "Importers" +msgstr "Uvoznici" + +#: ../gthumb/dlg-preferences-extensions.c:77 +msgid "Exporters" +msgstr "Izvoznici" + +#: ../gthumb/dlg-preferences-extensions.c:216 +msgid "Could not activate the extension" +msgstr "Nisam uspeo da pokrenem proširenje" + +#: ../gthumb/dlg-preferences-extensions.c:226 +msgid "Could not deactivate the extension" +msgstr "Nisam uspeo da isključim proširenje" + +#. add the page to the preferences dialog +#: ../gthumb/dlg-preferences-extensions.c:772 +msgid "Extensions" +msgstr "Proširenja" + +#: ../gthumb/dlg-preferences-extensions.c:819 +msgid "Restart required" +msgstr "Potrebno je ponovno pokretanje" + +#: ../gthumb/dlg-preferences-extensions.c:820 +msgid "You need to restart gthumb for these changes to take effect" +msgstr "" +"Treba ponovo da pokrenete Gnomovog slička da bi ove promene stupile na snagu" + +#: ../gthumb/dlg-preferences-extensions.c:821 +msgid "_Continue" +msgstr "_Nastavi" + +#: ../gthumb/dlg-preferences-extensions.c:822 +msgid "_Restart" +msgstr "_Ponovo pokreni" + +#. For translators: This is a progress size indicator, for example: 230.4 MB of 512.8 MB +#: ../gthumb/gio-utils.c:1351 +#, c-format +msgid "%s of %s" +msgstr "%s od %s" + +#: ../gthumb/gio-utils.c:1386 +#, c-format +msgid "Moving \"%s\" to \"%s\"" +msgstr "Premeštanje „%s“ u „%s“" + +#: ../gthumb/gio-utils.c:1388 +#, c-format +msgid "Copying \"%s\" to \"%s\"" +msgstr "Umnožavanje „%s“ u „%s“" + +#: ../gthumb/gio-utils.c:1750 +msgid "Moving files" +msgstr "Premeštanje datoteka" + +#: ../gthumb/gio-utils.c:1750 +msgid "Copying files" +msgstr "Umnožavanje datoteka" + +#: ../gthumb/gio-utils.c:1751 +msgid "Getting file information" +msgstr "Dobavljam podatke o datoteci" + +#. hour:minutes:seconds +#. Translators: This is a time format, like "9:05:02" for 9 +#. * hours, 5 minutes, and 2 seconds. You may change ":" to +#. * the separator that your locale uses or use "%Id" instead +#. * of "%d" if your locale uses localized digits. +#. +#: ../gthumb/glib-utils.c:3068 +#, c-format +msgctxt "long time format" +msgid "%d:%02d:%02d" +msgstr "%d:%02d:%02d" + +#. minutes:seconds +#. Translators: This is a time format, like "5:02" for 5 +#. * minutes and 2 seconds. You may change ":" to the +#. * separator that your locale uses or use "%Id" instead of +#. * "%d" if your locale uses localized digits. +#. +#: ../gthumb/glib-utils.c:3077 +#, c-format +msgctxt "short time format" +msgid "%d:%02d" +msgstr "%d:%02d" + +#: ../gthumb/gth-browser-actions-callbacks.c:414 +msgid "" +"gthumb is free software; you can redistribute it and/or modify it under the " +"terms of the GNU General Public License as published by the Free Software " +"Foundation; either version 2 of the License, or (at your option) any later " +"version." +msgstr "" +"Gnomov sličko je slobodna mekotvorina; možete je razdeljivati i/ili menjati " +"pod uslovima GNU Opšte javne licence koju je objavila Zadužbina slobodnog " +"softvera; bilo izdanja 2 licence ili (po vašem izboru) bilo kojeg novijeg " +"izdanja." + +#: ../gthumb/gth-browser-actions-callbacks.c:418 +msgid "" +"gthumb is distributed in the hope that it will be useful, but WITHOUT ANY " +"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " +"details." +msgstr "" +"Gnomov sličko se raspodeljuje u nadi da će biti koristan, ali BEZ IKAKVOG " +"JEMSTVA; čak i bez primenjenog jemstva TRŽIŠNE VREDNOSTI ili PRILAGOĐENOSTI " +"ODREĐENOJ NAMENI. Pogledajte GNU Opštu javnu licencu za više pojedinosti." + +#: ../gthumb/gth-browser-actions-callbacks.c:422 +msgid "" +"You should have received a copy of the GNU General Public License along with " +"gthumb. If not, see http://www.gnu.org/licenses/." +msgstr "" +"Trebali ste da primite primerak Gnuove opšte javne licence uz Gnomovog " +"slička. Ako niste, pogledajte http://www.gnu.org/licenses/." + +#: ../gthumb/gth-browser-actions-callbacks.c:441 +msgid "An image viewer and browser for GNOME." +msgstr "Pregledač i pretraživač slika za Gnom." + +#: ../gthumb/gth-browser-actions-callbacks.c:444 +msgid "translator_credits" +msgstr "" +"Dušan Živojnov \n" +"Danilo Šegan \n" +"Saša Petrović \n" +"\n" +"http://prevod.org — prevod na srpski jezik." + +#: ../gthumb/gth-browser-actions-entries.h:31 +msgid "_File" +msgstr "_Datoteka" + +#: ../gthumb/gth-browser-actions-entries.h:32 +msgid "_Edit" +msgstr "_Uredi" + +#: ../gthumb/gth-browser-actions-entries.h:34 +msgid "_Go" +msgstr "_Idi" + +#: ../gthumb/gth-browser-actions-entries.h:35 +msgid "_Help" +msgstr "_Pomoć" + +#: ../gthumb/gth-browser-actions-entries.h:36 +msgid "Open _With" +msgstr "_Otvori sa" + +#: ../gthumb/gth-browser-actions-entries.h:37 +msgid "I_mport From" +msgstr "U_vezi iz" + +#: ../gthumb/gth-browser-actions-entries.h:38 +msgid "E_xport To" +msgstr "Izvezi _u" + +#: ../gthumb/gth-browser-actions-entries.h:41 +msgid "New _Window" +msgstr "Novi _prozor" + +#: ../gthumb/gth-browser-actions-entries.h:42 +msgid "Open another window" +msgstr "Otvori još jedan prozor" + +#: ../gthumb/gth-browser-actions-entries.h:71 +msgid "Open" +msgstr "Otvori" + +#: ../gthumb/gth-browser-actions-entries.h:77 +msgid "Open in New Window" +msgstr "Otvori u novom prozoru" + +#: ../gthumb/gth-browser-actions-entries.h:84 +msgid "Edit various preferences" +msgstr "Izmeni razna podešavanja" + +#: ../gthumb/gth-browser-actions-entries.h:95 +msgid "_Sort By..." +msgstr "_Razvrstaj po..." + +#: ../gthumb/gth-browser-actions-entries.h:101 +msgid "_Filter..." +msgstr "_Uslov..." + +#: ../gthumb/gth-browser-actions-entries.h:108 +msgid "Stop loading the current location" +msgstr "Prekini učitavanje trenutne putanje" + +#: ../gthumb/gth-browser-actions-entries.h:114 +msgid "Reload the current location" +msgstr "Ponovo učitaj trenutno mesto" + +#: ../gthumb/gth-browser-actions-entries.h:120 +msgid "View previous image" +msgstr "Pogledaj prethodnu sliku" + +#: ../gthumb/gth-browser-actions-entries.h:126 +msgid "View next image" +msgstr "Pogledaj sledeću sliku" + +#: ../gthumb/gth-browser-actions-entries.h:132 +msgid "Switch to fullscreen" +msgstr "Prebaci na ceo ekran" + +#: ../gthumb/gth-browser-actions-entries.h:138 +msgid "Leave Fullscreen" +msgstr "Napusti ceo ekran" + +#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3841 +msgid "Go to the previous visited location" +msgstr "Idi na prethodno posećeno mesto" + +#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3859 +msgid "Go to the next visited location" +msgstr "Idi na sledeće posećeno mesto" + +#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3877 +msgid "Go up one level" +msgstr "Idi gore za jedan nivo" + +#: ../gthumb/gth-browser-actions-entries.h:161 +msgid "_Location..." +msgstr "_Mesto..." + +#: ../gthumb/gth-browser-actions-entries.h:162 +msgid "Specify a location to open" +msgstr "Navedi mesto za otvaranje" + +#: ../gthumb/gth-browser-actions-entries.h:173 ../gthumb/gth-browser.c:721 +msgid "_Delete History" +msgstr "_Obriši istorijat" + +#: ../gthumb/gth-browser-actions-entries.h:174 +msgid "Delete the list of visited locations" +msgstr "Obriši spisak posećenih mesta" + +#: ../gthumb/gth-browser-actions-entries.h:180 +msgid "View the folders" +msgstr "Pogledaj fascikle" + +#: ../gthumb/gth-browser-actions-entries.h:186 +msgid "Show information about gthumb" +msgstr "Prikazuje informacije o Gnomovom sličku" + +#: ../gthumb/gth-browser-actions-entries.h:191 +msgid "Contents" +msgstr "Sadržaj" + +#: ../gthumb/gth-browser-actions-entries.h:192 +msgid "Display the gthumb Manual" +msgstr "Prikazuje uputstvo Gnomovog slička" + +#: ../gthumb/gth-browser-actions-entries.h:197 +msgid "_Keyboard Shortcuts" +msgstr "Prečice na _tastaturi" + +#: ../gthumb/gth-browser-actions-entries.h:203 +#: ../gthumb/gth-browser-actions-entries.h:257 +msgid "Edit" +msgstr "Uredi" + +#: ../gthumb/gth-browser-actions-entries.h:204 +#: ../gthumb/gth-browser-actions-entries.h:258 +msgid "Edit file" +msgstr "Uredi datoteku" + +#: ../gthumb/gth-browser-actions-entries.h:212 +msgid "_Toolbar" +msgstr "Traka _alatki" + +#: ../gthumb/gth-browser-actions-entries.h:213 +msgid "View or hide the toolbar of this window" +msgstr "Pogledaj ili skloni traku alatki ovog prozora" + +#: ../gthumb/gth-browser-actions-entries.h:217 +msgid "_Statusbar" +msgstr "_Linija sa stanjem" + +#: ../gthumb/gth-browser-actions-entries.h:218 +msgid "View or hide the statusbar of this window" +msgstr "Pogledaj ili skloni traku stanja ovog prozora" + +#: ../gthumb/gth-browser-actions-entries.h:222 +msgid "_Filterbar" +msgstr "_Traka uslova" + +#: ../gthumb/gth-browser-actions-entries.h:223 +msgid "View or hide the filterbar of this window" +msgstr "Pogledaj ili skloni traku uslova ovog prozora" + +#: ../gthumb/gth-browser-actions-entries.h:227 +msgid "_Sidebar" +msgstr "_Bočna traka" + +#: ../gthumb/gth-browser-actions-entries.h:228 +msgid "View or hide the sidebar of this window" +msgstr "Pogledaj ili skloni bočnu traku ovog prozora" + +#: ../gthumb/gth-browser-actions-entries.h:232 +msgid "_Thumbnail Pane" +msgstr "Okno _umanjenih prikaza" + +#: ../gthumb/gth-browser-actions-entries.h:233 +msgid "View or hide the thumbnail pane in viewer mode" +msgstr "Pogledaj ili skloni okno umanjenih prikaza u načinu pregleda" + +#: ../gthumb/gth-browser-actions-entries.h:237 +msgid "_Thumbnails" +msgstr "_Umanjeni prikazi" + +#: ../gthumb/gth-browser-actions-entries.h:238 +msgid "View thumbnails" +msgstr "Pogledaj umanjene slike" + +#: ../gthumb/gth-browser-actions-entries.h:242 +msgid "_Hidden Files" +msgstr "_Sakrivene datoteke" + +#: ../gthumb/gth-browser-actions-entries.h:243 +msgid "Show hidden files and folders" +msgstr "Prikaži skrivene datoteke i fascikle" + +#: ../gthumb/gth-browser-actions-entries.h:248 +#: ../gthumb/gth-browser-actions-entries.h:253 +msgid "View file properties" +msgstr "Pogledaj osobine datoteke" + +#: ../gthumb/gth-browser-actions-entries.h:262 +msgid "_Fit Window to Image" +msgstr "_Prilagodi veličinu prozora slici" + +#: ../gthumb/gth-browser-actions-entries.h:263 +msgid "Resize the window to the size of the image" +msgstr "Podesi veličinu prozora veličini slike" + +#: ../gthumb/gth-browser.c:418 +#, c-format +msgid "Open %s" +msgstr "Otvori %s" + +#: ../gthumb/gth-browser.c:558 +msgid "[modified]" +msgstr "[izmenjeno]" + +#: ../gthumb/gth-browser.c:1117 +#, c-format +msgid "%d file selected (%s)" +msgid_plural "%d files selected (%s)" +msgstr[0] "%d označena datoteka (%s)" +msgstr[1] "%d označene datoteke (%s)" +msgstr[2] "%d označenih datoteka (%s)" +msgstr[3] "%d označena datoteka (%s)" + +#: ../gthumb/gth-browser.c:1152 +#, c-format +msgid "%s of free space" +msgstr "%s slobodnog prostora" + +#: ../gthumb/gth-browser.c:2073 ../gthumb/gth-browser.c:2100 +#, c-format +msgid "No suitable module found for %s" +msgstr "Nije pronađena odgovarajuća jedinica za %s" + +#: ../gthumb/gth-browser.c:2219 +#, c-format +msgid "Save changes to file '%s'?" +msgstr "Sačuvaj izmene na datoteci „%s“?" + +#: ../gthumb/gth-browser.c:2224 +msgid "If you don't save, changes to the file will be permanently lost." +msgstr "Ako ne sačuvate, izmene na datoteci će biti zauvek izgubljene." + +#: ../gthumb/gth-browser.c:2225 +msgid "Do _Not Save" +msgstr "Ne _čuvaj" + +#: ../gthumb/gth-browser.c:3020 ../gthumb/gth-source-tree.c:182 +msgid "Could not change name" +msgstr "Ne mogu izmeniti naziv" + +#: ../gthumb/gth-browser.c:3451 ../gthumb/gth-main-default-metadata.c:41 +msgid "Modified" +msgstr "Izmenjeno" + +#: ../gthumb/gth-browser.c:3842 ../gthumb/gth-browser.c:3860 +msgid "View the list of visited locations" +msgstr "Pogledajte spisak posećenih mesta" + +#: ../gthumb/gth-browser.c:3878 +msgid "View the list of upper locations" +msgstr "Pregledaj spisak roditeljskih mesta" + +#: ../gthumb/gth-browser.c:6215 +#, c-format +msgid "File type not supported" +msgstr "Vrsta datoteke nije podržana" + +#: ../gthumb/gth-browser.c:6258 +#, c-format +msgid "No suitable module found" +msgstr "Nije pronađen odgovarajuća jedinica" + +#: ../gthumb/gth-extensions.c:203 +#, c-format +msgid "Could not open the module `%s`: %s" +msgstr "Nisam uspeo da otvorim jedinicu „%s“: %s" + +#: ../gthumb/gth-extensions.c:754 +#, c-format +msgid "The extension '%1$s' is required by the extension '%2$s'" +msgstr "Nastavak „%1$s“ je potreban za nastavak „%2$s“" + +#: ../gthumb/gth-file-chooser-dialog.c:144 +msgid "All Supported Files" +msgstr "Sve podržane datoteke" + +#: ../gthumb/gth-file-source-vfs.c:121 +msgid "Home Folder" +msgstr "Lična fascikla" + +#: ../gthumb/gth-file-source-vfs.c:126 +msgid "File System" +msgstr "Sistem datoteka" + +#: ../gthumb/gth-file-source-vfs.c:739 +msgid "" +"The files cannot be moved to the Trash. Do you want to delete them " +"permanently?" +msgstr "Datoteke ne mogu biti prebačene u Đubre. Želite li ih trajno obrisati?" + +#: ../gthumb/gth-file-source-vfs.c:750 +msgid "Could not move the files to the Trash" +msgstr "Ne mogu premestiti datoteke u smeće" + +#: ../gthumb/gth-file-source-vfs.c:797 +#, c-format +msgid "Are you sure you want to move \"%s\" to trash?" +msgstr "Da li sigurno želite poslati datoteku „%s“ u smeće?" + +#: ../gthumb/gth-file-source-vfs.c:801 +#, c-format +msgid "Are you sure you want to move to trash the %'d selected file?" +msgid_plural "Are you sure you want to move to trash the %'d selected files?" +msgstr[0] "Da li sigurno želite da pošaljete u smeće %'d izabranu datoteku?" +msgstr[1] "Da li sigurno želite da pošaljete u smeće %'d izabrane datoteke?" +msgstr[2] "Da li sigurno želite da pošaljete u smeće %'d izabranih datoteka?" +msgstr[3] "Da li sigurno želite da pošaljete u smeće %'d izabranu datoteku?" + +#: ../gthumb/gth-file-source-vfs.c:844 +#, c-format +msgid "Are you sure you want to permanently delete the %'d selected file?" +msgid_plural "" +"Are you sure you want to permanently delete the %'d selected files?" +msgstr[0] "Da li sigurno želite da trajno obrišete %'d izabranu datoteku?" +msgstr[1] "Da li sigurno želite da trajno obrišete %'d izabrane datoteke?" +msgstr[2] "Da li sigurno želite da trajno obrišete %'d izabranih datoteka?" +msgstr[3] "Da li sigurno želite da trajno obrišete %'d izabranu datoteku?" + +#: ../gthumb/gth-filterbar.c:413 +msgid "Hide the filterbar" +msgstr "Sakrij traku uslova" + +#: ../gthumb/gth-filter.c:43 ../gthumb/gth-filter-editor-dialog.c:178 +#: ../gthumb/gth-test-simple.c:75 +msgid "kB" +msgstr "kB" + +#: ../gthumb/gth-filter.c:44 ../gthumb/gth-filter-editor-dialog.c:179 +#: ../gthumb/gth-test-simple.c:76 +msgid "MB" +msgstr "MB" + +#: ../gthumb/gth-filter.c:45 ../gthumb/gth-filter-editor-dialog.c:180 +#: ../gthumb/gth-test-simple.c:77 +msgid "GB" +msgstr "GB" + +#. "files" label +#: ../gthumb/gth-filter.c:286 ../gthumb/gth-filter-editor-dialog.c:177 +msgid "files" +msgstr "datoteke" + +#: ../gthumb/gth-filter-editor-dialog.c:224 +msgid "ascending" +msgstr "uzlazno" + +#: ../gthumb/gth-filter-editor-dialog.c:225 +msgid "descending" +msgstr "silazno" + +#: ../gthumb/gth-filter-editor-dialog.c:515 +#, c-format +msgid "No limit specified" +msgstr "Nije navedeno ograničenje" + +#: ../gthumb/gth-folder-tree.c:1369 +msgid "(Open Parent)" +msgstr "(Otvori nadfasciklu)" + +#: ../gthumb/gth-histogram-view.c:825 +msgid "Linear scale" +msgstr "Redna lestvica" + +#: ../gthumb/gth-histogram-view.c:837 +msgid "Logarithmic scale" +msgstr "Logaritamska lestvica" + +#: ../gthumb/gth-histogram-view.c:857 +msgid "Channel:" +msgstr "Kanal:" + +#: ../gthumb/gth-histogram-view.c:878 +msgid "Value" +msgstr "Vrednost" + +#: ../gthumb/gth-histogram-view.c:883 +msgid "Red" +msgstr "Crvena" + +#: ../gthumb/gth-histogram-view.c:888 +msgid "Green" +msgstr "Zelena" + +#: ../gthumb/gth-histogram-view.c:893 +msgid "Blue" +msgstr "Plava" + +#: ../gthumb/gth-histogram-view.c:898 +msgid "Alpha" +msgstr "Alfa" + +#: ../gthumb/gth-histogram-view.c:904 +msgid "RGB" +msgstr "RGB" + +#: ../gthumb/gth-image-list-task.c:141 +msgid "Could not rename the file" +msgstr "Ne mogu promeniti ime slike" + +#: ../gthumb/gth-image-saver.c:39 +msgid "No options available for this file type" +msgstr "Nema dostupnih mogućnosti za ovu vrstu datoteke" + +#: ../gthumb/gth-image-saver.c:185 +#, c-format +msgid "Could not find a suitable module to save the image as \"%s\"" +msgstr "Ne mogu pronađem odgovarajuću jedinicu za čuvanje slike kao„%s“" + +#: ../gthumb/gth-load-file-data-task.c:108 +msgid "Reading file information" +msgstr "Čitanje podataka datoteka" + +#: ../gthumb/gth-main-default-metadata.c:32 +msgid "File" +msgstr "Datoteka" + +#: ../gthumb/gth-main-default-metadata.c:39 +msgid "Name" +msgstr "Ime" + +#: ../gthumb/gth-main-default-metadata.c:40 +#: ../gthumb/gth-main-default-tests.c:284 +msgid "Size" +msgstr "Veličina" + +#: ../gthumb/gth-main-default-metadata.c:42 +msgid "Type" +msgstr "Vrsta" + +#: ../gthumb/gth-main-default-metadata.c:44 +msgid "Full Name" +msgstr "Potpuno ime" + +#: ../gthumb/gth-main-default-metadata.c:48 +msgid "Duration" +msgstr "Trajanje" + +#: ../gthumb/gth-main-default-sort-types.c:131 +msgid "file name" +msgstr "naziv datoteke" + +#: ../gthumb/gth-main-default-sort-types.c:132 +msgid "file path" +msgstr "putanja datoteke" + +#: ../gthumb/gth-main-default-sort-types.c:133 +msgid "file size" +msgstr "veličina datoteke" + +#: ../gthumb/gth-main-default-sort-types.c:134 +msgid "file modified date" +msgstr "datum poslednje izmene" + +#: ../gthumb/gth-main-default-sort-types.c:135 +msgid "no sorting" +msgstr "bez razvrstavanja" + +#: ../gthumb/gth-main-default-sort-types.c:136 +msgid "dimensions" +msgstr "veličina" + +#: ../gthumb/gth-main-default-tests.c:233 +msgid "All Files" +msgstr "Sve datoteke" + +#: ../gthumb/gth-main-default-tests.c:261 +msgid "Media" +msgstr "Nosač sadržaja" + +#: ../gthumb/gth-main-default-tests.c:268 +msgid "Text Files" +msgstr "Tekst datoteke" + +#: ../gthumb/gth-main-default-tests.c:276 +msgid "Filename" +msgstr "Naziv datoteke" + +#: ../gthumb/gth-main-default-tests.c:308 +msgid "Title (embedded)" +msgstr "Naslov (ugnježđen)" + +#: ../gthumb/gth-main-default-tests.c:316 +msgid "Description (embedded)" +msgstr "Opis (ugnježđen)" + +#: ../gthumb/gth-progress-dialog.c:146 +msgid "Cancel operation" +msgstr "Obustavi radnju" + +#: ../gthumb/gth-save-file-data-task.c:102 +msgid "Saving file information" +msgstr "Čuvanje podataka datoteke" + +#. Translators: %s is a filename +#: ../gthumb/gth-save-image-task.c:160 +#, c-format +#| msgid "Starting %s" +msgid "Saving '%s'" +msgstr "Čuvam „%s“" + +#: ../gthumb/gth-tags-entry.c:390 +#, c-format +msgid "Create tag «%s»" +msgstr "Napravi oznaku «%s»" + +#: ../gthumb/gth-tags-entry.c:814 +msgid "Show all the tags" +msgstr "Prikaži sve oznake" + +#: ../gthumb/gth-tags-file.c:235 +msgid "Holidays" +msgstr "Odmori" + +#: ../gthumb/gth-tags-file.c:236 +msgid "Temporary" +msgstr "Privemeno" + +#: ../gthumb/gth-tags-file.c:237 +msgid "Screenshots" +msgstr "Snimci ekrana" + +#: ../gthumb/gth-tags-file.c:238 +msgid "Science" +msgstr "Nauka" + +#: ../gthumb/gth-tags-file.c:239 +msgid "Favorite" +msgstr "Omiljeno" + +#: ../gthumb/gth-tags-file.c:240 +msgid "Important" +msgstr "Važno" + +#: ../gthumb/gth-tags-file.c:241 +msgid "GNOME" +msgstr "Gnom" + +#: ../gthumb/gth-tags-file.c:242 +msgid "Games" +msgstr "Igre" + +#: ../gthumb/gth-tags-file.c:243 +msgid "Party" +msgstr "Zabava" + +#: ../gthumb/gth-tags-file.c:244 +msgid "Birthday" +msgstr "Rođendan" + +#: ../gthumb/gth-tags-file.c:245 +msgid "Astronomy" +msgstr "Astronomija" + +#: ../gthumb/gth-tags-file.c:246 +msgid "Family" +msgstr "Porodica" + +#: ../gthumb/gth-test-category.c:46 ../gthumb/gth-test-simple.c:49 +#: ../gthumb/gth-test-simple.c:64 +msgid "is" +msgstr "je" + +#: ../gthumb/gth-test-category.c:47 +msgid "is only" +msgstr "je samo" + +#: ../gthumb/gth-test-category.c:48 ../gthumb/gth-test-simple.c:50 +#: ../gthumb/gth-test-simple.c:65 +msgid "is not" +msgstr "nije" + +#: ../gthumb/gth-test-category.c:407 ../gthumb/gth-test-simple.c:812 +#: ../gthumb/gth-test-simple.c:838 ../gthumb/gth-test-simple.c:859 +#: ../gthumb/gth-test-simple.c:885 +#, c-format +msgid "The test definition is incomplete" +msgstr "Opis probe je nepotpun" + +#: ../gthumb/gth-test-selector.c:252 +msgid "Add a new rule" +msgstr "Dodaj novo pravilo" + +#: ../gthumb/gth-test-selector.c:263 +msgid "Remove this rule" +msgstr "Ukloni ovo pravilo" + +#: ../gthumb/gth-test-simple.c:46 +msgid "contains" +msgstr "sadrži" + +#: ../gthumb/gth-test-simple.c:47 +msgid "starts with" +msgstr "počinje sa" + +#: ../gthumb/gth-test-simple.c:48 +msgid "ends with" +msgstr "završava sa" + +#: ../gthumb/gth-test-simple.c:51 +msgid "does not contain" +msgstr "ne sadrži" + +#: ../gthumb/gth-test-simple.c:52 +msgid "matches" +msgstr "poklapa se" + +#: ../gthumb/gth-test-simple.c:56 +msgid "is lower than" +msgstr "je niže od" + +#: ../gthumb/gth-test-simple.c:57 +msgid "is greater than" +msgstr "je veće od" + +#: ../gthumb/gth-test-simple.c:58 +msgid "is equal to" +msgstr "je jednako sa" + +#: ../gthumb/gth-test-simple.c:62 +msgid "is before" +msgstr "je pre" + +#: ../gthumb/gth-test-simple.c:63 +msgid "is after" +msgstr "je nakon" + +#: ../gthumb/gth-time-selector.c:478 +msgid "Today" +msgstr "Danas" + +#: ../gthumb/gth-time-selector.c:486 +msgid "Now" +msgstr "Sada" + +#: ../gthumb/gth-window-actions-entries.h:32 +msgid "Close this window" +msgstr "Zatvori ovaj prozor" + +#: ../gthumb/gth-window-actions-entries.h:36 +msgid "Close _All Windows" +msgstr "Zatvori _sve prozore" + +#: ../gthumb/gtk-utils.c:490 +msgid "Could not display help" +msgstr "Ne mogu prikazati pomoć" + +#: ../gthumb/gtk-utils.c:810 ../gthumb/gtk-utils.c:817 +msgid "Could not launch the application" +msgstr "Ne mogu pokrenuti program" + +#: ../gthumb/gtk-utils.c:920 +msgid "_Copy Here" +msgstr "Umnoži _ovde" + +#: ../gthumb/gtk-utils.c:925 +msgid "_Move Here" +msgstr "_Premesti ovde" + +#: ../gthumb/gtk-utils.c:930 +msgid "_Link Here" +msgstr "_Poveži ovde" + +#: ../gthumb/gtk-utils.c:939 +msgid "Cancel" +msgstr "Otkaži" + +#: ../gthumb/main.c:61 +msgid "Open a new window" +msgstr "Otvori novi prozor" + +#: ../gthumb/main.c:65 +msgid "Start in fullscreen mode" +msgstr "Počni u celom ekranu" + +#: ../gthumb/main.c:69 +msgid "Automatically start a slideshow" +msgstr "Samostalno pokreni niz slika" + +#: ../gthumb/main.c:73 +msgid "Automatically import digital camera photos" +msgstr "Sam uvezi slike sa digitalnog fotoaparata" + +#: ../gthumb/main.c:77 +msgid "Show version" +msgstr "Prikazuje izdanje" + +#: ../gthumb/main.c:483 +msgid "- Image browser and viewer" +msgstr " — Preglednik i pretraživač slika" diff -Nru gthumb-3.0.2/po/zh_HK.po gthumb-3.2.3/po/zh_HK.po --- gthumb-3.0.2/po/zh_HK.po 2012-08-14 16:25:43.000000000 +0000 +++ gthumb-3.2.3/po/zh_HK.po 2013-04-30 16:56:13.000000000 +0000 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: gthumb 2.12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-28 18:10+0800\n" -"PO-Revision-Date: 2012-05-28 18:11+0800\n" +"POT-Creation-Date: 2012-10-16 18:12+0800\n" +"PO-Revision-Date: 2012-10-16 18:13+0800\n" "Last-Translator: taijuin \n" "Language-Team: Chinese (Hong Kong) \n" "Language: \n" @@ -87,40 +87,40 @@ msgid "Show session management options" msgstr "顯示作業階段管理選項" -#: ../data/gthumb.desktop.in.in.h:1 -msgid "Image Viewer" -msgstr "圖片檢視工具" - -#: ../data/gthumb.desktop.in.in.h:2 -msgid "View and organize your images" -msgstr "檢視和組織你的圖片" - #. manually set name and icon -#: ../data/gthumb.desktop.in.in.h:3 ../gthumb/gth-browser.c:530 -#: ../gthumb/gth-progress-dialog.c:388 ../gthumb/main.c:313 +#: ../data/gthumb.desktop.in.in.h:1 ../gthumb/gth-browser.c:534 +#: ../gthumb/gth-progress-dialog.c:388 ../gthumb/main.c:315 msgid "gThumb" msgstr "gThumb" -#: ../data/gthumb.desktop.in.in.h:4 +#: ../data/gthumb.desktop.in.in.h:2 +msgid "Image Viewer" +msgstr "圖片檢視工具" + +#: ../data/gthumb.desktop.in.in.h:3 msgid "gThumb Image Viewer" msgstr "gThumb 圖片管理工具" -#: ../data/gthumb-import.desktop.in.in.h:1 -msgid "Import the photos on your camera card" -msgstr "從你的數碼相機記憶卡匯入照片" +#: ../data/gthumb.desktop.in.in.h:4 +msgid "View and organize your images" +msgstr "檢視和組織你的圖片" -#: ../data/gthumb-import.desktop.in.in.h:2 +#: ../data/gthumb-import.desktop.in.in.h:1 msgid "Import with gThumb" msgstr "" -#: ../data/gthumb-import.desktop.in.in.h:3 +#: ../data/gthumb-import.desktop.in.in.h:2 msgid "Photo Import Tool" msgstr "照片匯入工具" -#: ../data/gthumb-import.desktop.in.in.h:4 +#: ../data/gthumb-import.desktop.in.in.h:3 msgid "gThumb Photo Import Tool" msgstr "gThumb 照片匯入工具" +#: ../data/gthumb-import.desktop.in.in.h:4 +msgid "Import the photos on your camera card" +msgstr "從你的數碼相機記憶卡匯入照片" + #: ../data/org.gnome.gthumb.gschema.xml.in.h:1 msgid "" "Images over this size (in bytes) will not be thumbnailed. Use 0 if you want " @@ -128,25 +128,25 @@ msgstr "超過這個大小的圖片（以位元組計算）不會産生縮圖。如果你要所有的圖片都建立縮圖則使用 0。" #: ../data/org.gnome.gthumb.gschema.xml.in.h:2 -msgid "Open files in the active window" -msgstr "在作用中的視窗開啟檔案" - -#: ../data/org.gnome.gthumb.gschema.xml.in.h:3 msgid "Whether to resize the window to fit the size of the image" msgstr "是否調整視窗大小以符合圖片尺寸" +#: ../data/org.gnome.gthumb.gschema.xml.in.h:3 +msgid "Open files in the active window" +msgstr "在作用中的視窗開啟檔案" + #: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:1 msgid "Possible values are: white, black, checked, none." msgstr "適用的數值有:white, black, checked, none." #: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:2 -msgid "Whether to always use a black background." -msgstr "是否永遠使用黑色背景。" - -#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:3 msgid "Whether to reset the scrollbars position after changing image" msgstr "在改變圖片後是否重設捲動軸位置" +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:3 +msgid "Whether to always use a black background." +msgstr "是否永遠使用黑色背景。" + #: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:1 msgid "Possible values are: jpeg, jpg." msgstr "可能的值有：jpeg， jpg。" @@ -162,32 +162,32 @@ msgstr "" #: ../data/ui/extensions-preferences.ui.h:1 +msgid "_Extensions:" +msgstr "擴充套件(_E)：" + +#: ../data/ui/extensions-preferences.ui.h:2 msgid "More extensions..." msgstr "更多擴充套件..." -#: ../data/ui/extensions-preferences.ui.h:2 +#: ../data/ui/extensions-preferences.ui.h:3 msgid "Some extensions are configurable." msgstr "" -#: ../data/ui/extensions-preferences.ui.h:3 -msgid "_Extensions:" -msgstr "擴充套件(_E)：" - #: ../data/ui/filter-editor.ui.h:1 msgid "Filter _Name:" msgstr "篩選器名稱(_N)：" -#. limit label -#: ../data/ui/filter-editor.ui.h:2 ../gthumb/gth-filter.c:270 -#: ../gthumb/gth-filter.c:342 -msgid "_Limit to" -msgstr "限制於(_L)" - -#: ../data/ui/filter-editor.ui.h:3 +#: ../data/ui/filter-editor.ui.h:2 #: ../extensions/search/data/ui/search-editor.ui.h:3 msgid "_Match" msgstr "符合(_M)" +#. limit label +#: ../data/ui/filter-editor.ui.h:3 ../gthumb/gth-filter.c:269 +#: ../gthumb/gth-filter.c:337 +msgid "_Limit to" +msgstr "限制於(_L)" + #: ../data/ui/filter-editor.ui.h:4 msgid "selected by" msgstr "選取根據" @@ -196,76 +196,75 @@ msgid "Mean:" msgstr "平均：" -#: ../data/ui/histogram-info.ui.h:2 +#. Short for "Standard deviation". Try to keep it under the 12 characters in the translation or it will be ellipsizied at the end. +#: ../data/ui/histogram-info.ui.h:3 +msgid "Std dev:" +msgstr "標準偏差：" + +#: ../data/ui/histogram-info.ui.h:4 msgid "Median:" msgstr "中位數：" +#. After the colon there is the total number of pixels +#: ../data/ui/histogram-info.ui.h:6 +msgid "Pixels:" +msgstr "像素：" + #. After the colon there is a percentile. -#: ../data/ui/histogram-info.ui.h:4 +#: ../data/ui/histogram-info.ui.h:8 msgctxt "Pixels" msgid "Max:" msgstr "最大：" #. After the colon there is the percentile of selected pixels. -#: ../data/ui/histogram-info.ui.h:6 +#: ../data/ui/histogram-info.ui.h:10 msgctxt "Pixels" msgid "Selected:" msgstr "選取的：" -#. After the colon there is the total number of pixels -#: ../data/ui/histogram-info.ui.h:8 -msgid "Pixels:" -msgstr "像素：" - -#. Short for "Standard deviation". Try to keep it under the 12 characters in the translation or it will be ellipsizied at the end. -#: ../data/ui/histogram-info.ui.h:10 -msgid "Std dev:" -msgstr "標準偏差：" - #: ../data/ui/location.ui.h:1 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:5 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 msgid "_Location:" msgstr "位置(_L)：" #: ../data/ui/overwrite-dialog.ui.h:1 -msgid "Do not overwrite _the old file" -msgstr "不要覆蓋舊檔(_T)" +#, fuzzy +msgid "Overwrite the old file with the new one?" +msgstr "是否用新的圖片覆寫舊的圖片？" #: ../data/ui/overwrite-dialog.ui.h:2 +msgid "Old File:" +msgstr "舊檔案：" + +#: ../data/ui/overwrite-dialog.ui.h:3 msgid "Filename:" msgstr "檔案名稱：" -#: ../data/ui/overwrite-dialog.ui.h:3 +#: ../data/ui/overwrite-dialog.ui.h:4 +#: ../extensions/image_print/data/ui/print-layout.ui.h:23 +msgid "Size:" +msgstr "大小：" + +#: ../data/ui/overwrite-dialog.ui.h:5 #, fuzzy msgid "Modified:" msgstr "修改時間：" -#: ../data/ui/overwrite-dialog.ui.h:4 +#: ../data/ui/overwrite-dialog.ui.h:6 msgid "New File:" msgstr "新檔案：" -#: ../data/ui/overwrite-dialog.ui.h:5 -msgid "Old File:" -msgstr "舊檔案：" - -#: ../data/ui/overwrite-dialog.ui.h:6 +#: ../data/ui/overwrite-dialog.ui.h:7 msgid "Over_write the old file" msgstr "覆蓋舊檔案(_W)" -#: ../data/ui/overwrite-dialog.ui.h:7 -msgid "Overwrite _all files" -msgstr "覆蓋所有檔案(_A)" - #: ../data/ui/overwrite-dialog.ui.h:8 -#, fuzzy -msgid "Overwrite the old file with the new one?" -msgstr "是否用新的圖片覆寫舊的圖片？" +msgid "Do not overwrite _the old file" +msgstr "不要覆蓋舊檔(_T)" #: ../data/ui/overwrite-dialog.ui.h:9 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:9 -#: ../extensions/image_print/data/ui/print-layout.ui.h:16 -msgid "Size:" -msgstr "大小：" +msgid "Overwrite _all files" +msgstr "覆蓋所有檔案(_A)" #: ../data/ui/overwrite-dialog.ui.h:10 msgid "_Do not overwrite any file" @@ -288,122 +287,188 @@ msgstr "其他篩選器(_O)：" #: ../data/ui/preferences.ui.h:1 -msgid "Appearance" -msgstr "外觀" +msgid "below the folder list" +msgstr "在資料夾清單下面" #: ../data/ui/preferences.ui.h:2 -msgid "As_k confirmation before deleting files or catalogs" -msgstr "在刪除檔案或目錄之前，要求確認(_K)" +msgid "on the right" +msgstr "在右邊" #: ../data/ui/preferences.ui.h:3 -msgid "Ask whether to save _modified files" -msgstr "詢問是否儲存修改過的檔案(_M)" +msgid "gThumb Preferences" +msgstr "gthumb 偏好設定" -#: ../data/ui/preferences.ui.h:4 ../gthumb/dlg-preferences-extensions.c:71 -#: ../gthumb/gth-browser-actions-entries.h:179 -msgid "Browser" -msgstr "圖片清單" +#: ../data/ui/preferences.ui.h:4 +msgid "_Toolbar style:" +msgstr "工具列樣式(_T):" #: ../data/ui/preferences.ui.h:5 -#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 -#: ../extensions/image_print/data/ui/print-layout.ui.h:4 -msgid "Caption" -msgstr "圖片標題" +msgid "T_humbnails in viewer:" +msgstr "預覽縮圖的位置(_H)：" #: ../data/ui/preferences.ui.h:6 -msgid "Choose startup folder" -msgstr "選擇啟始的資料夾" +msgid "System settings" +msgstr "系統設定" #: ../data/ui/preferences.ui.h:7 -msgid "D_etermine image type from content (slower)" -msgstr "從圖片檔內容決定格式，會較慢(_E)" +msgid "Text below icons" +msgstr "圖示下顯示文字" #: ../data/ui/preferences.ui.h:8 -msgid "File _properties in browser:" -msgstr "在瀏覽器中的檔案屬性(_P)：" +msgid "Text beside icons" +msgstr "圖示旁顯示文字" #: ../data/ui/preferences.ui.h:9 -#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 -#: ../extensions/edit_metadata/gth-edit-general-page.c:481 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 -#: ../gthumb/gth-main-default-metadata.c:33 -msgid "General" -msgstr "一般" +msgid "Icons only" +msgstr "只顯示圖示" #: ../data/ui/preferences.ui.h:10 -msgid "Go to last _visited location" -msgstr "前往上次訪問的位置(_V)" +msgid "Text only" +msgstr "只顯示文字" #: ../data/ui/preferences.ui.h:11 -msgid "Go to this _folder:" -msgstr "前往這個資料夾(_F)：" +msgid "on the bottom" +msgstr "在底部" #: ../data/ui/preferences.ui.h:12 -msgid "On startup:" -msgstr "在啟動時：" +msgid "on the side" +msgstr "在側邊" #: ../data/ui/preferences.ui.h:13 -#: ../extensions/exiv2_tools/gth-edit-iptc-page.c:198 -#: ../extensions/gstreamer_tools/main.c:33 -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:2 -msgid "Other" -msgstr "其他" +msgid "File _properties in browser:" +msgstr "在瀏覽器中的檔案屬性(_P)：" #: ../data/ui/preferences.ui.h:14 -msgid "Set to C_urrent" -msgstr "更改為目前的資料夾(_U)" +msgid "Appearance" +msgstr "外觀" #: ../data/ui/preferences.ui.h:15 -msgid "T_humbnails in viewer:" -msgstr "預覽縮圖的位置(_H)：" +msgid "Go to last _visited location" +msgstr "前往上次訪問的位置(_V)" #: ../data/ui/preferences.ui.h:16 -msgid "Thumbnail _size:" -msgstr "縮圖大小(_S)：" +msgid "Go to this _folder:" +msgstr "前往這個資料夾(_F)：" #: ../data/ui/preferences.ui.h:17 -msgid "_Reuse the active window to open files" -msgstr "重新使用作用中的視窗來開啟檔案(_R)" +msgid "Choose startup folder" +msgstr "選擇啟始的資料夾" #: ../data/ui/preferences.ui.h:18 -msgid "_Store metadata inside files if possible" -msgstr "在檔案內部儲存詮釋資料，如果有可能的話(_S)" +msgid "Set to C_urrent" +msgstr "更改為目前的資料夾(_U)" #: ../data/ui/preferences.ui.h:19 -msgid "_Toolbar style:" -msgstr "工具列樣式(_T):" +msgid "_Reuse the active window to open files" +msgstr "重新使用作用中的視窗來開啟檔案(_R)" #: ../data/ui/preferences.ui.h:20 -#, fuzzy -#| msgid "View the folders" -msgid "below the folder list" -msgstr "檢視資料夾" +msgid "On startup:" +msgstr "在啟動時：" #: ../data/ui/preferences.ui.h:21 -msgid "gThumb Preferences" -msgstr "gthumb 偏好設定" +msgid "As_k confirmation before deleting files or catalogs" +msgstr "在刪除檔案或目錄之前，要求確認(_K)" #: ../data/ui/preferences.ui.h:22 -msgid "on the right" -msgstr "在右邊" +msgid "Ask whether to save _modified files" +msgstr "詢問是否儲存修改過的檔案(_M)" + +#: ../data/ui/preferences.ui.h:23 +msgid "_Store metadata inside files if possible" +msgstr "在檔案內部儲存詮釋資料，如果有可能的話(_S)" + +#: ../data/ui/preferences.ui.h:24 +#: ../extensions/exiv2_tools/gth-edit-iptc-page.c:198 +#: ../extensions/gstreamer_tools/main.c:33 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:17 +msgid "Other" +msgstr "其他" + +#: ../data/ui/preferences.ui.h:25 +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 +#: ../extensions/edit_metadata/gth-edit-general-page.c:481 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 +#: ../gthumb/gth-main-default-metadata.c:33 +msgid "General" +msgstr "一般" + +#: ../data/ui/preferences.ui.h:26 +#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 +#: ../extensions/image_print/data/ui/print-layout.ui.h:18 +msgid "Caption" +msgstr "圖片標題" + +#: ../data/ui/preferences.ui.h:27 +msgid "Thumbnail _size:" +msgstr "縮圖大小(_S)：" + +#: ../data/ui/preferences.ui.h:28 +msgid "48" +msgstr "48" + +#: ../data/ui/preferences.ui.h:29 +msgid "64" +msgstr "64" + +#: ../data/ui/preferences.ui.h:30 +msgid "85" +msgstr "85" + +#: ../data/ui/preferences.ui.h:31 +msgid "95" +msgstr "95" + +#: ../data/ui/preferences.ui.h:32 +#, fuzzy +#| msgid "1:1" +msgid "112" +msgstr "原來尺寸" + +#: ../data/ui/preferences.ui.h:33 +#, fuzzy +#| msgid "1:1" +msgid "128" +msgstr "原來尺寸" + +#: ../data/ui/preferences.ui.h:34 +msgid "164" +msgstr "164" + +#: ../data/ui/preferences.ui.h:35 +msgid "200" +msgstr "200" + +#: ../data/ui/preferences.ui.h:36 +msgid "256" +msgstr "256" + +#: ../data/ui/preferences.ui.h:37 +msgid "D_etermine image type from content (slower)" +msgstr "從圖片檔內容決定格式，會較慢(_E)" + +#: ../data/ui/preferences.ui.h:38 ../gthumb/dlg-preferences-extensions.c:71 +#: ../gthumb/gth-browser-actions-entries.h:179 +msgid "Browser" +msgstr "圖片清單" #: ../data/ui/sort-order.ui.h:1 msgid "Sort By" msgstr "排序方式" #: ../data/ui/sort-order.ui.h:2 -msgid "_Inverse order" -msgstr "相反次序(_I)" - -#: ../data/ui/sort-order.ui.h:3 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:4 msgid "_Sort by:" msgstr "排序方式(_S)：" +#: ../data/ui/sort-order.ui.h:3 +msgid "_Inverse order" +msgstr "相反次序(_I)" + #: ../extensions/23hq/23hq.extension.in.in.h:1 msgid "23" -msgstr "" +msgstr "23" #: ../extensions/23hq/23hq.extension.in.in.h:2 msgid "Upload images to 23hq.com" @@ -411,22 +476,21 @@ #: ../extensions/23hq/callbacks.c:68 msgid "_23..." -msgstr "" +msgstr "_23..." #: ../extensions/23hq/callbacks.c:69 msgid "Upload photos to 23" msgstr "上傳照片至 23" #: ../extensions/bookmarks/bookmarks.extension.in.in.h:1 -#, fuzzy -msgid "Add bookmarks support." -msgstr "新增至書籤(_A)" - -#: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:1 msgid "Bookmarks" msgstr "書籤" +#: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 +msgid "Add bookmarks support." +msgstr "加入書籤支援。" + #: ../extensions/bookmarks/bookmarks.extension.in.in.h:3 #: ../extensions/burn_disc/burn_disc.extension.in.in.h:3 #: ../extensions/catalogs/catalogs.extension.in.in.h:3 @@ -446,7 +510,6 @@ #: ../extensions/image_viewer/image_viewer.extension.in.in.h:3 #: ../extensions/list_tools/list_tools.extension.in.in.h:3 #: ../extensions/photo_importer/photo_importer.extension.in.in.h:3 -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:3 #: ../extensions/raw_files/raw_files.extension.in.in.h:3 #: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:3 #: ../extensions/rename_series/rename_series.extension.in.in.h:3 @@ -487,13 +550,13 @@ msgstr "書籤(_B):" #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:3 -msgid "_Location" -msgstr "位置(_L)" - -#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:4 msgid "_Name" msgstr "名稱(_N)" +#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:4 +msgid "_Location" +msgstr "位置(_L)" + #: ../extensions/bookmarks/dlg-bookmarks.c:70 msgid "Could not remove the bookmark" msgstr "無法移除書籤" @@ -527,29 +590,141 @@ msgstr "目前的資料夾和它的子資料夾(_U)" #: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:3 -msgid "Source" -msgstr "來源" - -#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:4 msgid "_Selected files" msgstr "選取的檔案(_S)" +#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:4 +msgid "Source" +msgstr "來源" + #: ../extensions/burn_disc/gth-burn-task.c:238 #: ../extensions/burn_disc/gth-burn-task.c:259 #: ../extensions/burn_disc/gth-burn-task.c:397 msgid "Write to Disc" msgstr "寫入至光碟" -#: ../extensions/cairo_io/cairo-io-jpeg.c:62 +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:62 #, c-format msgid "Error interpreting JPEG image file: %s" msgstr "" -#: ../extensions/cairo_io/cairo-io-jpeg.c:482 +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:483 #, c-format msgid "Unknown JPEG color space (%d)" msgstr "" +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:1 +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:1 +msgid "_Default extension:" +msgstr "預設副檔名(_D)：" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:2 +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:1 +msgid "_Quality:" +msgstr "品質(_Q)：" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:3 +msgid "_Smoothing:" +msgstr "平滑化(_S):" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:4 +msgid "Opti_mize" +msgstr "最佳化(_M)" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:5 +msgid "_Progressive" +msgstr "漸進式顯示(_P)" + +#: ../extensions/cairo_io/data/ui/png-options.ui.h:1 +msgid "Compression _level:" +msgstr "壓縮程度(_L):" + +#: ../extensions/cairo_io/data/ui/save-options-preferences.ui.h:1 +msgid "Default options:" +msgstr "預設選項：" + +#: ../extensions/cairo_io/data/ui/tga-options.ui.h:1 +msgid "_RLE compression" +msgstr "_RLE 無損壓縮" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:2 +msgid "Compression" +msgstr "壓縮" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:3 +msgid "_No compression" +msgstr "不壓縮(_N)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:4 +msgid "No_rmal (Deflate)" +msgstr "無損壓縮[Deflate](_R)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:5 +msgid "_Loss compression (JPEG)" +msgstr "有損壓縮[JPEG](_L)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:6 +msgid "Resolution" +msgstr "解像度" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:7 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 +msgid "_Horizontal:" +msgstr "水平(_H):" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:8 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 +msgid "_Vertical:" +msgstr "垂直(_V):" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:9 +msgid "dpi" +msgstr "dpi" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:2 +msgid "_Method:" +msgstr "方法(_M)：" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:3 +msgid "_Lossless" +msgstr "無損(_L)" + +#: ../extensions/cairo_io/gth-image-saver-jpeg.c:515 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:140 +msgid "JPEG" +msgstr "JPEG" + +#: ../extensions/cairo_io/gth-image-saver-png.c:352 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:110 +msgid "PNG" +msgstr "PNG" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:257 +#: ../extensions/cairo_io/gth-image-saver-tiff.c:435 +#: ../gthumb/gth-buffer-data.c:84 +msgid "Insufficient memory" +msgstr "記憶體不足" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:343 +msgid "TGA" +msgstr "TGA" + +#: ../extensions/cairo_io/gth-image-saver-tiff.c:558 +msgid "TIFF" +msgstr "TIFF" + +#: ../extensions/cairo_io/gth-image-saver-webp.c:381 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:165 +msgid "WebP" +msgstr "" + +#: ../extensions/cairo_io/preferences.c:134 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 +msgid "Saving" +msgstr "儲存" + #: ../extensions/catalogs/actions.c:92 ../extensions/catalogs/actions.c:213 #: ../extensions/catalogs/dlg-add-to-catalog.c:274 #: ../extensions/catalogs/dlg-add-to-catalog.c:394 @@ -692,15 +867,14 @@ #: ../extensions/catalogs/catalogs.extension.in.in.h:1 #: ../extensions/catalogs/gth-catalog.c:611 #: ../extensions/catalogs/gth-catalog.c:662 -#: ../extensions/catalogs/gth-catalog.c:1024 -#: ../extensions/catalogs/gth-catalog.c:1025 +#: ../extensions/catalogs/gth-catalog.c:1016 +#: ../extensions/catalogs/gth-catalog.c:1017 msgid "Catalogs" msgstr "圖片集" #: ../extensions/catalogs/catalogs.extension.in.in.h:2 -#, fuzzy msgid "Create file collections." -msgstr "建立檔案系統" +msgstr "建立檔案收藏。" #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:1 msgid "Add to Catalog" @@ -711,70 +885,70 @@ msgstr "圖片集(_A):" #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:3 -msgid "New _Library" -msgstr "新增圖庫(_L)" - -#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:4 msgid "_New Catalog" msgstr "新增圖片集(_N)" +#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:4 +msgid "New _Library" +msgstr "新增圖庫(_L)" + #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:5 #: ../extensions/file_manager/actions.c:945 -#: ../extensions/webalbums/gth-web-exporter.c:1842 +#: ../extensions/webalbums/gth-web-exporter.c:1840 msgid "_View the destination" msgstr "檢視目的端(_V)" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:1 -msgid "Catalog" -msgstr "圖片集" - -#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 #: ../gthumb/gth-file-properties.c:209 msgid "Properties" msgstr "屬性" +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:1 +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:1 +msgid "_Name:" +msgstr "名稱(_N)：" + #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:4 -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:3 +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:2 msgid "_Date:" msgstr "日期(_D):" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:5 -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 -#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 -msgid "_Name:" -msgstr "名稱(_N)：" +msgid "Catalog" +msgstr "圖片集" #: ../extensions/catalogs/data/ui/organize-files-task.ui.h:1 -#, fuzzy -msgid "Catalog _Preview:" -msgstr "遊戲預覽" +#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 +msgid "Organize Files" +msgstr "組織檔案" #: ../extensions/catalogs/data/ui/organize-files-task.ui.h:2 +msgid "Organizing files" +msgstr "正在組織檔案" + +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 #, fuzzy msgid "Organization:" msgstr "組織：" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 -#: ../extensions/catalogs/data/ui/organize-files.ui.h:4 -msgid "Organize Files" -msgstr "組織檔案" - #: ../extensions/catalogs/data/ui/organize-files-task.ui.h:4 -msgid "Organizing files" -msgstr "正在組織檔案" - -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 msgid "Select All" msgstr "全部選取" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 msgid "Select None" msgstr "不選取" +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 +#, fuzzy +msgid "Catalog _Preview:" +msgstr "遊戲預覽" + #: ../extensions/catalogs/data/ui/organize-files.ui.h:1 #: ../extensions/edit_metadata/gth-edit-general-page.c:558 #: ../gthumb/gth-main-default-tests.c:300 @@ -787,41 +961,41 @@ msgstr "檔案修改日期" #: ../extensions/catalogs/data/ui/organize-files.ui.h:3 -msgid "Ignore catalogs with a single file" -msgstr "忽略單一檔案的目錄 " - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:5 -msgid "Put single files in the catalog:" -msgstr "放置單獨的檔案至目錄：" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 -#, fuzzy -msgid "Singles" -msgstr "普通" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:7 #: ../extensions/comments/main.c:159 msgid "Tag" msgstr "標籤" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:8 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:4 +msgid "tag" +msgstr "標籤" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:5 #: ../gthumb/gth-main-default-tests.c:324 msgid "Tag (embedded)" msgstr "標籤(嵌入式)" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:9 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:7 msgid "_Group files by:" msgstr "檔案分組根據據(_G)：" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:10 -#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:8 +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 #: ../extensions/search/data/ui/search-editor.ui.h:2 msgid "_Include sub-folders" msgstr "包括子資料夾(_I)" +#: ../extensions/catalogs/data/ui/organize-files.ui.h:9 +msgid "Ignore catalogs with a single file" +msgstr "忽略單一檔案的目錄 " + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:10 +msgid "Put single files in the catalog:" +msgstr "放置單獨的檔案至目錄：" + #: ../extensions/catalogs/data/ui/organize-files.ui.h:11 -msgid "tag" -msgstr "標籤" +#, fuzzy +msgid "Singles" +msgstr "普通" #: ../extensions/catalogs/dlg-add-to-catalog.c:105 #: ../extensions/catalogs/dlg-add-to-catalog.c:136 @@ -849,7 +1023,7 @@ msgid "Files will be organized in catalogs. No file will be moved on disk." msgstr "檔案將被組織在目錄中。沒有檔案會被移動到磁碟上。" -#: ../extensions/catalogs/gth-catalog.c:1122 ../extensions/comments/main.c:44 +#: ../extensions/catalogs/gth-catalog.c:1114 ../extensions/comments/main.c:44 #: ../extensions/edit_metadata/callbacks.c:106 #: ../gthumb/gth-main-default-metadata.c:53 msgid "Tags" @@ -897,10 +1071,10 @@ msgstr "無法自既存的資料夾 %F 移除檔案。" #: ../extensions/catalogs/gth-file-source-catalogs.c:1380 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:731 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:740 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:769 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:1281 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:733 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:742 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:771 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:1304 #: ../extensions/search/gth-search.c:265 msgid "Invalid file format" msgstr "無效的檔案格式" @@ -935,60 +1109,56 @@ msgstr "" #: ../extensions/change_date/data/ui/change-date.ui.h:3 -msgid "A_djust by" -msgstr "調整根據(_D)" - -#: ../extensions/change_date/data/ui/change-date.ui.h:4 msgid "Change Date" msgstr "更改日期" -#: ../extensions/change_date/data/ui/change-date.ui.h:5 +#: ../extensions/change_date/data/ui/change-date.ui.h:4 msgid "Change the following values:" msgstr "更改以下數值：" -#: ../extensions/change_date/data/ui/change-date.ui.h:6 -msgid "Change to:" -msgstr "更改為：" +#: ../extensions/change_date/data/ui/change-date.ui.h:5 +msgid "_Last modified date" +msgstr "最後修改日期(_L)" -#: ../extensions/change_date/data/ui/change-date.ui.h:7 +#: ../extensions/change_date/data/ui/change-date.ui.h:6 msgid "Co_mment date" msgstr "註解日期(_M)" +#: ../extensions/change_date/data/ui/change-date.ui.h:7 +msgid "Change to:" +msgstr "更改為：" + #: ../extensions/change_date/data/ui/change-date.ui.h:8 -msgid "Date p_hoto was taken" -msgstr "照片的拍攝日期(_H)" +msgid "The _following date:" +msgstr "以下的日期(_F)：" #: ../extensions/change_date/data/ui/change-date.ui.h:9 -msgid "Exif DateTimeOriginal tag" -msgstr "Exif 日期時刻原始標籤" - -#: ../extensions/change_date/data/ui/change-date.ui.h:10 msgid "File _modified date" msgstr "檔案修改日期(_M)" -#: ../extensions/change_date/data/ui/change-date.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:10 msgid "File c_reation date" msgstr "檔案建立日期(_R)" +#: ../extensions/change_date/data/ui/change-date.ui.h:11 +msgid "Date p_hoto was taken" +msgstr "照片的拍攝日期(_H)" + #: ../extensions/change_date/data/ui/change-date.ui.h:12 -msgid "The _following date:" -msgstr "以下的日期(_F)：" +msgid "A_djust by" +msgstr "調整根據(_D)" #: ../extensions/change_date/data/ui/change-date.ui.h:13 -msgid "_Last modified date" -msgstr "最後修改日期(_L)" - -#: ../extensions/change_date/data/ui/change-date.ui.h:14 msgid "hours" msgstr "小時" -#: ../extensions/change_date/data/ui/change-date.ui.h:15 +#: ../extensions/change_date/data/ui/change-date.ui.h:14 #, fuzzy msgid "minutes" msgstr "分鐘(_M)" -#: ../extensions/change_date/data/ui/change-date.ui.h:16 -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:15 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:6 msgid "seconds" msgstr "秒" @@ -1001,13 +1171,13 @@ msgstr "匯入儲存在檔案中的詮釋資料到 gThumb 註解系統" #: ../extensions/comments/comments.extension.in.in.h:1 -msgid "Add comments and tags to any file type." -msgstr "加入註解和標籤到任何檔案類型。" - -#: ../extensions/comments/comments.extension.in.in.h:2 msgid "Comments and tags" msgstr "評論和標籤" +#: ../extensions/comments/comments.extension.in.in.h:2 +msgid "Add comments and tags to any file type." +msgstr "加入註解和標籤到任何檔案類型。" + #: ../extensions/comments/data/ui/comments-preferences.ui.h:1 #: ../extensions/importer/gth-import-preferences-dialog.c:318 msgid "Preferences" @@ -1027,13 +1197,13 @@ msgstr "標題" #: ../extensions/comments/main.c:41 ../extensions/comments/main.c:143 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 #: ../extensions/image_print/data/ui/print-layout.ui.h:8 -#: ../extensions/importer/data/ui/import-preferences.ui.h:1 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:16 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:13 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 +#: ../extensions/importer/data/ui/import-preferences.ui.h:6 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 #: ../gthumb/gth-main-default-metadata.c:52 msgid "Description" msgstr "描述" @@ -1072,299 +1242,281 @@ msgstr "建立一個影像牆" #: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:1 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:8 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:1 msgid "Contact Sheet" msgstr "縮圖目錄" #: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:2 -#, fuzzy -#| msgid "Edit the comment and other information of the selected files" msgid "Create an index image displaying the thumbnails of the selected files." -msgstr "編輯選取檔案的註解和其他資訊" +msgstr "建立一索引圖片顯示所選的檔案縮圖。" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:1 -msgid "Background" -msgstr "背景" +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:446 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 +#: ../extensions/file_tools/gth-file-tool-rotate.c:403 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:14 +#: ../extensions/slideshow/main.c:277 +msgid "None" +msgstr "無" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:2 -msgid "C_olor:" -msgstr "顏色(_O)：" +#, fuzzy +msgid "Simple" +msgstr "普通" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:3 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 -msgid "Caption:" -msgstr "標題：" +msgid "Simple with shadow" +msgstr "" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:4 #, fuzzy -msgid "Frame" -msgstr "幀率：" +#| msgid "Show version" +msgid "Shadow only" +msgstr "顯示版本" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:5 -msgid "Inward Shadow" -msgstr "" +#, fuzzy +#| msgid "Slideshow" +msgid "Slide" +msgstr "幻燈片顯示" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:6 -#: ../extensions/file_tools/gth-file-tool-crop.c:424 -#: ../extensions/file_tools/gth-file-tool-crop.c:454 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 -#: ../extensions/file_tools/gth-file-tool-rotate.c:415 -#: ../extensions/slideshow/main.c:277 -msgid "None" -msgstr "無" +msgid "Inward Shadow" +msgstr "" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:7 msgid "Outward Shadow" msgstr "" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 -#, fuzzy -msgid "Select a color" -msgstr "全部選取" - #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:9 -msgid "Select a font" -msgstr "選取一個字型" +msgid "Background" +msgstr "背景" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:10 -#, fuzzy -#| msgid "Show version" -msgid "Shadow only" -msgstr "顯示版本" +msgid "_Solid color" +msgstr "素色(_S)" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:11 -#, fuzzy -msgid "Simple" -msgstr "普通" - -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 -msgid "Simple with shadow" -msgstr "" - -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 -#, fuzzy -#| msgid "Slideshow" -msgid "Slide" -msgstr "幻燈片顯示" +msgid "_Gradient" +msgstr "漸變色(_G)" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:14 -#: ../extensions/rename_series/dlg-rename-series.c:57 -msgid "Text" -msgstr "文字" +#, fuzzy +msgid "Select a color" +msgstr "全部選取" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:15 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 -#: ../extensions/image_print/data/ui/print-layout.ui.h:26 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 -msgid "_Footer:" -msgstr "頁尾(_F):" +#, fuzzy +msgid "Frame" +msgstr "幀率：" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:16 -msgid "_Gradient" -msgstr "漸變色(_G)" +msgid "_Style:" +msgstr "風格(_S)：" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:17 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 -#: ../extensions/image_print/data/ui/print-layout.ui.h:27 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 -msgid "_Header:" -msgstr "頁首(_H):" +msgid "C_olor:" +msgstr "顏色(_O)：" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:18 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 -msgid "_Horizontal:" -msgstr "水平(_H):" +#: ../extensions/rename_series/dlg-rename-series.c:57 +msgid "Text" +msgstr "文字" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 +#: ../extensions/image_print/data/ui/print-layout.ui.h:3 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 +msgid "_Header:" +msgstr "頁首(_H):" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:20 -msgid "_Solid color" -msgstr "素色(_S)" +msgid "Select a font" +msgstr "選取一個字型" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:21 -msgid "_Style:" -msgstr "風格(_S)：" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 +#: ../extensions/image_print/data/ui/print-layout.ui.h:4 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 +msgid "_Footer:" +msgstr "頁尾(_F):" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:22 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 -msgid "_Vertical:" -msgstr "垂直(_V):" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 +msgid "Caption:" +msgstr "標題：" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:2 +#: ../extensions/image_print/data/ui/print-layout.ui.h:5 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:6 +msgid "The current page number" +msgstr "目前的頁碼" -#. translate only the text in the curly brackets #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:3 -#: ../extensions/image_print/data/ui/print-layout.ui.h:3 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 -#, fuzzy, no-c-format -msgid "%D{ format }" -msgstr "格式化 %s (%s)" +#: ../extensions/image_print/data/ui/print-layout.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 +msgid "The total number of pages" +msgstr "總頁數" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:4 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 -msgid "All images on a single page" -msgstr "所有圖片在一個頁面上" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:6 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 -#: ../extensions/convert_format/data/ui/convert-format.ui.h:1 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:10 -msgid "Choose destination folder" -msgstr "選擇目的地資料夾" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 +#: ../extensions/image_print/data/ui/print-layout.ui.h:7 +#: ../extensions/importer/data/ui/import-preferences.ui.h:5 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:8 +msgid "Special code" +msgstr "特殊的代碼" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:7 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:3 -#: ../extensions/image_print/data/ui/print-layout.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:11 -msgid "Columns:" -msgstr "欄數：" +#. translate only the text in the curly brackets +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:8 +#: ../extensions/image_print/data/ui/print-layout.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 +#, fuzzy, no-c-format +msgid "%D{ format }" +msgstr "格式化 %s (%s)" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:9 -msgid "Create _HTML image map" -msgstr "建立 _HTML 影像地圖" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 -msgid "Create a new theme" -msgstr "建立一個新的主題" +#: ../extensions/image_print/data/ui/print-layout.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 +#, fuzzy +msgid "The current date" +msgstr "現在的日期(_D)" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 -msgid "Delete the selected theme" -msgstr "刪除選定的主題" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 +msgid "_Destination:" +msgstr "目的地(_D)：" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:13 -msgid "Edit the selected theme" -msgstr "編輯選定的主題" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:3 +#: ../extensions/convert_format/data/ui/convert-format.ui.h:4 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 +msgid "Choose destination folder" +msgstr "選擇目的地資料夾" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:14 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 msgid "File_name:" msgstr "檔案名稱(_N)：" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:16 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 -msgid "Images per page:" -msgstr "每頁圖片數目:" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 -#: ../extensions/image_print/data/ui/print-layout.ui.h:11 -msgid "Layout" -msgstr "配置" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:15 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:8 #, fuzzy msgid "New enumerator digit" msgstr "數字，數字" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:16 +msgid "Create _HTML image map" +msgstr "建立 _HTML 影像地圖" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 +msgid "Create a new theme" +msgstr "建立一個新的主題" + #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:19 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:10 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 -msgid "Re_verse order" -msgstr "相反次序排列(_V)" +msgid "Edit the selected theme" +msgstr "編輯選定的主題" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:20 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:11 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 -msgid "S_ort:" -msgstr "排序(_O)：" +msgid "Delete the selected theme" +msgstr "刪除選定的主題" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:21 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 -#: ../extensions/pixbuf_savers/preferences.c:134 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 -msgid "Saving" -msgstr "儲存" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:13 -#: ../extensions/image_print/data/ui/print-layout.ui.h:17 -#: ../extensions/importer/data/ui/import-preferences.ui.h:2 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:20 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:18 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 -msgid "Special code" -msgstr "特殊的代碼" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 +msgid "Theme" +msgstr "主題" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:23 -msgid "Sq_uared" -msgstr "正方形(_U)" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:16 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 +msgid "Columns:" +msgstr "欄數：" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:24 -#: ../extensions/image_print/data/ui/print-layout.ui.h:18 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 -#, fuzzy -msgid "The current date" -msgstr "現在的日期(_D)" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:10 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 +msgid "Images per page:" +msgstr "每頁圖片數目:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:25 -#: ../extensions/image_print/data/ui/print-layout.ui.h:19 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 -msgid "The current page number" -msgstr "目前的頁碼" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 +msgid "All images on a single page" +msgstr "所有圖片在一個頁面上" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:26 -#: ../extensions/image_print/data/ui/print-layout.ui.h:22 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 -msgid "The total number of pages" -msgstr "總頁數" +msgid "_All pages with the same size" +msgstr "所有頁面使用相同大小(_A)" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:27 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 -msgid "Theme" -msgstr "主題" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:15 +msgid "Layout" +msgstr "配置" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:28 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:14 -msgid "Thumbnails" -msgstr "縮圖" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:13 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 +msgid "S_ort:" +msgstr "排序(_O)：" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:29 -msgid "_All pages with the same size" -msgstr "所有頁面使用相同大小(_A)" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:14 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 +msgid "Re_verse order" +msgstr "相反次序排列(_V)" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:30 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:15 -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:9 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 -msgid "_Destination:" -msgstr "目的地(_D)：" +msgid "_Size:" +msgstr "大小(_S)：" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 +msgid "Sq_uared" +msgstr "正方形(_U)" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:33 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:16 -msgid "_Size:" -msgstr "大小(_S)：" +msgid "Thumbnails" +msgstr "縮圖" -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 msgid "Image Wall" msgstr "影像牆" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:486 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:498 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:512 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:481 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:492 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:506 #, fuzzy #| msgid "Could not save the filter" msgid "Could not save the theme" msgstr "無法儲存篩選器" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:657 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:651 #, fuzzy msgid "Could not delete the theme" msgstr "無法匯入檔案。" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:248 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:247 msgid "Creating images" msgstr "正在建立圖片" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:897 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:895 msgid "Generating thumbnails" msgstr "正在產生縮圖" @@ -1404,35 +1556,35 @@ msgid "Save images in a different format" msgstr "用不同的格式儲存圖片" -#: ../extensions/convert_format/data/ui/convert-format.ui.h:2 +#: ../extensions/convert_format/data/ui/convert-format.ui.h:1 msgid "Convert Format" msgstr "轉換格式" +#: ../extensions/convert_format/data/ui/convert-format.ui.h:2 +msgid "New format" +msgstr "新的格式" + #: ../extensions/convert_format/data/ui/convert-format.ui.h:3 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:4 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 msgid "Destination" msgstr "目的地" -#: ../extensions/convert_format/data/ui/convert-format.ui.h:4 -msgid "New format" -msgstr "新的格式" - #: ../extensions/convert_format/data/ui/convert-format.ui.h:5 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 #, fuzzy msgid "_Use the original image folder" msgstr "原始大小(_O)" -#: ../extensions/convert_format/dlg-convert-format.c:93 +#: ../extensions/convert_format/dlg-convert-format.c:95 msgid "Converting images" msgstr "正在轉換圖片" -#: ../extensions/desktop_background/actions.c:162 +#: ../extensions/desktop_background/actions.c:158 msgid "Could not show the desktop background properties" msgstr "無法顯示桌面背景屬性" -#: ../extensions/desktop_background/actions.c:228 -#: ../extensions/desktop_background/actions.c:246 +#: ../extensions/desktop_background/actions.c:224 +#: ../extensions/desktop_background/actions.c:242 msgid "Could not set the desktop background" msgstr "無法設置桌面背景" @@ -1484,20 +1636,20 @@ msgstr "刪除選取檔案的註解和詮釋資料" #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:1 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:1 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 msgid "D_escription:" msgstr "描述(_E)：" -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:2 +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:3 +msgid "_Place:" +msgstr "位置(_P):" + +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 #: ../extensions/edit_metadata/data/ui/tag-chooser.ui.h:1 msgid "T_ags:" msgstr "標籤(_A)： " -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 -msgid "_Place:" -msgstr "位置(_P):" - #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:5 msgid "_Rating:" msgstr "評分(_R)：" @@ -1516,13 +1668,13 @@ msgstr "不能讀取檔案資訊" #: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:1 -msgid "Allow to edit files metadata." -msgstr "允許編輯檔案的註解資料。" - -#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 msgid "Edit metadata" msgstr "編輯註解資料" +#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 +msgid "Allow to edit files metadata." +msgstr "允許編輯檔案的註解資料。" + #. Translators: the %s symbol in the string is a file name #: ../extensions/edit_metadata/gth-edit-comment-dialog.c:63 #, c-format @@ -1606,53 +1758,53 @@ msgstr "例如： *.o; *.bak" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:1 -msgid "Byline _Title:" -msgstr "署名標題(_T)：" - -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 msgid "C_opyright:" msgstr "版權(_O)：" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:3 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 msgid "Co_untry:" msgstr "國家(_U)：" +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:3 +msgid "_Code:" +msgstr "地區代碼(_C)：" + #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:4 msgid "Cr_edit:" msgstr "信用(_E)：" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 -msgid "State/Province:" -msgstr "州/省：" - #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:6 -msgid "_Byline:" -msgstr "署名(_B)：" +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 +msgid "_Source:" +msgstr "來源(_S)：" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:7 -msgid "_City:" -msgstr "城市(_C)：" +msgid "_Urgency:" +msgstr "緊急程度(_U)：" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:8 -msgid "_Code:" -msgstr "地區代碼(_C)：" +msgid "_Object Name:" +msgstr "物件名稱(_O)：" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:9 +msgid "Byline _Title:" +msgstr "署名標題(_T)：" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:10 -msgid "_Language:" -msgstr "語言(_L)：" +msgid "_Byline:" +msgstr "署名(_B)：" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:11 -msgid "_Object Name:" -msgstr "物件名稱(_O)：" +msgid "_City:" +msgstr "城市(_C)：" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:12 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 -msgid "_Source:" -msgstr "來源(_S)：" +msgid "_Language:" +msgstr "語言(_L)：" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:13 -msgid "_Urgency:" -msgstr "緊急程度(_U)：" +msgid "State/Province:" +msgstr "州/省：" #: ../extensions/exiv2_tools/exiv2_tools.extension.in.in.h:1 msgid "EXIF, IPTC, XMP support" @@ -1707,7 +1859,7 @@ msgid "XMP Attached" msgstr "%d 個附加的郵件" -#: ../extensions/exiv2_tools/main.c:256 +#: ../extensions/exiv2_tools/main.c:267 msgid "date photo was taken" msgstr "照片的拍攝日期" @@ -1724,80 +1876,82 @@ msgstr "上傳照片到 Facebook" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:1 -msgid "1024 x 1024" -msgstr "1024 x 1024" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 +msgid "Export to Flickr" +msgstr "匯出至 Flickr" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:2 -msgid "1280 x 1280" -msgstr "1280 x 1280" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 +msgid "_Upload" +msgstr "上傳(_U)" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:3 -msgid "1600 x 1600" -msgstr "1600 x 1600" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 +#, fuzzy +msgid "_Account:" +msgstr "帳號(_A):" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:4 -msgid "2048 x 2048" -msgstr "2048 x 2048" - -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 -msgid "720 x 720" -msgstr "720 x 720" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 +msgid "Edit accounts" +msgstr "編輯你的帳號" -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 msgid "A_lbum:" msgstr "相簿(_L)：" -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 msgid "Add a new album" msgstr "加入一新的相簿" +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 +#, fuzzy +#| msgid "_Resize if larger than:" +msgid "Resize the images if larger than this size" +msgstr "大於這個尺寸便會調整大小(_R)：" + #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:8 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 -msgid "Edit accounts" -msgstr "編輯你的帳號" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 +msgid "_Resize if larger than:" +msgstr "大於這個尺寸便會調整大小(_R)：" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:9 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 -msgid "Export to Flickr" -msgstr "匯出至 Flickr" +msgid "720 x 720" +msgstr "720 x 720" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:10 -#, fuzzy -#| msgid "_Resize if larger than:" -msgid "Resize the images if larger than this size" -msgstr "大於這個尺寸便會調整大小(_R)：" +msgid "1024 x 1024" +msgstr "1024 x 1024" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:11 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 -#, fuzzy -msgid "_Account:" -msgstr "帳號(_A):" +msgid "1280 x 1280" +msgstr "1280 x 1280" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:12 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 -#, fuzzy -msgid "_Resize to:" -msgstr "面對面" +msgid "1600 x 1600" +msgstr "1600 x 1600" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:13 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 -msgid "_Upload" -msgstr "上傳(_U)" +msgid "2048 x 2048" +msgstr "2048 x 2048" #: ../extensions/facebook/data/ui/facebook-account-chooser.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-account-chooser.ui.h:1 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 #: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 #: ../extensions/picasaweb/data/ui/picasa-web-account-chooser.ui.h:1 #, fuzzy msgid "A_ccount:" @@ -1811,25 +1965,25 @@ msgid "A_ccounts:" msgstr "最近使用(_R):" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 #, fuzzy -msgid "Private" -msgstr "私人" +msgid "Public photos" +msgstr "照片數量" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 msgid "Private photos, visible to friends" msgstr "私人照片，朋友們可看見的" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:5 #, fuzzy -msgid "Public photos" -msgstr "照片數量" +msgid "Private" +msgstr "私人" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:5 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:5 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 #, fuzzy msgid "_Visibility:" msgstr "可見狀態" @@ -1841,18 +1995,18 @@ msgstr "授權(_A)..." #: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-complete-authorization.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-complete-authorization.ui.h:1 -msgid "C_ontinue" -msgstr "繼續(_O)" - -#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 #: ../extensions/facebook/facebook-authentication.c:472 #: ../extensions/flicker_utils/flickr-authentication.c:408 #: ../extensions/oauth/oauth-authentication.c:423 msgid "Once you're done, click the 'Continue' button below." msgstr "一旦你完成後，點擊下面的“繼續”按鈕。" +#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 +#: ../extensions/flicker_utils/data/ui/flicker-complete-authorization.ui.h:1 +#: ../extensions/oauth/data/ui/oauth-complete-authorization.ui.h:1 +msgid "C_ontinue" +msgstr "繼續(_O)" + #: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:1 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:1 @@ -1864,79 +2018,79 @@ #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:2 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:2 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:2 -#: ../extensions/webalbums/gth-web-exporter.c:1841 +#: ../extensions/webalbums/gth-web-exporter.c:1839 msgid "_Open in the Browser" msgstr "在網頁瀏覽器中開啟(_O)" #: ../extensions/facebook/dlg-export-to-facebook.c:130 #: ../extensions/facebook/dlg-export-to-facebook.c:335 #: ../extensions/facebook/facebook-authentication.c:192 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:138 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:399 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:141 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:417 #: ../extensions/flicker_utils/dlg-import-from-flickr.c:237 #: ../extensions/flicker_utils/flickr-authentication.c:191 #: ../extensions/oauth/oauth-authentication.c:187 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:131 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:376 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:139 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:424 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:133 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:378 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:142 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:442 #: ../extensions/picasaweb/dlg-import-from-picasaweb.c:380 msgid "Could not connect to the server" msgstr "無法連接伺服器" #: ../extensions/facebook/dlg-export-to-facebook.c:182 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:246 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:182 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:192 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:249 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:184 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:195 msgid "Could not upload the files" msgstr "無法上傳檔案" #: ../extensions/facebook/dlg-export-to-facebook.c:412 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:188 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:223 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:462 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:717 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:191 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:226 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:464 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:735 msgid "Could not create the album" msgstr "無法建立相簿" #: ../extensions/facebook/dlg-export-to-facebook.c:481 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:534 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:783 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:536 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:801 msgid "New Album" msgstr "新增相簿" #: ../extensions/facebook/dlg-export-to-facebook.c:561 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:557 -#: ../extensions/image_print/gth-image-print-job.c:1789 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:614 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1002 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:591 +#: ../extensions/image_print/gth-image-print-job.c:1739 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:615 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1036 #, fuzzy msgid "No valid file selected." msgstr "無檔案可支援 (%i 個選擇的檔案)" #: ../extensions/facebook/dlg-export-to-facebook.c:562 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:558 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:615 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1003 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:592 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:616 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1037 msgid "Could not export the files" msgstr "無法匯出檔案" #: ../extensions/facebook/dlg-export-to-facebook.c:570 -#: ../extensions/find_duplicates/gth-find-duplicates.c:255 -#: ../extensions/find_duplicates/gth-find-duplicates.c:347 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:566 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:623 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1010 +#: ../extensions/find_duplicates/gth-find-duplicates.c:277 +#: ../extensions/find_duplicates/gth-find-duplicates.c:470 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:600 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:624 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1044 #: ../extensions/picasaweb/dlg-import-from-picasaweb.c:803 -#: ../gthumb/gth-browser.c:1006 +#: ../gthumb/gth-browser.c:1072 #, c-format msgid "%d file (%s)" msgid_plural "%d files (%s)" msgstr[0] "%d 個檔案 (大小為 %s)" #: ../extensions/facebook/dlg-export-to-facebook.c:591 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:589 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:642 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:623 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:643 #, c-format msgid "Export to %s" msgstr "匯出至 %s" @@ -1982,7 +2136,7 @@ #: ../extensions/facebook/facebook-authentication.c:652 #: ../extensions/flicker_utils/flickr-authentication.c:588 #: ../extensions/oauth/oauth-authentication.c:605 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:820 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:838 #: ../extensions/picasaweb/dlg-import-from-picasaweb.c:684 msgid "Choose Account" msgstr "選擇帳戶" @@ -1990,7 +2144,7 @@ #: ../extensions/facebook/facebook-authentication.c:761 #: ../extensions/flicker_utils/flickr-authentication.c:697 #: ../extensions/oauth/oauth-authentication.c:714 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:881 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:899 #: ../extensions/picasaweb/dlg-import-from-picasaweb.c:745 msgid "Edit Accounts" msgstr "編輯你的帳號" @@ -2002,8 +2156,8 @@ #: ../extensions/facebook/facebook-service.c:468 #: ../extensions/flicker_utils/flickr-connection.c:266 #: ../extensions/flicker_utils/flickr-connection.c:413 -#: ../extensions/flicker_utils/flickr-service.c:195 -#: ../extensions/flicker_utils/flickr-service.c:398 +#: ../extensions/flicker_utils/flickr-service.c:197 +#: ../extensions/flicker_utils/flickr-service.c:400 #: ../extensions/photobucket/photobucket-consumer.c:74 #: ../extensions/photobucket/photobucket-consumer.c:79 #: ../extensions/photobucket/photobucket-consumer.c:115 @@ -2017,7 +2171,7 @@ #: ../extensions/facebook/facebook-service.c:290 #: ../extensions/flicker_utils/flickr-connection.c:292 #: ../extensions/flicker_utils/flickr-connection.c:439 -#: ../extensions/flicker_utils/flickr-service.c:219 +#: ../extensions/flicker_utils/flickr-service.c:221 #: ../extensions/oauth/oauth-connection.c:356 #: ../extensions/oauth/oauth-connection.c:431 #: ../extensions/oauth/oauth-connection.c:535 @@ -2035,7 +2189,7 @@ #: ../extensions/facebook/facebook-service.c:188 #: ../extensions/facebook/facebook-service.c:290 -#: ../extensions/flicker_utils/flickr-service.c:219 +#: ../extensions/flicker_utils/flickr-service.c:221 #: ../extensions/oauth/oauth-connection.c:356 #: ../extensions/oauth/oauth-connection.c:431 #: ../extensions/oauth/oauth-connection.c:535 @@ -2043,48 +2197,48 @@ msgstr "正在取得帳戶資訊" #: ../extensions/facebook/facebook-service.c:396 -#: ../extensions/flicker_utils/flickr-service.c:323 +#: ../extensions/flicker_utils/flickr-service.c:325 #: ../extensions/photobucket/photobucket-service.c:207 -#: ../extensions/picasaweb/picasa-web-service.c:209 +#: ../extensions/picasaweb/picasa-web-service.c:211 msgid "Getting the album list" msgstr "取得相簿清單" #: ../extensions/facebook/facebook-service.c:525 -#: ../extensions/flicker_utils/flickr-service.c:426 -#: ../extensions/flicker_utils/flickr-service.c:546 -#: ../extensions/flicker_utils/flickr-service.c:584 +#: ../extensions/flicker_utils/flickr-service.c:428 +#: ../extensions/flicker_utils/flickr-service.c:548 +#: ../extensions/flicker_utils/flickr-service.c:586 #: ../extensions/photobucket/photobucket-service.c:316 -#: ../extensions/picasaweb/picasa-web-service.c:300 +#: ../extensions/picasaweb/picasa-web-service.c:302 msgid "Creating the new album" msgstr "建立新的相簿" #: ../extensions/facebook/facebook-service.c:584 -#: ../extensions/flicker_utils/flickr-service.c:634 +#: ../extensions/flicker_utils/flickr-service.c:636 #: ../extensions/photobucket/photobucket-service.c:373 -#: ../extensions/picasaweb/picasa-web-service.c:357 +#: ../extensions/picasaweb/picasa-web-service.c:359 #, fuzzy, c-format msgid "Could not upload '%s': %s" msgstr "無法上傳偏好設定。理由：{0}" #. Translators: %s is a filename #: ../extensions/facebook/facebook-service.c:670 -#: ../extensions/flicker_utils/flickr-service.c:745 +#: ../extensions/flicker_utils/flickr-service.c:747 #: ../extensions/photobucket/photobucket-service.c:430 -#: ../extensions/picasaweb/picasa-web-service.c:412 +#: ../extensions/picasaweb/picasa-web-service.c:414 #, c-format msgid "Uploading '%s'" msgstr "正在上傳 '%s'" -#: ../extensions/facebook/facebook-service.c:886 -#: ../extensions/flicker_utils/flickr-service.c:914 +#: ../extensions/facebook/facebook-service.c:884 +#: ../extensions/flicker_utils/flickr-service.c:940 #: ../extensions/photobucket/photobucket-service.c:599 -#: ../extensions/picasaweb/picasa-web-service.c:605 +#: ../extensions/picasaweb/picasa-web-service.c:631 msgid "Uploading the files to the server" msgstr "正在上傳檔案至伺服器" -#: ../extensions/facebook/facebook-service.c:1003 -#: ../extensions/flicker_utils/flickr-service.c:1077 -#: ../extensions/picasaweb/picasa-web-service.c:718 +#: ../extensions/facebook/facebook-service.c:1001 +#: ../extensions/flicker_utils/flickr-service.c:1105 +#: ../extensions/picasaweb/picasa-web-service.c:746 msgid "Getting the photo list" msgstr "獲取照片清單" @@ -2203,7 +2357,7 @@ #: ../extensions/file_manager/callbacks.c:191 #: ../extensions/file_manager/callbacks.c:203 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:2 msgid "_Rename" msgstr "重新命名(_R)" @@ -2246,8 +2400,8 @@ msgstr "選取的檔案移動到另一個資料夾" #: ../extensions/file_manager/callbacks.c:1003 -#: ../extensions/find_duplicates/gth-find-duplicates.c:581 -#: ../gthumb/gth-browser.c:5011 ../gthumb/gth-browser.c:5045 +#: ../extensions/find_duplicates/gth-find-duplicates.c:766 +#: ../gthumb/gth-browser.c:5120 ../gthumb/gth-browser.c:5154 #, fuzzy msgid "Could not perform the operation" msgstr "操作無法進行" @@ -2265,391 +2419,401 @@ msgstr "刪除檔案" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:1 -msgid "B_rightness:" -msgstr "亮度(_R)：" +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:5 +msgid "_Preview" +msgstr "預覽(_P)" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:2 -msgid "Color Levels" -msgstr "色階" +msgid "B_rightness:" +msgstr "亮度(_R)：" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:3 msgid "Con_trast:" msgstr "對比(_T):" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:4 -msgid "Cyan-_Red:" -msgstr "氰藍色－紅色(_R):" +msgid "_Saturation:" +msgstr "彩度(_S):" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:5 msgid "G_amma:" msgstr "G_amma：" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:6 -msgid "_Magenta-Green:" -msgstr "紫紅色－綠色(_M):" +msgid "Cyan-_Red:" +msgstr "氰藍色－紅色(_R):" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:7 -msgid "_Preview" -msgstr "預覽(_P)" +msgid "_Magenta-Green:" +msgstr "紫紅色－綠色(_M):" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:8 -#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:5 -msgid "_Reset" -msgstr "重設(_R)" +msgid "_Yellow-Blue:" +msgstr "黃色－藍色(_Y):" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:9 -msgid "_Saturation:" -msgstr "彩度(_S):" +msgid "Color Levels" +msgstr "色階" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:10 -msgid "_Yellow-Blue:" -msgstr "黃色－藍色(_Y):" +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:5 +msgid "_Reset" +msgstr "重設(_R)" #: ../extensions/file_tools/data/ui/crop-options.ui.h:1 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 -msgid "Aspect ratio" -msgstr "長寬比" +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +msgid "Selection" +msgstr "選取" #: ../extensions/file_tools/data/ui/crop-options.ui.h:2 -msgid "C_rop" -msgstr "裁剪(_R)" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 +msgid "_Width:" +msgstr "闊度(_W):" #: ../extensions/file_tools/data/ui/crop-options.ui.h:3 -msgid "Center" -msgstr "置中" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 +msgid "Heigh_t:" +msgstr "高度(_T)：" #: ../extensions/file_tools/data/ui/crop-options.ui.h:4 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 -msgid "I_nvert aspect ratio" -msgstr "反轉長寬比(_N)" +msgid "_Position:" +msgstr "位置(_P)：" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:5 +msgid "Maximize" +msgstr "最大化" -#. after the colon there is a control to select the size in pixels #: ../extensions/file_tools/data/ui/crop-options.ui.h:6 -msgid "M_ultiple of:" -msgstr "倍數於(_U)：" +msgid "Center" +msgstr "置中" #: ../extensions/file_tools/data/ui/crop-options.ui.h:7 -msgid "Maximize" -msgstr "最大化" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:5 +msgid "Aspect ratio" +msgstr "長寬比" #: ../extensions/file_tools/data/ui/crop-options.ui.h:8 -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 -msgid "Selection" -msgstr "選取區域" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 +msgid "I_nvert aspect ratio" +msgstr "反轉長寬比(_N)" +#. after the colon there is a control to select the size in pixels #: ../extensions/file_tools/data/ui/crop-options.ui.h:10 -msgid "_Grid:" -msgstr "格線(_G)：" - -#: ../extensions/file_tools/data/ui/crop-options.ui.h:11 -msgid "_Position:" -msgstr "位置(_P)：" +msgid "M_ultiple of:" +msgstr "倍數於(_U)：" #. abbreviation of pixel -#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:12 msgid "px" msgstr "像素" -#. this is used to separate the dimensions, for example: 120 × 250 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 +#: ../gthumb/gth-file-chooser-dialog.c:252 +msgid "Options" +msgstr "選項" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:14 +msgid "_Grid:" +msgstr "格線(_G)：" + #: ../extensions/file_tools/data/ui/crop-options.ui.h:15 -msgid "×" -msgstr "" +msgid "C_rop" +msgstr "裁剪(_R)" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:2 -#, no-c-format -msgid "%" -msgstr "%" +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:1 +msgid "Method" +msgstr "方法" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:2 +msgid "_Brightness" +msgstr "亮度(_B)" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:3 +msgid "_Saturation" +msgstr "飽和度(_S)" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:4 +msgid "_Average" +msgstr "平均(_A)" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 #: ../gthumb/gth-main-default-metadata.c:47 msgid "Dimensions" msgstr "尺寸" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:5 -msgid "Heigh_t:" -msgstr "高度(_T)：" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +#, fuzzy +#| msgid "Set the image as desktop background" +msgid "Set the image size to this value" +msgstr "將圖片設為桌面背景" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:8 msgid "High _quality" msgstr "高品質(_Q)" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:8 -msgid "New dimensions:" -msgstr "新的尺寸：" - #: ../extensions/file_tools/data/ui/resize-options.ui.h:9 -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 -msgid "Options" -msgstr "選項" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 msgid "Original dimensions:" msgstr "原來的尺寸：" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 msgid "Scale factor:" msgstr "比例因子：" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 -#, fuzzy -#| msgid "Set the image as desktop background" -msgid "Set the image size to this value" -msgstr "將圖片設為桌面背景" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:13 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:11 -msgid "_Width:" -msgstr "闊度(_W):" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 +msgid "New dimensions:" +msgstr "新的尺寸：" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:14 -#: ../extensions/image_print/data/ui/print-layout.ui.h:31 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:29 msgid "pixels" msgstr "像素" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:14 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:12 +#, no-c-format +msgid "%" +msgstr "%" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:1 -msgid "Align" -msgstr "對齊" +msgid "Angle" +msgstr "角度" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 -msgid "Alignment" -msgstr "對齊方式" +msgid "Align" +msgstr "對齊" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 -msgid "Angle" -msgstr "角度" +msgid "Image size" +msgstr "圖片大小" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 -msgid "Bounding box" -msgstr "邊界框" +msgid "Point 1:" +msgstr "第1點：" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 -msgid "Crop borders" -msgstr "裁剪邊框" +msgid "Point 2:" +msgstr "第2點：" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 -msgid "" -"Draw a line on the image \n" -"to set the alignment." -msgstr "" -"畫一條線在圖片上\n" -"以設置對齊。" +msgid "Keep aspect ratio" +msgstr "保持長寬比" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 msgid "Grid:" msgstr "格線：" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 -msgid "Image size" -msgstr "圖片大小" +msgid "_Background:" +msgstr "背景(_B)：" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 -msgid "Keep aspect ratio" -msgstr "保持長寬比" +msgid "Pick a background color" +msgstr "挑選一個背景顏色" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 +msgid "_Transparent" +msgstr "透明度(_T)" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:12 -msgid "Original size" -msgstr "原始大小" +msgid "Reset" +msgstr "重設" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:13 +msgid "" +"Draw a line on the image \n" +"to set the alignment." +msgstr "" +"畫一條線在圖片上\n" +"以設置對齊。" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:15 msgid "Parallel" msgstr "平行" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:14 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:16 msgid "Perpendicular" msgstr "垂直" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:15 -msgid "Pick a background color" -msgstr "挑選一個背景顏色" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:16 -msgid "Point 1:" -msgstr "" - #: ../extensions/file_tools/data/ui/rotate-options.ui.h:17 -msgid "Point 2:" -msgstr "" +msgid "Alignment" +msgstr "對齊方式" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:18 -msgid "Reset" -msgstr "重設" +msgid "Original size" +msgstr "原始大小" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:19 -msgid "_Background:" -msgstr "背景(_B)：" +msgid "Bounding box" +msgstr "邊界框" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:20 -msgid "_Transparent" -msgstr "透明度(_T)" +msgid "Crop borders" +msgstr "裁剪邊框" #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:1 -msgid "Amount:" -msgstr "總數：" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 +msgid "_Preview:" +msgstr "預覽(_P)：" #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:2 -msgid "Radius:" -msgstr "半徑：" - -#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:3 msgid "Threshold:" msgstr "臨界值：" +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:3 +msgid "Radius:" +msgstr "半徑：" + #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:4 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 -msgid "_Preview:" -msgstr "預覽(_P)：" +msgid "Amount:" +msgstr "總數：" #: ../extensions/file_tools/file_tools.extension.in.in.h:1 +msgid "Image tools" +msgstr "圖片工具" + +#: ../extensions/file_tools/file_tools.extension.in.in.h:2 msgid "Basic tools to modify images." msgstr "修改圖片的基本工具。" -#: ../extensions/file_tools/file_tools.extension.in.in.h:2 -msgid "Image tools" -msgstr "圖片工具" +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:372 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:272 +#: ../extensions/file_tools/gth-file-tool-grayscale.c:248 +#: ../extensions/file_tools/gth-file-tool-negative.c:68 +msgid "Applying changes" +msgstr "套用更改中" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 msgid "Adjust Colors..." msgstr "調整顏色..." -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 msgid "Adjust Colors" msgstr "調整顏色" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:531 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:619 msgid "Change brightness, contrast, saturation and gamma level of the image" msgstr "更改圖片的亮度、對比、飽和度和灰色階調" -#: ../extensions/file_tools/gth-file-tool-crop.c:424 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:304 +msgid "Adjust Contrast" +msgstr "調整對比度" + +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:305 +msgid "Automatic contrast adjustment" +msgstr "自動對比度調整" + +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 msgid "Square" msgstr "正方形" -#: ../extensions/file_tools/gth-file-tool-crop.c:425 -#: ../extensions/file_tools/gth-file-tool-resize.c:499 +#: ../extensions/file_tools/gth-file-tool-crop.c:417 +#: ../extensions/file_tools/gth-file-tool-resize.c:590 #, c-format msgid "%d x %d (Image)" msgstr "%d×%d (圖片)" -#: ../extensions/file_tools/gth-file-tool-crop.c:428 -#: ../extensions/file_tools/gth-file-tool-resize.c:503 +#: ../extensions/file_tools/gth-file-tool-crop.c:420 +#: ../extensions/file_tools/gth-file-tool-resize.c:594 #, c-format msgid "%d x %d (Screen)" msgstr "%d × %d (畫面)" -#: ../extensions/file_tools/gth-file-tool-crop.c:432 -#: ../extensions/file_tools/gth-file-tool-resize.c:508 +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-resize.c:599 #, fuzzy msgid "5:4" msgstr "5:" -#: ../extensions/file_tools/gth-file-tool-crop.c:433 -#: ../extensions/file_tools/gth-file-tool-resize.c:509 +#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-resize.c:600 #, fuzzy msgid "4:3 (DVD, Book)" msgstr "書本名稱(_N)" -#: ../extensions/file_tools/gth-file-tool-crop.c:434 -#: ../extensions/file_tools/gth-file-tool-resize.c:510 +#: ../extensions/file_tools/gth-file-tool-crop.c:426 +#: ../extensions/file_tools/gth-file-tool-resize.c:601 #, fuzzy msgid "7:5" msgstr "75" -#: ../extensions/file_tools/gth-file-tool-crop.c:435 -#: ../extensions/file_tools/gth-file-tool-resize.c:511 +#: ../extensions/file_tools/gth-file-tool-crop.c:427 +#: ../extensions/file_tools/gth-file-tool-resize.c:602 #, fuzzy msgid "3:2 (Postcard)" msgstr "明信片" -#: ../extensions/file_tools/gth-file-tool-crop.c:436 -#: ../extensions/file_tools/gth-file-tool-resize.c:512 +#: ../extensions/file_tools/gth-file-tool-crop.c:428 +#: ../extensions/file_tools/gth-file-tool-resize.c:603 #, fuzzy msgid "16:10" msgstr "RAID-10" -#: ../extensions/file_tools/gth-file-tool-crop.c:437 -#: ../extensions/file_tools/gth-file-tool-resize.c:513 +#: ../extensions/file_tools/gth-file-tool-crop.c:429 +#: ../extensions/file_tools/gth-file-tool-resize.c:604 #, fuzzy msgid "16:9 (DVD)" msgstr "播放 D_VD" -#: ../extensions/file_tools/gth-file-tool-crop.c:438 -#: ../extensions/file_tools/gth-file-tool-resize.c:514 +#: ../extensions/file_tools/gth-file-tool-crop.c:430 +#: ../extensions/file_tools/gth-file-tool-resize.c:605 #, fuzzy msgid "1.85:1" msgstr "85%" -#: ../extensions/file_tools/gth-file-tool-crop.c:439 -#: ../extensions/file_tools/gth-file-tool-resize.c:515 +#: ../extensions/file_tools/gth-file-tool-crop.c:431 +#: ../extensions/file_tools/gth-file-tool-resize.c:606 #, fuzzy msgid "2.39:1" msgstr "39" -#: ../extensions/file_tools/gth-file-tool-crop.c:440 -#: ../extensions/file_tools/gth-file-tool-resize.c:516 -#: ../extensions/image_print/data/ui/print-layout.ui.h:7 +#: ../extensions/file_tools/gth-file-tool-crop.c:432 +#: ../extensions/file_tools/gth-file-tool-resize.c:607 +#: ../extensions/image_print/data/ui/print-layout.ui.h:2 #: ../extensions/rename_series/gth-template-selector.c:234 msgid "Custom" msgstr "自選" -#: ../extensions/file_tools/gth-file-tool-crop.c:455 -#: ../extensions/file_tools/gth-file-tool-rotate.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:447 +#: ../extensions/file_tools/gth-file-tool-rotate.c:404 msgid "Rule of Thirds" msgstr "三分法則" -#: ../extensions/file_tools/gth-file-tool-crop.c:456 -#: ../extensions/file_tools/gth-file-tool-rotate.c:417 +#: ../extensions/file_tools/gth-file-tool-crop.c:448 +#: ../extensions/file_tools/gth-file-tool-rotate.c:405 msgid "Golden Sections" msgstr "黃金分割" -#: ../extensions/file_tools/gth-file-tool-crop.c:457 -#: ../extensions/file_tools/gth-file-tool-rotate.c:418 +#: ../extensions/file_tools/gth-file-tool-crop.c:449 +#: ../extensions/file_tools/gth-file-tool-rotate.c:406 msgid "Center Lines" msgstr "中心線" -#: ../extensions/file_tools/gth-file-tool-crop.c:458 -#: ../extensions/file_tools/gth-file-tool-rotate.c:419 +#: ../extensions/file_tools/gth-file-tool-crop.c:450 +#: ../extensions/file_tools/gth-file-tool-rotate.c:407 msgid "Uniform" msgstr "均勻分佈" -#: ../extensions/file_tools/gth-file-tool-crop.c:614 +#: ../extensions/file_tools/gth-file-tool-crop.c:608 msgid "Crop..." msgstr "裁剪..." -#: ../extensions/file_tools/gth-file-tool-crop.c:614 +#: ../extensions/file_tools/gth-file-tool-crop.c:608 msgid "Crop" msgstr "裁剪" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:68 -#: ../extensions/file_tools/gth-file-tool-negative.c:68 -msgid "Applying changes" -msgstr "套用更改中" - -#: ../extensions/file_tools/gth-file-tool-desaturate.c:203 -msgid "Desaturate" -msgstr "去除色彩" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:119 -msgid "White balance correction" -msgstr "白平衡校正" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:342 -msgid "Enhance Colors" -msgstr "加強色彩" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:343 -msgid "Automatic white balance correction" -msgstr "自動白平衡修正" - -#: ../extensions/file_tools/gth-file-tool-equalize.c:86 +#: ../extensions/file_tools/gth-file-tool-equalize.c:45 msgid "Equalizing image histogram" msgstr "正在均等圖片的色彩分佈" -#: ../extensions/file_tools/gth-file-tool-equalize.c:275 +#: ../extensions/file_tools/gth-file-tool-equalize.c:230 msgid "Equalize" msgstr "均等" -#: ../extensions/file_tools/gth-file-tool-equalize.c:276 +#: ../extensions/file_tools/gth-file-tool-equalize.c:231 msgid "Equalize image histogram" msgstr "均等圖片的色彩分佈" @@ -2661,6 +2825,14 @@ msgid "Flip the image vertically" msgstr "垂直翻轉圖片" +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale..." +msgstr "灰階..." + +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale" +msgstr "灰階" + #: ../extensions/file_tools/gth-file-tool-mirror.c:87 msgid "Mirror" msgstr "左右倒置" @@ -2677,23 +2849,28 @@ msgid "Redo" msgstr "取消復原" -#: ../extensions/file_tools/gth-file-tool-resize.c:680 +#: ../extensions/file_tools/gth-file-tool-resize.c:214 +#: ../extensions/resize_images/dlg-resize-images.c:180 +msgid "Resizing images" +msgstr "調整圖片大小" + +#: ../extensions/file_tools/gth-file-tool-resize.c:808 msgid "Resize..." msgstr "調整大小..." -#: ../extensions/file_tools/gth-file-tool-resize.c:680 +#: ../extensions/file_tools/gth-file-tool-resize.c:808 msgid "Resize" msgstr "調整大小" -#: ../extensions/file_tools/gth-file-tool-rotate.c:636 +#: ../extensions/file_tools/gth-file-tool-rotate.c:637 msgid "Rotate..." msgstr "旋轉..." -#: ../extensions/file_tools/gth-file-tool-rotate.c:636 +#: ../extensions/file_tools/gth-file-tool-rotate.c:637 msgid "Rotate" msgstr "旋轉" -#: ../extensions/file_tools/gth-file-tool-rotate.c:637 +#: ../extensions/file_tools/gth-file-tool-rotate.c:638 msgid "Freely rotate the image" msgstr "自由旋轉圖片" @@ -2723,15 +2900,15 @@ msgid "Save" msgstr "儲存" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:100 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:101 msgid "Sharpening image" msgstr "正在銳利化圖片" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 msgid "Enhance Focus..." msgstr "加強聚焦..." -#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 msgid "Enhance Focus" msgstr "加強聚焦" @@ -2752,38 +2929,38 @@ msgstr "資料夾(_F)：" #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:1 +msgid "Search for Duplicates" +msgstr "搜尋重複的" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 msgid "Duplicates:" msgstr "重複：" -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 msgid "Files:" msgstr "檔案：" -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 -msgid "No duplicates found." -msgstr "沒有發現重複的。" - #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:4 -msgid "Search for Duplicates" -msgstr "搜尋重複的" - -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 #: ../gthumb/gth-browser-actions-entries.h:33 msgid "_View" msgstr "檢視(_V)" +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 +msgid "No duplicates found." +msgstr "沒有發現重複的。" + #: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:1 #: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:1 msgid "Find Duplicates" msgstr "尋找重複的" #: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:2 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:19 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 #: ../extensions/search/data/ui/search-editor.ui.h:1 msgid "Start _at:" msgstr "開始於(_A)：" -#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 msgid "_Filter:" msgstr "篩選器(_F)：" @@ -2791,46 +2968,46 @@ msgid "Find duplicated files." msgstr "尋找重複的檔案。" -#: ../extensions/find_duplicates/gth-find-duplicates.c:53 +#: ../extensions/find_duplicates/gth-find-duplicates.c:65 #, fuzzy #| msgid "_Save the new file as:" msgid "leave the newest duplicates" msgstr "儲存新檔案為(_S)：" -#: ../extensions/find_duplicates/gth-find-duplicates.c:54 +#: ../extensions/find_duplicates/gth-find-duplicates.c:66 #, fuzzy #| msgid "Change the files date" msgid "leave the oldest duplicates" msgstr "更改檔案日期" -#: ../extensions/find_duplicates/gth-find-duplicates.c:55 +#: ../extensions/find_duplicates/gth-find-duplicates.c:67 msgid "by folder..." msgstr "" -#: ../extensions/find_duplicates/gth-find-duplicates.c:56 +#: ../extensions/find_duplicates/gth-find-duplicates.c:68 msgid "all files" msgstr "所有檔案" -#: ../extensions/find_duplicates/gth-find-duplicates.c:57 +#: ../extensions/find_duplicates/gth-find-duplicates.c:69 msgid "no file" msgstr "沒有檔案" -#: ../extensions/find_duplicates/gth-find-duplicates.c:397 -#: ../extensions/find_duplicates/gth-find-duplicates.c:492 +#: ../extensions/find_duplicates/gth-find-duplicates.c:560 +#: ../extensions/find_duplicates/gth-find-duplicates.c:668 #, c-format msgid "%d duplicate" msgid_plural "%d duplicates" msgstr[0] "%d 個重複" -#: ../extensions/find_duplicates/gth-find-duplicates.c:536 +#: ../extensions/find_duplicates/gth-find-duplicates.c:712 msgid "Search completed" msgstr "搜尋完成" -#: ../extensions/find_duplicates/gth-find-duplicates.c:548 +#: ../extensions/find_duplicates/gth-find-duplicates.c:725 msgid "Searching for duplicates" msgstr "正在搜尋重複的" -#: ../extensions/find_duplicates/gth-find-duplicates.c:551 +#: ../extensions/find_duplicates/gth-find-duplicates.c:728 #: ../gthumb/gth-load-file-data-task.c:106 #: ../gthumb/gth-save-file-data-task.c:100 #, c-format @@ -2838,15 +3015,15 @@ msgid_plural "%d files remaining" msgstr[0] "%d 個檔案剩餘" -#: ../extensions/find_duplicates/gth-find-duplicates.c:634 +#: ../extensions/find_duplicates/gth-find-duplicates.c:830 msgid "Getting the file list" msgstr "正在取得檔案清單" -#: ../extensions/find_duplicates/gth-find-duplicates.c:740 +#: ../extensions/find_duplicates/gth-find-duplicates.c:1016 msgid "Duplicates" msgstr "重製" -#: ../extensions/find_duplicates/gth-find-duplicates.c:997 +#: ../extensions/find_duplicates/gth-find-duplicates.c:1306 msgid "Select" msgstr "選取" @@ -2870,62 +3047,62 @@ msgid "Upload images to Flickr" msgstr "上傳圖片至 Flickr" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 msgid "Free space:" msgstr "可用空間：" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 -msgid "Hi_de from public searches" -msgstr "從公開搜尋中隱藏(_D)" - -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 -#, fuzzy -msgid "Moderate content" -msgstr "html content" - #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:5 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 #, fuzzy msgid "Ph_otoset:" msgstr "綠色相位差(_A):" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:6 -msgid "Private photos" -msgstr "私人照片" +#, fuzzy +msgid "_Privacy:" +msgstr "私隱" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:7 -msgid "Private photos, visible to family" -msgstr "" +msgid "Hi_de from public searches" +msgstr "從公開搜尋中隱藏(_D)" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:8 +#, fuzzy +msgid "_Safety:" +msgstr "安全邊界" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 msgid "Private photos, visible to family and friends" msgstr "" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 -#, fuzzy -msgid "Restricted content" -msgstr "html content" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 +msgid "Private photos, visible to family" +msgstr "" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 +msgid "Private photos" +msgstr "私人照片" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 #, fuzzy msgid "Safe content" msgstr "html content" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 #, fuzzy -msgid "_Privacy:" -msgstr "私隱" +msgid "Moderate content" +msgstr "html content" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:17 #, fuzzy -msgid "_Safety:" -msgstr "安全邊界" +msgid "Restricted content" +msgstr "html content" -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 msgid "_Import" msgstr "匯入(_I)" @@ -2936,20 +3113,20 @@ msgstr "無法在通訊協定清單中取得使用中的通訊協定。" #: ../extensions/flicker_utils/dlg-import-from-flickr.c:397 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:561 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:562 #: ../extensions/picasaweb/dlg-import-from-picasaweb.c:864 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1026 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1027 msgid "No album selected" msgstr "沒有相簿是選取的" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:579 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:580 #, c-format msgid "Import from %s" msgstr "由 %s 匯入" #: ../extensions/gstreamer_tools/actions.c:66 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1080 -#: ../gthumb/gth-browser.c:2013 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1072 +#: ../gthumb/gth-browser.c:2100 msgid "Could not save the file" msgstr "無法儲存檔案" @@ -2958,7 +3135,7 @@ msgstr "無法拍下螢幕截圖" #: ../extensions/gstreamer_tools/actions.c:132 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1248 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1243 msgid "Save Image" msgstr "儲存圖片" @@ -2968,35 +3145,35 @@ msgstr "螢幕擷圖" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:1 -msgid "--:--" -msgstr "" +msgid "Slower" +msgstr "放慢" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 -msgid "Change volume level" -msgstr "改變音量大小" +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:687 +msgid "Play" +msgstr "播放" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:3 msgid "Faster" msgstr "加速" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:686 -msgid "Play" -msgstr "播放" +msgid "Time:" +msgstr "時間：" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 -msgid "Slower" -msgstr "放慢" +msgid "--:--" +msgstr "" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 -msgid "Time:" -msgstr "時間：" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 msgid "Toggle volume" msgstr "切換音量" -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 +msgid "Change volume level" +msgstr "改變音量大小" + +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 #: ../extensions/photo_importer/actions.c:67 #: ../extensions/photo_importer/dlg-photo-importer.c:620 msgid "Choose a folder" @@ -3018,11 +3195,11 @@ msgid "Take a screenshot" msgstr "拍下螢幕擷圖" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:663 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:664 msgid "Playing video" msgstr "播放影片" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:677 msgid "Pause" msgstr "暫停" @@ -3041,7 +3218,7 @@ msgstr "演出者" #: ../extensions/gstreamer_tools/main.c:40 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 msgid "Album" msgstr "相簿" @@ -3059,18 +3236,17 @@ msgstr "編解碼器" #: ../extensions/gstreamer_tools/main.c:45 -#, fuzzy msgid "Framerate" -msgstr "幀率：" +msgstr "畫面更新率：" #: ../extensions/gstreamer_tools/main.c:46 -#: ../extensions/image_print/data/ui/print-layout.ui.h:25 +#: ../extensions/image_print/data/ui/print-layout.ui.h:24 #: ../extensions/image_viewer/gth-image-viewer-page.c:209 msgid "Width" msgstr "闊度" #: ../extensions/gstreamer_tools/main.c:47 -#: ../extensions/image_print/data/ui/print-layout.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:25 msgid "Height" msgstr "高度" @@ -3092,10 +3268,9 @@ #. Translators: this is an image size, such as 1024 × 768 #: ../extensions/gstreamer_utils/gstreamer-utils.c:396 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1303 -#: ../extensions/image_viewer/gth-metadata-provider-image.c:190 -#: ../extensions/webalbums/dlg-web-exporter.c:442 -#: ../extensions/webalbums/gth-web-exporter.c:2446 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1298 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:209 +#: ../extensions/webalbums/gth-web-exporter.c:2444 ../gthumb/gtk-utils.c:1055 #, fuzzy, c-format msgid "%d × %d" msgstr "%d × %d" @@ -3104,100 +3279,101 @@ msgid "Could not print the selected files" msgstr "無法列印選取的檔案" -#: ../extensions/image_print/callbacks.c:54 +#: ../extensions/image_print/callbacks.c:65 msgid "Print the selected images" msgstr "列印選取的圖片" -#: ../extensions/image_print/data/ui/print-layout.ui.h:5 +#: ../extensions/image_print/data/ui/print-layout.ui.h:1 #, fuzzy msgid "Centered" msgstr "置中" -#: ../extensions/image_print/data/ui/print-layout.ui.h:10 -msgid "Image" -msgstr "圖片" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:12 -msgid "Left" -msgstr "左" - #: ../extensions/image_print/data/ui/print-layout.ui.h:13 -msgid "Position:" -msgstr "位置：" +msgid "The total number of files" +msgstr "檔案的總數" #: ../extensions/image_print/data/ui/print-layout.ui.h:14 -msgid "Preview" -msgstr "預覽" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:15 -msgid "Rotation:" -msgstr "旋轉：" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:20 #: ../extensions/importer/data/ui/import-preferences.ui.h:4 msgid "The event description" msgstr "事件描述" +#: ../extensions/image_print/data/ui/print-layout.ui.h:17 +#, fuzzy +msgid "_Rows:" +msgstr "顯示格線(_H)" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:19 +msgid "Image" +msgstr "圖片" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:20 +msgid "Position:" +msgstr "位置：" + #: ../extensions/image_print/data/ui/print-layout.ui.h:21 -msgid "The total number of files" -msgstr "檔案的總數" +msgid "Left" +msgstr "左" -#: ../extensions/image_print/data/ui/print-layout.ui.h:23 +#: ../extensions/image_print/data/ui/print-layout.ui.h:22 msgid "Top" msgstr "上" -#: ../extensions/image_print/data/ui/print-layout.ui.h:24 +#: ../extensions/image_print/data/ui/print-layout.ui.h:26 +msgid "Rotation:" +msgstr "旋轉：" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:27 msgid "Unit:" msgstr "單位：" #: ../extensions/image_print/data/ui/print-layout.ui.h:28 -#, fuzzy -msgid "_Rows:" -msgstr "顯示格線(_H)" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:29 -msgid "inches" -msgstr "英吋" +msgid "Preview" +msgstr "預覽" #: ../extensions/image_print/data/ui/print-layout.ui.h:30 msgid "millimeters" msgstr "毫米" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 -msgid "Fonts" -msgstr "字型" +#: ../extensions/image_print/data/ui/print-layout.ui.h:31 +msgid "inches" +msgstr "英吋" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:4 msgid "Select Caption Font" msgstr "選擇標題的字體" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:4 -msgid "Select Footer Font" -msgstr "選擇頁尾字型" - #: ../extensions/image_print/data/ui/print-preferences.ui.h:5 msgid "Select Header Font" msgstr "選擇頁首字型" -#: ../extensions/image_print/gth-image-print-job.c:971 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 +msgid "Select Footer Font" +msgstr "選擇頁尾字型" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 +msgid "Fonts" +msgstr "字型" + +#: ../extensions/image_print/gth-image-print-job.c:914 #: ../extensions/webalbums/data/albumthemes/text.h:31 #, c-format msgid "Page %d of %d" msgstr "第 %d 頁 (共 %d 頁)" -#: ../extensions/image_print/gth-image-print-job.c:1734 -#: ../extensions/image_print/gth-image-print-job.c:1861 -#: ../extensions/image_print/gth-image-print-job.c:1898 +#: ../extensions/image_print/gth-image-print-job.c:1680 +#: ../extensions/image_print/gth-image-print-job.c:1845 +#: ../extensions/image_print/gth-image-print-job.c:1888 msgid "Could not print" msgstr "無法列印" -#: ../extensions/image_print/gth-image-print-job.c:1796 +#: ../extensions/image_print/gth-image-print-job.c:1746 #: ../gthumb/gth-main-default-tests.c:240 msgid "Images" msgstr "圖片" -#: ../extensions/image_print/gth-image-print-job.c:1863 -#: ../gthumb/gth-image-loader.c:204 ../gthumb/gth-image-loader.c:278 +#: ../extensions/image_print/gth-image-print-job.c:1847 +#: ../gthumb/gth-image-loader.c:197 ../gthumb/gth-image-loader.c:304 +#: ../gthumb/gth-image-utils.c:131 ../gthumb/gth-image-utils.c:137 msgid "No suitable loader available for this file type" msgstr "" @@ -3208,18 +3384,18 @@ msgstr "載入中" #: ../extensions/image_print/gth-load-image-info-task.c:166 -#: ../extensions/webalbums/gth-web-exporter.c:2685 +#: ../extensions/webalbums/gth-web-exporter.c:2716 msgid "Loading images" msgstr "圖片載入中" #: ../extensions/image_print/image_print.extension.in.in.h:1 -msgid "Allow to print images choosing the page layout." -msgstr "允許選擇列印圖片的版面。" - -#: ../extensions/image_print/image_print.extension.in.in.h:2 msgid "Image print" msgstr "圖片列印" +#: ../extensions/image_print/image_print.extension.in.in.h:2 +msgid "Allow to print images choosing the page layout." +msgstr "允許選擇列印圖片的版面。" + #: ../extensions/image_print/preferences.c:79 msgid "Print" msgstr "列印" @@ -3250,15 +3426,14 @@ #: ../extensions/image_rotation/gth-reset-orientation-task.c:111 #: ../extensions/image_rotation/gth-transform-task.c:141 -#: ../extensions/webalbums/gth-web-exporter.c:2339 -#: ../extensions/webalbums/gth-web-exporter.c:2423 +#: ../extensions/webalbums/gth-web-exporter.c:2337 +#: ../extensions/webalbums/gth-web-exporter.c:2421 msgid "Saving images" msgstr "正在儲存圖片" #: ../extensions/image_rotation/image_rotation.extension.in.in.h:1 -#, fuzzy msgid "Image rotation" -msgstr "文字旋轉" +msgstr "圖片旋轉" #: ../extensions/image_rotation/image_rotation.extension.in.in.h:2 msgid "Rotate images without data loss." @@ -3298,21 +3473,65 @@ msgstr "鏡頭扭曲..." #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:1 -msgid "After loading an image:" -msgstr "在載入一圖片後：" +msgid "Set to actual size" +msgstr "設置為實際尺寸" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:2 +msgid "Keep previous zoom" +msgstr "沿用之前的縮放比例" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:3 -msgid "Reset scrollbar positions" -msgstr "重新設置滾動條的位置" +msgid "Fit to window" +msgstr "符合視窗" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 -msgid "Transparency _type:" -msgstr "透明表示方式(_T):" +msgid "Fit to window if larger" +msgstr "如果圖片太大則縮小至視窗尺寸" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:5 +msgid "Fit to width" +msgstr "符合闊度" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:6 +msgid "Fit to width if larger" +msgstr "如果圖片太大則縮小以符合闊度" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:7 +msgid "Reset scrollbar positions" +msgstr "重新設置滾動條的位置" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:8 +msgid "After loading an image:" +msgstr "在載入一圖片後：" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:9 msgid "_Zoom quality:" msgstr "縮放品質(_Z)：" +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:10 +msgid "Transparency _type:" +msgstr "透明表示方式(_T):" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:11 +msgid "High" +msgstr "高" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:12 +msgid "Low" +msgstr "低" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:13 +msgid "White" +msgstr "白" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:15 +msgid "Black" +msgstr "黑" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:16 +msgid "Checked" +msgstr "方格" + #: ../extensions/image_viewer/gth-image-histogram.c:84 msgid "Histogram" msgstr "分佈圖" @@ -3370,56 +3589,55 @@ msgstr "縮放至符合闊度" #: ../extensions/image_viewer/image_viewer.extension.in.in.h:1 -#, fuzzy -msgid "Basic image viewing." -msgstr "機械人圖案佈景" - -#: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 msgid "Image viewer" msgstr "圖片檢視器" +#: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 +msgid "Basic image viewing." +msgstr "基本的圖片檢視。" + #: ../extensions/image_viewer/preferences.c:125 msgid "Viewer" msgstr "圖片顯示" -#: ../extensions/importer/data/ui/import-preferences.ui.h:3 -#, fuzzy -msgid "The day of the month" -msgstr "顯示一個月第幾天" +#: ../extensions/importer/data/ui/import-preferences.ui.h:1 +msgid "_Destination" +msgstr "目的地(_D)" -#: ../extensions/importer/data/ui/import-preferences.ui.h:5 -msgid "The hour" -msgstr "小時" +#: ../extensions/importer/data/ui/import-preferences.ui.h:2 +#, fuzzy +msgid "_Automatic subfolder" +msgstr "自動下載" -#: ../extensions/importer/data/ui/import-preferences.ui.h:6 -msgid "The minutes" -msgstr "分鐘" +#: ../extensions/importer/data/ui/import-preferences.ui.h:3 +#, fuzzy +msgid "as _single subfolder" +msgstr "每次發一張牌" #: ../extensions/importer/data/ui/import-preferences.ui.h:7 -msgid "The month" -msgstr "月" +msgid "The year" +msgstr "年" #: ../extensions/importer/data/ui/import-preferences.ui.h:8 -msgid "The seconds" -msgstr "秒" +msgid "The month" +msgstr "月" #: ../extensions/importer/data/ui/import-preferences.ui.h:9 -msgid "The year" -msgstr "年" +#, fuzzy +msgid "The day of the month" +msgstr "顯示一個月第幾天" #: ../extensions/importer/data/ui/import-preferences.ui.h:10 -#, fuzzy -msgid "_Automatic subfolder" -msgstr "自動下載" +msgid "The hour" +msgstr "小時" #: ../extensions/importer/data/ui/import-preferences.ui.h:11 -msgid "_Destination" -msgstr "目的地(_D)" +msgid "The minutes" +msgstr "分鐘" #: ../extensions/importer/data/ui/import-preferences.ui.h:12 -#, fuzzy -msgid "as _single subfolder" -msgstr "每次發一張牌" +msgid "The seconds" +msgstr "秒" #: ../extensions/importer/gth-import-destination-button.c:183 msgid "Invalid Destination" @@ -3493,7 +3711,7 @@ "%s of space is required but only %s is available." msgstr "" -#: ../extensions/list_tools/callbacks.c:76 ../gthumb/gth-filterbar.c:304 +#: ../extensions/list_tools/callbacks.c:76 ../gthumb/gth-filterbar.c:311 msgid "Personalize..." msgstr "個性化..." @@ -3511,104 +3729,104 @@ msgstr "_Skip" #: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:1 -msgid "Co_mmands:" -msgstr "命令(_M)：" - -#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:2 msgid "Commands" msgstr "指令" +#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:2 +msgid "Co_mmands:" +msgstr "命令(_M)：" + #: ../extensions/list_tools/data/ui/script-editor.ui.h:2 -#, fuzzy, no-c-format -msgid "%E" -msgstr "%" +msgid "_Wait for the command to finish" +msgstr "等待指令完成(_W)" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:3 +msgid "E_xecute command once for every file" +msgstr "為每個檔案執行一次指令(_X)" #: ../extensions/list_tools/data/ui/script-editor.ui.h:4 -#, fuzzy, no-c-format -msgid "%N" -msgstr "%" +msgid "_Terminal command (shell script)" +msgstr "終端指令[命令稿](_T)" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:5 +#, fuzzy +msgid "Sh_ortcut:" +msgstr "分享(_A)" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:6 +#, fuzzy +msgid "The file uri" +msgstr "[FILE|URI...]" -#. Translate only 'message' and 'default_value'. #: ../extensions/list_tools/data/ui/script-editor.ui.h:7 -#, fuzzy, no-c-format -msgid "%ask{ message }{ default value }" -msgstr "目前的數值是預設值。" +msgid "The file path" +msgstr "檔案路徑" -#. Translate only 'attribute name' -#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 -#, fuzzy, no-c-format -msgid "%attr{ attribute name }" -msgstr "無效的延伸屬性名稱" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:8 +#, fuzzy +msgid "The file basename" +msgstr "解密檔案" -#. Translate only 'text'. -#: ../extensions/list_tools/data/ui/script-editor.ui.h:13 -#, fuzzy, no-c-format -msgid "%quote{ text }" -msgstr "已加密文字" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:9 +msgid "The parent folder path" +msgstr "上層資料夾路徑" +#. Translate only 'message' and 'default_value'. #: ../extensions/list_tools/data/ui/script-editor.ui.h:14 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 -msgid "A file attribute" -msgstr "檔案屬性" +#, fuzzy, no-c-format +msgid "%ask{ message }{ default value }" +msgstr "目前的數值是預設值。" #: ../extensions/list_tools/data/ui/script-editor.ui.h:15 #, fuzzy msgid "Ask an input value" msgstr "數值超過界限。\n" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:17 -msgid "E_xecute command once for every file" -msgstr "為每個檔案執行一次指令(_X)" - +#. Translate only 'attribute name' #: ../extensions/list_tools/data/ui/script-editor.ui.h:18 -#, fuzzy -msgid "Quote the text " -msgstr "已加密文字" +#, fuzzy, no-c-format +msgid "%attr{ attribute name }" +msgstr "無效的延伸屬性名稱" #: ../extensions/list_tools/data/ui/script-editor.ui.h:19 -#, fuzzy -msgid "Sh_ortcut:" -msgstr "分享(_A)" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 +msgid "A file attribute" +msgstr "檔案屬性" #: ../extensions/list_tools/data/ui/script-editor.ui.h:21 -#, fuzzy -msgid "The file basename" -msgstr "解密檔案" +#, fuzzy, no-c-format +msgid "%N" +msgstr "%" #: ../extensions/list_tools/data/ui/script-editor.ui.h:22 #, fuzzy msgid "The file basename without extension" msgstr "目前編輯的檔案名稱(不含延伸檔名)" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:23 -#, fuzzy -msgid "The file extension" -msgstr "檔案延伸(_F):" - #: ../extensions/list_tools/data/ui/script-editor.ui.h:24 -msgid "The file path" -msgstr "檔案路徑" +#, fuzzy, no-c-format +msgid "%E" +msgstr "%" #: ../extensions/list_tools/data/ui/script-editor.ui.h:25 #, fuzzy -msgid "The file uri" -msgstr "[FILE|URI...]" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:26 -msgid "The parent folder path" -msgstr "上層資料夾路徑" +msgid "The file extension" +msgstr "檔案延伸(_F):" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:27 -msgid "_Command:" -msgstr "指令(_C)：" +#. Translate only 'text'. +#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 +#, fuzzy, no-c-format +msgid "%quote{ text }" +msgstr "已加密文字" #: ../extensions/list_tools/data/ui/script-editor.ui.h:29 -msgid "_Terminal command (shell script)" -msgstr "終端指令[命令稿](_T)" +#, fuzzy +msgid "Quote the text " +msgstr "已加密文字" #: ../extensions/list_tools/data/ui/script-editor.ui.h:30 -msgid "_Wait for the command to finish" -msgstr "等待指令完成(_W)" +msgid "_Command:" +msgstr "指令(_C)：" #: ../extensions/list_tools/dlg-personalize-scripts.c:257 msgid "Script" @@ -3646,9 +3864,9 @@ msgstr "<輸入數值>" #: ../extensions/list_tools/gth-script.c:745 -#: ../extensions/webalbums/gth-web-exporter.c:560 -#: ../extensions/webalbums/gth-web-exporter.c:572 -#: ../extensions/webalbums/gth-web-exporter.c:580 +#: ../extensions/webalbums/gth-web-exporter.c:558 +#: ../extensions/webalbums/gth-web-exporter.c:570 +#: ../extensions/webalbums/gth-web-exporter.c:578 msgid "Malformed command" msgstr "有缺陷的指令" @@ -3673,9 +3891,8 @@ msgstr "子程序正常的以狀態 %d 結束。" #: ../extensions/list_tools/list_tools.extension.in.in.h:1 -#, fuzzy msgid "File list tools" -msgstr "取得檔案清單" +msgstr "檔案清單工具" #: ../extensions/list_tools/list_tools.extension.in.in.h:2 msgid "Scripting and batch manipulation of files." @@ -3721,74 +3938,74 @@ msgid "Photobucket..." msgstr "" -#: ../extensions/photobucket/callbacks.c:55 -msgid "Upload photos to Photobucket" -msgstr "上傳照片至 Photobucket" - -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 -msgid "1 megabyte file size" -msgstr "1 MB的檔案大小" - -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 -msgid "15ʺ screen ( 800 x 600 )" -msgstr "15吋螢幕( 800 × 600 )" - -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 -msgid "17ʺ screen ( 1024 x 768 )" -msgstr "17吋螢幕( 1024 x 768 )" - +#: ../extensions/photobucket/callbacks.c:55 +msgid "Upload photos to Photobucket" +msgstr "上傳照片至 Photobucket" + #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 -msgid "Large ( 640 x 480 )" -msgstr "大的 ( 640 x 480 )" +#, fuzzy +msgid "_Scramble filenames" +msgstr "貼上檔案名稱(_F)" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 -msgid "Medium ( 320 x 240 )" -msgstr "中的 ( 320 x 240 )" +msgid "Tiny ( 100 x 75 )" +msgstr "極小的 (100×75)" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 msgid "Small ( 160 x 120 )" msgstr "小的 ( 160 x 120 )" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 -msgid "Tiny ( 100 x 75 )" -msgstr "極小的 (100×75)" +msgid "Medium ( 320 x 240 )" +msgstr "中的 ( 320 x 240 )" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 +msgid "Large ( 640 x 480 )" +msgstr "大的 ( 640 x 480 )" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 +msgid "15ʺ screen ( 800 x 600 )" +msgstr "15吋螢幕( 800 × 600 )" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 -#, fuzzy -msgid "_Scramble filenames" -msgstr "貼上檔案名稱(_F)" +msgid "17ʺ screen ( 1024 x 768 )" +msgstr "17吋螢幕( 1024 x 768 )" -#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:299 +msgid "1 megabyte file size" +msgstr "1 MB的檔案大小" + +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 #, fuzzy msgid "_Container:" msgstr "h t m l container" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 msgid "Tiny ( 100 × 75 )" msgstr "極小的 (100×75)" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 msgid "Small ( 160 × 120 )" msgstr "小的 ( 160 × 120 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 msgid "Medium ( 320 × 240 )" msgstr "中的 ( 320 × 240 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 msgid "Large ( 640 × 480 )" msgstr "大的 ( 640 × 480 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 msgid "15ʺ screen ( 800 × 600 )" msgstr "15吋螢幕( 800 × 600 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:298 msgid "17ʺ screen ( 1024 × 768 )" msgstr "17吋螢幕( 1024 x 768 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:304 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:306 msgid "2 megabyte file size" msgstr "2 MB的檔案大小" @@ -3823,30 +4040,30 @@ msgstr "從一抽取式儲存裝置匯入照片和其他檔案" #: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:1 -msgid "After importing from a device:" -msgstr "從裝置匯入後：" - -#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 msgid "_Rotate the images physically" msgstr "實質地旋轉圖片(_R)" +#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 +msgid "After importing from a device:" +msgstr "從裝置匯入後：" + #. view label -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 -#: ../gthumb/gth-filterbar.c:414 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 +#: ../gthumb/gth-filterbar.c:421 msgid "S_how:" msgstr "顯示(_H)：" -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 -msgid "_Delete the imported files from the source" -msgstr "刪除匯入檔案的來源檔(_D)" - #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:4 +msgid "_Tags:" +msgstr "標籤(_T)：" + +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 msgid "_Event:" msgstr "事件(_E)：" #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:7 -msgid "_Tags:" -msgstr "標籤(_T)：" +msgid "_Delete the imported files from the source" +msgstr "刪除匯入檔案的來源檔(_D)" #: ../extensions/photo_importer/dlg-photo-importer.c:227 #: ../extensions/picasaweb/dlg-import-from-picasaweb.c:174 @@ -3864,7 +4081,7 @@ msgstr "無法載入資料夾" #: ../extensions/photo_importer/dlg-photo-importer.c:369 -#: ../gthumb/gth-browser.c:1927 +#: ../gthumb/gth-browser.c:2014 msgid "Getting folder listing..." msgstr "正在取得資料夾清單…" @@ -3901,51 +4118,51 @@ msgid "Upload photos to Picasa Web Album" msgstr "上傳照片至 Picasa 網絡相簿" -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 msgid "Export to Picasa Web Albums" msgstr "匯出至 Picasa 網絡相簿" -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 msgid "_Albums:" msgstr "相簿(_A)：" -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 msgid "Import from Picasa Web Album" msgstr "從 Picasa 網絡相冊匯入" -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 msgid "_Album:" msgstr "相簿(_A)：" #: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:1 +msgid "_E-Mail:" +msgstr "電子郵件(_E)：" + +#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 msgid "" "Type the characters you see in the picture below. Letters are not case-" "sensitive." msgstr "" -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 -msgid "_E-Mail:" -msgstr "電子郵件(_E)：" - #: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:3 msgid "_Password:" msgstr "密碼(_P)：" -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 msgid "Public" msgstr "公開" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:354 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:372 #: ../extensions/picasaweb/dlg-import-from-picasaweb.c:310 msgid "Could not get the album list" msgstr "無法取得相簿清單" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:438 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:456 #: ../extensions/picasaweb/dlg-import-from-picasaweb.c:394 msgid "Picasa Web Album" msgstr "Picasa 網絡相簿" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:525 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:543 #: ../extensions/picasaweb/dlg-import-from-picasaweb.c:481 msgid "Account" msgstr "帳號" @@ -3962,100 +4179,14 @@ msgid "Upload images to Picasa Web Albums" msgstr "上傳圖片至 Picasa 網絡相簿" -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:1 -msgid "Opti_mize" -msgstr "最佳化(_M)" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:2 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 -msgid "_Default extension:" -msgstr "預設副檔名(_D)：" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 -msgid "_Progressive" -msgstr "漸進式顯示(_P)" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 -msgid "_Quality:" -msgstr "品質(_Q)：" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:5 -msgid "_Smoothing:" -msgstr "平滑化(_S):" - -#: ../extensions/pixbuf_savers/data/ui/png-options.ui.h:1 -msgid "Compression _level:" -msgstr "壓縮程度(_L):" - -#: ../extensions/pixbuf_savers/data/ui/save-options-preferences.ui.h:1 -msgid "Default options:" -msgstr "預設選項：" - -#: ../extensions/pixbuf_savers/data/ui/tga-options.ui.h:1 -msgid "_RLE compression" -msgstr "_RLE 無損壓縮" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:1 -msgid "Compression" -msgstr "壓縮" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:2 -msgid "No_rmal (Deflate)" -msgstr "無損壓縮[Deflate](_R)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:3 -msgid "Resolution" -msgstr "解像度" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 -msgid "_Loss compression (JPEG)" -msgstr "有損壓縮[JPEG](_L)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 -msgid "_No compression" -msgstr "不壓縮(_N)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:9 -msgid "dpi" -msgstr "dpi" - -#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:519 -msgid "JPEG" -msgstr "JPEG" - -#: ../extensions/pixbuf_savers/gth-png-saver.c:140 -msgid "PNG" -msgstr "PNG" - -#: ../extensions/pixbuf_savers/gth-tga-saver.c:286 -#: ../gthumb/gth-buffer-data.c:84 -msgid "Insufficient memory" -msgstr "記憶體不足" - -#: ../extensions/pixbuf_savers/gth-tga-saver.c:373 -msgid "TGA" -msgstr "TGA" - -#: ../extensions/pixbuf_savers/gth-tiff-saver.c:537 -msgid "TIFF" -msgstr "TIFF" - -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:1 -msgid "Save images" -msgstr "儲存圖片" - -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:2 -msgid "Save images in common file formats such as JPEG, PNG and TIFF" -msgstr "儲存圖片用一般的檔案格式，例如常見的 JPEG，PNG 和 TIFF" - #: ../extensions/raw_files/raw_files.extension.in.in.h:1 -msgid "Allow to load raw format images." -msgstr "允許載入 RAW 格式圖像。" - -#: ../extensions/raw_files/raw_files.extension.in.in.h:2 msgid "Raw format support" msgstr "Raw 格式的支持" +#: ../extensions/raw_files/raw_files.extension.in.in.h:2 +msgid "Allow to load raw format images." +msgstr "允許載入 RAW 格式圖像。" + #: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 msgid "_X:" msgstr "_X:" @@ -4085,81 +4216,81 @@ msgstr "工具用於移除照片的紅眼效應" #: ../extensions/rename_series/data/ui/code-selector.ui.h:1 -msgid "add" -msgstr "" - -#: ../extensions/rename_series/data/ui/code-selector.ui.h:2 #, fuzzy #| msgid "Edit" msgid "digits" msgstr "編輯" -#: ../extensions/rename_series/data/ui/code-selector.ui.h:3 +#: ../extensions/rename_series/data/ui/code-selector.ui.h:2 msgid "format:" msgstr "格式：" -#: ../extensions/rename_series/data/ui/code-selector.ui.h:4 +#: ../extensions/rename_series/data/ui/code-selector.ui.h:3 msgid "remove" msgstr "移除" -#. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 -#, fuzzy, no-c-format -msgid "%A{ identifier }" -msgstr "識別碼：" +#: ../extensions/rename_series/data/ui/code-selector.ui.h:4 +msgid "add" +msgstr "" -#. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 -#, fuzzy, no-c-format -msgid "%M{ format }" -msgstr "格式化 %s (%s)" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:1 +msgid "Rename" +msgstr "重新命名" #. Translators: this is the text case (upper or lower case). -#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 msgid "Cas_e:" msgstr "大小寫(_E):" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:14 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:7 msgid "Edit template" msgstr "編輯篩選器" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 -msgid "Re_verse Order" -msgstr "相反次序排列(_V)" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 +msgid "The original filename" +msgstr "原始檔案名稱" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 -msgid "Rename" -msgstr "重新命名" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 +#, fuzzy +msgid "The original extension" +msgstr "根據延伸檔名" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:13 #, fuzzy -msgid "The digitalization date" -msgstr "有效日期：" +msgid "The original enumerator" +msgstr "原始大小(_O)" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:21 +#. translate only the text in the curly brackets +#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 +#, fuzzy, no-c-format +msgid "%M{ format }" +msgstr "格式化 %s (%s)" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 #, fuzzy msgid "The modification date" msgstr "以修改日期" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:22 -#, fuzzy -msgid "The original enumerator" -msgstr "原始大小(_O)" - -#: ../extensions/rename_series/data/ui/rename-series.ui.h:23 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:21 #, fuzzy -msgid "The original extension" -msgstr "根據延伸檔名" +msgid "The digitalization date" +msgstr "有效日期：" +#. translate only the text in the curly brackets #: ../extensions/rename_series/data/ui/rename-series.ui.h:24 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 -msgid "The original filename" -msgstr "原始檔案名稱" +#, fuzzy, no-c-format +msgid "%A{ identifier }" +msgstr "識別碼：" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 msgid "_Template:" msgstr "樣式(_T):" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +msgid "Re_verse Order" +msgstr "相反次序排列(_V)" + #: ../extensions/rename_series/dlg-rename-series.c:58 #, fuzzy msgid "Enumerator" @@ -4252,36 +4383,32 @@ msgid "Resize the selected images" msgstr "調整選取的圖片大小" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:5 -#: ../gthumb/gth-main-default-metadata.c:49 -msgid "Format" -msgstr "格式" +#: ../extensions/resize_images/data/ui/resize-images.ui.h:1 +msgid "Resize Images" +msgstr "調整圖片大小" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:2 msgid "New dimensions" msgstr "新的尺寸" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 -msgid "Resize Images" -msgstr "調整圖片大小" - -#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:4 msgid "_Height:" msgstr "高度(_H)：" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:5 msgid "_Preserve original aspect ratios" msgstr "保留原來的長寬比(_P)" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:12 -msgid "pixel" -msgstr "像素" +#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 +#: ../gthumb/gth-main-default-metadata.c:49 +msgid "Format" +msgstr "格式" -#: ../extensions/resize_images/dlg-resize-images.c:168 -msgid "Resizing images" -msgstr "調整圖片大小" +#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 +msgid "pixel" +msgstr "像素" -#: ../extensions/resize_images/dlg-resize-images.c:412 +#: ../extensions/resize_images/dlg-resize-images.c:423 msgid "Keep the original format" msgstr "保持原有的格式" @@ -4317,7 +4444,7 @@ #. Translators: This is not a verb, it's a name as in "the search properties". #: ../extensions/search/callbacks.c:174 -#: ../extensions/search/search.extension.in.in.h:2 +#: ../extensions/search/search.extension.in.in.h:1 msgid "Search" msgstr "搜尋" @@ -4344,57 +4471,45 @@ msgid "Cancel the operation" msgstr "取消操作" -#: ../extensions/search/search.extension.in.in.h:1 +#: ../extensions/search/search.extension.in.in.h:2 msgid "File search tool." msgstr "檔案搜尋工具。" #: ../extensions/selections/callbacks.c:77 -#, fuzzy -#| msgid "Selection" msgid "Add to _Selection" -msgstr "選取區域" +msgstr "加入到選取(_S)" #: ../extensions/selections/callbacks.c:86 -#, fuzzy -#| msgid "Selection" msgid "Selection 1" -msgstr "選取區域" +msgstr "選取 1" #: ../extensions/selections/callbacks.c:91 -#, fuzzy -#| msgid "Selection" msgid "Selection 2" -msgstr "選取區域" +msgstr "選取 2" #: ../extensions/selections/callbacks.c:96 -#, fuzzy -#| msgid "Selection" msgid "Selection 3" -msgstr "選取區域" +msgstr "選取 3" #: ../extensions/selections/callbacks.c:285 #, c-format msgid "" "Use Alt-%d to add files to this selection, Ctrl-%d to view this selection." -msgstr "" +msgstr "使用 Alt-%d 以加入檔案到這個選取，Ctrl-%d 以檢視這個選取。" #: ../extensions/selections/gth-selections-manager.c:239 -#, fuzzy, c-format -#| msgid "Selection" +#, c-format msgid "Selection %d" -msgstr "選取區域" +msgstr "選取 %d" #: ../extensions/selections/gth-selections-manager.c:242 -#: ../extensions/selections/selections.extension.in.in.h:2 -#, fuzzy -#| msgid "Selection" +#: ../extensions/selections/selections.extension.in.in.h:1 msgid "Selections" -msgstr "選取區域" +msgstr "選取" -#: ../extensions/selections/selections.extension.in.in.h:1 -#, fuzzy +#: ../extensions/selections/selections.extension.in.in.h:2 msgid "Advanced file selection." -msgstr "無檔案可支援 (%i 個選擇的檔案)" +msgstr "進階檔案選取。" #: ../extensions/slideshow/callbacks.c:56 msgid "_Slideshow" @@ -4405,48 +4520,48 @@ msgstr "以幻燈片播放方式檢視" #: ../extensions/slideshow/callbacks.c:410 -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 #: ../extensions/slideshow/preferences.c:162 #: ../extensions/slideshow/slideshow.extension.in.in.h:1 msgid "Slideshow" msgstr "幻燈片顯示" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:1 -#, fuzzy -msgid "Add files to the playlist" -msgstr "將影片加入至播放清單" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 -msgid "Playlist" -msgstr "播放清單" +msgid "_Personalize" +msgstr "個性化(_P)" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:3 -msgid "R_andom order" -msgstr "隨機順序(_A)" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:4 -msgid "Remove the selected files" -msgstr "移除選取的檔案" +#, fuzzy +msgid "_Transition effect:" +msgstr "字型效果" #. This is the first part of the phrase "change automatically, every x seconds", where x is an input control that let the user choose a value. -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 msgid "_Change automatically, every" msgstr "自動更改，每(_C)" +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 +msgid "_Restart when finished" +msgstr "播放完後，又重新開始(_R)" + #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:8 -msgid "_Personalize" -msgstr "個性化(_P)" +msgid "R_andom order" +msgstr "隨機順序(_A)" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:9 -msgid "_Restart when finished" -msgstr "播放完後，又重新開始(_R)" +msgid "Playlist" +msgstr "播放清單" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:10 #, fuzzy -msgid "_Transition effect:" -msgstr "字型效果" +msgid "Add files to the playlist" +msgstr "將影片加入至播放清單" + +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:11 +msgid "Remove the selected files" +msgstr "移除選取的檔案" -#: ../extensions/slideshow/gth-slideshow.c:229 +#: ../extensions/slideshow/gth-slideshow.c:231 msgid "Playing slideshow" msgstr "播放幻燈片" @@ -4564,120 +4679,116 @@ msgid "View the previous page" msgstr "檢視上一頁" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:5 -#, fuzzy, no-c-format -msgid "%P" -msgstr "%" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:1 +msgid "All images on a single image" +msgstr "" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:2 #, fuzzy msgid "Adapts to the window width" msgstr "將視窗的闊度改變為 WIDTH" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:8 -msgid "All images on a single image" -msgstr "" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 +msgid "Web Album" +msgstr "網頁相簿" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 -msgid "Image Attributes" -msgstr "圖片屬性" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:5 +#, fuzzy, no-c-format +msgid "%P" +msgstr "%" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 -msgid "Image Page" -msgstr "圖片頁" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 +msgid "_Copy originals to destination" +msgstr "將原檔複製至目的地(_C)" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 +#, fuzzy +msgid "_Adapt to the window width " +msgstr "將視窗的闊度改變為 WIDTH" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 msgid "Index Page" msgstr "索引頁" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 -msgid "Show the description, if available" -msgstr "顯示描述，如果有的話" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 -msgid "Show the following attributes:" -msgstr "顯示下列屬性：" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 +msgid "Thumbnail Caption" +msgstr "縮圖標題" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 #, fuzzy msgid "The current image number" msgstr "重新載入目前的圖片" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 -#, fuzzy -msgid "The file comment" -msgstr "檔案的路徑" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 #, fuzzy msgid "The total number of images" msgstr "URI 的總數" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 -msgid "Thumbnail Caption" -msgstr "縮圖標題" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 +#, fuzzy +msgid "The file comment" +msgstr "檔案的路徑" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 -msgid "Web Album" -msgstr "網頁相簿" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 +msgid "Image Page" +msgstr "圖片頁" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 -#, fuzzy -msgid "_Adapt to the window width " -msgstr "將視窗的闊度改變為 WIDTH" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 +msgid "Show the description, if available" +msgstr "顯示描述，如果有的話" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 -msgid "_Copy originals to destination" -msgstr "將原檔複製至目的地(_C)" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 +msgid "Show the following attributes:" +msgstr "顯示下列屬性：" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:39 -msgid "_Resize if larger than:" -msgstr "大於這個尺寸便會調整大小(_R)：" +msgid "Image Attributes" +msgstr "圖片屬性" -#: ../extensions/webalbums/gth-web-exporter.c:1802 +#: ../extensions/webalbums/gth-web-exporter.c:1800 msgid "Could not show the destination" msgstr "無法顯示目的地" -#: ../extensions/webalbums/gth-web-exporter.c:1838 +#: ../extensions/webalbums/gth-web-exporter.c:1836 msgid "The album has been created successfully." msgstr "相簿已成功建立。" -#: ../extensions/webalbums/gth-web-exporter.c:2106 -#: ../extensions/webalbums/gth-web-exporter.c:2133 +#: ../extensions/webalbums/gth-web-exporter.c:2104 +#: ../extensions/webalbums/gth-web-exporter.c:2131 msgid "Saving thumbnails" msgstr "儲存縮圖" -#: ../extensions/webalbums/gth-web-exporter.c:2161 +#: ../extensions/webalbums/gth-web-exporter.c:2159 msgid "Saving HTML pages: Images" msgstr "儲存 HTML 頁面：圖片" -#: ../extensions/webalbums/gth-web-exporter.c:2219 +#: ../extensions/webalbums/gth-web-exporter.c:2217 msgid "Saving HTML pages: Indexes" msgstr "儲存 HTML 頁面:索引" -#: ../extensions/webalbums/gth-web-exporter.c:2502 +#: ../extensions/webalbums/gth-web-exporter.c:2500 msgid "Copying original images" msgstr "正在複製原始圖片" -#: ../extensions/webalbums/gth-web-exporter.c:2929 +#: ../extensions/webalbums/gth-web-exporter.c:2960 msgid "Could not find the style folder" msgstr "找不到樣式資料夾" -#: ../extensions/webalbums/gth-web-exporter.c:2967 +#: ../extensions/webalbums/gth-web-exporter.c:2998 msgid "Could not create a temporary folder" msgstr "無法建立暫存資料夾" #: ../extensions/webalbums/webalbums.extension.in.in.h:1 -msgid "Create static web albums." -msgstr "建立靜態的網頁相簿。" - -#: ../extensions/webalbums/webalbums.extension.in.in.h:2 msgid "Web Albums" msgstr "網頁相簿" -#: ../gthumb/dlg-location.c:200 ../gthumb/gth-browser.c:1249 -#: ../gthumb/gth-browser.c:1818 ../gthumb/gth-browser.c:5974 -#: ../gthumb/gth-browser.c:5993 ../gthumb/gth-browser.c:6017 +#: ../extensions/webalbums/webalbums.extension.in.in.h:2 +msgid "Create static web albums." +msgstr "建立靜態的網頁相簿。" + +#: ../gthumb/dlg-location.c:200 ../gthumb/gth-browser.c:1336 +#: ../gthumb/gth-browser.c:1905 ../gthumb/gth-browser.c:6100 +#: ../gthumb/gth-browser.c:6119 ../gthumb/gth-browser.c:6143 #, fuzzy, c-format msgid "Could not load the position \"%s\"" msgstr "無法載入主題" @@ -4698,7 +4809,7 @@ msgid "Edit Filter" msgstr "編輯篩選器" -#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:270 +#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:277 msgid "All" msgstr "全部" @@ -4723,9 +4834,8 @@ msgstr "檔案工具" #: ../gthumb/dlg-preferences-extensions.c:75 -#, fuzzy msgid "List tools" -msgstr "系統工具" +msgstr "工具清單" #: ../gthumb/dlg-preferences-extensions.c:76 msgid "Importers" @@ -4765,44 +4875,6 @@ msgid "_Restart" msgstr "重新啟動(_R)" -#: ../gthumb/eggfileformatchooser.c:236 -#, c-format -msgid "File _Format: %s" -msgstr "檔案格式(_F)：%s" - -#: ../gthumb/eggfileformatchooser.c:397 ../gthumb/gth-main-default-tests.c:233 -msgid "All Files" -msgstr "所有檔案" - -#: ../gthumb/eggfileformatchooser.c:398 -msgid "All Supported Files" -msgstr "所有支援的檔案" - -#: ../gthumb/eggfileformatchooser.c:407 -msgid "By Extension" -msgstr "根據擴充套件" - -#: ../gthumb/eggfileformatchooser.c:422 -msgid "File Format" -msgstr "檔案格式" - -#: ../gthumb/eggfileformatchooser.c:440 -msgid "Extension(s)" -msgstr "擴充套件" - -#: ../gthumb/eggfileformatchooser.c:681 -#, fuzzy, c-format -msgid "" -"The program was not able to find out the file format you want to use for `" -"%s'. Please make sure to use a known extension for that file or manually " -"choose a file format from the list below." -msgstr "此程式無法找出你要用於「%s」的檔案格式。請確定該檔案使用已知的延伸檔名或手動從下列清單中選擇檔案格式。" - -#: ../gthumb/eggfileformatchooser.c:688 -#, fuzzy -msgid "File format not recognized" -msgstr "無法辨識檔案格式" - #. For translators: This is a progress size indicator, for example: 230.4 MB of 512.8 MB #: ../gthumb/gio-utils.c:1351 #, fuzzy, c-format @@ -4839,7 +4911,7 @@ #. * the separator that your locale uses or use "%Id" instead #. * of "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2945 +#: ../gthumb/glib-utils.c:3068 #, fuzzy, c-format msgctxt "long time format" msgid "%d:%02d:%02d" @@ -4851,13 +4923,13 @@ #. * separator that your locale uses or use "%Id" instead of #. * "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2954 +#: ../gthumb/glib-utils.c:3077 #, fuzzy, c-format msgctxt "short time format" msgid "%d:%02d" msgstr "%d:%02d" -#: ../gthumb/gth-browser-actions-callbacks.c:400 +#: ../gthumb/gth-browser-actions-callbacks.c:414 #, fuzzy msgid "" "gthumb is free software; you can redistribute it and/or modify it under the " @@ -4866,7 +4938,7 @@ "version." msgstr "Gucharmap 為自由軟件；你可根據據自由軟件基金會所發表的 GNU 通用公共授權條款規定，就本程式再為散布與／或修改；無論你根據據的是本授權的第二版或（你自行選擇的）任一日後發行的版本。" -#: ../gthumb/gth-browser-actions-callbacks.c:404 +#: ../gthumb/gth-browser-actions-callbacks.c:418 #, fuzzy msgid "" "gthumb is distributed in the hope that it will be useful, but WITHOUT ANY " @@ -4875,18 +4947,18 @@ "details." msgstr "Totem 係基於使用目的而加以散布，然而不負任何擔保責任；亦無對適售性或特定目的適用性所為的默示性擔保。詳情請參照 GNU 通用公共授權。" -#: ../gthumb/gth-browser-actions-callbacks.c:408 +#: ../gthumb/gth-browser-actions-callbacks.c:422 #, fuzzy msgid "" "You should have received a copy of the GNU General Public License along with " "gthumb. If not, see http://www.gnu.org/licenses/." msgstr "你應該已經和程式一起收到一份 GNU 通用公共許可證的副本。如果還沒有，請參訪 。" -#: ../gthumb/gth-browser-actions-callbacks.c:427 +#: ../gthumb/gth-browser-actions-callbacks.c:441 msgid "An image viewer and browser for GNOME." msgstr "適合在 GNOME 環境下使用的圖片瀏覽器。" -#: ../gthumb/gth-browser-actions-callbacks.c:430 +#: ../gthumb/gth-browser-actions-callbacks.c:444 msgid "translator_credits" msgstr "" "如對翻譯有任何意見，請送一封電子郵件給\n" @@ -4976,15 +5048,15 @@ msgid "Leave Fullscreen" msgstr "離開全螢幕" -#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3654 +#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3749 msgid "Go to the previous visited location" msgstr "回到前一次瀏覽過的位置" -#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3672 +#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3767 msgid "Go to the next visited location" msgstr "前往下一個瀏覽過的位置" -#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3690 +#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3785 msgid "Go up one level" msgstr "前往上一層資料夾" @@ -4996,7 +5068,7 @@ msgid "Specify a location to open" msgstr "" -#: ../gthumb/gth-browser-actions-entries.h:173 ../gthumb/gth-browser.c:673 +#: ../gthumb/gth-browser-actions-entries.h:173 ../gthumb/gth-browser.c:677 msgid "_Delete History" msgstr "刪除瀏覽紀錄(_D)" @@ -5024,144 +5096,146 @@ msgid "_Keyboard Shortcuts" msgstr "捷徑鍵(_K)" -#: ../gthumb/gth-browser-actions-entries.h:206 +#: ../gthumb/gth-browser-actions-entries.h:203 +#: ../gthumb/gth-browser-actions-entries.h:257 +msgid "Edit" +msgstr "編輯" + +#: ../gthumb/gth-browser-actions-entries.h:204 +#: ../gthumb/gth-browser-actions-entries.h:258 +msgid "Edit file" +msgstr "編輯檔案" + +#: ../gthumb/gth-browser-actions-entries.h:212 msgid "_Toolbar" msgstr "工具列(_T)" -#: ../gthumb/gth-browser-actions-entries.h:207 +#: ../gthumb/gth-browser-actions-entries.h:213 msgid "View or hide the toolbar of this window" msgstr "顯示或隱藏本視窗中的工具列" -#: ../gthumb/gth-browser-actions-entries.h:211 +#: ../gthumb/gth-browser-actions-entries.h:217 msgid "_Statusbar" msgstr "狀態列(_S)" -#: ../gthumb/gth-browser-actions-entries.h:212 +#: ../gthumb/gth-browser-actions-entries.h:218 msgid "View or hide the statusbar of this window" msgstr "顯示或隱藏本視窗中的狀態列" -#: ../gthumb/gth-browser-actions-entries.h:216 +#: ../gthumb/gth-browser-actions-entries.h:222 msgid "_Filterbar" msgstr "篩選器工具列(_F)" -#: ../gthumb/gth-browser-actions-entries.h:217 +#: ../gthumb/gth-browser-actions-entries.h:223 msgid "View or hide the filterbar of this window" msgstr "顯示或隱藏本視窗中的篩選器工具列" -#: ../gthumb/gth-browser-actions-entries.h:221 +#: ../gthumb/gth-browser-actions-entries.h:227 msgid "_Sidebar" msgstr "側邊欄(_S)" -#: ../gthumb/gth-browser-actions-entries.h:222 +#: ../gthumb/gth-browser-actions-entries.h:228 msgid "View or hide the sidebar of this window" msgstr "顯示或隱藏本視窗中的側邊欄" -#: ../gthumb/gth-browser-actions-entries.h:226 +#: ../gthumb/gth-browser-actions-entries.h:232 msgid "_Thumbnail Pane" msgstr "縮圖窗格(_T)" -#: ../gthumb/gth-browser-actions-entries.h:227 +#: ../gthumb/gth-browser-actions-entries.h:233 #, fuzzy msgid "View or hide the thumbnail pane in viewer mode" msgstr "顯示或隱藏本視窗中的狀態列" -#: ../gthumb/gth-browser-actions-entries.h:231 +#: ../gthumb/gth-browser-actions-entries.h:237 msgid "_Thumbnails" msgstr "縮圖(_T)" -#: ../gthumb/gth-browser-actions-entries.h:232 +#: ../gthumb/gth-browser-actions-entries.h:238 msgid "View thumbnails" msgstr "顯示縮圖" -#: ../gthumb/gth-browser-actions-entries.h:236 +#: ../gthumb/gth-browser-actions-entries.h:242 msgid "_Hidden Files" msgstr "隱藏檔案(_H)" -#: ../gthumb/gth-browser-actions-entries.h:237 +#: ../gthumb/gth-browser-actions-entries.h:243 msgid "Show hidden files and folders" msgstr "顯示隱藏的檔案和資料夾" -#: ../gthumb/gth-browser-actions-entries.h:242 -#: ../gthumb/gth-browser-actions-entries.h:247 +#: ../gthumb/gth-browser-actions-entries.h:248 +#: ../gthumb/gth-browser-actions-entries.h:253 msgid "View file properties" msgstr "檢視檔案的屬性" -#: ../gthumb/gth-browser-actions-entries.h:251 -msgid "Edit" -msgstr "編輯" - -#: ../gthumb/gth-browser-actions-entries.h:252 -msgid "Edit file" -msgstr "編輯檔案" - -#: ../gthumb/gth-browser-actions-entries.h:256 +#: ../gthumb/gth-browser-actions-entries.h:262 msgid "_Fit Window to Image" msgstr "使視窗符合圖片尺寸(_F)" -#: ../gthumb/gth-browser-actions-entries.h:257 +#: ../gthumb/gth-browser-actions-entries.h:263 msgid "Resize the window to the size of the image" msgstr "調整視窗大小以符合圖片尺寸" -#: ../gthumb/gth-browser.c:370 +#: ../gthumb/gth-browser.c:374 #, c-format msgid "Open %s" msgstr "開啟 %s" -#: ../gthumb/gth-browser.c:510 +#: ../gthumb/gth-browser.c:514 msgid "[modified]" msgstr "[已修改]" -#: ../gthumb/gth-browser.c:1007 +#: ../gthumb/gth-browser.c:1073 #, c-format msgid "%d file selected (%s)" msgid_plural "%d files selected (%s)" msgstr[0] "%d 個檔案選取的 (大小為 %s)" -#: ../gthumb/gth-browser.c:1042 +#: ../gthumb/gth-browser.c:1108 #, c-format msgid "%s of free space" msgstr "%s 的可用空間：" -#: ../gthumb/gth-browser.c:1911 ../gthumb/gth-browser.c:1938 +#: ../gthumb/gth-browser.c:1998 ../gthumb/gth-browser.c:2025 #, fuzzy, c-format msgid "No suitable module found for %s" msgstr "找不到 URI‘%s’的項目" -#: ../gthumb/gth-browser.c:2057 +#: ../gthumb/gth-browser.c:2144 #, c-format msgid "Save changes to file '%s'?" msgstr "儲存改變至檔案「%s」？" -#: ../gthumb/gth-browser.c:2062 +#: ../gthumb/gth-browser.c:2149 msgid "If you don't save, changes to the file will be permanently lost." msgstr "如果你不儲存，所有對檔案的更改都會永久消失。" -#: ../gthumb/gth-browser.c:2063 +#: ../gthumb/gth-browser.c:2150 msgid "Do _Not Save" msgstr "不要儲存(_N)" -#: ../gthumb/gth-browser.c:2836 ../gthumb/gth-source-tree.c:182 +#: ../gthumb/gth-browser.c:2928 ../gthumb/gth-source-tree.c:182 msgid "Could not change name" msgstr "無法更改名稱" -#: ../gthumb/gth-browser.c:3267 ../gthumb/gth-main-default-metadata.c:41 +#: ../gthumb/gth-browser.c:3359 ../gthumb/gth-main-default-metadata.c:41 msgid "Modified" msgstr "最後修改" -#: ../gthumb/gth-browser.c:3655 ../gthumb/gth-browser.c:3673 +#: ../gthumb/gth-browser.c:3750 ../gthumb/gth-browser.c:3768 msgid "View the list of visited locations" msgstr "檢視瀏覽過的位置清單" -#: ../gthumb/gth-browser.c:3691 +#: ../gthumb/gth-browser.c:3786 msgid "View the list of upper locations" msgstr "檢視上層的位置清單" -#: ../gthumb/gth-browser.c:5975 +#: ../gthumb/gth-browser.c:6101 #, c-format msgid "File type not supported" msgstr "檔案類型不支援" -#: ../gthumb/gth-browser.c:6018 +#: ../gthumb/gth-browser.c:6144 #, c-format msgid "No suitable module found" msgstr "沒有找到合適的模組" @@ -5176,6 +5250,10 @@ msgid "The extension '%1$s' is required by the extension '%2$s'" msgstr "需要 XKB 擴展功能。" +#: ../gthumb/gth-file-chooser-dialog.c:144 +msgid "All Supported Files" +msgstr "所有支援的檔案" + #: ../gthumb/gth-file-source-vfs.c:121 msgid "Home Folder" msgstr "家目錄" @@ -5214,7 +5292,7 @@ "Are you sure you want to permanently delete the %'d selected files?" msgstr[0] "確定要永久刪除已選的 %'d 個檔案嗎？" -#: ../gthumb/gth-filterbar.c:406 +#: ../gthumb/gth-filterbar.c:413 msgid "Hide the filterbar" msgstr "隱藏篩選器工具列" @@ -5234,7 +5312,7 @@ msgstr "GB" #. "files" label -#: ../gthumb/gth-filter.c:291 ../gthumb/gth-filter-editor-dialog.c:177 +#: ../gthumb/gth-filter.c:286 ../gthumb/gth-filter-editor-dialog.c:177 msgid "files" msgstr "檔案" @@ -5259,42 +5337,55 @@ msgid "(Open Parent)" msgstr "(開啟上一層)" -#: ../gthumb/gth-histogram-view.c:826 +#: ../gthumb/gth-histogram-view.c:825 msgid "Linear scale" msgstr "線性刻度" -#: ../gthumb/gth-histogram-view.c:838 +#: ../gthumb/gth-histogram-view.c:837 msgid "Logarithmic scale" msgstr "對數刻度" -#: ../gthumb/gth-histogram-view.c:858 +#: ../gthumb/gth-histogram-view.c:857 msgid "Channel:" msgstr "色版：" -#: ../gthumb/gth-histogram-view.c:890 +#: ../gthumb/gth-histogram-view.c:878 msgid "Value" msgstr "亮度" -#: ../gthumb/gth-histogram-view.c:896 +#: ../gthumb/gth-histogram-view.c:883 msgid "Red" msgstr "紅色" -#: ../gthumb/gth-histogram-view.c:902 +#: ../gthumb/gth-histogram-view.c:888 msgid "Green" msgstr "綠色" -#: ../gthumb/gth-histogram-view.c:908 +#: ../gthumb/gth-histogram-view.c:893 msgid "Blue" msgstr "藍色" -#: ../gthumb/gth-histogram-view.c:914 +#: ../gthumb/gth-histogram-view.c:898 msgid "Alpha" msgstr "透明" -#: ../gthumb/gth-histogram-view.c:921 +#: ../gthumb/gth-histogram-view.c:904 msgid "RGB" msgstr "RGB" +#: ../gthumb/gth-image-list-task.c:141 +msgid "Could not rename the file" +msgstr "無法為檔案重新命名" + +#: ../gthumb/gth-image-saver.c:39 +msgid "No options available for this file type" +msgstr "無選項可用於此檔案類型" + +#: ../gthumb/gth-image-saver.c:181 +#, c-format +msgid "Could not find a suitable module to save the image as \"%s\"" +msgstr "無法找到合適的模組以儲存圖片為「%s」" + #: ../gthumb/gth-load-file-data-task.c:108 msgid "Reading file information" msgstr "讀取檔案資訊" @@ -5348,6 +5439,10 @@ msgid "dimensions" msgstr "尺寸" +#: ../gthumb/gth-main-default-tests.c:233 +msgid "All Files" +msgstr "所有檔案" + #: ../gthumb/gth-main-default-tests.c:261 msgid "Media" msgstr "媒體" @@ -5368,14 +5463,6 @@ msgid "Description (embedded)" msgstr "描述(嵌入式)" -#: ../gthumb/gth-pixbuf-list-task.c:139 -msgid "Could not rename the file" -msgstr "無法為檔案重新命名" - -#: ../gthumb/gth-pixbuf-saver.c:34 -msgid "No options available for this file type" -msgstr "無選項可用於此檔案類型" - #: ../gthumb/gth-progress-dialog.c:144 msgid "Cancel operation" msgstr "取消操作" @@ -5393,51 +5480,51 @@ msgid "Show all the tags" msgstr "顯示所有的標籤" -#: ../gthumb/gth-tags-file.c:236 +#: ../gthumb/gth-tags-file.c:235 msgid "Holidays" msgstr "假期" -#: ../gthumb/gth-tags-file.c:237 +#: ../gthumb/gth-tags-file.c:236 msgid "Temporary" msgstr "暫存" -#: ../gthumb/gth-tags-file.c:238 +#: ../gthumb/gth-tags-file.c:237 msgid "Screenshots" msgstr "畫面快照" -#: ../gthumb/gth-tags-file.c:239 +#: ../gthumb/gth-tags-file.c:238 msgid "Science" msgstr "科學" -#: ../gthumb/gth-tags-file.c:240 +#: ../gthumb/gth-tags-file.c:239 msgid "Favorite" msgstr "特別喜愛的" -#: ../gthumb/gth-tags-file.c:241 +#: ../gthumb/gth-tags-file.c:240 msgid "Important" msgstr "重要" -#: ../gthumb/gth-tags-file.c:242 +#: ../gthumb/gth-tags-file.c:241 msgid "GNOME" msgstr "GNOME" -#: ../gthumb/gth-tags-file.c:243 +#: ../gthumb/gth-tags-file.c:242 msgid "Games" msgstr "遊戲" -#: ../gthumb/gth-tags-file.c:244 +#: ../gthumb/gth-tags-file.c:243 msgid "Party" msgstr "派對" -#: ../gthumb/gth-tags-file.c:245 +#: ../gthumb/gth-tags-file.c:244 msgid "Birthday" msgstr "生日" -#: ../gthumb/gth-tags-file.c:246 +#: ../gthumb/gth-tags-file.c:245 msgid "Astronomy" msgstr "天文" -#: ../gthumb/gth-tags-file.c:247 +#: ../gthumb/gth-tags-file.c:246 msgid "Family" msgstr "全家褔" @@ -5457,7 +5544,7 @@ msgid "is not" msgstr "不是" -#: ../gthumb/gth-test-category.c:397 ../gthumb/gth-test-simple.c:812 +#: ../gthumb/gth-test-category.c:407 ../gthumb/gth-test-simple.c:812 #: ../gthumb/gth-test-simple.c:838 ../gthumb/gth-test-simple.c:859 #: ../gthumb/gth-test-simple.c:885 #, fuzzy, c-format @@ -5530,117 +5617,103 @@ msgid "Close _All Windows" msgstr "關閉所有視窗(_A)" -#: ../gthumb/gtk-utils.c:551 +#: ../gthumb/gtk-utils.c:499 msgid "Could not display help" msgstr "無法顯示說明文件" -#: ../gthumb/gtk-utils.c:868 ../gthumb/gtk-utils.c:875 +#: ../gthumb/gtk-utils.c:828 ../gthumb/gtk-utils.c:835 msgid "Could not launch the application" msgstr "無法啟動應用程式" -#: ../gthumb/gtk-utils.c:978 +#: ../gthumb/gtk-utils.c:938 msgid "_Copy Here" msgstr "複製這裏(_C)" -#: ../gthumb/gtk-utils.c:983 +#: ../gthumb/gtk-utils.c:943 msgid "_Move Here" msgstr "移動這裏(_M)" -#: ../gthumb/gtk-utils.c:988 +#: ../gthumb/gtk-utils.c:948 msgid "_Link Here" msgstr "鏈接這裏(_L)" -#: ../gthumb/gtk-utils.c:997 +#: ../gthumb/gtk-utils.c:957 msgid "Cancel" msgstr "取消" -#: ../gthumb/main.c:59 +#: ../gthumb/main.c:61 msgid "Open a new window" msgstr "開啟一新的視窗" -#: ../gthumb/main.c:63 +#: ../gthumb/main.c:65 msgid "Start in fullscreen mode" msgstr "在全螢幕模式下啟動" -#: ../gthumb/main.c:67 +#: ../gthumb/main.c:69 msgid "Automatically start a slideshow" msgstr "自動啟動幻燈片模式" -#: ../gthumb/main.c:71 +#: ../gthumb/main.c:73 msgid "Automatically import digital camera photos" msgstr "自動匯入數碼相片" -#: ../gthumb/main.c:75 +#: ../gthumb/main.c:77 msgid "Show version" msgstr "顯示版本" -#: ../gthumb/main.c:344 +#: ../gthumb/main.c:483 msgid "- Image browser and viewer" msgstr "- 圖片瀏覽器和檢視器" -#: ../gthumb/pixbuf-io.c:174 -#, c-format -msgid "Could not find a suitable module to save the image as \"%s\"" -msgstr "無法找到合適的模組以儲存圖片為「%s」" - -#~ msgid "System settings" -#~ msgstr "系統設定" - -#~ msgid "Text below icons" -#~ msgstr "圖示下顯示文字" - -#~ msgid "Text beside icons" -#~ msgstr "圖示旁顯示文字" - -#~ msgid "Icons only" -#~ msgstr "只顯示圖示" - -#~ msgid "Text only" -#~ msgstr "只顯示文字" - -#~ msgid "on the bottom" -#~ msgstr "在底部" - -#~ msgid "on the side" -#~ msgstr "在側邊" +#~ msgid "Exif DateTimeOriginal tag" +#~ msgstr "Exif 日期時刻原始標籤" #, fuzzy -#~| msgid "1:1" -#~ msgid "112" -#~ msgstr "原來尺寸" +#~ msgid "_Resize to:" +#~ msgstr "面對面" -#~ msgid "Set to actual size" -#~ msgstr "設置為實際尺寸" +#~ msgid "Desaturate" +#~ msgstr "去除色彩" -#~ msgid "Keep previous zoom" -#~ msgstr "沿用之前的縮放比例" +#~ msgid "White balance correction" +#~ msgstr "白平衡校正" -#~ msgid "Fit to window" -#~ msgstr "符合視窗" +#~ msgid "Enhance Colors" +#~ msgstr "加強色彩" -#~ msgid "Fit to window if larger" -#~ msgstr "如果圖片太大則縮小至視窗尺寸" +#~ msgid "Automatic white balance correction" +#~ msgstr "自動白平衡修正" -#~ msgid "Fit to width" -#~ msgstr "符合寬度" +#~ msgid "Save images" +#~ msgstr "儲存圖片" -#~ msgid "Fit to width if larger" -#~ msgstr "如果圖片太大則縮小以符合寬度" +#~ msgid "Save images in common file formats such as JPEG, PNG and TIFF" +#~ msgstr "儲存圖片用一般的檔案格式，例如常見的 JPEG，PNG 和 TIFF" -#~ msgid "High" -#~ msgstr "高" +#~ msgid "File _Format: %s" +#~ msgstr "檔案格式(_F)：%s" -#~ msgid "Low" -#~ msgstr "低" +#~ msgid "By Extension" +#~ msgstr "依擴充套件" -#~ msgid "White" -#~ msgstr "白" +#~ msgid "File Format" +#~ msgstr "檔案格式" + +#~ msgid "Extension(s)" +#~ msgstr "擴充套件" -#~ msgid "Black" -#~ msgstr "黑" +#, fuzzy +#~ msgid "" +#~ "The program was not able to find out the file format you want to use for `" +#~ "%s'. Please make sure to use a known extension for that file or manually " +#~ "choose a file format from the list below." +#~ msgstr "" +#~ "此程式無法找出您要用於「%s」的檔案格式。請確定該檔案使用已知的延伸檔名或手" +#~ "動從下列清單中選擇檔案格式。" -#~ msgid "Checked" -#~ msgstr "方格" +#, fuzzy +#~ msgid "File format not recognized" +#~ msgstr "無法辨識檔案格式" #~ msgid "" #~ "Possible values are: actual_size, fit, keep_prev, fit_if_larger, " diff -Nru gthumb-3.0.2/po/zh_TW.po gthumb-3.2.3/po/zh_TW.po --- gthumb-3.0.2/po/zh_TW.po 2012-08-14 16:25:43.000000000 +0000 +++ gthumb-3.2.3/po/zh_TW.po 2013-04-30 16:56:13.000000000 +0000 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: gthumb 2.12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-28 18:10+0800\n" -"PO-Revision-Date: 2012-05-16 16:32+0800\n" +"POT-Creation-Date: 2012-10-16 18:12+0800\n" +"PO-Revision-Date: 2012-10-04 02:09+0800\n" "Last-Translator: taijuin \n" "Language-Team: Chinese/Traditional \n" "Language: \n" @@ -87,40 +87,40 @@ msgid "Show session management options" msgstr "顯示作業階段管理選項" -#: ../data/gthumb.desktop.in.in.h:1 -msgid "Image Viewer" -msgstr "圖片檢視工具" - -#: ../data/gthumb.desktop.in.in.h:2 -msgid "View and organize your images" -msgstr "檢視和組織您的圖片" - #. manually set name and icon -#: ../data/gthumb.desktop.in.in.h:3 ../gthumb/gth-browser.c:530 -#: ../gthumb/gth-progress-dialog.c:388 ../gthumb/main.c:313 +#: ../data/gthumb.desktop.in.in.h:1 ../gthumb/gth-browser.c:534 +#: ../gthumb/gth-progress-dialog.c:388 ../gthumb/main.c:315 msgid "gThumb" msgstr "gThumb" -#: ../data/gthumb.desktop.in.in.h:4 +#: ../data/gthumb.desktop.in.in.h:2 +msgid "Image Viewer" +msgstr "圖片檢視工具" + +#: ../data/gthumb.desktop.in.in.h:3 msgid "gThumb Image Viewer" msgstr "gThumb 圖片管理工具" -#: ../data/gthumb-import.desktop.in.in.h:1 -msgid "Import the photos on your camera card" -msgstr "從您的數位相機記憶卡匯入照片" +#: ../data/gthumb.desktop.in.in.h:4 +msgid "View and organize your images" +msgstr "檢視和組織您的圖片" -#: ../data/gthumb-import.desktop.in.in.h:2 +#: ../data/gthumb-import.desktop.in.in.h:1 msgid "Import with gThumb" msgstr "" -#: ../data/gthumb-import.desktop.in.in.h:3 +#: ../data/gthumb-import.desktop.in.in.h:2 msgid "Photo Import Tool" msgstr "照片匯入工具" -#: ../data/gthumb-import.desktop.in.in.h:4 +#: ../data/gthumb-import.desktop.in.in.h:3 msgid "gThumb Photo Import Tool" msgstr "gThumb 照片匯入工具" +#: ../data/gthumb-import.desktop.in.in.h:4 +msgid "Import the photos on your camera card" +msgstr "從您的數位相機記憶卡匯入照片" + #: ../data/org.gnome.gthumb.gschema.xml.in.h:1 msgid "" "Images over this size (in bytes) will not be thumbnailed. Use 0 if you want " @@ -130,25 +130,25 @@ "則使用 0。" #: ../data/org.gnome.gthumb.gschema.xml.in.h:2 -msgid "Open files in the active window" -msgstr "在作用中的視窗開啟檔案" - -#: ../data/org.gnome.gthumb.gschema.xml.in.h:3 msgid "Whether to resize the window to fit the size of the image" msgstr "是否調整視窗大小以符合圖片尺寸" +#: ../data/org.gnome.gthumb.gschema.xml.in.h:3 +msgid "Open files in the active window" +msgstr "在作用中的視窗開啟檔案" + #: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:1 msgid "Possible values are: white, black, checked, none." msgstr "適用的數值有:white, black, checked, none." #: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:2 -msgid "Whether to always use a black background." -msgstr "是否永遠使用黑色背景。" - -#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:3 msgid "Whether to reset the scrollbars position after changing image" msgstr "在改變圖片後是否重設捲動軸位置" +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:3 +msgid "Whether to always use a black background." +msgstr "是否永遠使用黑色背景。" + #: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:1 msgid "Possible values are: jpeg, jpg." msgstr "可能的值有：jpeg， jpg。" @@ -164,32 +164,32 @@ msgstr "" #: ../data/ui/extensions-preferences.ui.h:1 +msgid "_Extensions:" +msgstr "擴充套件(_E)：" + +#: ../data/ui/extensions-preferences.ui.h:2 msgid "More extensions..." msgstr "更多擴充套件..." -#: ../data/ui/extensions-preferences.ui.h:2 +#: ../data/ui/extensions-preferences.ui.h:3 msgid "Some extensions are configurable." msgstr "" -#: ../data/ui/extensions-preferences.ui.h:3 -msgid "_Extensions:" -msgstr "擴充套件(_E)：" - #: ../data/ui/filter-editor.ui.h:1 msgid "Filter _Name:" msgstr "篩選器名稱(_N)：" -#. limit label -#: ../data/ui/filter-editor.ui.h:2 ../gthumb/gth-filter.c:270 -#: ../gthumb/gth-filter.c:342 -msgid "_Limit to" -msgstr "限制於(_L)" - -#: ../data/ui/filter-editor.ui.h:3 +#: ../data/ui/filter-editor.ui.h:2 #: ../extensions/search/data/ui/search-editor.ui.h:3 msgid "_Match" msgstr "符合(_M)" +#. limit label +#: ../data/ui/filter-editor.ui.h:3 ../gthumb/gth-filter.c:269 +#: ../gthumb/gth-filter.c:337 +msgid "_Limit to" +msgstr "限制於(_L)" + #: ../data/ui/filter-editor.ui.h:4 msgid "selected by" msgstr "選取根據" @@ -198,76 +198,75 @@ msgid "Mean:" msgstr "平均：" -#: ../data/ui/histogram-info.ui.h:2 +#. Short for "Standard deviation". Try to keep it under the 12 characters in the translation or it will be ellipsizied at the end. +#: ../data/ui/histogram-info.ui.h:3 +msgid "Std dev:" +msgstr "標準偏差：" + +#: ../data/ui/histogram-info.ui.h:4 msgid "Median:" msgstr "中位數：" +#. After the colon there is the total number of pixels +#: ../data/ui/histogram-info.ui.h:6 +msgid "Pixels:" +msgstr "像素：" + #. After the colon there is a percentile. -#: ../data/ui/histogram-info.ui.h:4 +#: ../data/ui/histogram-info.ui.h:8 msgctxt "Pixels" msgid "Max:" msgstr "最大：" #. After the colon there is the percentile of selected pixels. -#: ../data/ui/histogram-info.ui.h:6 +#: ../data/ui/histogram-info.ui.h:10 msgctxt "Pixels" msgid "Selected:" msgstr "選取的：" -#. After the colon there is the total number of pixels -#: ../data/ui/histogram-info.ui.h:8 -msgid "Pixels:" -msgstr "像素：" - -#. Short for "Standard deviation". Try to keep it under the 12 characters in the translation or it will be ellipsizied at the end. -#: ../data/ui/histogram-info.ui.h:10 -msgid "Std dev:" -msgstr "標準偏差：" - #: ../data/ui/location.ui.h:1 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:5 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 msgid "_Location:" msgstr "位置(_L)：" #: ../data/ui/overwrite-dialog.ui.h:1 -msgid "Do not overwrite _the old file" -msgstr "不要覆蓋舊檔(_T)" +#, fuzzy +msgid "Overwrite the old file with the new one?" +msgstr "是否用新的圖片覆寫舊的圖片？" #: ../data/ui/overwrite-dialog.ui.h:2 +msgid "Old File:" +msgstr "舊檔案：" + +#: ../data/ui/overwrite-dialog.ui.h:3 msgid "Filename:" msgstr "檔案名稱：" -#: ../data/ui/overwrite-dialog.ui.h:3 +#: ../data/ui/overwrite-dialog.ui.h:4 +#: ../extensions/image_print/data/ui/print-layout.ui.h:23 +msgid "Size:" +msgstr "大小：" + +#: ../data/ui/overwrite-dialog.ui.h:5 #, fuzzy msgid "Modified:" msgstr "修改時間：" -#: ../data/ui/overwrite-dialog.ui.h:4 +#: ../data/ui/overwrite-dialog.ui.h:6 msgid "New File:" msgstr "新檔案：" -#: ../data/ui/overwrite-dialog.ui.h:5 -msgid "Old File:" -msgstr "舊檔案：" - -#: ../data/ui/overwrite-dialog.ui.h:6 +#: ../data/ui/overwrite-dialog.ui.h:7 msgid "Over_write the old file" msgstr "覆蓋舊檔案(_W)" -#: ../data/ui/overwrite-dialog.ui.h:7 -msgid "Overwrite _all files" -msgstr "覆蓋所有檔案(_A)" - #: ../data/ui/overwrite-dialog.ui.h:8 -#, fuzzy -msgid "Overwrite the old file with the new one?" -msgstr "是否用新的圖片覆寫舊的圖片？" +msgid "Do not overwrite _the old file" +msgstr "不要覆蓋舊檔(_T)" #: ../data/ui/overwrite-dialog.ui.h:9 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:9 -#: ../extensions/image_print/data/ui/print-layout.ui.h:16 -msgid "Size:" -msgstr "大小：" +msgid "Overwrite _all files" +msgstr "覆蓋所有檔案(_A)" #: ../data/ui/overwrite-dialog.ui.h:10 msgid "_Do not overwrite any file" @@ -290,122 +289,188 @@ msgstr "其他篩選器(_O)：" #: ../data/ui/preferences.ui.h:1 -msgid "Appearance" -msgstr "外觀" +msgid "below the folder list" +msgstr "在資料夾清單下面" #: ../data/ui/preferences.ui.h:2 -msgid "As_k confirmation before deleting files or catalogs" -msgstr "在刪除檔案或目錄之前，要求確認(_K)" +msgid "on the right" +msgstr "在右邊" #: ../data/ui/preferences.ui.h:3 -msgid "Ask whether to save _modified files" -msgstr "詢問是否儲存修改過的檔案(_M)" +msgid "gThumb Preferences" +msgstr "gthumb 偏好設定" -#: ../data/ui/preferences.ui.h:4 ../gthumb/dlg-preferences-extensions.c:71 -#: ../gthumb/gth-browser-actions-entries.h:179 -msgid "Browser" -msgstr "圖片清單" +#: ../data/ui/preferences.ui.h:4 +msgid "_Toolbar style:" +msgstr "工具列樣式(_T):" #: ../data/ui/preferences.ui.h:5 -#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 -#: ../extensions/image_print/data/ui/print-layout.ui.h:4 -msgid "Caption" -msgstr "圖片標題" +msgid "T_humbnails in viewer:" +msgstr "預覽縮圖的位置(_H)：" #: ../data/ui/preferences.ui.h:6 -msgid "Choose startup folder" -msgstr "選擇啟始的資料夾" +msgid "System settings" +msgstr "系統設定" #: ../data/ui/preferences.ui.h:7 -msgid "D_etermine image type from content (slower)" -msgstr "從圖片檔內容決定格式，會較慢(_E)" +msgid "Text below icons" +msgstr "圖示下顯示文字" #: ../data/ui/preferences.ui.h:8 -msgid "File _properties in browser:" -msgstr "在瀏覽器中的檔案屬性(_P)：" +msgid "Text beside icons" +msgstr "圖示旁顯示文字" #: ../data/ui/preferences.ui.h:9 -#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 -#: ../extensions/edit_metadata/gth-edit-general-page.c:481 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 -#: ../gthumb/gth-main-default-metadata.c:33 -msgid "General" -msgstr "一般" +msgid "Icons only" +msgstr "只顯示圖示" #: ../data/ui/preferences.ui.h:10 -msgid "Go to last _visited location" -msgstr "前往上次訪問的位置(_V)" +msgid "Text only" +msgstr "只顯示文字" #: ../data/ui/preferences.ui.h:11 -msgid "Go to this _folder:" -msgstr "前往這個資料夾(_F)：" +msgid "on the bottom" +msgstr "在底部" #: ../data/ui/preferences.ui.h:12 -msgid "On startup:" -msgstr "在啟動時：" +msgid "on the side" +msgstr "在側邊" #: ../data/ui/preferences.ui.h:13 -#: ../extensions/exiv2_tools/gth-edit-iptc-page.c:198 -#: ../extensions/gstreamer_tools/main.c:33 -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:2 -msgid "Other" -msgstr "其他" +msgid "File _properties in browser:" +msgstr "在瀏覽器中的檔案屬性(_P)：" #: ../data/ui/preferences.ui.h:14 -msgid "Set to C_urrent" -msgstr "更改為目前的資料夾(_U)" +msgid "Appearance" +msgstr "外觀" #: ../data/ui/preferences.ui.h:15 -msgid "T_humbnails in viewer:" -msgstr "預覽縮圖的位置(_H)：" +msgid "Go to last _visited location" +msgstr "前往上次訪問的位置(_V)" #: ../data/ui/preferences.ui.h:16 -msgid "Thumbnail _size:" -msgstr "縮圖大小(_S)：" +msgid "Go to this _folder:" +msgstr "前往這個資料夾(_F)：" #: ../data/ui/preferences.ui.h:17 -msgid "_Reuse the active window to open files" -msgstr "重新使用作用中的視窗來開啟檔案(_R)" +msgid "Choose startup folder" +msgstr "選擇啟始的資料夾" #: ../data/ui/preferences.ui.h:18 -msgid "_Store metadata inside files if possible" -msgstr "在檔案內部儲存詮釋資料，如果有可能的話(_S)" +msgid "Set to C_urrent" +msgstr "更改為目前的資料夾(_U)" #: ../data/ui/preferences.ui.h:19 -msgid "_Toolbar style:" -msgstr "工具列樣式(_T):" +msgid "_Reuse the active window to open files" +msgstr "重新使用作用中的視窗來開啟檔案(_R)" #: ../data/ui/preferences.ui.h:20 -#, fuzzy -#| msgid "View the folders" -msgid "below the folder list" -msgstr "檢視資料夾" +msgid "On startup:" +msgstr "在啟動時：" #: ../data/ui/preferences.ui.h:21 -msgid "gThumb Preferences" -msgstr "gthumb 偏好設定" +msgid "As_k confirmation before deleting files or catalogs" +msgstr "在刪除檔案或目錄之前，要求確認(_K)" #: ../data/ui/preferences.ui.h:22 -msgid "on the right" -msgstr "在右邊" +msgid "Ask whether to save _modified files" +msgstr "詢問是否儲存修改過的檔案(_M)" + +#: ../data/ui/preferences.ui.h:23 +msgid "_Store metadata inside files if possible" +msgstr "在檔案內部儲存詮釋資料，如果有可能的話(_S)" + +#: ../data/ui/preferences.ui.h:24 +#: ../extensions/exiv2_tools/gth-edit-iptc-page.c:198 +#: ../extensions/gstreamer_tools/main.c:33 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:17 +msgid "Other" +msgstr "其他" + +#: ../data/ui/preferences.ui.h:25 +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 +#: ../extensions/edit_metadata/gth-edit-general-page.c:481 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 +#: ../gthumb/gth-main-default-metadata.c:33 +msgid "General" +msgstr "一般" + +#: ../data/ui/preferences.ui.h:26 +#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 +#: ../extensions/image_print/data/ui/print-layout.ui.h:18 +msgid "Caption" +msgstr "圖片標題" + +#: ../data/ui/preferences.ui.h:27 +msgid "Thumbnail _size:" +msgstr "縮圖大小(_S)：" + +#: ../data/ui/preferences.ui.h:28 +msgid "48" +msgstr "48" + +#: ../data/ui/preferences.ui.h:29 +msgid "64" +msgstr "64" + +#: ../data/ui/preferences.ui.h:30 +msgid "85" +msgstr "85" + +#: ../data/ui/preferences.ui.h:31 +msgid "95" +msgstr "95" + +#: ../data/ui/preferences.ui.h:32 +#, fuzzy +#| msgid "1:1" +msgid "112" +msgstr "原來尺寸" + +#: ../data/ui/preferences.ui.h:33 +#, fuzzy +#| msgid "1:1" +msgid "128" +msgstr "原來尺寸" + +#: ../data/ui/preferences.ui.h:34 +msgid "164" +msgstr "164" + +#: ../data/ui/preferences.ui.h:35 +msgid "200" +msgstr "200" + +#: ../data/ui/preferences.ui.h:36 +msgid "256" +msgstr "256" + +#: ../data/ui/preferences.ui.h:37 +msgid "D_etermine image type from content (slower)" +msgstr "從圖片檔內容決定格式，會較慢(_E)" + +#: ../data/ui/preferences.ui.h:38 ../gthumb/dlg-preferences-extensions.c:71 +#: ../gthumb/gth-browser-actions-entries.h:179 +msgid "Browser" +msgstr "圖片清單" #: ../data/ui/sort-order.ui.h:1 msgid "Sort By" msgstr "排序方式" #: ../data/ui/sort-order.ui.h:2 -msgid "_Inverse order" -msgstr "相反次序(_I)" - -#: ../data/ui/sort-order.ui.h:3 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:4 msgid "_Sort by:" msgstr "排序方式(_S)：" +#: ../data/ui/sort-order.ui.h:3 +msgid "_Inverse order" +msgstr "相反次序(_I)" + #: ../extensions/23hq/23hq.extension.in.in.h:1 msgid "23" -msgstr "" +msgstr "23" #: ../extensions/23hq/23hq.extension.in.in.h:2 msgid "Upload images to 23hq.com" @@ -413,22 +478,21 @@ #: ../extensions/23hq/callbacks.c:68 msgid "_23..." -msgstr "" +msgstr "_23..." #: ../extensions/23hq/callbacks.c:69 msgid "Upload photos to 23" msgstr "上傳照片至 23" #: ../extensions/bookmarks/bookmarks.extension.in.in.h:1 -#, fuzzy -msgid "Add bookmarks support." -msgstr "新增至書籤(_A)" - -#: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:1 msgid "Bookmarks" msgstr "書籤" +#: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 +msgid "Add bookmarks support." +msgstr "加入書籤支援。" + #: ../extensions/bookmarks/bookmarks.extension.in.in.h:3 #: ../extensions/burn_disc/burn_disc.extension.in.in.h:3 #: ../extensions/catalogs/catalogs.extension.in.in.h:3 @@ -448,7 +512,6 @@ #: ../extensions/image_viewer/image_viewer.extension.in.in.h:3 #: ../extensions/list_tools/list_tools.extension.in.in.h:3 #: ../extensions/photo_importer/photo_importer.extension.in.in.h:3 -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:3 #: ../extensions/raw_files/raw_files.extension.in.in.h:3 #: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:3 #: ../extensions/rename_series/rename_series.extension.in.in.h:3 @@ -489,13 +552,13 @@ msgstr "書籤(_B):" #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:3 -msgid "_Location" -msgstr "位置(_L)" - -#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:4 msgid "_Name" msgstr "名稱(_N)" +#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:4 +msgid "_Location" +msgstr "位置(_L)" + #: ../extensions/bookmarks/dlg-bookmarks.c:70 msgid "Could not remove the bookmark" msgstr "無法移除書籤" @@ -529,29 +592,141 @@ msgstr "目前的資料夾和它的子資料夾(_U)" #: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:3 -msgid "Source" -msgstr "來源" - -#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:4 msgid "_Selected files" msgstr "選取的檔案(_S)" +#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:4 +msgid "Source" +msgstr "來源" + #: ../extensions/burn_disc/gth-burn-task.c:238 #: ../extensions/burn_disc/gth-burn-task.c:259 #: ../extensions/burn_disc/gth-burn-task.c:397 msgid "Write to Disc" msgstr "寫入至光碟" -#: ../extensions/cairo_io/cairo-io-jpeg.c:62 +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:62 #, c-format msgid "Error interpreting JPEG image file: %s" msgstr "" -#: ../extensions/cairo_io/cairo-io-jpeg.c:482 +#: ../extensions/cairo_io/cairo-image-surface-jpeg.c:483 #, c-format msgid "Unknown JPEG color space (%d)" msgstr "" +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:1 +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:1 +msgid "_Default extension:" +msgstr "預設副檔名(_D)：" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:2 +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:1 +msgid "_Quality:" +msgstr "品質(_Q)：" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:3 +msgid "_Smoothing:" +msgstr "平滑化(_S):" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:4 +msgid "Opti_mize" +msgstr "最佳化(_M)" + +#: ../extensions/cairo_io/data/ui/jpeg-options.ui.h:5 +msgid "_Progressive" +msgstr "漸進式顯示(_P)" + +#: ../extensions/cairo_io/data/ui/png-options.ui.h:1 +msgid "Compression _level:" +msgstr "壓縮程度(_L):" + +#: ../extensions/cairo_io/data/ui/save-options-preferences.ui.h:1 +msgid "Default options:" +msgstr "預設選項：" + +#: ../extensions/cairo_io/data/ui/tga-options.ui.h:1 +msgid "_RLE compression" +msgstr "_RLE 無損壓縮" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:2 +msgid "Compression" +msgstr "壓縮" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:3 +msgid "_No compression" +msgstr "不壓縮(_N)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:4 +msgid "No_rmal (Deflate)" +msgstr "無損壓縮[Deflate](_R)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:5 +msgid "_Loss compression (JPEG)" +msgstr "有損壓縮[JPEG](_L)" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:6 +msgid "Resolution" +msgstr "解析度" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:7 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 +msgid "_Horizontal:" +msgstr "水平(_H):" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:8 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 +msgid "_Vertical:" +msgstr "垂直(_V):" + +#: ../extensions/cairo_io/data/ui/tiff-options.ui.h:9 +msgid "dpi" +msgstr "dpi" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:2 +msgid "_Method:" +msgstr "方法(_M)：" + +#: ../extensions/cairo_io/data/ui/webp-options.ui.h:3 +msgid "_Lossless" +msgstr "無損(_L)" + +#: ../extensions/cairo_io/gth-image-saver-jpeg.c:515 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:140 +msgid "JPEG" +msgstr "JPEG" + +#: ../extensions/cairo_io/gth-image-saver-png.c:352 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:110 +msgid "PNG" +msgstr "PNG" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:257 +#: ../extensions/cairo_io/gth-image-saver-tiff.c:435 +#: ../gthumb/gth-buffer-data.c:84 +msgid "Insufficient memory" +msgstr "記憶體不足" + +#: ../extensions/cairo_io/gth-image-saver-tga.c:343 +msgid "TGA" +msgstr "TGA" + +#: ../extensions/cairo_io/gth-image-saver-tiff.c:558 +msgid "TIFF" +msgstr "TIFF" + +#: ../extensions/cairo_io/gth-image-saver-webp.c:381 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:165 +msgid "WebP" +msgstr "" + +#: ../extensions/cairo_io/preferences.c:134 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 +msgid "Saving" +msgstr "儲存" + #: ../extensions/catalogs/actions.c:92 ../extensions/catalogs/actions.c:213 #: ../extensions/catalogs/dlg-add-to-catalog.c:274 #: ../extensions/catalogs/dlg-add-to-catalog.c:394 @@ -694,15 +869,14 @@ #: ../extensions/catalogs/catalogs.extension.in.in.h:1 #: ../extensions/catalogs/gth-catalog.c:611 #: ../extensions/catalogs/gth-catalog.c:662 -#: ../extensions/catalogs/gth-catalog.c:1024 -#: ../extensions/catalogs/gth-catalog.c:1025 +#: ../extensions/catalogs/gth-catalog.c:1016 +#: ../extensions/catalogs/gth-catalog.c:1017 msgid "Catalogs" msgstr "圖片集" #: ../extensions/catalogs/catalogs.extension.in.in.h:2 -#, fuzzy msgid "Create file collections." -msgstr "建立檔案系統" +msgstr "建立檔案收藏。" #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:1 msgid "Add to Catalog" @@ -713,70 +887,70 @@ msgstr "圖片集(_A):" #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:3 -msgid "New _Library" -msgstr "新增圖庫(_L)" - -#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:4 msgid "_New Catalog" msgstr "新增圖片集(_N)" +#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:4 +msgid "New _Library" +msgstr "新增圖庫(_L)" + #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:5 #: ../extensions/file_manager/actions.c:945 -#: ../extensions/webalbums/gth-web-exporter.c:1842 +#: ../extensions/webalbums/gth-web-exporter.c:1840 msgid "_View the destination" msgstr "檢視目的端(_V)" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:1 -msgid "Catalog" -msgstr "圖片集" - -#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 #: ../gthumb/gth-file-properties.c:209 msgid "Properties" msgstr "屬性" +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:1 +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:1 +msgid "_Name:" +msgstr "名稱(_N)：" + #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:4 -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:3 +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:2 msgid "_Date:" msgstr "日期(_D):" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:5 -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 -#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 -msgid "_Name:" -msgstr "名稱(_N)：" +msgid "Catalog" +msgstr "圖片集" #: ../extensions/catalogs/data/ui/organize-files-task.ui.h:1 -#, fuzzy -msgid "Catalog _Preview:" -msgstr "遊戲預覽" +#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 +msgid "Organize Files" +msgstr "組織檔案" #: ../extensions/catalogs/data/ui/organize-files-task.ui.h:2 +msgid "Organizing files" +msgstr "正在組織檔案" + +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 #, fuzzy msgid "Organization:" msgstr "組織：" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 -#: ../extensions/catalogs/data/ui/organize-files.ui.h:4 -msgid "Organize Files" -msgstr "組織檔案" - #: ../extensions/catalogs/data/ui/organize-files-task.ui.h:4 -msgid "Organizing files" -msgstr "正在組織檔案" - -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 msgid "Select All" msgstr "全部選取" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 msgid "Select None" msgstr "不選取" +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 +#, fuzzy +msgid "Catalog _Preview:" +msgstr "遊戲預覽" + #: ../extensions/catalogs/data/ui/organize-files.ui.h:1 #: ../extensions/edit_metadata/gth-edit-general-page.c:558 #: ../gthumb/gth-main-default-tests.c:300 @@ -789,41 +963,41 @@ msgstr "檔案修改日期" #: ../extensions/catalogs/data/ui/organize-files.ui.h:3 -msgid "Ignore catalogs with a single file" -msgstr "忽略單一檔案的目錄 " - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:5 -msgid "Put single files in the catalog:" -msgstr "放置單獨的檔案至目錄：" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 -#, fuzzy -msgid "Singles" -msgstr "普通" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:7 #: ../extensions/comments/main.c:159 msgid "Tag" msgstr "標籤" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:8 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:4 +msgid "tag" +msgstr "標籤" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:5 #: ../gthumb/gth-main-default-tests.c:324 msgid "Tag (embedded)" msgstr "標籤(嵌入式)" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:9 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:7 msgid "_Group files by:" msgstr "檔案分組依據(_G)：" +#: ../extensions/catalogs/data/ui/organize-files.ui.h:8 +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 +#: ../extensions/search/data/ui/search-editor.ui.h:2 +msgid "_Include sub-folders" +msgstr "包括子資料夾(_I)" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:9 +msgid "Ignore catalogs with a single file" +msgstr "忽略單一檔案的目錄 " + #: ../extensions/catalogs/data/ui/organize-files.ui.h:10 -#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 -#: ../extensions/search/data/ui/search-editor.ui.h:2 -msgid "_Include sub-folders" -msgstr "包括子資料夾(_I)" +msgid "Put single files in the catalog:" +msgstr "放置單獨的檔案至目錄：" #: ../extensions/catalogs/data/ui/organize-files.ui.h:11 -msgid "tag" -msgstr "標籤" +#, fuzzy +msgid "Singles" +msgstr "普通" #: ../extensions/catalogs/dlg-add-to-catalog.c:105 #: ../extensions/catalogs/dlg-add-to-catalog.c:136 @@ -851,7 +1025,7 @@ msgid "Files will be organized in catalogs. No file will be moved on disk." msgstr "檔案將被組織在目錄中。沒有檔案會被移動到磁碟上。" -#: ../extensions/catalogs/gth-catalog.c:1122 ../extensions/comments/main.c:44 +#: ../extensions/catalogs/gth-catalog.c:1114 ../extensions/comments/main.c:44 #: ../extensions/edit_metadata/callbacks.c:106 #: ../gthumb/gth-main-default-metadata.c:53 msgid "Tags" @@ -899,10 +1073,10 @@ msgstr "無法自既存的資料夾 %F 移除檔案。" #: ../extensions/catalogs/gth-file-source-catalogs.c:1380 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:731 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:740 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:769 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:1281 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:733 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:742 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:771 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:1304 #: ../extensions/search/gth-search.c:265 msgid "Invalid file format" msgstr "無效的檔案格式" @@ -937,60 +1111,56 @@ msgstr "" #: ../extensions/change_date/data/ui/change-date.ui.h:3 -msgid "A_djust by" -msgstr "調整依(_D)" - -#: ../extensions/change_date/data/ui/change-date.ui.h:4 msgid "Change Date" msgstr "更改日期" -#: ../extensions/change_date/data/ui/change-date.ui.h:5 +#: ../extensions/change_date/data/ui/change-date.ui.h:4 msgid "Change the following values:" msgstr "更改以下數值：" -#: ../extensions/change_date/data/ui/change-date.ui.h:6 -msgid "Change to:" -msgstr "更改為：" +#: ../extensions/change_date/data/ui/change-date.ui.h:5 +msgid "_Last modified date" +msgstr "最後修改日期(_L)" -#: ../extensions/change_date/data/ui/change-date.ui.h:7 +#: ../extensions/change_date/data/ui/change-date.ui.h:6 msgid "Co_mment date" msgstr "註解日期(_M)" +#: ../extensions/change_date/data/ui/change-date.ui.h:7 +msgid "Change to:" +msgstr "更改為：" + #: ../extensions/change_date/data/ui/change-date.ui.h:8 -msgid "Date p_hoto was taken" -msgstr "照片的拍攝日期(_H)" +msgid "The _following date:" +msgstr "以下的日期(_F)：" #: ../extensions/change_date/data/ui/change-date.ui.h:9 -msgid "Exif DateTimeOriginal tag" -msgstr "Exif 日期時刻原始標籤" - -#: ../extensions/change_date/data/ui/change-date.ui.h:10 msgid "File _modified date" msgstr "檔案修改日期(_M)" -#: ../extensions/change_date/data/ui/change-date.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:10 msgid "File c_reation date" msgstr "檔案建立日期(_R)" +#: ../extensions/change_date/data/ui/change-date.ui.h:11 +msgid "Date p_hoto was taken" +msgstr "照片的拍攝日期(_H)" + #: ../extensions/change_date/data/ui/change-date.ui.h:12 -msgid "The _following date:" -msgstr "以下的日期(_F)：" +msgid "A_djust by" +msgstr "調整依(_D)" #: ../extensions/change_date/data/ui/change-date.ui.h:13 -msgid "_Last modified date" -msgstr "最後修改日期(_L)" - -#: ../extensions/change_date/data/ui/change-date.ui.h:14 msgid "hours" msgstr "小時" -#: ../extensions/change_date/data/ui/change-date.ui.h:15 +#: ../extensions/change_date/data/ui/change-date.ui.h:14 #, fuzzy msgid "minutes" msgstr "分鐘(_M)" -#: ../extensions/change_date/data/ui/change-date.ui.h:16 -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:15 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:6 msgid "seconds" msgstr "秒" @@ -1003,13 +1173,13 @@ msgstr "匯入儲存在檔案中的詮釋資料到 gThumb 註解系統" #: ../extensions/comments/comments.extension.in.in.h:1 -msgid "Add comments and tags to any file type." -msgstr "加入註解和標籤到任何檔案類型。" - -#: ../extensions/comments/comments.extension.in.in.h:2 msgid "Comments and tags" msgstr "評論和標籤" +#: ../extensions/comments/comments.extension.in.in.h:2 +msgid "Add comments and tags to any file type." +msgstr "加入註解和標籤到任何檔案類型。" + #: ../extensions/comments/data/ui/comments-preferences.ui.h:1 #: ../extensions/importer/gth-import-preferences-dialog.c:318 msgid "Preferences" @@ -1029,13 +1199,13 @@ msgstr "標題" #: ../extensions/comments/main.c:41 ../extensions/comments/main.c:143 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 #: ../extensions/image_print/data/ui/print-layout.ui.h:8 -#: ../extensions/importer/data/ui/import-preferences.ui.h:1 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:16 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:13 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 +#: ../extensions/importer/data/ui/import-preferences.ui.h:6 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 #: ../gthumb/gth-main-default-metadata.c:52 msgid "Description" msgstr "描述" @@ -1074,299 +1244,281 @@ msgstr "建立一個影像牆" #: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:1 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:8 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:1 msgid "Contact Sheet" msgstr "縮圖目錄" #: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:2 -#, fuzzy -#| msgid "Edit the comment and other information of the selected files" msgid "Create an index image displaying the thumbnails of the selected files." -msgstr "編輯選取檔案的註解和其他資訊" +msgstr "建立一索引圖片顯示所選的檔案縮圖。" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:1 -msgid "Background" -msgstr "背景" +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:446 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 +#: ../extensions/file_tools/gth-file-tool-rotate.c:403 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:14 +#: ../extensions/slideshow/main.c:277 +msgid "None" +msgstr "無" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:2 -msgid "C_olor:" -msgstr "顏色(_O)：" +#, fuzzy +msgid "Simple" +msgstr "普通" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:3 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 -msgid "Caption:" -msgstr "標題：" +msgid "Simple with shadow" +msgstr "" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:4 #, fuzzy -msgid "Frame" -msgstr "幀率：" +#| msgid "Show version" +msgid "Shadow only" +msgstr "顯示版本" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:5 -msgid "Inward Shadow" -msgstr "" +#, fuzzy +#| msgid "Slideshow" +msgid "Slide" +msgstr "幻燈片顯示" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:6 -#: ../extensions/file_tools/gth-file-tool-crop.c:424 -#: ../extensions/file_tools/gth-file-tool-crop.c:454 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 -#: ../extensions/file_tools/gth-file-tool-rotate.c:415 -#: ../extensions/slideshow/main.c:277 -msgid "None" -msgstr "無" +msgid "Inward Shadow" +msgstr "" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:7 msgid "Outward Shadow" msgstr "" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 -#, fuzzy -msgid "Select a color" -msgstr "全部選取" - #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:9 -msgid "Select a font" -msgstr "選取一個字型" +msgid "Background" +msgstr "背景" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:10 -#, fuzzy -#| msgid "Show version" -msgid "Shadow only" -msgstr "顯示版本" +msgid "_Solid color" +msgstr "素色(_S)" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:11 -#, fuzzy -msgid "Simple" -msgstr "普通" - -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 -msgid "Simple with shadow" -msgstr "" - -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 -#, fuzzy -#| msgid "Slideshow" -msgid "Slide" -msgstr "幻燈片顯示" +msgid "_Gradient" +msgstr "漸層(_G)" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:14 -#: ../extensions/rename_series/dlg-rename-series.c:57 -msgid "Text" -msgstr "文字" +#, fuzzy +msgid "Select a color" +msgstr "全部選取" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:15 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 -#: ../extensions/image_print/data/ui/print-layout.ui.h:26 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 -msgid "_Footer:" -msgstr "頁尾(_F):" +#, fuzzy +msgid "Frame" +msgstr "幀率：" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:16 -msgid "_Gradient" -msgstr "漸層(_G)" +msgid "_Style:" +msgstr "風格(_S)：" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:17 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 -#: ../extensions/image_print/data/ui/print-layout.ui.h:27 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 -msgid "_Header:" -msgstr "頁首(_H):" +msgid "C_olor:" +msgstr "顏色(_O)：" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:18 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 -msgid "_Horizontal:" -msgstr "水平(_H):" +#: ../extensions/rename_series/dlg-rename-series.c:57 +msgid "Text" +msgstr "文字" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 +#: ../extensions/image_print/data/ui/print-layout.ui.h:3 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 +msgid "_Header:" +msgstr "頁首(_H):" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:20 -msgid "_Solid color" -msgstr "素色(_S)" +msgid "Select a font" +msgstr "選取一個字型" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:21 -msgid "_Style:" -msgstr "風格(_S)：" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 +#: ../extensions/image_print/data/ui/print-layout.ui.h:4 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 +msgid "_Footer:" +msgstr "頁尾(_F):" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:22 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 -msgid "_Vertical:" -msgstr "垂直(_V):" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 +msgid "Caption:" +msgstr "標題：" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:2 +#: ../extensions/image_print/data/ui/print-layout.ui.h:5 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:6 +msgid "The current page number" +msgstr "目前的頁碼" -#. translate only the text in the curly brackets #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:3 -#: ../extensions/image_print/data/ui/print-layout.ui.h:3 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 -#, fuzzy, no-c-format -msgid "%D{ format }" -msgstr "格式化 %s (%s)" +#: ../extensions/image_print/data/ui/print-layout.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 +msgid "The total number of pages" +msgstr "總頁數" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:4 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 -msgid "All images on a single page" -msgstr "所有圖片在一個頁面上" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:6 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 -#: ../extensions/convert_format/data/ui/convert-format.ui.h:1 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:10 -msgid "Choose destination folder" -msgstr "選擇目的地資料夾" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 +#: ../extensions/image_print/data/ui/print-layout.ui.h:7 +#: ../extensions/importer/data/ui/import-preferences.ui.h:5 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:8 +msgid "Special code" +msgstr "特殊的代碼" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:7 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:3 -#: ../extensions/image_print/data/ui/print-layout.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:11 -msgid "Columns:" -msgstr "欄數：" +#. translate only the text in the curly brackets +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:8 +#: ../extensions/image_print/data/ui/print-layout.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 +#, fuzzy, no-c-format +msgid "%D{ format }" +msgstr "格式化 %s (%s)" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:9 -msgid "Create _HTML image map" -msgstr "建立 _HTML 影像地圖" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 -msgid "Create a new theme" -msgstr "建立一個新的主題" +#: ../extensions/image_print/data/ui/print-layout.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 +#, fuzzy +msgid "The current date" +msgstr "現在的日期(_D)" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 -msgid "Delete the selected theme" -msgstr "刪除選定的主題" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 +msgid "_Destination:" +msgstr "目的地(_D)：" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:13 -msgid "Edit the selected theme" -msgstr "編輯選定的主題" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:3 +#: ../extensions/convert_format/data/ui/convert-format.ui.h:4 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 +msgid "Choose destination folder" +msgstr "選擇目的地資料夾" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:14 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 msgid "File_name:" msgstr "檔案名稱(_N)：" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:16 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 -msgid "Images per page:" -msgstr "每頁圖片數目:" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 -#: ../extensions/image_print/data/ui/print-layout.ui.h:11 -msgid "Layout" -msgstr "配置" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:15 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:8 #, fuzzy msgid "New enumerator digit" msgstr "數字，數字" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:16 +msgid "Create _HTML image map" +msgstr "建立 _HTML 影像地圖" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 +msgid "Create a new theme" +msgstr "建立一個新的主題" + #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:19 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:10 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 -msgid "Re_verse order" -msgstr "相反次序排列(_V)" +msgid "Edit the selected theme" +msgstr "編輯選定的主題" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:20 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:11 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 -msgid "S_ort:" -msgstr "排序(_O)：" +msgid "Delete the selected theme" +msgstr "刪除選定的主題" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:21 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 -#: ../extensions/pixbuf_savers/preferences.c:134 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 -msgid "Saving" -msgstr "儲存" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:13 -#: ../extensions/image_print/data/ui/print-layout.ui.h:17 -#: ../extensions/importer/data/ui/import-preferences.ui.h:2 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:20 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:18 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 -msgid "Special code" -msgstr "特殊的代碼" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 +msgid "Theme" +msgstr "主題" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:23 -msgid "Sq_uared" -msgstr "正方形(_U)" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:16 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 +msgid "Columns:" +msgstr "欄數：" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:24 -#: ../extensions/image_print/data/ui/print-layout.ui.h:18 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 -#, fuzzy -msgid "The current date" -msgstr "現在的日期(_D)" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:10 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 +msgid "Images per page:" +msgstr "每頁圖片數目:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:25 -#: ../extensions/image_print/data/ui/print-layout.ui.h:19 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 -msgid "The current page number" -msgstr "目前的頁碼" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 +msgid "All images on a single page" +msgstr "所有圖片在一個頁面上" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:26 -#: ../extensions/image_print/data/ui/print-layout.ui.h:22 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 -msgid "The total number of pages" -msgstr "總頁數" +msgid "_All pages with the same size" +msgstr "所有頁面使用相同大小(_A)" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:27 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 -msgid "Theme" -msgstr "主題" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:15 +msgid "Layout" +msgstr "配置" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:28 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:14 -msgid "Thumbnails" -msgstr "縮圖" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:13 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 +msgid "S_ort:" +msgstr "排序(_O)：" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:29 -msgid "_All pages with the same size" -msgstr "所有頁面使用相同大小(_A)" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:14 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 +msgid "Re_verse order" +msgstr "相反次序排列(_V)" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:30 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:15 -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:9 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 -msgid "_Destination:" -msgstr "目的地(_D)：" +msgid "_Size:" +msgstr "大小(_S)：" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 +msgid "Sq_uared" +msgstr "正方形(_U)" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:33 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:16 -msgid "_Size:" -msgstr "大小(_S)：" +msgid "Thumbnails" +msgstr "縮圖" -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 msgid "Image Wall" msgstr "影像牆" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:486 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:498 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:512 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:481 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:492 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:506 #, fuzzy #| msgid "Could not save the filter" msgid "Could not save the theme" msgstr "無法儲存篩選器" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:657 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:651 #, fuzzy msgid "Could not delete the theme" msgstr "無法匯入檔案。" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:248 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:247 msgid "Creating images" msgstr "正在建立圖片" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:897 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:895 msgid "Generating thumbnails" msgstr "正在產生縮圖" @@ -1406,35 +1558,35 @@ msgid "Save images in a different format" msgstr "用不同的格式儲存圖片" -#: ../extensions/convert_format/data/ui/convert-format.ui.h:2 +#: ../extensions/convert_format/data/ui/convert-format.ui.h:1 msgid "Convert Format" msgstr "轉換格式" +#: ../extensions/convert_format/data/ui/convert-format.ui.h:2 +msgid "New format" +msgstr "新的格式" + #: ../extensions/convert_format/data/ui/convert-format.ui.h:3 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:4 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 msgid "Destination" msgstr "目的地" -#: ../extensions/convert_format/data/ui/convert-format.ui.h:4 -msgid "New format" -msgstr "新的格式" - #: ../extensions/convert_format/data/ui/convert-format.ui.h:5 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 #, fuzzy msgid "_Use the original image folder" msgstr "原始大小(_O)" -#: ../extensions/convert_format/dlg-convert-format.c:93 +#: ../extensions/convert_format/dlg-convert-format.c:95 msgid "Converting images" msgstr "正在轉換圖片" -#: ../extensions/desktop_background/actions.c:162 +#: ../extensions/desktop_background/actions.c:158 msgid "Could not show the desktop background properties" msgstr "無法顯示桌面背景屬性" -#: ../extensions/desktop_background/actions.c:228 -#: ../extensions/desktop_background/actions.c:246 +#: ../extensions/desktop_background/actions.c:224 +#: ../extensions/desktop_background/actions.c:242 msgid "Could not set the desktop background" msgstr "無法設置桌面背景" @@ -1486,20 +1638,20 @@ msgstr "刪除選取檔案的註解和詮釋資料" #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:1 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:1 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 msgid "D_escription:" msgstr "描述(_E)：" -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:2 +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:3 +msgid "_Place:" +msgstr "位置(_P):" + +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 #: ../extensions/edit_metadata/data/ui/tag-chooser.ui.h:1 msgid "T_ags:" msgstr "標籤(_A)： " -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 -msgid "_Place:" -msgstr "位置(_P):" - #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:5 msgid "_Rating:" msgstr "評分(_R)：" @@ -1518,13 +1670,13 @@ msgstr "不能讀取檔案資訊" #: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:1 -msgid "Allow to edit files metadata." -msgstr "允許編輯檔案的註解資料。" - -#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 msgid "Edit metadata" msgstr "編輯註解資料" +#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 +msgid "Allow to edit files metadata." +msgstr "允許編輯檔案的註解資料。" + #. Translators: the %s symbol in the string is a file name #: ../extensions/edit_metadata/gth-edit-comment-dialog.c:63 #, c-format @@ -1608,53 +1760,53 @@ msgstr "例如： *.o; *.bak" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:1 -msgid "Byline _Title:" -msgstr "署名標題(_T)：" - -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 msgid "C_opyright:" msgstr "版權(_O)：" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:3 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 msgid "Co_untry:" msgstr "國家(_U)：" +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:3 +msgid "_Code:" +msgstr "地區代碼(_C)：" + #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:4 msgid "Cr_edit:" msgstr "信用(_E)：" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 -msgid "State/Province:" -msgstr "州/省：" - #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:6 -msgid "_Byline:" -msgstr "署名(_B)：" +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 +msgid "_Source:" +msgstr "來源(_S)：" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:7 -msgid "_City:" -msgstr "城市(_C)：" +msgid "_Urgency:" +msgstr "緊急程度(_U)：" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:8 -msgid "_Code:" -msgstr "地區代碼(_C)：" +msgid "_Object Name:" +msgstr "物件名稱(_O)：" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:9 +msgid "Byline _Title:" +msgstr "署名標題(_T)：" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:10 -msgid "_Language:" -msgstr "語言(_L)：" +msgid "_Byline:" +msgstr "署名(_B)：" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:11 -msgid "_Object Name:" -msgstr "物件名稱(_O)：" +msgid "_City:" +msgstr "城市(_C)：" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:12 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 -msgid "_Source:" -msgstr "來源(_S)：" +msgid "_Language:" +msgstr "語言(_L)：" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:13 -msgid "_Urgency:" -msgstr "緊急程度(_U)：" +msgid "State/Province:" +msgstr "州/省：" #: ../extensions/exiv2_tools/exiv2_tools.extension.in.in.h:1 msgid "EXIF, IPTC, XMP support" @@ -1709,7 +1861,7 @@ msgid "XMP Attached" msgstr "%d 個附加的郵件" -#: ../extensions/exiv2_tools/main.c:256 +#: ../extensions/exiv2_tools/main.c:267 msgid "date photo was taken" msgstr "照片的拍攝日期" @@ -1726,80 +1878,82 @@ msgstr "上傳照片到 Facebook" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:1 -msgid "1024 x 1024" -msgstr "1024 x 1024" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 +msgid "Export to Flickr" +msgstr "匯出至 Flickr" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:2 -msgid "1280 x 1280" -msgstr "1280 x 1280" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 +msgid "_Upload" +msgstr "上傳(_U)" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:3 -msgid "1600 x 1600" -msgstr "1600 x 1600" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 +#, fuzzy +msgid "_Account:" +msgstr "帳號(_A):" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:4 -msgid "2048 x 2048" -msgstr "2048 x 2048" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 +msgid "Edit accounts" +msgstr "編輯您的帳號" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 -msgid "720 x 720" -msgstr "720 x 720" - -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 msgid "A_lbum:" msgstr "相簿(_L)：" -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 msgid "Add a new album" msgstr "加入一新的相簿" +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 +#, fuzzy +#| msgid "_Resize if larger than:" +msgid "Resize the images if larger than this size" +msgstr "大於這個尺寸便會調整大小(_R)：" + #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:8 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 -msgid "Edit accounts" -msgstr "編輯您的帳號" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 +msgid "_Resize if larger than:" +msgstr "大於這個尺寸便會調整大小(_R)：" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:9 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 -msgid "Export to Flickr" -msgstr "匯出至 Flickr" +msgid "720 x 720" +msgstr "720 x 720" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:10 -#, fuzzy -#| msgid "_Resize if larger than:" -msgid "Resize the images if larger than this size" -msgstr "大於這個尺寸便會調整大小(_R)：" +msgid "1024 x 1024" +msgstr "1024 x 1024" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:11 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 -#, fuzzy -msgid "_Account:" -msgstr "帳號(_A):" +msgid "1280 x 1280" +msgstr "1280 x 1280" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:12 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 -#, fuzzy -msgid "_Resize to:" -msgstr "面對面" +msgid "1600 x 1600" +msgstr "1600 x 1600" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:13 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 -msgid "_Upload" -msgstr "上傳(_U)" +msgid "2048 x 2048" +msgstr "2048 x 2048" #: ../extensions/facebook/data/ui/facebook-account-chooser.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-account-chooser.ui.h:1 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 #: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 #: ../extensions/picasaweb/data/ui/picasa-web-account-chooser.ui.h:1 #, fuzzy msgid "A_ccount:" @@ -1813,25 +1967,25 @@ msgid "A_ccounts:" msgstr "最近使用(_R):" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 #, fuzzy -msgid "Private" -msgstr "私人" +msgid "Public photos" +msgstr "照片數量" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 msgid "Private photos, visible to friends" msgstr "私人照片，朋友們可看見的" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:5 #, fuzzy -msgid "Public photos" -msgstr "照片數量" +msgid "Private" +msgstr "私人" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:5 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:5 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 #, fuzzy msgid "_Visibility:" msgstr "可見狀態" @@ -1843,18 +1997,18 @@ msgstr "授權(_A)..." #: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:1 -#: ../extensions/flicker_utils/data/ui/flicker-complete-authorization.ui.h:1 -#: ../extensions/oauth/data/ui/oauth-complete-authorization.ui.h:1 -msgid "C_ontinue" -msgstr "繼續(_O)" - -#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 #: ../extensions/facebook/facebook-authentication.c:472 #: ../extensions/flicker_utils/flickr-authentication.c:408 #: ../extensions/oauth/oauth-authentication.c:423 msgid "Once you're done, click the 'Continue' button below." msgstr "一旦您完成後，點擊下面的“繼續”按鈕。" +#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 +#: ../extensions/flicker_utils/data/ui/flicker-complete-authorization.ui.h:1 +#: ../extensions/oauth/data/ui/oauth-complete-authorization.ui.h:1 +msgid "C_ontinue" +msgstr "繼續(_O)" + #: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:1 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:1 @@ -1866,79 +2020,79 @@ #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:2 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:2 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:2 -#: ../extensions/webalbums/gth-web-exporter.c:1841 +#: ../extensions/webalbums/gth-web-exporter.c:1839 msgid "_Open in the Browser" msgstr "在網頁瀏覽器中開啟(_O)" #: ../extensions/facebook/dlg-export-to-facebook.c:130 #: ../extensions/facebook/dlg-export-to-facebook.c:335 #: ../extensions/facebook/facebook-authentication.c:192 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:138 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:399 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:141 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:417 #: ../extensions/flicker_utils/dlg-import-from-flickr.c:237 #: ../extensions/flicker_utils/flickr-authentication.c:191 #: ../extensions/oauth/oauth-authentication.c:187 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:131 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:376 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:139 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:424 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:133 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:378 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:142 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:442 #: ../extensions/picasaweb/dlg-import-from-picasaweb.c:380 msgid "Could not connect to the server" msgstr "無法連接伺服器" #: ../extensions/facebook/dlg-export-to-facebook.c:182 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:246 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:182 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:192 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:249 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:184 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:195 msgid "Could not upload the files" msgstr "無法上傳檔案" #: ../extensions/facebook/dlg-export-to-facebook.c:412 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:188 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:223 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:462 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:717 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:191 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:226 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:464 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:735 msgid "Could not create the album" msgstr "無法建立相簿" #: ../extensions/facebook/dlg-export-to-facebook.c:481 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:534 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:783 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:536 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:801 msgid "New Album" msgstr "新增相簿" #: ../extensions/facebook/dlg-export-to-facebook.c:561 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:557 -#: ../extensions/image_print/gth-image-print-job.c:1789 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:614 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1002 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:591 +#: ../extensions/image_print/gth-image-print-job.c:1739 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:615 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1036 #, fuzzy msgid "No valid file selected." msgstr "無檔案可支援 (%i 個選擇的檔案)" #: ../extensions/facebook/dlg-export-to-facebook.c:562 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:558 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:615 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1003 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:592 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:616 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1037 msgid "Could not export the files" msgstr "無法匯出檔案" #: ../extensions/facebook/dlg-export-to-facebook.c:570 -#: ../extensions/find_duplicates/gth-find-duplicates.c:255 -#: ../extensions/find_duplicates/gth-find-duplicates.c:347 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:566 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:623 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1010 +#: ../extensions/find_duplicates/gth-find-duplicates.c:277 +#: ../extensions/find_duplicates/gth-find-duplicates.c:470 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:600 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:624 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1044 #: ../extensions/picasaweb/dlg-import-from-picasaweb.c:803 -#: ../gthumb/gth-browser.c:1006 +#: ../gthumb/gth-browser.c:1072 #, c-format msgid "%d file (%s)" msgid_plural "%d files (%s)" msgstr[0] "%d 個檔案 (大小為 %s)" #: ../extensions/facebook/dlg-export-to-facebook.c:591 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:589 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:642 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:623 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:643 #, c-format msgid "Export to %s" msgstr "匯出至 %s" @@ -1986,7 +2140,7 @@ #: ../extensions/facebook/facebook-authentication.c:652 #: ../extensions/flicker_utils/flickr-authentication.c:588 #: ../extensions/oauth/oauth-authentication.c:605 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:820 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:838 #: ../extensions/picasaweb/dlg-import-from-picasaweb.c:684 msgid "Choose Account" msgstr "選擇帳戶" @@ -1994,7 +2148,7 @@ #: ../extensions/facebook/facebook-authentication.c:761 #: ../extensions/flicker_utils/flickr-authentication.c:697 #: ../extensions/oauth/oauth-authentication.c:714 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:881 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:899 #: ../extensions/picasaweb/dlg-import-from-picasaweb.c:745 msgid "Edit Accounts" msgstr "編輯您的帳號" @@ -2006,8 +2160,8 @@ #: ../extensions/facebook/facebook-service.c:468 #: ../extensions/flicker_utils/flickr-connection.c:266 #: ../extensions/flicker_utils/flickr-connection.c:413 -#: ../extensions/flicker_utils/flickr-service.c:195 -#: ../extensions/flicker_utils/flickr-service.c:398 +#: ../extensions/flicker_utils/flickr-service.c:197 +#: ../extensions/flicker_utils/flickr-service.c:400 #: ../extensions/photobucket/photobucket-consumer.c:74 #: ../extensions/photobucket/photobucket-consumer.c:79 #: ../extensions/photobucket/photobucket-consumer.c:115 @@ -2021,7 +2175,7 @@ #: ../extensions/facebook/facebook-service.c:290 #: ../extensions/flicker_utils/flickr-connection.c:292 #: ../extensions/flicker_utils/flickr-connection.c:439 -#: ../extensions/flicker_utils/flickr-service.c:219 +#: ../extensions/flicker_utils/flickr-service.c:221 #: ../extensions/oauth/oauth-connection.c:356 #: ../extensions/oauth/oauth-connection.c:431 #: ../extensions/oauth/oauth-connection.c:535 @@ -2039,7 +2193,7 @@ #: ../extensions/facebook/facebook-service.c:188 #: ../extensions/facebook/facebook-service.c:290 -#: ../extensions/flicker_utils/flickr-service.c:219 +#: ../extensions/flicker_utils/flickr-service.c:221 #: ../extensions/oauth/oauth-connection.c:356 #: ../extensions/oauth/oauth-connection.c:431 #: ../extensions/oauth/oauth-connection.c:535 @@ -2047,48 +2201,48 @@ msgstr "正在取得帳戶資訊" #: ../extensions/facebook/facebook-service.c:396 -#: ../extensions/flicker_utils/flickr-service.c:323 +#: ../extensions/flicker_utils/flickr-service.c:325 #: ../extensions/photobucket/photobucket-service.c:207 -#: ../extensions/picasaweb/picasa-web-service.c:209 +#: ../extensions/picasaweb/picasa-web-service.c:211 msgid "Getting the album list" msgstr "取得相簿清單" #: ../extensions/facebook/facebook-service.c:525 -#: ../extensions/flicker_utils/flickr-service.c:426 -#: ../extensions/flicker_utils/flickr-service.c:546 -#: ../extensions/flicker_utils/flickr-service.c:584 +#: ../extensions/flicker_utils/flickr-service.c:428 +#: ../extensions/flicker_utils/flickr-service.c:548 +#: ../extensions/flicker_utils/flickr-service.c:586 #: ../extensions/photobucket/photobucket-service.c:316 -#: ../extensions/picasaweb/picasa-web-service.c:300 +#: ../extensions/picasaweb/picasa-web-service.c:302 msgid "Creating the new album" msgstr "建立新的相簿" #: ../extensions/facebook/facebook-service.c:584 -#: ../extensions/flicker_utils/flickr-service.c:634 +#: ../extensions/flicker_utils/flickr-service.c:636 #: ../extensions/photobucket/photobucket-service.c:373 -#: ../extensions/picasaweb/picasa-web-service.c:357 +#: ../extensions/picasaweb/picasa-web-service.c:359 #, fuzzy, c-format msgid "Could not upload '%s': %s" msgstr "無法上傳偏好設定。理由：{0}" #. Translators: %s is a filename #: ../extensions/facebook/facebook-service.c:670 -#: ../extensions/flicker_utils/flickr-service.c:745 +#: ../extensions/flicker_utils/flickr-service.c:747 #: ../extensions/photobucket/photobucket-service.c:430 -#: ../extensions/picasaweb/picasa-web-service.c:412 +#: ../extensions/picasaweb/picasa-web-service.c:414 #, c-format msgid "Uploading '%s'" msgstr "正在上傳 '%s'" -#: ../extensions/facebook/facebook-service.c:886 -#: ../extensions/flicker_utils/flickr-service.c:914 +#: ../extensions/facebook/facebook-service.c:884 +#: ../extensions/flicker_utils/flickr-service.c:940 #: ../extensions/photobucket/photobucket-service.c:599 -#: ../extensions/picasaweb/picasa-web-service.c:605 +#: ../extensions/picasaweb/picasa-web-service.c:631 msgid "Uploading the files to the server" msgstr "正在上傳檔案至伺服器" -#: ../extensions/facebook/facebook-service.c:1003 -#: ../extensions/flicker_utils/flickr-service.c:1077 -#: ../extensions/picasaweb/picasa-web-service.c:718 +#: ../extensions/facebook/facebook-service.c:1001 +#: ../extensions/flicker_utils/flickr-service.c:1105 +#: ../extensions/picasaweb/picasa-web-service.c:746 msgid "Getting the photo list" msgstr "獲取照片清單" @@ -2207,7 +2361,7 @@ #: ../extensions/file_manager/callbacks.c:191 #: ../extensions/file_manager/callbacks.c:203 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:2 msgid "_Rename" msgstr "重新命名(_R)" @@ -2250,8 +2404,8 @@ msgstr "選取的檔案移動到另一個資料夾" #: ../extensions/file_manager/callbacks.c:1003 -#: ../extensions/find_duplicates/gth-find-duplicates.c:581 -#: ../gthumb/gth-browser.c:5011 ../gthumb/gth-browser.c:5045 +#: ../extensions/find_duplicates/gth-find-duplicates.c:766 +#: ../gthumb/gth-browser.c:5120 ../gthumb/gth-browser.c:5154 #, fuzzy msgid "Could not perform the operation" msgstr "操作無法進行" @@ -2269,391 +2423,401 @@ msgstr "刪除檔案" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:1 -msgid "B_rightness:" -msgstr "亮度(_R)：" +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:5 +msgid "_Preview" +msgstr "預覽(_P)" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:2 -msgid "Color Levels" -msgstr "色階" +msgid "B_rightness:" +msgstr "亮度(_R)：" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:3 msgid "Con_trast:" msgstr "對比(_T):" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:4 -msgid "Cyan-_Red:" -msgstr "氰藍色－紅色(_R):" +msgid "_Saturation:" +msgstr "彩度(_S):" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:5 msgid "G_amma:" msgstr "G_amma：" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:6 -msgid "_Magenta-Green:" -msgstr "紫紅色－綠色(_M):" +msgid "Cyan-_Red:" +msgstr "氰藍色－紅色(_R):" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:7 -msgid "_Preview" -msgstr "預覽(_P)" +msgid "_Magenta-Green:" +msgstr "紫紅色－綠色(_M):" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:8 -#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:5 -msgid "_Reset" -msgstr "重設(_R)" +msgid "_Yellow-Blue:" +msgstr "黃色－藍色(_Y):" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:9 -msgid "_Saturation:" -msgstr "彩度(_S):" +msgid "Color Levels" +msgstr "色階" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:10 -msgid "_Yellow-Blue:" -msgstr "黃色－藍色(_Y):" +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:5 +msgid "_Reset" +msgstr "重設(_R)" #: ../extensions/file_tools/data/ui/crop-options.ui.h:1 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 -msgid "Aspect ratio" -msgstr "長寬比" +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +msgid "Selection" +msgstr "選取" #: ../extensions/file_tools/data/ui/crop-options.ui.h:2 -msgid "C_rop" -msgstr "裁剪(_R)" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 +msgid "_Width:" +msgstr "寬度(_W):" #: ../extensions/file_tools/data/ui/crop-options.ui.h:3 -msgid "Center" -msgstr "置中" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 +msgid "Heigh_t:" +msgstr "高度(_T)：" #: ../extensions/file_tools/data/ui/crop-options.ui.h:4 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 -msgid "I_nvert aspect ratio" -msgstr "反轉長寬比(_N)" +msgid "_Position:" +msgstr "位置(_P)：" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:5 +msgid "Maximize" +msgstr "最大化" -#. after the colon there is a control to select the size in pixels #: ../extensions/file_tools/data/ui/crop-options.ui.h:6 -msgid "M_ultiple of:" -msgstr "倍數於(_U)：" +msgid "Center" +msgstr "置中" #: ../extensions/file_tools/data/ui/crop-options.ui.h:7 -msgid "Maximize" -msgstr "最大化" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:5 +msgid "Aspect ratio" +msgstr "長寬比" #: ../extensions/file_tools/data/ui/crop-options.ui.h:8 -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 -msgid "Selection" -msgstr "選取區域" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 +msgid "I_nvert aspect ratio" +msgstr "反轉長寬比(_N)" +#. after the colon there is a control to select the size in pixels #: ../extensions/file_tools/data/ui/crop-options.ui.h:10 -msgid "_Grid:" -msgstr "格線(_G)：" - -#: ../extensions/file_tools/data/ui/crop-options.ui.h:11 -msgid "_Position:" -msgstr "位置(_P)：" +msgid "M_ultiple of:" +msgstr "倍數於(_U)：" #. abbreviation of pixel -#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:12 msgid "px" msgstr "像素" -#. this is used to separate the dimensions, for example: 120 × 250 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 +#: ../gthumb/gth-file-chooser-dialog.c:252 +msgid "Options" +msgstr "選項" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:14 +msgid "_Grid:" +msgstr "格線(_G)：" + #: ../extensions/file_tools/data/ui/crop-options.ui.h:15 -msgid "×" -msgstr "" +msgid "C_rop" +msgstr "裁剪(_R)" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:2 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:2 -#, no-c-format -msgid "%" -msgstr "%" +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:1 +msgid "Method" +msgstr "方法" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:2 +msgid "_Brightness" +msgstr "亮度(_B)" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:3 +msgid "_Saturation" +msgstr "飽和度(_S)" + +#: ../extensions/file_tools/data/ui/grayscale-options.ui.h:4 +msgid "_Average" +msgstr "平均(_A)" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 #: ../gthumb/gth-main-default-metadata.c:47 msgid "Dimensions" msgstr "尺寸" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:5 -msgid "Heigh_t:" -msgstr "高度(_T)：" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:4 +#, fuzzy +#| msgid "Set the image as desktop background" +msgid "Set the image size to this value" +msgstr "將圖片設為桌面背景" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:8 msgid "High _quality" msgstr "高品質(_Q)" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:8 -msgid "New dimensions:" -msgstr "新的尺寸：" - #: ../extensions/file_tools/data/ui/resize-options.ui.h:9 -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 -msgid "Options" -msgstr "選項" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 msgid "Original dimensions:" msgstr "原來的尺寸：" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 msgid "Scale factor:" msgstr "比例因子：" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 -#, fuzzy -#| msgid "Set the image as desktop background" -msgid "Set the image size to this value" -msgstr "將圖片設為桌面背景" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:13 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:11 -msgid "_Width:" -msgstr "寬度(_W):" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 +msgid "New dimensions:" +msgstr "新的尺寸：" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:14 -#: ../extensions/image_print/data/ui/print-layout.ui.h:31 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:29 msgid "pixels" msgstr "像素" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:14 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:12 +#, no-c-format +msgid "%" +msgstr "%" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:1 -msgid "Align" -msgstr "對齊" +msgid "Angle" +msgstr "角度" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 -msgid "Alignment" -msgstr "對齊方式" +msgid "Align" +msgstr "對齊" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 -msgid "Angle" -msgstr "角度" +msgid "Image size" +msgstr "圖片大小" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 -msgid "Bounding box" -msgstr "邊界框" +msgid "Point 1:" +msgstr "第1點：" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 -msgid "Crop borders" -msgstr "裁剪邊框" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 +msgid "Point 2:" +msgstr "第2點：" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 -msgid "" -"Draw a line on the image \n" -"to set the alignment." -msgstr "" -"畫一條線在圖片上\n" -"以設置對齊。" +msgid "Keep aspect ratio" +msgstr "保持長寬比" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 msgid "Grid:" msgstr "格線：" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 -msgid "Image size" -msgstr "圖片大小" +msgid "_Background:" +msgstr "背景(_B)：" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 -msgid "Keep aspect ratio" -msgstr "保持長寬比" +msgid "Pick a background color" +msgstr "挑選一個背景顏色" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 +msgid "_Transparent" +msgstr "透明度(_T)" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:12 -msgid "Original size" -msgstr "原始大小" +msgid "Reset" +msgstr "重設" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:13 +msgid "" +"Draw a line on the image \n" +"to set the alignment." +msgstr "" +"畫一條線在圖片上\n" +"以設置對齊。" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:15 msgid "Parallel" msgstr "平行" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:14 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:16 msgid "Perpendicular" msgstr "垂直" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:15 -msgid "Pick a background color" -msgstr "挑選一個背景顏色" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:16 -msgid "Point 1:" -msgstr "" - #: ../extensions/file_tools/data/ui/rotate-options.ui.h:17 -msgid "Point 2:" -msgstr "" +msgid "Alignment" +msgstr "對齊方式" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:18 -msgid "Reset" -msgstr "重設" +msgid "Original size" +msgstr "原始大小" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:19 -msgid "_Background:" -msgstr "背景(_B)：" +msgid "Bounding box" +msgstr "邊界框" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:20 -msgid "_Transparent" -msgstr "透明度(_T)" +msgid "Crop borders" +msgstr "裁剪邊框" #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:1 -msgid "Amount:" -msgstr "總數：" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 +msgid "_Preview:" +msgstr "預覽(_P)：" #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:2 -msgid "Radius:" -msgstr "半徑：" - -#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:3 msgid "Threshold:" msgstr "臨界值：" +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:3 +msgid "Radius:" +msgstr "半徑：" + #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:4 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 -msgid "_Preview:" -msgstr "預覽(_P)：" +msgid "Amount:" +msgstr "總數：" #: ../extensions/file_tools/file_tools.extension.in.in.h:1 +msgid "Image tools" +msgstr "圖片工具" + +#: ../extensions/file_tools/file_tools.extension.in.in.h:2 msgid "Basic tools to modify images." msgstr "修改圖片的基本工具。" -#: ../extensions/file_tools/file_tools.extension.in.in.h:2 -msgid "Image tools" -msgstr "圖片工具" +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:372 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:272 +#: ../extensions/file_tools/gth-file-tool-grayscale.c:248 +#: ../extensions/file_tools/gth-file-tool-negative.c:68 +msgid "Applying changes" +msgstr "套用變更中" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 msgid "Adjust Colors..." msgstr "調整顏色..." -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:618 msgid "Adjust Colors" msgstr "調整顏色" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:531 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:619 msgid "Change brightness, contrast, saturation and gamma level of the image" msgstr "更改圖片的亮度、對比、飽和度和灰色階調" -#: ../extensions/file_tools/gth-file-tool-crop.c:424 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:304 +msgid "Adjust Contrast" +msgstr "調整對比度" + +#: ../extensions/file_tools/gth-file-tool-adjust-contrast.c:305 +msgid "Automatic contrast adjustment" +msgstr "自動對比度調整" + +#: ../extensions/file_tools/gth-file-tool-crop.c:416 +#: ../extensions/file_tools/gth-file-tool-resize.c:589 msgid "Square" msgstr "正方形" -#: ../extensions/file_tools/gth-file-tool-crop.c:425 -#: ../extensions/file_tools/gth-file-tool-resize.c:499 +#: ../extensions/file_tools/gth-file-tool-crop.c:417 +#: ../extensions/file_tools/gth-file-tool-resize.c:590 #, c-format msgid "%d x %d (Image)" msgstr "%d×%d (圖片)" -#: ../extensions/file_tools/gth-file-tool-crop.c:428 -#: ../extensions/file_tools/gth-file-tool-resize.c:503 +#: ../extensions/file_tools/gth-file-tool-crop.c:420 +#: ../extensions/file_tools/gth-file-tool-resize.c:594 #, c-format msgid "%d x %d (Screen)" msgstr "%d × %d (畫面)" -#: ../extensions/file_tools/gth-file-tool-crop.c:432 -#: ../extensions/file_tools/gth-file-tool-resize.c:508 +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-resize.c:599 #, fuzzy msgid "5:4" msgstr "5:" -#: ../extensions/file_tools/gth-file-tool-crop.c:433 -#: ../extensions/file_tools/gth-file-tool-resize.c:509 +#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-resize.c:600 #, fuzzy msgid "4:3 (DVD, Book)" msgstr "書本名稱(_N)" -#: ../extensions/file_tools/gth-file-tool-crop.c:434 -#: ../extensions/file_tools/gth-file-tool-resize.c:510 +#: ../extensions/file_tools/gth-file-tool-crop.c:426 +#: ../extensions/file_tools/gth-file-tool-resize.c:601 #, fuzzy msgid "7:5" msgstr "75" -#: ../extensions/file_tools/gth-file-tool-crop.c:435 -#: ../extensions/file_tools/gth-file-tool-resize.c:511 +#: ../extensions/file_tools/gth-file-tool-crop.c:427 +#: ../extensions/file_tools/gth-file-tool-resize.c:602 #, fuzzy msgid "3:2 (Postcard)" msgstr "明信片" -#: ../extensions/file_tools/gth-file-tool-crop.c:436 -#: ../extensions/file_tools/gth-file-tool-resize.c:512 +#: ../extensions/file_tools/gth-file-tool-crop.c:428 +#: ../extensions/file_tools/gth-file-tool-resize.c:603 #, fuzzy msgid "16:10" msgstr "RAID-10" -#: ../extensions/file_tools/gth-file-tool-crop.c:437 -#: ../extensions/file_tools/gth-file-tool-resize.c:513 +#: ../extensions/file_tools/gth-file-tool-crop.c:429 +#: ../extensions/file_tools/gth-file-tool-resize.c:604 #, fuzzy msgid "16:9 (DVD)" msgstr "播放 D_VD" -#: ../extensions/file_tools/gth-file-tool-crop.c:438 -#: ../extensions/file_tools/gth-file-tool-resize.c:514 +#: ../extensions/file_tools/gth-file-tool-crop.c:430 +#: ../extensions/file_tools/gth-file-tool-resize.c:605 #, fuzzy msgid "1.85:1" msgstr "85%" -#: ../extensions/file_tools/gth-file-tool-crop.c:439 -#: ../extensions/file_tools/gth-file-tool-resize.c:515 +#: ../extensions/file_tools/gth-file-tool-crop.c:431 +#: ../extensions/file_tools/gth-file-tool-resize.c:606 #, fuzzy msgid "2.39:1" msgstr "39" -#: ../extensions/file_tools/gth-file-tool-crop.c:440 -#: ../extensions/file_tools/gth-file-tool-resize.c:516 -#: ../extensions/image_print/data/ui/print-layout.ui.h:7 +#: ../extensions/file_tools/gth-file-tool-crop.c:432 +#: ../extensions/file_tools/gth-file-tool-resize.c:607 +#: ../extensions/image_print/data/ui/print-layout.ui.h:2 #: ../extensions/rename_series/gth-template-selector.c:234 msgid "Custom" msgstr "自訂" -#: ../extensions/file_tools/gth-file-tool-crop.c:455 -#: ../extensions/file_tools/gth-file-tool-rotate.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:447 +#: ../extensions/file_tools/gth-file-tool-rotate.c:404 msgid "Rule of Thirds" msgstr "三分法則" -#: ../extensions/file_tools/gth-file-tool-crop.c:456 -#: ../extensions/file_tools/gth-file-tool-rotate.c:417 +#: ../extensions/file_tools/gth-file-tool-crop.c:448 +#: ../extensions/file_tools/gth-file-tool-rotate.c:405 msgid "Golden Sections" msgstr "黃金分割" -#: ../extensions/file_tools/gth-file-tool-crop.c:457 -#: ../extensions/file_tools/gth-file-tool-rotate.c:418 +#: ../extensions/file_tools/gth-file-tool-crop.c:449 +#: ../extensions/file_tools/gth-file-tool-rotate.c:406 msgid "Center Lines" msgstr "中心線" -#: ../extensions/file_tools/gth-file-tool-crop.c:458 -#: ../extensions/file_tools/gth-file-tool-rotate.c:419 +#: ../extensions/file_tools/gth-file-tool-crop.c:450 +#: ../extensions/file_tools/gth-file-tool-rotate.c:407 msgid "Uniform" msgstr "均勻分佈" -#: ../extensions/file_tools/gth-file-tool-crop.c:614 +#: ../extensions/file_tools/gth-file-tool-crop.c:608 msgid "Crop..." msgstr "裁剪..." -#: ../extensions/file_tools/gth-file-tool-crop.c:614 +#: ../extensions/file_tools/gth-file-tool-crop.c:608 msgid "Crop" msgstr "裁剪" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:68 -#: ../extensions/file_tools/gth-file-tool-negative.c:68 -msgid "Applying changes" -msgstr "套用變更中" - -#: ../extensions/file_tools/gth-file-tool-desaturate.c:203 -msgid "Desaturate" -msgstr "去除色彩" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:119 -msgid "White balance correction" -msgstr "白平衡校正" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:342 -msgid "Enhance Colors" -msgstr "加強色彩" - -#: ../extensions/file_tools/gth-file-tool-enhance.c:343 -msgid "Automatic white balance correction" -msgstr "自動白平衡修正" - -#: ../extensions/file_tools/gth-file-tool-equalize.c:86 +#: ../extensions/file_tools/gth-file-tool-equalize.c:45 msgid "Equalizing image histogram" msgstr "正在均等圖片的色彩分佈" -#: ../extensions/file_tools/gth-file-tool-equalize.c:275 +#: ../extensions/file_tools/gth-file-tool-equalize.c:230 msgid "Equalize" msgstr "均等" -#: ../extensions/file_tools/gth-file-tool-equalize.c:276 +#: ../extensions/file_tools/gth-file-tool-equalize.c:231 msgid "Equalize image histogram" msgstr "均等圖片的色彩分佈" @@ -2665,6 +2829,14 @@ msgid "Flip the image vertically" msgstr "垂直翻轉圖片" +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale..." +msgstr "灰階..." + +#: ../extensions/file_tools/gth-file-tool-grayscale.c:507 +msgid "Grayscale" +msgstr "灰階" + #: ../extensions/file_tools/gth-file-tool-mirror.c:87 msgid "Mirror" msgstr "左右倒置" @@ -2681,23 +2853,28 @@ msgid "Redo" msgstr "取消復原" -#: ../extensions/file_tools/gth-file-tool-resize.c:680 +#: ../extensions/file_tools/gth-file-tool-resize.c:214 +#: ../extensions/resize_images/dlg-resize-images.c:180 +msgid "Resizing images" +msgstr "調整圖片大小" + +#: ../extensions/file_tools/gth-file-tool-resize.c:808 msgid "Resize..." msgstr "調整大小..." -#: ../extensions/file_tools/gth-file-tool-resize.c:680 +#: ../extensions/file_tools/gth-file-tool-resize.c:808 msgid "Resize" msgstr "調整大小" -#: ../extensions/file_tools/gth-file-tool-rotate.c:636 +#: ../extensions/file_tools/gth-file-tool-rotate.c:637 msgid "Rotate..." msgstr "旋轉..." -#: ../extensions/file_tools/gth-file-tool-rotate.c:636 +#: ../extensions/file_tools/gth-file-tool-rotate.c:637 msgid "Rotate" msgstr "旋轉" -#: ../extensions/file_tools/gth-file-tool-rotate.c:637 +#: ../extensions/file_tools/gth-file-tool-rotate.c:638 msgid "Freely rotate the image" msgstr "自由旋轉圖片" @@ -2727,15 +2904,15 @@ msgid "Save" msgstr "儲存" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:100 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:101 msgid "Sharpening image" msgstr "正在銳利化圖片" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 msgid "Enhance Focus..." msgstr "加強聚焦..." -#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:484 msgid "Enhance Focus" msgstr "加強聚焦" @@ -2756,38 +2933,38 @@ msgstr "資料夾(_F)：" #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:1 +msgid "Search for Duplicates" +msgstr "搜尋重複的" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 msgid "Duplicates:" msgstr "重複：" -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 msgid "Files:" msgstr "檔案：" -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 -msgid "No duplicates found." -msgstr "沒有發現重複的。" - #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:4 -msgid "Search for Duplicates" -msgstr "搜尋重複的" - -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 #: ../gthumb/gth-browser-actions-entries.h:33 msgid "_View" msgstr "檢視(_V)" +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 +msgid "No duplicates found." +msgstr "沒有發現重複的。" + #: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:1 #: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:1 msgid "Find Duplicates" msgstr "尋找重複的" #: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:2 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:19 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 #: ../extensions/search/data/ui/search-editor.ui.h:1 msgid "Start _at:" msgstr "開始於(_A)：" -#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 msgid "_Filter:" msgstr "篩選器(_F)：" @@ -2795,46 +2972,46 @@ msgid "Find duplicated files." msgstr "尋找重複的檔案。" -#: ../extensions/find_duplicates/gth-find-duplicates.c:53 +#: ../extensions/find_duplicates/gth-find-duplicates.c:65 #, fuzzy #| msgid "_Save the new file as:" msgid "leave the newest duplicates" msgstr "儲存新檔案為(_S)：" -#: ../extensions/find_duplicates/gth-find-duplicates.c:54 +#: ../extensions/find_duplicates/gth-find-duplicates.c:66 #, fuzzy #| msgid "Change the files date" msgid "leave the oldest duplicates" msgstr "更改檔案日期" -#: ../extensions/find_duplicates/gth-find-duplicates.c:55 +#: ../extensions/find_duplicates/gth-find-duplicates.c:67 msgid "by folder..." msgstr "" -#: ../extensions/find_duplicates/gth-find-duplicates.c:56 +#: ../extensions/find_duplicates/gth-find-duplicates.c:68 msgid "all files" msgstr "所有檔案" -#: ../extensions/find_duplicates/gth-find-duplicates.c:57 +#: ../extensions/find_duplicates/gth-find-duplicates.c:69 msgid "no file" msgstr "沒有檔案" -#: ../extensions/find_duplicates/gth-find-duplicates.c:397 -#: ../extensions/find_duplicates/gth-find-duplicates.c:492 +#: ../extensions/find_duplicates/gth-find-duplicates.c:560 +#: ../extensions/find_duplicates/gth-find-duplicates.c:668 #, c-format msgid "%d duplicate" msgid_plural "%d duplicates" msgstr[0] "%d 個重複" -#: ../extensions/find_duplicates/gth-find-duplicates.c:536 +#: ../extensions/find_duplicates/gth-find-duplicates.c:712 msgid "Search completed" msgstr "搜尋完成" -#: ../extensions/find_duplicates/gth-find-duplicates.c:548 +#: ../extensions/find_duplicates/gth-find-duplicates.c:725 msgid "Searching for duplicates" msgstr "正在搜尋重複的" -#: ../extensions/find_duplicates/gth-find-duplicates.c:551 +#: ../extensions/find_duplicates/gth-find-duplicates.c:728 #: ../gthumb/gth-load-file-data-task.c:106 #: ../gthumb/gth-save-file-data-task.c:100 #, c-format @@ -2842,15 +3019,15 @@ msgid_plural "%d files remaining" msgstr[0] "%d 個檔案剩餘" -#: ../extensions/find_duplicates/gth-find-duplicates.c:634 +#: ../extensions/find_duplicates/gth-find-duplicates.c:830 msgid "Getting the file list" msgstr "正在取得檔案清單" -#: ../extensions/find_duplicates/gth-find-duplicates.c:740 +#: ../extensions/find_duplicates/gth-find-duplicates.c:1016 msgid "Duplicates" msgstr "重製" -#: ../extensions/find_duplicates/gth-find-duplicates.c:997 +#: ../extensions/find_duplicates/gth-find-duplicates.c:1306 msgid "Select" msgstr "選取" @@ -2874,62 +3051,62 @@ msgid "Upload images to Flickr" msgstr "上傳圖片至 Flickr" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 msgid "Free space:" msgstr "可用空間：" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 -msgid "Hi_de from public searches" -msgstr "從公開搜尋中隱藏(_D)" - -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 -#, fuzzy -msgid "Moderate content" -msgstr "html content" - #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:5 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 #, fuzzy msgid "Ph_otoset:" msgstr "綠色相位差(_A):" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:6 -msgid "Private photos" -msgstr "私人照片" +#, fuzzy +msgid "_Privacy:" +msgstr "隱私" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:7 -msgid "Private photos, visible to family" -msgstr "" +msgid "Hi_de from public searches" +msgstr "從公開搜尋中隱藏(_D)" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:8 +#, fuzzy +msgid "_Safety:" +msgstr "安全邊界" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 msgid "Private photos, visible to family and friends" msgstr "" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 -#, fuzzy -msgid "Restricted content" -msgstr "html content" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 +msgid "Private photos, visible to family" +msgstr "" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 +msgid "Private photos" +msgstr "私人照片" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 #, fuzzy msgid "Safe content" msgstr "html content" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 #, fuzzy -msgid "_Privacy:" -msgstr "隱私" +msgid "Moderate content" +msgstr "html content" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:17 #, fuzzy -msgid "_Safety:" -msgstr "安全邊界" +msgid "Restricted content" +msgstr "html content" -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 msgid "_Import" msgstr "匯入(_I)" @@ -2940,20 +3117,20 @@ msgstr "無法在通訊協定清單中取得使用中的通訊協定。" #: ../extensions/flicker_utils/dlg-import-from-flickr.c:397 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:561 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:562 #: ../extensions/picasaweb/dlg-import-from-picasaweb.c:864 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1026 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1027 msgid "No album selected" msgstr "沒有相簿是選取的" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:579 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:580 #, c-format msgid "Import from %s" msgstr "由 %s 匯入" #: ../extensions/gstreamer_tools/actions.c:66 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1080 -#: ../gthumb/gth-browser.c:2013 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1072 +#: ../gthumb/gth-browser.c:2100 msgid "Could not save the file" msgstr "無法儲存檔案" @@ -2962,7 +3139,7 @@ msgstr "無法拍下螢幕截圖" #: ../extensions/gstreamer_tools/actions.c:132 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1248 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1243 msgid "Save Image" msgstr "儲存圖片" @@ -2972,35 +3149,35 @@ msgstr "螢幕擷圖" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:1 -msgid "--:--" -msgstr "" +msgid "Slower" +msgstr "放慢" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 -msgid "Change volume level" -msgstr "改變音量大小" +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:687 +msgid "Play" +msgstr "播放" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:3 msgid "Faster" msgstr "加速" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:686 -msgid "Play" -msgstr "播放" +msgid "Time:" +msgstr "時間：" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 -msgid "Slower" -msgstr "放慢" +msgid "--:--" +msgstr "" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 -msgid "Time:" -msgstr "時間：" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 msgid "Toggle volume" msgstr "切換音量" -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 +msgid "Change volume level" +msgstr "改變音量大小" + +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 #: ../extensions/photo_importer/actions.c:67 #: ../extensions/photo_importer/dlg-photo-importer.c:620 msgid "Choose a folder" @@ -3022,11 +3199,11 @@ msgid "Take a screenshot" msgstr "拍下螢幕擷圖" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:663 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:664 msgid "Playing video" msgstr "播放影片" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:677 msgid "Pause" msgstr "暫停" @@ -3045,7 +3222,7 @@ msgstr "演出者" #: ../extensions/gstreamer_tools/main.c:40 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 msgid "Album" msgstr "相簿" @@ -3063,18 +3240,17 @@ msgstr "編解碼器" #: ../extensions/gstreamer_tools/main.c:45 -#, fuzzy msgid "Framerate" -msgstr "幀率：" +msgstr "畫面更新率：" #: ../extensions/gstreamer_tools/main.c:46 -#: ../extensions/image_print/data/ui/print-layout.ui.h:25 +#: ../extensions/image_print/data/ui/print-layout.ui.h:24 #: ../extensions/image_viewer/gth-image-viewer-page.c:209 msgid "Width" msgstr "寬度" #: ../extensions/gstreamer_tools/main.c:47 -#: ../extensions/image_print/data/ui/print-layout.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:25 msgid "Height" msgstr "高度" @@ -3096,10 +3272,9 @@ #. Translators: this is an image size, such as 1024 × 768 #: ../extensions/gstreamer_utils/gstreamer-utils.c:396 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1303 -#: ../extensions/image_viewer/gth-metadata-provider-image.c:190 -#: ../extensions/webalbums/dlg-web-exporter.c:442 -#: ../extensions/webalbums/gth-web-exporter.c:2446 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1298 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:209 +#: ../extensions/webalbums/gth-web-exporter.c:2444 ../gthumb/gtk-utils.c:1055 #, fuzzy, c-format msgid "%d × %d" msgstr "%d × %d" @@ -3108,100 +3283,101 @@ msgid "Could not print the selected files" msgstr "無法列印選取的檔案" -#: ../extensions/image_print/callbacks.c:54 +#: ../extensions/image_print/callbacks.c:65 msgid "Print the selected images" msgstr "列印選取的圖片" -#: ../extensions/image_print/data/ui/print-layout.ui.h:5 +#: ../extensions/image_print/data/ui/print-layout.ui.h:1 #, fuzzy msgid "Centered" msgstr "置中" -#: ../extensions/image_print/data/ui/print-layout.ui.h:10 -msgid "Image" -msgstr "圖片" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:12 -msgid "Left" -msgstr "左" - #: ../extensions/image_print/data/ui/print-layout.ui.h:13 -msgid "Position:" -msgstr "位置：" +msgid "The total number of files" +msgstr "檔案的總數" #: ../extensions/image_print/data/ui/print-layout.ui.h:14 -msgid "Preview" -msgstr "預覽" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:15 -msgid "Rotation:" -msgstr "旋轉：" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:20 #: ../extensions/importer/data/ui/import-preferences.ui.h:4 msgid "The event description" msgstr "事件描述" +#: ../extensions/image_print/data/ui/print-layout.ui.h:17 +#, fuzzy +msgid "_Rows:" +msgstr "顯示格線(_H)" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:19 +msgid "Image" +msgstr "圖片" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:20 +msgid "Position:" +msgstr "位置：" + #: ../extensions/image_print/data/ui/print-layout.ui.h:21 -msgid "The total number of files" -msgstr "檔案的總數" +msgid "Left" +msgstr "左" -#: ../extensions/image_print/data/ui/print-layout.ui.h:23 +#: ../extensions/image_print/data/ui/print-layout.ui.h:22 msgid "Top" msgstr "上" -#: ../extensions/image_print/data/ui/print-layout.ui.h:24 +#: ../extensions/image_print/data/ui/print-layout.ui.h:26 +msgid "Rotation:" +msgstr "旋轉：" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:27 msgid "Unit:" msgstr "單位：" #: ../extensions/image_print/data/ui/print-layout.ui.h:28 -#, fuzzy -msgid "_Rows:" -msgstr "顯示格線(_H)" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:29 -msgid "inches" -msgstr "英吋" +msgid "Preview" +msgstr "預覽" #: ../extensions/image_print/data/ui/print-layout.ui.h:30 msgid "millimeters" msgstr "毫米" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 -msgid "Fonts" -msgstr "字型" +#: ../extensions/image_print/data/ui/print-layout.ui.h:31 +msgid "inches" +msgstr "英吋" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:4 msgid "Select Caption Font" msgstr "選擇標題的字體" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:4 -msgid "Select Footer Font" -msgstr "選擇頁尾字型" - #: ../extensions/image_print/data/ui/print-preferences.ui.h:5 msgid "Select Header Font" msgstr "選擇頁首字型" -#: ../extensions/image_print/gth-image-print-job.c:971 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 +msgid "Select Footer Font" +msgstr "選擇頁尾字型" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 +msgid "Fonts" +msgstr "字型" + +#: ../extensions/image_print/gth-image-print-job.c:914 #: ../extensions/webalbums/data/albumthemes/text.h:31 #, c-format msgid "Page %d of %d" msgstr "第 %d 頁 (共 %d 頁)" -#: ../extensions/image_print/gth-image-print-job.c:1734 -#: ../extensions/image_print/gth-image-print-job.c:1861 -#: ../extensions/image_print/gth-image-print-job.c:1898 +#: ../extensions/image_print/gth-image-print-job.c:1680 +#: ../extensions/image_print/gth-image-print-job.c:1845 +#: ../extensions/image_print/gth-image-print-job.c:1888 msgid "Could not print" msgstr "無法列印" -#: ../extensions/image_print/gth-image-print-job.c:1796 +#: ../extensions/image_print/gth-image-print-job.c:1746 #: ../gthumb/gth-main-default-tests.c:240 msgid "Images" msgstr "圖片" -#: ../extensions/image_print/gth-image-print-job.c:1863 -#: ../gthumb/gth-image-loader.c:204 ../gthumb/gth-image-loader.c:278 +#: ../extensions/image_print/gth-image-print-job.c:1847 +#: ../gthumb/gth-image-loader.c:197 ../gthumb/gth-image-loader.c:304 +#: ../gthumb/gth-image-utils.c:131 ../gthumb/gth-image-utils.c:137 msgid "No suitable loader available for this file type" msgstr "" @@ -3212,18 +3388,18 @@ msgstr "載入中" #: ../extensions/image_print/gth-load-image-info-task.c:166 -#: ../extensions/webalbums/gth-web-exporter.c:2685 +#: ../extensions/webalbums/gth-web-exporter.c:2716 msgid "Loading images" msgstr "圖片載入中" #: ../extensions/image_print/image_print.extension.in.in.h:1 -msgid "Allow to print images choosing the page layout." -msgstr "允許選擇列印圖片的版面。" - -#: ../extensions/image_print/image_print.extension.in.in.h:2 msgid "Image print" msgstr "圖片列印" +#: ../extensions/image_print/image_print.extension.in.in.h:2 +msgid "Allow to print images choosing the page layout." +msgstr "允許選擇列印圖片的版面。" + #: ../extensions/image_print/preferences.c:79 msgid "Print" msgstr "列印" @@ -3254,15 +3430,14 @@ #: ../extensions/image_rotation/gth-reset-orientation-task.c:111 #: ../extensions/image_rotation/gth-transform-task.c:141 -#: ../extensions/webalbums/gth-web-exporter.c:2339 -#: ../extensions/webalbums/gth-web-exporter.c:2423 +#: ../extensions/webalbums/gth-web-exporter.c:2337 +#: ../extensions/webalbums/gth-web-exporter.c:2421 msgid "Saving images" msgstr "正在儲存圖片" #: ../extensions/image_rotation/image_rotation.extension.in.in.h:1 -#, fuzzy msgid "Image rotation" -msgstr "文字旋轉" +msgstr "圖片旋轉" #: ../extensions/image_rotation/image_rotation.extension.in.in.h:2 msgid "Rotate images without data loss." @@ -3304,21 +3479,65 @@ msgstr "鏡頭扭曲..." #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:1 -msgid "After loading an image:" -msgstr "在載入一圖片後：" +msgid "Set to actual size" +msgstr "設置為實際尺寸" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:2 +msgid "Keep previous zoom" +msgstr "沿用之前的縮放比例" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:3 -msgid "Reset scrollbar positions" -msgstr "重新設置滾動條的位置" +msgid "Fit to window" +msgstr "符合視窗" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 -msgid "Transparency _type:" -msgstr "透明表示方式(_T):" +msgid "Fit to window if larger" +msgstr "如果圖片太大則縮小至視窗尺寸" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:5 +msgid "Fit to width" +msgstr "符合寬度" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:6 +msgid "Fit to width if larger" +msgstr "如果圖片太大則縮小以符合寬度" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:7 +msgid "Reset scrollbar positions" +msgstr "重新設置滾動條的位置" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:8 +msgid "After loading an image:" +msgstr "在載入一圖片後：" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:9 msgid "_Zoom quality:" msgstr "縮放品質(_Z)：" +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:10 +msgid "Transparency _type:" +msgstr "透明表示方式(_T):" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:11 +msgid "High" +msgstr "高" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:12 +msgid "Low" +msgstr "低" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:13 +msgid "White" +msgstr "白" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:15 +msgid "Black" +msgstr "黑" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:16 +msgid "Checked" +msgstr "方格" + #: ../extensions/image_viewer/gth-image-histogram.c:84 msgid "Histogram" msgstr "分佈圖" @@ -3376,56 +3595,55 @@ msgstr "縮放至符合寬度" #: ../extensions/image_viewer/image_viewer.extension.in.in.h:1 -#, fuzzy -msgid "Basic image viewing." -msgstr "機器人圖案佈景" - -#: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 msgid "Image viewer" msgstr "圖片檢視器" +#: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 +msgid "Basic image viewing." +msgstr "基本的圖片檢視。" + #: ../extensions/image_viewer/preferences.c:125 msgid "Viewer" msgstr "圖片顯示" -#: ../extensions/importer/data/ui/import-preferences.ui.h:3 -#, fuzzy -msgid "The day of the month" -msgstr "顯示一個月第幾天" +#: ../extensions/importer/data/ui/import-preferences.ui.h:1 +msgid "_Destination" +msgstr "目的地(_D)" -#: ../extensions/importer/data/ui/import-preferences.ui.h:5 -msgid "The hour" -msgstr "小時" +#: ../extensions/importer/data/ui/import-preferences.ui.h:2 +#, fuzzy +msgid "_Automatic subfolder" +msgstr "自動下載" -#: ../extensions/importer/data/ui/import-preferences.ui.h:6 -msgid "The minutes" -msgstr "分鐘" +#: ../extensions/importer/data/ui/import-preferences.ui.h:3 +#, fuzzy +msgid "as _single subfolder" +msgstr "每次發一張牌" #: ../extensions/importer/data/ui/import-preferences.ui.h:7 -msgid "The month" -msgstr "月" +msgid "The year" +msgstr "年" #: ../extensions/importer/data/ui/import-preferences.ui.h:8 -msgid "The seconds" -msgstr "秒" +msgid "The month" +msgstr "月" #: ../extensions/importer/data/ui/import-preferences.ui.h:9 -msgid "The year" -msgstr "年" +#, fuzzy +msgid "The day of the month" +msgstr "顯示一個月第幾天" #: ../extensions/importer/data/ui/import-preferences.ui.h:10 -#, fuzzy -msgid "_Automatic subfolder" -msgstr "自動下載" +msgid "The hour" +msgstr "小時" #: ../extensions/importer/data/ui/import-preferences.ui.h:11 -msgid "_Destination" -msgstr "目的地(_D)" +msgid "The minutes" +msgstr "分鐘" #: ../extensions/importer/data/ui/import-preferences.ui.h:12 -#, fuzzy -msgid "as _single subfolder" -msgstr "每次發一張牌" +msgid "The seconds" +msgstr "秒" #: ../extensions/importer/gth-import-destination-button.c:183 msgid "Invalid Destination" @@ -3499,7 +3717,7 @@ "%s of space is required but only %s is available." msgstr "" -#: ../extensions/list_tools/callbacks.c:76 ../gthumb/gth-filterbar.c:304 +#: ../extensions/list_tools/callbacks.c:76 ../gthumb/gth-filterbar.c:311 msgid "Personalize..." msgstr "個性化..." @@ -3517,104 +3735,104 @@ msgstr "_Skip" #: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:1 -msgid "Co_mmands:" -msgstr "命令(_M)：" - -#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:2 msgid "Commands" msgstr "指令" +#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:2 +msgid "Co_mmands:" +msgstr "命令(_M)：" + #: ../extensions/list_tools/data/ui/script-editor.ui.h:2 -#, fuzzy, no-c-format -msgid "%E" -msgstr "%" +msgid "_Wait for the command to finish" +msgstr "等待指令完成(_W)" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:3 +msgid "E_xecute command once for every file" +msgstr "為每個檔案執行一次指令(_X)" #: ../extensions/list_tools/data/ui/script-editor.ui.h:4 -#, fuzzy, no-c-format -msgid "%N" -msgstr "%" +msgid "_Terminal command (shell script)" +msgstr "終端指令[命令稿](_T)" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:5 +#, fuzzy +msgid "Sh_ortcut:" +msgstr "分享(_A)" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:6 +#, fuzzy +msgid "The file uri" +msgstr "[FILE|URI...]" -#. Translate only 'message' and 'default_value'. #: ../extensions/list_tools/data/ui/script-editor.ui.h:7 -#, fuzzy, no-c-format -msgid "%ask{ message }{ default value }" -msgstr "目前的數值是預設值。" +msgid "The file path" +msgstr "檔案路徑" -#. Translate only 'attribute name' -#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 -#, fuzzy, no-c-format -msgid "%attr{ attribute name }" -msgstr "無效的延伸屬性名稱" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:8 +#, fuzzy +msgid "The file basename" +msgstr "解密檔案" -#. Translate only 'text'. -#: ../extensions/list_tools/data/ui/script-editor.ui.h:13 -#, fuzzy, no-c-format -msgid "%quote{ text }" -msgstr "已加密文字" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:9 +msgid "The parent folder path" +msgstr "上層資料夾路徑" +#. Translate only 'message' and 'default_value'. #: ../extensions/list_tools/data/ui/script-editor.ui.h:14 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 -msgid "A file attribute" -msgstr "檔案屬性" +#, fuzzy, no-c-format +msgid "%ask{ message }{ default value }" +msgstr "目前的數值是預設值。" #: ../extensions/list_tools/data/ui/script-editor.ui.h:15 #, fuzzy msgid "Ask an input value" msgstr "數值超過界限。\n" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:17 -msgid "E_xecute command once for every file" -msgstr "為每個檔案執行一次指令(_X)" - +#. Translate only 'attribute name' #: ../extensions/list_tools/data/ui/script-editor.ui.h:18 -#, fuzzy -msgid "Quote the text " -msgstr "已加密文字" +#, fuzzy, no-c-format +msgid "%attr{ attribute name }" +msgstr "無效的延伸屬性名稱" #: ../extensions/list_tools/data/ui/script-editor.ui.h:19 -#, fuzzy -msgid "Sh_ortcut:" -msgstr "分享(_A)" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 +msgid "A file attribute" +msgstr "檔案屬性" #: ../extensions/list_tools/data/ui/script-editor.ui.h:21 -#, fuzzy -msgid "The file basename" -msgstr "解密檔案" +#, fuzzy, no-c-format +msgid "%N" +msgstr "%" #: ../extensions/list_tools/data/ui/script-editor.ui.h:22 #, fuzzy msgid "The file basename without extension" msgstr "目前編輯的檔案名稱(不含延伸檔名)" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:23 -#, fuzzy -msgid "The file extension" -msgstr "檔案延伸(_F):" - #: ../extensions/list_tools/data/ui/script-editor.ui.h:24 -msgid "The file path" -msgstr "檔案路徑" +#, fuzzy, no-c-format +msgid "%E" +msgstr "%" #: ../extensions/list_tools/data/ui/script-editor.ui.h:25 #, fuzzy -msgid "The file uri" -msgstr "[FILE|URI...]" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:26 -msgid "The parent folder path" -msgstr "上層資料夾路徑" +msgid "The file extension" +msgstr "檔案延伸(_F):" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:27 -msgid "_Command:" -msgstr "指令(_C)：" +#. Translate only 'text'. +#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 +#, fuzzy, no-c-format +msgid "%quote{ text }" +msgstr "已加密文字" #: ../extensions/list_tools/data/ui/script-editor.ui.h:29 -msgid "_Terminal command (shell script)" -msgstr "終端指令[命令稿](_T)" +#, fuzzy +msgid "Quote the text " +msgstr "已加密文字" #: ../extensions/list_tools/data/ui/script-editor.ui.h:30 -msgid "_Wait for the command to finish" -msgstr "等待指令完成(_W)" +msgid "_Command:" +msgstr "指令(_C)：" #: ../extensions/list_tools/dlg-personalize-scripts.c:257 msgid "Script" @@ -3652,9 +3870,9 @@ msgstr "<輸入數值>" #: ../extensions/list_tools/gth-script.c:745 -#: ../extensions/webalbums/gth-web-exporter.c:560 -#: ../extensions/webalbums/gth-web-exporter.c:572 -#: ../extensions/webalbums/gth-web-exporter.c:580 +#: ../extensions/webalbums/gth-web-exporter.c:558 +#: ../extensions/webalbums/gth-web-exporter.c:570 +#: ../extensions/webalbums/gth-web-exporter.c:578 msgid "Malformed command" msgstr "有缺陷的指令" @@ -3679,9 +3897,8 @@ msgstr "子程序正常的以狀態 %d 結束。" #: ../extensions/list_tools/list_tools.extension.in.in.h:1 -#, fuzzy msgid "File list tools" -msgstr "取得檔案清單" +msgstr "檔案清單工具" #: ../extensions/list_tools/list_tools.extension.in.in.h:2 msgid "Scripting and batch manipulation of files." @@ -3725,76 +3942,76 @@ #: ../extensions/photobucket/callbacks.c:54 msgid "Photobucket..." -msgstr "" - -#: ../extensions/photobucket/callbacks.c:55 -msgid "Upload photos to Photobucket" -msgstr "上傳照片至 Photobucket" - -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 -msgid "1 megabyte file size" -msgstr "1 MB的檔案大小" - -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 -msgid "15ʺ screen ( 800 x 600 )" -msgstr "15吋螢幕( 800 × 600 )" - -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 -msgid "17ʺ screen ( 1024 x 768 )" -msgstr "17吋螢幕( 1024 x 768 )" +msgstr "" + +#: ../extensions/photobucket/callbacks.c:55 +msgid "Upload photos to Photobucket" +msgstr "上傳照片至 Photobucket" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 -msgid "Large ( 640 x 480 )" -msgstr "大的 ( 640 x 480 )" +#, fuzzy +msgid "_Scramble filenames" +msgstr "貼上檔案名稱(_F)" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 -msgid "Medium ( 320 x 240 )" -msgstr "中的 ( 320 x 240 )" +msgid "Tiny ( 100 x 75 )" +msgstr "極小的 (100×75)" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 msgid "Small ( 160 x 120 )" msgstr "小的 ( 160 x 120 )" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 -msgid "Tiny ( 100 x 75 )" -msgstr "極小的 (100×75)" +msgid "Medium ( 320 x 240 )" +msgstr "中的 ( 320 x 240 )" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 +msgid "Large ( 640 x 480 )" +msgstr "大的 ( 640 x 480 )" + +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 +msgid "15ʺ screen ( 800 x 600 )" +msgstr "15吋螢幕( 800 × 600 )" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 -#, fuzzy -msgid "_Scramble filenames" -msgstr "貼上檔案名稱(_F)" +msgid "17ʺ screen ( 1024 x 768 )" +msgstr "17吋螢幕( 1024 x 768 )" -#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:299 +msgid "1 megabyte file size" +msgstr "1 MB的檔案大小" + +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 #, fuzzy msgid "_Container:" msgstr "h t m l container" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 msgid "Tiny ( 100 × 75 )" msgstr "極小的 (100×75)" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 msgid "Small ( 160 × 120 )" msgstr "小的 ( 160 × 120 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 msgid "Medium ( 320 × 240 )" msgstr "中的 ( 320 × 240 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 msgid "Large ( 640 × 480 )" msgstr "大的 ( 640 × 480 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 msgid "15ʺ screen ( 800 × 600 )" msgstr "15吋螢幕( 800 × 600 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:298 msgid "17ʺ screen ( 1024 × 768 )" msgstr "17吋螢幕( 1024 x 768 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:304 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:306 msgid "2 megabyte file size" msgstr "2 MB的檔案大小" @@ -3829,30 +4046,30 @@ msgstr "從一抽取式儲存裝置匯入照片和其他檔案" #: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:1 -msgid "After importing from a device:" -msgstr "從裝置匯入後：" - -#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 msgid "_Rotate the images physically" msgstr "實質地旋轉圖片(_R)" +#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 +msgid "After importing from a device:" +msgstr "從裝置匯入後：" + #. view label -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 -#: ../gthumb/gth-filterbar.c:414 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 +#: ../gthumb/gth-filterbar.c:421 msgid "S_how:" msgstr "顯示(_H)：" -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 -msgid "_Delete the imported files from the source" -msgstr "刪除匯入檔案的來源檔(_D)" - #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:4 +msgid "_Tags:" +msgstr "標籤(_T)：" + +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 msgid "_Event:" msgstr "事件(_E)：" #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:7 -msgid "_Tags:" -msgstr "標籤(_T)：" +msgid "_Delete the imported files from the source" +msgstr "刪除匯入檔案的來源檔(_D)" #: ../extensions/photo_importer/dlg-photo-importer.c:227 #: ../extensions/picasaweb/dlg-import-from-picasaweb.c:174 @@ -3870,7 +4087,7 @@ msgstr "無法載入資料夾" #: ../extensions/photo_importer/dlg-photo-importer.c:369 -#: ../gthumb/gth-browser.c:1927 +#: ../gthumb/gth-browser.c:2014 msgid "Getting folder listing..." msgstr "正在取得資料夾清單…" @@ -3907,51 +4124,51 @@ msgid "Upload photos to Picasa Web Album" msgstr "上傳照片至 Picasa 網路相簿" -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 msgid "Export to Picasa Web Albums" msgstr "匯出至 Picasa 網路相簿" -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 msgid "_Albums:" msgstr "相簿(_A)：" -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 msgid "Import from Picasa Web Album" msgstr "從 Picasa 網路相冊匯入" -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 msgid "_Album:" msgstr "相簿(_A)：" #: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:1 +msgid "_E-Mail:" +msgstr "電子郵件(_E)：" + +#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 msgid "" "Type the characters you see in the picture below. Letters are not case-" "sensitive." msgstr "" -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 -msgid "_E-Mail:" -msgstr "電子郵件(_E)：" - #: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:3 msgid "_Password:" msgstr "密碼(_P)：" -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 msgid "Public" msgstr "公開" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:354 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:372 #: ../extensions/picasaweb/dlg-import-from-picasaweb.c:310 msgid "Could not get the album list" msgstr "無法取得相簿清單" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:438 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:456 #: ../extensions/picasaweb/dlg-import-from-picasaweb.c:394 msgid "Picasa Web Album" msgstr "Picasa 網路相簿" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:525 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:543 #: ../extensions/picasaweb/dlg-import-from-picasaweb.c:481 msgid "Account" msgstr "帳號" @@ -3968,100 +4185,14 @@ msgid "Upload images to Picasa Web Albums" msgstr "上傳圖片至 Picasa 網路相簿" -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:1 -msgid "Opti_mize" -msgstr "最佳化(_M)" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:2 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 -msgid "_Default extension:" -msgstr "預設副檔名(_D)：" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 -msgid "_Progressive" -msgstr "漸進式顯示(_P)" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 -msgid "_Quality:" -msgstr "品質(_Q)：" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:5 -msgid "_Smoothing:" -msgstr "平滑化(_S):" - -#: ../extensions/pixbuf_savers/data/ui/png-options.ui.h:1 -msgid "Compression _level:" -msgstr "壓縮程度(_L):" - -#: ../extensions/pixbuf_savers/data/ui/save-options-preferences.ui.h:1 -msgid "Default options:" -msgstr "預設選項：" - -#: ../extensions/pixbuf_savers/data/ui/tga-options.ui.h:1 -msgid "_RLE compression" -msgstr "_RLE 無損壓縮" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:1 -msgid "Compression" -msgstr "壓縮" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:2 -msgid "No_rmal (Deflate)" -msgstr "無損壓縮[Deflate](_R)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:3 -msgid "Resolution" -msgstr "解析度" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 -msgid "_Loss compression (JPEG)" -msgstr "有損壓縮[JPEG](_L)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 -msgid "_No compression" -msgstr "不壓縮(_N)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:9 -msgid "dpi" -msgstr "dpi" - -#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:519 -msgid "JPEG" -msgstr "JPEG" - -#: ../extensions/pixbuf_savers/gth-png-saver.c:140 -msgid "PNG" -msgstr "PNG" - -#: ../extensions/pixbuf_savers/gth-tga-saver.c:286 -#: ../gthumb/gth-buffer-data.c:84 -msgid "Insufficient memory" -msgstr "記憶體不足" - -#: ../extensions/pixbuf_savers/gth-tga-saver.c:373 -msgid "TGA" -msgstr "TGA" - -#: ../extensions/pixbuf_savers/gth-tiff-saver.c:537 -msgid "TIFF" -msgstr "TIFF" - -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:1 -msgid "Save images" -msgstr "儲存圖片" - -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:2 -msgid "Save images in common file formats such as JPEG, PNG and TIFF" -msgstr "儲存圖片用一般的檔案格式，例如常見的 JPEG，PNG 和 TIFF" - #: ../extensions/raw_files/raw_files.extension.in.in.h:1 -msgid "Allow to load raw format images." -msgstr "允許載入 RAW 格式圖像。" - -#: ../extensions/raw_files/raw_files.extension.in.in.h:2 msgid "Raw format support" msgstr "Raw 格式的支持" +#: ../extensions/raw_files/raw_files.extension.in.in.h:2 +msgid "Allow to load raw format images." +msgstr "允許載入 RAW 格式圖像。" + #: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 msgid "_X:" msgstr "_X:" @@ -4091,81 +4222,81 @@ msgstr "工具用於移除照片的紅眼效應" #: ../extensions/rename_series/data/ui/code-selector.ui.h:1 -msgid "add" -msgstr "" - -#: ../extensions/rename_series/data/ui/code-selector.ui.h:2 #, fuzzy #| msgid "Edit" msgid "digits" msgstr "編輯" -#: ../extensions/rename_series/data/ui/code-selector.ui.h:3 +#: ../extensions/rename_series/data/ui/code-selector.ui.h:2 msgid "format:" msgstr "格式：" -#: ../extensions/rename_series/data/ui/code-selector.ui.h:4 +#: ../extensions/rename_series/data/ui/code-selector.ui.h:3 msgid "remove" msgstr "移除" -#. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 -#, fuzzy, no-c-format -msgid "%A{ identifier }" -msgstr "識別碼：" +#: ../extensions/rename_series/data/ui/code-selector.ui.h:4 +msgid "add" +msgstr "" -#. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 -#, fuzzy, no-c-format -msgid "%M{ format }" -msgstr "格式化 %s (%s)" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:1 +msgid "Rename" +msgstr "重新命名" #. Translators: this is the text case (upper or lower case). -#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 msgid "Cas_e:" msgstr "大小寫(_E):" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:14 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:7 msgid "Edit template" msgstr "編輯篩選器" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 -msgid "Re_verse Order" -msgstr "相反次序排列(_V)" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 +msgid "The original filename" +msgstr "原始檔案名稱" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 -msgid "Rename" -msgstr "重新命名" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 +#, fuzzy +msgid "The original extension" +msgstr "依延伸檔名" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:13 #, fuzzy -msgid "The digitalization date" -msgstr "有效日期：" +msgid "The original enumerator" +msgstr "原始大小(_O)" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:21 +#. translate only the text in the curly brackets +#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 +#, fuzzy, no-c-format +msgid "%M{ format }" +msgstr "格式化 %s (%s)" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 #, fuzzy msgid "The modification date" msgstr "以修改日期" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:22 -#, fuzzy -msgid "The original enumerator" -msgstr "原始大小(_O)" - -#: ../extensions/rename_series/data/ui/rename-series.ui.h:23 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:21 #, fuzzy -msgid "The original extension" -msgstr "依延伸檔名" +msgid "The digitalization date" +msgstr "有效日期：" +#. translate only the text in the curly brackets #: ../extensions/rename_series/data/ui/rename-series.ui.h:24 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 -msgid "The original filename" -msgstr "原始檔案名稱" +#, fuzzy, no-c-format +msgid "%A{ identifier }" +msgstr "識別碼：" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 msgid "_Template:" msgstr "樣式(_T):" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +msgid "Re_verse Order" +msgstr "相反次序排列(_V)" + #: ../extensions/rename_series/dlg-rename-series.c:58 #, fuzzy msgid "Enumerator" @@ -4258,36 +4389,32 @@ msgid "Resize the selected images" msgstr "調整選取的圖片大小" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:5 -#: ../gthumb/gth-main-default-metadata.c:49 -msgid "Format" -msgstr "格式" +#: ../extensions/resize_images/data/ui/resize-images.ui.h:1 +msgid "Resize Images" +msgstr "調整圖片大小" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:2 msgid "New dimensions" msgstr "新的尺寸" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 -msgid "Resize Images" -msgstr "調整圖片大小" - -#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:4 msgid "_Height:" msgstr "高度(_H)：" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:5 msgid "_Preserve original aspect ratios" msgstr "保留原來的長寬比(_P)" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:12 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 +#: ../gthumb/gth-main-default-metadata.c:49 +msgid "Format" +msgstr "格式" + +#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 msgid "pixel" msgstr "像素" -#: ../extensions/resize_images/dlg-resize-images.c:168 -msgid "Resizing images" -msgstr "調整圖片大小" - -#: ../extensions/resize_images/dlg-resize-images.c:412 +#: ../extensions/resize_images/dlg-resize-images.c:423 msgid "Keep the original format" msgstr "保持原有的格式" @@ -4323,7 +4450,7 @@ #. Translators: This is not a verb, it's a name as in "the search properties". #: ../extensions/search/callbacks.c:174 -#: ../extensions/search/search.extension.in.in.h:2 +#: ../extensions/search/search.extension.in.in.h:1 msgid "Search" msgstr "搜尋" @@ -4350,57 +4477,45 @@ msgid "Cancel the operation" msgstr "取消操作" -#: ../extensions/search/search.extension.in.in.h:1 +#: ../extensions/search/search.extension.in.in.h:2 msgid "File search tool." msgstr "檔案搜尋工具。" #: ../extensions/selections/callbacks.c:77 -#, fuzzy -#| msgid "Selection" msgid "Add to _Selection" -msgstr "選取區域" +msgstr "加入到選取(_S)" #: ../extensions/selections/callbacks.c:86 -#, fuzzy -#| msgid "Selection" msgid "Selection 1" -msgstr "選取區域" +msgstr "選取 1" #: ../extensions/selections/callbacks.c:91 -#, fuzzy -#| msgid "Selection" msgid "Selection 2" -msgstr "選取區域" +msgstr "選取 2" #: ../extensions/selections/callbacks.c:96 -#, fuzzy -#| msgid "Selection" msgid "Selection 3" -msgstr "選取區域" +msgstr "選取 3" #: ../extensions/selections/callbacks.c:285 #, c-format msgid "" "Use Alt-%d to add files to this selection, Ctrl-%d to view this selection." -msgstr "" +msgstr "使用 Alt-%d 以加入檔案到這個選取，Ctrl-%d 以檢視這個選取。" #: ../extensions/selections/gth-selections-manager.c:239 -#, fuzzy, c-format -#| msgid "Selection" +#, c-format msgid "Selection %d" -msgstr "選取區域" +msgstr "選取 %d" #: ../extensions/selections/gth-selections-manager.c:242 -#: ../extensions/selections/selections.extension.in.in.h:2 -#, fuzzy -#| msgid "Selection" +#: ../extensions/selections/selections.extension.in.in.h:1 msgid "Selections" -msgstr "選取區域" +msgstr "選取" -#: ../extensions/selections/selections.extension.in.in.h:1 -#, fuzzy +#: ../extensions/selections/selections.extension.in.in.h:2 msgid "Advanced file selection." -msgstr "無檔案可支援 (%i 個選擇的檔案)" +msgstr "進階檔案選取。" #: ../extensions/slideshow/callbacks.c:56 msgid "_Slideshow" @@ -4411,48 +4526,48 @@ msgstr "以幻燈片播放方式檢視" #: ../extensions/slideshow/callbacks.c:410 -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 #: ../extensions/slideshow/preferences.c:162 #: ../extensions/slideshow/slideshow.extension.in.in.h:1 msgid "Slideshow" msgstr "幻燈片顯示" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:1 -#, fuzzy -msgid "Add files to the playlist" -msgstr "將影片加入至播放清單" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 -msgid "Playlist" -msgstr "播放清單" +msgid "_Personalize" +msgstr "個性化(_P)" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:3 -msgid "R_andom order" -msgstr "隨機順序(_A)" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:4 -msgid "Remove the selected files" -msgstr "移除選取的檔案" +#, fuzzy +msgid "_Transition effect:" +msgstr "字型效果" #. This is the first part of the phrase "change automatically, every x seconds", where x is an input control that let the user choose a value. -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 msgid "_Change automatically, every" msgstr "自動變更，每(_C)" +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 +msgid "_Restart when finished" +msgstr "播放完後，又重新開始(_R)" + #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:8 -msgid "_Personalize" -msgstr "個性化(_P)" +msgid "R_andom order" +msgstr "隨機順序(_A)" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:9 -msgid "_Restart when finished" -msgstr "播放完後，又重新開始(_R)" +msgid "Playlist" +msgstr "播放清單" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:10 #, fuzzy -msgid "_Transition effect:" -msgstr "字型效果" +msgid "Add files to the playlist" +msgstr "將影片加入至播放清單" -#: ../extensions/slideshow/gth-slideshow.c:229 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:11 +msgid "Remove the selected files" +msgstr "移除選取的檔案" + +#: ../extensions/slideshow/gth-slideshow.c:231 msgid "Playing slideshow" msgstr "播放幻燈片" @@ -4570,120 +4685,116 @@ msgid "View the previous page" msgstr "檢視上一頁" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:5 -#, fuzzy, no-c-format -msgid "%P" -msgstr "%" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:1 +msgid "All images on a single image" +msgstr "" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:2 #, fuzzy msgid "Adapts to the window width" msgstr "將視窗的寬度改變為 WIDTH" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:8 -msgid "All images on a single image" -msgstr "" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 +msgid "Web Album" +msgstr "網頁相簿" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 -msgid "Image Attributes" -msgstr "圖片屬性" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:5 +#, fuzzy, no-c-format +msgid "%P" +msgstr "%" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 -msgid "Image Page" -msgstr "圖片頁" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 +msgid "_Copy originals to destination" +msgstr "將原檔複製至目的地(_C)" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 +#, fuzzy +msgid "_Adapt to the window width " +msgstr "將視窗的寬度改變為 WIDTH" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 msgid "Index Page" msgstr "索引頁" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 -msgid "Show the description, if available" -msgstr "顯示描述，如果有的話" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 -msgid "Show the following attributes:" -msgstr "顯示下列屬性：" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 +msgid "Thumbnail Caption" +msgstr "縮圖標題" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 #, fuzzy msgid "The current image number" msgstr "重新載入目前的圖片" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 -#, fuzzy -msgid "The file comment" -msgstr "檔案的路徑" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 #, fuzzy msgid "The total number of images" msgstr "URI 的總數" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 -msgid "Thumbnail Caption" -msgstr "縮圖標題" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 +#, fuzzy +msgid "The file comment" +msgstr "檔案的路徑" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 -msgid "Web Album" -msgstr "網頁相簿" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 +msgid "Image Page" +msgstr "圖片頁" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 -#, fuzzy -msgid "_Adapt to the window width " -msgstr "將視窗的寬度改變為 WIDTH" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 +msgid "Show the description, if available" +msgstr "顯示描述，如果有的話" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 -msgid "_Copy originals to destination" -msgstr "將原檔複製至目的地(_C)" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 +msgid "Show the following attributes:" +msgstr "顯示下列屬性：" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:39 -msgid "_Resize if larger than:" -msgstr "大於這個尺寸便會調整大小(_R)：" +msgid "Image Attributes" +msgstr "圖片屬性" -#: ../extensions/webalbums/gth-web-exporter.c:1802 +#: ../extensions/webalbums/gth-web-exporter.c:1800 msgid "Could not show the destination" msgstr "無法顯示目的地" -#: ../extensions/webalbums/gth-web-exporter.c:1838 +#: ../extensions/webalbums/gth-web-exporter.c:1836 msgid "The album has been created successfully." msgstr "相簿已成功建立。" -#: ../extensions/webalbums/gth-web-exporter.c:2106 -#: ../extensions/webalbums/gth-web-exporter.c:2133 +#: ../extensions/webalbums/gth-web-exporter.c:2104 +#: ../extensions/webalbums/gth-web-exporter.c:2131 msgid "Saving thumbnails" msgstr "儲存縮圖" -#: ../extensions/webalbums/gth-web-exporter.c:2161 +#: ../extensions/webalbums/gth-web-exporter.c:2159 msgid "Saving HTML pages: Images" msgstr "儲存 HTML 頁面：圖片" -#: ../extensions/webalbums/gth-web-exporter.c:2219 +#: ../extensions/webalbums/gth-web-exporter.c:2217 msgid "Saving HTML pages: Indexes" msgstr "儲存 HTML 頁面:索引" -#: ../extensions/webalbums/gth-web-exporter.c:2502 +#: ../extensions/webalbums/gth-web-exporter.c:2500 msgid "Copying original images" msgstr "正在複製原始圖片" -#: ../extensions/webalbums/gth-web-exporter.c:2929 +#: ../extensions/webalbums/gth-web-exporter.c:2960 msgid "Could not find the style folder" msgstr "找不到樣式資料夾" -#: ../extensions/webalbums/gth-web-exporter.c:2967 +#: ../extensions/webalbums/gth-web-exporter.c:2998 msgid "Could not create a temporary folder" msgstr "無法建立暫存資料夾" #: ../extensions/webalbums/webalbums.extension.in.in.h:1 -msgid "Create static web albums." -msgstr "建立靜態的網頁相簿。" - -#: ../extensions/webalbums/webalbums.extension.in.in.h:2 msgid "Web Albums" msgstr "網頁相簿" -#: ../gthumb/dlg-location.c:200 ../gthumb/gth-browser.c:1249 -#: ../gthumb/gth-browser.c:1818 ../gthumb/gth-browser.c:5974 -#: ../gthumb/gth-browser.c:5993 ../gthumb/gth-browser.c:6017 +#: ../extensions/webalbums/webalbums.extension.in.in.h:2 +msgid "Create static web albums." +msgstr "建立靜態的網頁相簿。" + +#: ../gthumb/dlg-location.c:200 ../gthumb/gth-browser.c:1336 +#: ../gthumb/gth-browser.c:1905 ../gthumb/gth-browser.c:6100 +#: ../gthumb/gth-browser.c:6119 ../gthumb/gth-browser.c:6143 #, fuzzy, c-format msgid "Could not load the position \"%s\"" msgstr "無法載入主題" @@ -4704,7 +4815,7 @@ msgid "Edit Filter" msgstr "編輯篩選器" -#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:270 +#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:277 msgid "All" msgstr "全部" @@ -4729,9 +4840,8 @@ msgstr "檔案工具" #: ../gthumb/dlg-preferences-extensions.c:75 -#, fuzzy msgid "List tools" -msgstr "系統工具" +msgstr "工具清單" #: ../gthumb/dlg-preferences-extensions.c:76 msgid "Importers" @@ -4771,46 +4881,6 @@ msgid "_Restart" msgstr "重新啟動(_R)" -#: ../gthumb/eggfileformatchooser.c:236 -#, c-format -msgid "File _Format: %s" -msgstr "檔案格式(_F)：%s" - -#: ../gthumb/eggfileformatchooser.c:397 ../gthumb/gth-main-default-tests.c:233 -msgid "All Files" -msgstr "所有檔案" - -#: ../gthumb/eggfileformatchooser.c:398 -msgid "All Supported Files" -msgstr "所有支援的檔案" - -#: ../gthumb/eggfileformatchooser.c:407 -msgid "By Extension" -msgstr "依擴充套件" - -#: ../gthumb/eggfileformatchooser.c:422 -msgid "File Format" -msgstr "檔案格式" - -#: ../gthumb/eggfileformatchooser.c:440 -msgid "Extension(s)" -msgstr "擴充套件" - -#: ../gthumb/eggfileformatchooser.c:681 -#, fuzzy, c-format -msgid "" -"The program was not able to find out the file format you want to use for `" -"%s'. Please make sure to use a known extension for that file or manually " -"choose a file format from the list below." -msgstr "" -"此程式無法找出您要用於「%s」的檔案格式。請確定該檔案使用已知的延伸檔名或手動" -"從下列清單中選擇檔案格式。" - -#: ../gthumb/eggfileformatchooser.c:688 -#, fuzzy -msgid "File format not recognized" -msgstr "無法辨識檔案格式" - #. For translators: This is a progress size indicator, for example: 230.4 MB of 512.8 MB #: ../gthumb/gio-utils.c:1351 #, fuzzy, c-format @@ -4847,7 +4917,7 @@ #. * the separator that your locale uses or use "%Id" instead #. * of "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2945 +#: ../gthumb/glib-utils.c:3068 #, fuzzy, c-format msgctxt "long time format" msgid "%d:%02d:%02d" @@ -4859,13 +4929,13 @@ #. * separator that your locale uses or use "%Id" instead of #. * "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2954 +#: ../gthumb/glib-utils.c:3077 #, fuzzy, c-format msgctxt "short time format" msgid "%d:%02d" msgstr "%d:%02d" -#: ../gthumb/gth-browser-actions-callbacks.c:400 +#: ../gthumb/gth-browser-actions-callbacks.c:414 #, fuzzy msgid "" "gthumb is free software; you can redistribute it and/or modify it under the " @@ -4877,7 +4947,7 @@ "定，就本程式再為散布與／或修改；無論您依據的是本授權的第二版或（您自行選擇" "的）任一日後發行的版本。" -#: ../gthumb/gth-browser-actions-callbacks.c:404 +#: ../gthumb/gth-browser-actions-callbacks.c:418 #, fuzzy msgid "" "gthumb is distributed in the hope that it will be useful, but WITHOUT ANY " @@ -4888,7 +4958,7 @@ "Totem 係基於使用目的而加以散布，然而不負任何擔保責任；亦無對適售性或特定目的" "適用性所為的默示性擔保。詳情請參照 GNU 通用公共授權。" -#: ../gthumb/gth-browser-actions-callbacks.c:408 +#: ../gthumb/gth-browser-actions-callbacks.c:422 #, fuzzy msgid "" "You should have received a copy of the GNU General Public License along with " @@ -4897,11 +4967,11 @@ "您應該已經和程式一起收到一份 GNU 通用公共許可證的副本。如果還沒有，請參訪 " "。" -#: ../gthumb/gth-browser-actions-callbacks.c:427 +#: ../gthumb/gth-browser-actions-callbacks.c:441 msgid "An image viewer and browser for GNOME." msgstr "適合在 GNOME 環境下使用的圖片瀏覽器。" -#: ../gthumb/gth-browser-actions-callbacks.c:430 +#: ../gthumb/gth-browser-actions-callbacks.c:444 msgid "translator_credits" msgstr "" "如對翻譯有任何意見，請送一封電子郵件給\n" @@ -4991,15 +5061,15 @@ msgid "Leave Fullscreen" msgstr "離開全螢幕" -#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3654 +#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3749 msgid "Go to the previous visited location" msgstr "回到前一次瀏覽過的位置" -#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3672 +#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3767 msgid "Go to the next visited location" msgstr "前往下一個瀏覽過的位置" -#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3690 +#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3785 msgid "Go up one level" msgstr "前往上一層資料夾" @@ -5011,7 +5081,7 @@ msgid "Specify a location to open" msgstr "" -#: ../gthumb/gth-browser-actions-entries.h:173 ../gthumb/gth-browser.c:673 +#: ../gthumb/gth-browser-actions-entries.h:173 ../gthumb/gth-browser.c:677 msgid "_Delete History" msgstr "刪除瀏覽紀錄(_D)" @@ -5039,144 +5109,146 @@ msgid "_Keyboard Shortcuts" msgstr "捷徑鍵(_K)" -#: ../gthumb/gth-browser-actions-entries.h:206 +#: ../gthumb/gth-browser-actions-entries.h:203 +#: ../gthumb/gth-browser-actions-entries.h:257 +msgid "Edit" +msgstr "編輯" + +#: ../gthumb/gth-browser-actions-entries.h:204 +#: ../gthumb/gth-browser-actions-entries.h:258 +msgid "Edit file" +msgstr "編輯檔案" + +#: ../gthumb/gth-browser-actions-entries.h:212 msgid "_Toolbar" msgstr "工具列(_T)" -#: ../gthumb/gth-browser-actions-entries.h:207 +#: ../gthumb/gth-browser-actions-entries.h:213 msgid "View or hide the toolbar of this window" msgstr "顯示或隱藏本視窗中的工具列" -#: ../gthumb/gth-browser-actions-entries.h:211 +#: ../gthumb/gth-browser-actions-entries.h:217 msgid "_Statusbar" msgstr "狀態列(_S)" -#: ../gthumb/gth-browser-actions-entries.h:212 +#: ../gthumb/gth-browser-actions-entries.h:218 msgid "View or hide the statusbar of this window" msgstr "顯示或隱藏本視窗中的狀態列" -#: ../gthumb/gth-browser-actions-entries.h:216 +#: ../gthumb/gth-browser-actions-entries.h:222 msgid "_Filterbar" msgstr "篩選器工具列(_F)" -#: ../gthumb/gth-browser-actions-entries.h:217 +#: ../gthumb/gth-browser-actions-entries.h:223 msgid "View or hide the filterbar of this window" msgstr "顯示或隱藏本視窗中的篩選器工具列" -#: ../gthumb/gth-browser-actions-entries.h:221 +#: ../gthumb/gth-browser-actions-entries.h:227 msgid "_Sidebar" msgstr "側邊欄(_S)" -#: ../gthumb/gth-browser-actions-entries.h:222 +#: ../gthumb/gth-browser-actions-entries.h:228 msgid "View or hide the sidebar of this window" msgstr "顯示或隱藏本視窗中的側邊欄" -#: ../gthumb/gth-browser-actions-entries.h:226 +#: ../gthumb/gth-browser-actions-entries.h:232 msgid "_Thumbnail Pane" msgstr "縮圖窗格(_T)" -#: ../gthumb/gth-browser-actions-entries.h:227 +#: ../gthumb/gth-browser-actions-entries.h:233 #, fuzzy msgid "View or hide the thumbnail pane in viewer mode" msgstr "顯示或隱藏本視窗中的狀態列" -#: ../gthumb/gth-browser-actions-entries.h:231 +#: ../gthumb/gth-browser-actions-entries.h:237 msgid "_Thumbnails" msgstr "縮圖(_T)" -#: ../gthumb/gth-browser-actions-entries.h:232 +#: ../gthumb/gth-browser-actions-entries.h:238 msgid "View thumbnails" msgstr "顯示縮圖" -#: ../gthumb/gth-browser-actions-entries.h:236 +#: ../gthumb/gth-browser-actions-entries.h:242 msgid "_Hidden Files" msgstr "隱藏檔案(_H)" -#: ../gthumb/gth-browser-actions-entries.h:237 +#: ../gthumb/gth-browser-actions-entries.h:243 msgid "Show hidden files and folders" msgstr "顯示隱藏的檔案和資料夾" -#: ../gthumb/gth-browser-actions-entries.h:242 -#: ../gthumb/gth-browser-actions-entries.h:247 +#: ../gthumb/gth-browser-actions-entries.h:248 +#: ../gthumb/gth-browser-actions-entries.h:253 msgid "View file properties" msgstr "檢視檔案的屬性" -#: ../gthumb/gth-browser-actions-entries.h:251 -msgid "Edit" -msgstr "編輯" - -#: ../gthumb/gth-browser-actions-entries.h:252 -msgid "Edit file" -msgstr "編輯檔案" - -#: ../gthumb/gth-browser-actions-entries.h:256 +#: ../gthumb/gth-browser-actions-entries.h:262 msgid "_Fit Window to Image" msgstr "使視窗符合圖片尺寸(_F)" -#: ../gthumb/gth-browser-actions-entries.h:257 +#: ../gthumb/gth-browser-actions-entries.h:263 msgid "Resize the window to the size of the image" msgstr "調整視窗大小以符合圖片尺寸" -#: ../gthumb/gth-browser.c:370 +#: ../gthumb/gth-browser.c:374 #, c-format msgid "Open %s" msgstr "開啟 %s" -#: ../gthumb/gth-browser.c:510 +#: ../gthumb/gth-browser.c:514 msgid "[modified]" msgstr "[已修改]" -#: ../gthumb/gth-browser.c:1007 +#: ../gthumb/gth-browser.c:1073 #, c-format msgid "%d file selected (%s)" msgid_plural "%d files selected (%s)" msgstr[0] "%d 個檔案選取的 (大小為 %s)" -#: ../gthumb/gth-browser.c:1042 +#: ../gthumb/gth-browser.c:1108 #, c-format msgid "%s of free space" msgstr "%s 的可用空間：" -#: ../gthumb/gth-browser.c:1911 ../gthumb/gth-browser.c:1938 +#: ../gthumb/gth-browser.c:1998 ../gthumb/gth-browser.c:2025 #, fuzzy, c-format msgid "No suitable module found for %s" msgstr "找不到 URI‘%s’的項目" -#: ../gthumb/gth-browser.c:2057 +#: ../gthumb/gth-browser.c:2144 #, c-format msgid "Save changes to file '%s'?" msgstr "儲存改變至檔案「%s」？" -#: ../gthumb/gth-browser.c:2062 +#: ../gthumb/gth-browser.c:2149 msgid "If you don't save, changes to the file will be permanently lost." msgstr "如果您不儲存，所有對檔案的變更都會永久消失。" -#: ../gthumb/gth-browser.c:2063 +#: ../gthumb/gth-browser.c:2150 msgid "Do _Not Save" msgstr "不要儲存(_N)" -#: ../gthumb/gth-browser.c:2836 ../gthumb/gth-source-tree.c:182 +#: ../gthumb/gth-browser.c:2928 ../gthumb/gth-source-tree.c:182 msgid "Could not change name" msgstr "無法變更名稱" -#: ../gthumb/gth-browser.c:3267 ../gthumb/gth-main-default-metadata.c:41 +#: ../gthumb/gth-browser.c:3359 ../gthumb/gth-main-default-metadata.c:41 msgid "Modified" msgstr "最後修改" -#: ../gthumb/gth-browser.c:3655 ../gthumb/gth-browser.c:3673 +#: ../gthumb/gth-browser.c:3750 ../gthumb/gth-browser.c:3768 msgid "View the list of visited locations" msgstr "檢視瀏覽過的位置清單" -#: ../gthumb/gth-browser.c:3691 +#: ../gthumb/gth-browser.c:3786 msgid "View the list of upper locations" msgstr "檢視上層的位置清單" -#: ../gthumb/gth-browser.c:5975 +#: ../gthumb/gth-browser.c:6101 #, c-format msgid "File type not supported" msgstr "檔案類型不支援" -#: ../gthumb/gth-browser.c:6018 +#: ../gthumb/gth-browser.c:6144 #, c-format msgid "No suitable module found" msgstr "沒有找到合適的模組" @@ -5191,6 +5263,10 @@ msgid "The extension '%1$s' is required by the extension '%2$s'" msgstr "需要 XKB 擴展功能。" +#: ../gthumb/gth-file-chooser-dialog.c:144 +msgid "All Supported Files" +msgstr "所有支援的檔案" + #: ../gthumb/gth-file-source-vfs.c:121 msgid "Home Folder" msgstr "家目錄" @@ -5229,7 +5305,7 @@ "Are you sure you want to permanently delete the %'d selected files?" msgstr[0] "確定要永久刪除已選的 %'d 個檔案嗎？" -#: ../gthumb/gth-filterbar.c:406 +#: ../gthumb/gth-filterbar.c:413 msgid "Hide the filterbar" msgstr "隱藏篩選器工具列" @@ -5249,7 +5325,7 @@ msgstr "GB" #. "files" label -#: ../gthumb/gth-filter.c:291 ../gthumb/gth-filter-editor-dialog.c:177 +#: ../gthumb/gth-filter.c:286 ../gthumb/gth-filter-editor-dialog.c:177 msgid "files" msgstr "檔案" @@ -5274,42 +5350,55 @@ msgid "(Open Parent)" msgstr "(開啟上一層)" -#: ../gthumb/gth-histogram-view.c:826 +#: ../gthumb/gth-histogram-view.c:825 msgid "Linear scale" msgstr "線性刻度" -#: ../gthumb/gth-histogram-view.c:838 +#: ../gthumb/gth-histogram-view.c:837 msgid "Logarithmic scale" msgstr "對數刻度" -#: ../gthumb/gth-histogram-view.c:858 +#: ../gthumb/gth-histogram-view.c:857 msgid "Channel:" msgstr "色版：" -#: ../gthumb/gth-histogram-view.c:890 +#: ../gthumb/gth-histogram-view.c:878 msgid "Value" msgstr "亮度" -#: ../gthumb/gth-histogram-view.c:896 +#: ../gthumb/gth-histogram-view.c:883 msgid "Red" msgstr "紅色" -#: ../gthumb/gth-histogram-view.c:902 +#: ../gthumb/gth-histogram-view.c:888 msgid "Green" msgstr "綠色" -#: ../gthumb/gth-histogram-view.c:908 +#: ../gthumb/gth-histogram-view.c:893 msgid "Blue" msgstr "藍色" -#: ../gthumb/gth-histogram-view.c:914 +#: ../gthumb/gth-histogram-view.c:898 msgid "Alpha" msgstr "透明" -#: ../gthumb/gth-histogram-view.c:921 +#: ../gthumb/gth-histogram-view.c:904 msgid "RGB" msgstr "RGB" +#: ../gthumb/gth-image-list-task.c:141 +msgid "Could not rename the file" +msgstr "無法為檔案重新命名" + +#: ../gthumb/gth-image-saver.c:39 +msgid "No options available for this file type" +msgstr "無選項可用於此檔案類型" + +#: ../gthumb/gth-image-saver.c:181 +#, c-format +msgid "Could not find a suitable module to save the image as \"%s\"" +msgstr "無法找到合適的模組以儲存圖片為「%s」" + #: ../gthumb/gth-load-file-data-task.c:108 msgid "Reading file information" msgstr "讀取檔案資訊" @@ -5363,6 +5452,10 @@ msgid "dimensions" msgstr "尺寸" +#: ../gthumb/gth-main-default-tests.c:233 +msgid "All Files" +msgstr "所有檔案" + #: ../gthumb/gth-main-default-tests.c:261 msgid "Media" msgstr "媒體" @@ -5383,14 +5476,6 @@ msgid "Description (embedded)" msgstr "描述(嵌入式)" -#: ../gthumb/gth-pixbuf-list-task.c:139 -msgid "Could not rename the file" -msgstr "無法為檔案重新命名" - -#: ../gthumb/gth-pixbuf-saver.c:34 -msgid "No options available for this file type" -msgstr "無選項可用於此檔案類型" - #: ../gthumb/gth-progress-dialog.c:144 msgid "Cancel operation" msgstr "取消操作" @@ -5408,51 +5493,51 @@ msgid "Show all the tags" msgstr "顯示所有的標籤" -#: ../gthumb/gth-tags-file.c:236 +#: ../gthumb/gth-tags-file.c:235 msgid "Holidays" msgstr "假期" -#: ../gthumb/gth-tags-file.c:237 +#: ../gthumb/gth-tags-file.c:236 msgid "Temporary" msgstr "暫存" -#: ../gthumb/gth-tags-file.c:238 +#: ../gthumb/gth-tags-file.c:237 msgid "Screenshots" msgstr "畫面快照" -#: ../gthumb/gth-tags-file.c:239 +#: ../gthumb/gth-tags-file.c:238 msgid "Science" msgstr "科學" -#: ../gthumb/gth-tags-file.c:240 +#: ../gthumb/gth-tags-file.c:239 msgid "Favorite" msgstr "特別喜愛的" -#: ../gthumb/gth-tags-file.c:241 +#: ../gthumb/gth-tags-file.c:240 msgid "Important" msgstr "重要" -#: ../gthumb/gth-tags-file.c:242 +#: ../gthumb/gth-tags-file.c:241 msgid "GNOME" msgstr "GNOME" -#: ../gthumb/gth-tags-file.c:243 +#: ../gthumb/gth-tags-file.c:242 msgid "Games" msgstr "遊戲" -#: ../gthumb/gth-tags-file.c:244 +#: ../gthumb/gth-tags-file.c:243 msgid "Party" msgstr "派對" -#: ../gthumb/gth-tags-file.c:245 +#: ../gthumb/gth-tags-file.c:244 msgid "Birthday" msgstr "生日" -#: ../gthumb/gth-tags-file.c:246 +#: ../gthumb/gth-tags-file.c:245 msgid "Astronomy" msgstr "天文" -#: ../gthumb/gth-tags-file.c:247 +#: ../gthumb/gth-tags-file.c:246 msgid "Family" msgstr "全家褔" @@ -5472,7 +5557,7 @@ msgid "is not" msgstr "不是" -#: ../gthumb/gth-test-category.c:397 ../gthumb/gth-test-simple.c:812 +#: ../gthumb/gth-test-category.c:407 ../gthumb/gth-test-simple.c:812 #: ../gthumb/gth-test-simple.c:838 ../gthumb/gth-test-simple.c:859 #: ../gthumb/gth-test-simple.c:885 #, fuzzy, c-format @@ -5545,117 +5630,103 @@ msgid "Close _All Windows" msgstr "關閉所有視窗(_A)" -#: ../gthumb/gtk-utils.c:551 +#: ../gthumb/gtk-utils.c:499 msgid "Could not display help" msgstr "無法顯示說明文件" -#: ../gthumb/gtk-utils.c:868 ../gthumb/gtk-utils.c:875 +#: ../gthumb/gtk-utils.c:828 ../gthumb/gtk-utils.c:835 msgid "Could not launch the application" msgstr "無法啟動應用程式" -#: ../gthumb/gtk-utils.c:978 +#: ../gthumb/gtk-utils.c:938 msgid "_Copy Here" msgstr "複製這裡(_C)" -#: ../gthumb/gtk-utils.c:983 +#: ../gthumb/gtk-utils.c:943 msgid "_Move Here" msgstr "移動這裡(_M)" -#: ../gthumb/gtk-utils.c:988 +#: ../gthumb/gtk-utils.c:948 msgid "_Link Here" msgstr "鏈接這裡(_L)" -#: ../gthumb/gtk-utils.c:997 +#: ../gthumb/gtk-utils.c:957 msgid "Cancel" msgstr "取消" -#: ../gthumb/main.c:59 +#: ../gthumb/main.c:61 msgid "Open a new window" msgstr "開啟一新的視窗" -#: ../gthumb/main.c:63 +#: ../gthumb/main.c:65 msgid "Start in fullscreen mode" msgstr "在全螢幕模式下啟動" -#: ../gthumb/main.c:67 +#: ../gthumb/main.c:69 msgid "Automatically start a slideshow" msgstr "自動啟動幻燈片模式" -#: ../gthumb/main.c:71 +#: ../gthumb/main.c:73 msgid "Automatically import digital camera photos" msgstr "自動匯入數位相片" -#: ../gthumb/main.c:75 +#: ../gthumb/main.c:77 msgid "Show version" msgstr "顯示版本" -#: ../gthumb/main.c:344 +#: ../gthumb/main.c:483 msgid "- Image browser and viewer" msgstr "- 圖片瀏覽器和檢視器" -#: ../gthumb/pixbuf-io.c:174 -#, c-format -msgid "Could not find a suitable module to save the image as \"%s\"" -msgstr "無法找到合適的模組以儲存圖片為「%s」" - -#~ msgid "System settings" -#~ msgstr "系統設定" - -#~ msgid "Text below icons" -#~ msgstr "圖示下顯示文字" - -#~ msgid "Text beside icons" -#~ msgstr "圖示旁顯示文字" - -#~ msgid "Icons only" -#~ msgstr "只顯示圖示" - -#~ msgid "Text only" -#~ msgstr "只顯示文字" - -#~ msgid "on the bottom" -#~ msgstr "在底部" - -#~ msgid "on the side" -#~ msgstr "在側邊" +#~ msgid "Exif DateTimeOriginal tag" +#~ msgstr "Exif 日期時刻原始標籤" #, fuzzy -#~| msgid "1:1" -#~ msgid "112" -#~ msgstr "原來尺寸" +#~ msgid "_Resize to:" +#~ msgstr "面對面" -#~ msgid "Set to actual size" -#~ msgstr "設置為實際尺寸" +#~ msgid "Desaturate" +#~ msgstr "去除色彩" -#~ msgid "Keep previous zoom" -#~ msgstr "沿用之前的縮放比例" +#~ msgid "White balance correction" +#~ msgstr "白平衡校正" -#~ msgid "Fit to window" -#~ msgstr "符合視窗" +#~ msgid "Enhance Colors" +#~ msgstr "加強色彩" -#~ msgid "Fit to window if larger" -#~ msgstr "如果圖片太大則縮小至視窗尺寸" +#~ msgid "Automatic white balance correction" +#~ msgstr "自動白平衡修正" -#~ msgid "Fit to width" -#~ msgstr "符合寬度" +#~ msgid "Save images" +#~ msgstr "儲存圖片" -#~ msgid "Fit to width if larger" -#~ msgstr "如果圖片太大則縮小以符合寬度" +#~ msgid "Save images in common file formats such as JPEG, PNG and TIFF" +#~ msgstr "儲存圖片用一般的檔案格式，例如常見的 JPEG，PNG 和 TIFF" -#~ msgid "High" -#~ msgstr "高" +#~ msgid "File _Format: %s" +#~ msgstr "檔案格式(_F)：%s" -#~ msgid "Low" -#~ msgstr "低" +#~ msgid "By Extension" +#~ msgstr "依擴充套件" -#~ msgid "White" -#~ msgstr "白" +#~ msgid "File Format" +#~ msgstr "檔案格式" + +#~ msgid "Extension(s)" +#~ msgstr "擴充套件" -#~ msgid "Black" -#~ msgstr "黑" +#, fuzzy +#~ msgid "" +#~ "The program was not able to find out the file format you want to use for `" +#~ "%s'. Please make sure to use a known extension for that file or manually " +#~ "choose a file format from the list below." +#~ msgstr "" +#~ "此程式無法找出您要用於「%s」的檔案格式。請確定該檔案使用已知的延伸檔名或手" +#~ "動從下列清單中選擇檔案格式。" -#~ msgid "Checked" -#~ msgstr "方格" +#, fuzzy +#~ msgid "File format not recognized" +#~ msgstr "無法辨識檔案格式" #~ msgid "" #~ "Possible values are: actual_size, fit, keep_prev, fit_if_larger, " diff -Nru gthumb-3.0.2/tests/Makefile.in gthumb-3.2.3/tests/Makefile.in --- gthumb-3.0.2/tests/Makefile.in 2012-08-20 19:54:19.000000000 +0000 +++ gthumb-3.2.3/tests/Makefile.in 2013-07-10 13:33:52.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -55,17 +83,17 @@ @BUILD_TEST_SUITE_TRUE@ gsignature-test$(EXEEXT) \ @BUILD_TEST_SUITE_TRUE@ oauth-test$(EXEEXT) subdir = tests -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -150,6 +178,23 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -182,9 +227,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -198,13 +241,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -233,7 +275,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -249,11 +294,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -270,7 +319,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -300,7 +348,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -412,15 +463,19 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + dom-test$(EXEEXT): $(dom_test_OBJECTS) $(dom_test_DEPENDENCIES) $(EXTRA_dom_test_DEPENDENCIES) @rm -f dom-test$(EXEEXT) $(AM_V_CCLD)$(dom_test_LINK) $(dom_test_OBJECTS) $(dom_test_LDADD) $(LIBS) + glib-utils-test$(EXEEXT): $(glib_utils_test_OBJECTS) $(glib_utils_test_DEPENDENCIES) $(EXTRA_glib_utils_test_DEPENDENCIES) @rm -f glib-utils-test$(EXEEXT) $(AM_V_CCLD)$(glib_utils_test_LINK) $(glib_utils_test_OBJECTS) $(glib_utils_test_LDADD) $(LIBS) + gsignature-test$(EXEEXT): $(gsignature_test_OBJECTS) $(gsignature_test_DEPENDENCIES) $(EXTRA_gsignature_test_DEPENDENCIES) @rm -f gsignature-test$(EXEEXT) $(AM_V_CCLD)$(gsignature_test_LINK) $(gsignature_test_OBJECTS) $(gsignature_test_LDADD) $(LIBS) + oauth-test$(EXEEXT): $(oauth_test_OBJECTS) $(oauth_test_DEPENDENCIES) $(EXTRA_oauth_test_DEPENDENCIES) @rm -f oauth-test$(EXEEXT) $(AM_V_CCLD)$(oauth_test_LINK) $(oauth_test_OBJECTS) $(oauth_test_LDADD) $(LIBS) @@ -445,14 +500,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -579,26 +634,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -610,15 +654,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -627,9 +667,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -782,18 +823,19 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS cscopelist ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk
---- gthumb.orig/help/C/shortcuts.page -+++ gthumb/help/C/shortcuts.page -@@ -6,7 +6,7 @@ id="gthumb-shortcuts"> - - Keyboard Shortcuts - --
-+
- Viewing and hiding parts of the user interface - - -@@ -83,7 +83,7 @@ id="gthumb-shortcuts"> - - - --
-+
- Editing shortcuts for the browser and viewer -
- -@@ -178,7 +178,7 @@ id="gthumb-shortcuts"> -
-
- --
-+
- Editing shortcuts for the viewer mode only - - -@@ -262,7 +262,7 @@ id="gthumb-shortcuts"> -
-
- --
-+
- Viewer shortcuts - - -@@ -406,7 +406,7 @@ id="gthumb-shortcuts"> -
-
- --
-+
- Browser Navigation - - -@@ -487,7 +487,7 @@ id="gthumb-shortcuts"> -
-
- --
-+
- Slideshow controls - - ---- gthumb.orig/help/de/shortcuts.page -+++ gthumb/help/de/shortcuts.page -@@ -6,7 +6,7 @@ - - Tastenkombinationen - --
-+
- Anzeigen und verbergen von Teilen der grafischen Oberflächen -
- -@@ -80,7 +80,7 @@ - - - --
-+
- Tastenkombinationen für Bildbetrachter und Browser bearbeiten -
- -@@ -173,7 +173,7 @@ -
-
- --
-+
- Tastenkombinationen nur für den Ansichtsmodus bearbeiten - - -@@ -257,7 +257,7 @@ -
-
- --
-+
- Tastenkombinationen des Betrachters - - -@@ -390,7 +390,7 @@ -
-
- --
-+
- Browser-Navigation - - -@@ -467,7 +467,7 @@ -
-
- --
-+
- Steuerung von Dia-Vorführungen - - ---- gthumb.orig/help/el/shortcuts.page -+++ gthumb/help/el/shortcuts.page -@@ -6,7 +6,7 @@ - - Keyboard Shortcuts - --
-+
- Viewing and hiding parts of the user interface -
- -@@ -83,7 +83,7 @@ - - - --
-+
- Editing shortcuts for the browser and viewer -
- -@@ -178,7 +178,7 @@ -
-
- --
-+
- Editing shortcuts for the viewer mode only - - -@@ -262,7 +262,7 @@ -
-
- --
-+
- Viewer shortcuts - - -@@ -406,7 +406,7 @@ -
-
- --
-+
- Browser Navigation - - -@@ -487,7 +487,7 @@ -
-
- --
-+
- Slideshow controls - - ---- gthumb.orig/help/es/shortcuts.page -+++ gthumb/help/es/shortcuts.page -@@ -6,7 +6,7 @@ - - Combinaciones de teclas - --
-+
- Ver y ocultar partes del interfaz de usuario -
- -@@ -80,7 +80,7 @@ - - - --
-+
- Editar atajos para el explorador y el visor -
- -@@ -173,7 +173,7 @@ -
-
- --
-+
- Editar atajos para el modo visor solamente - - -@@ -257,7 +257,7 @@ -
-
- --
-+
- Ver atajos de teclado - - -@@ -390,7 +390,7 @@ -
-
- --
-+
- Navegación con explorador - - -@@ -467,7 +467,7 @@ -
-
- --
-+
- Controles de las diapositivas - - ---- gthumb.orig/help/fr/shortcuts.page -+++ gthumb/help/fr/shortcuts.page -@@ -6,7 +6,7 @@ - - Raccourcis clavier - --
-+
- Affichage et masquage de certaines parties de l'interface utilisateur -
- -@@ -80,7 +80,7 @@ - - - --
-+
- Raccourcis pour l'édition dans le navigateur et le visionneur -
- -@@ -173,7 +173,7 @@ -
-
- --
-+
- Raccourcis pour l'édition dans le visionneur uniquement - - -@@ -257,7 +257,7 @@ -
-
- --
-+
- Raccourcis clavier du visionneur - - -@@ -390,7 +390,7 @@ -
-
- --
-+
- Déplacement dans le navigateur - - -@@ -467,7 +467,7 @@ -
-
- --
-+
- Contrôles du diaporama - - ---- gthumb.orig/help/oc/shortcuts.page -+++ gthumb/help/oc/shortcuts.page -@@ -6,7 +6,7 @@ - - Keyboard Shortcuts - --
-+
- Viewing and hiding parts of the user interface -
- -@@ -83,7 +83,7 @@ - - - --
-+
- Editing shortcuts for the browser and viewer -
- -@@ -178,7 +178,7 @@ -
-
- --
-+
- Editing shortcuts for the viewer mode only - - -@@ -262,7 +262,7 @@ -
-
- --
-+
- Viewer shortcuts - - -@@ -406,7 +406,7 @@ -
-
- --
-+
- Browser Navigation - - -@@ -487,7 +487,7 @@ -
-
- --
-+
- Slideshow controls - - ---- gthumb.orig/help/sv/shortcuts.page -+++ gthumb/help/sv/shortcuts.page -@@ -6,7 +6,7 @@ - - Keyboard Shortcuts - --
-+
- Viewing and hiding parts of the user interface -
- -@@ -83,7 +83,7 @@ - - - --
-+
- Editing shortcuts for the browser and viewer -
- -@@ -178,7 +178,7 @@ -
-
- --
-+
- Editing shortcuts for the viewer mode only - - -@@ -262,7 +262,7 @@ -
-
- --
-+
- Viewer shortcuts - - -@@ -406,7 +406,7 @@ -
-
- --
-+
- Browser Navigation - - -@@ -487,7 +487,7 @@ -
-
- --
-+
- Slideshow controls - - ---- gthumb.orig/help/zh_CN/shortcuts.page -+++ gthumb/help/zh_CN/shortcuts.page -@@ -6,7 +6,7 @@ - - Keyboard Shortcuts - --
-+
- Viewing and hiding parts of the user interface -
- -@@ -83,7 +83,7 @@ - - - --
-+
- Editing shortcuts for the browser and viewer -
- -@@ -178,7 +178,7 @@ -
-
- --
-+
- Editing shortcuts for the viewer mode only - - -@@ -262,7 +262,7 @@ -
-
- --
-+
- Viewer shortcuts - - -@@ -406,7 +406,7 @@ -
-
- --
-+
- Browser Navigation - - -@@ -487,7 +487,7 @@ -
-
- --
-+
- Slideshow controls - - ---- gthumb.orig/help/sl/shortcuts.page -+++ gthumb/help/sl/shortcuts.page -@@ -6,7 +6,7 @@ - - Tipkovne bližnjice - --
-+
- Ogled in skrivanje delov uporabniškega vmesnika -
- -@@ -80,7 +80,7 @@ - - - --
-+
- Urejanje bližnjic za brskalnik in pregledovalnik -
- -@@ -173,7 +173,7 @@ -
-
- --
-+
- Urejanje bližnjic le za način pregledovalnika - - -@@ -257,7 +257,7 @@ -
-
- --
-+
- Bližnjice pregledovalnika - - -@@ -390,7 +390,7 @@ -
-
- --
-+
- Krmarjenje brskalnika - - -@@ -467,7 +467,7 @@ -
-
- --
-+
- Nadzor predstavitve - - diff -Nru gthumb-3.0.2/debian/patches/10-fix_POTFILES.skip.patch gthumb-3.2.3/debian/patches/10-fix_POTFILES.skip.patch --- gthumb-3.0.2/debian/patches/10-fix_POTFILES.skip.patch 2012-09-02 21:11:44.000000000 +0000 +++ gthumb-3.2.3/debian/patches/10-fix_POTFILES.skip.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -These files are private to quilt. I'm not even sure why intltool-extract is -seeing them. ---- - po/POTFILES.skip | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) - ---- gthumb.orig/po/POTFILES.skip -+++ gthumb/po/POTFILES.skip -@@ -1,3 +1,20 @@ - data/gthumb.desktop.in - data/gthumb-import.desktop.in - extensions/webalbums/albumtheme.c -+ -+# These are the original files patched by quilt. -+.pc/04-fix_source_typo.patch/extensions/edit_metadata/callbacks.c -+#.pc/07-fix_zooms.patch/src/gth-window-actions-callbacks.c -+#.pc/07-fix_zooms.patch/src/gth-window-actions-entries.h -+#.pc/08-fix_preferences.patch/data/glade/gthumb_preferences.glade -+#.pc/09-fix_infinite_loop_dragging_parent_dir.patch/src/gth-browser.c -+#.pc/11-fix_Film_on_import.patch/src/dlg-photo-importer.c -+#.pc/12-remove_Save_button_in_crop_dialog.patch/data/glade/gthumb_crop.glade -+#.pc/12-remove_Save_button_in_crop_dialog.patch/src/dlg-crop.c -+.pc/13-fix_Close_mismatch.patch/gthumb/gth-window-actions-entries.h -+#.pc/14-add_rotate_button_viewer.patch/src/gth-browser.c -+#.pc/15-suggest_new_name_on_overwrite_dialog.patch/src/dlg-file-utils.c -+#.pc/16-fix_crop_dialog_usability.patch/data/glade/gthumb_crop.glade -+#.pc/16-fix_crop_dialog_usability.patch/src/dlg-crop.c -+#.pc/17-dont_follow_symlinks_on_dups_search.patch/src/dlg-duplicates.c -+ diff -Nru gthumb-3.0.2/debian/patches/13-fix_Close_mismatch.patch gthumb-3.2.3/debian/patches/13-fix_Close_mismatch.patch --- gthumb-3.0.2/debian/patches/13-fix_Close_mismatch.patch 2012-09-02 21:11:44.000000000 +0000 +++ gthumb-3.2.3/debian/patches/13-fix_Close_mismatch.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -It really should be "Quit", not "Close"... (also fixes the keybinding) ---- - gthumb/gth-window-actions-entries.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- gthumb.orig/gthumb/gth-window-actions-entries.h -+++ gthumb/gthumb/gth-window-actions-entries.h -@@ -27,7 +27,7 @@ - #include "gth-window-actions-callbacks.h" - - static GtkActionEntry gth_window_action_entries[] = { -- { "File_CloseWindow", GTK_STOCK_CLOSE, -+ { "File_CloseWindow", GTK_STOCK_QUIT, - NULL, NULL, - N_("Close this window"), - G_CALLBACK (gth_window_activate_action_file_close_window) }, diff -Nru gthumb-3.0.2/debian/patches/20-backport_comments_loss_fix.patch gthumb-3.2.3/debian/patches/20-backport_comments_loss_fix.patch --- gthumb-3.0.2/debian/patches/20-backport_comments_loss_fix.patch 2012-09-02 21:11:44.000000000 +0000 +++ gthumb-3.2.3/debian/patches/20-backport_comments_loss_fix.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,283 +0,0 @@ -Author: Paolo Bacchilega -Description: fix photo comments loss when upgrading from 2.10 -Bug: http://bugzilla.gnome.org/show_bug.cgi?id=626893 -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=593813 -Comment: Patch backported by David Paleino , using the - following git commits: - - http://git.gnome.org/browse/gthumb/commit/?id=b80580d3341d2b050bf59fdc42973ed28e93bc54 - - http://git.gnome.org/browse/gthumb/commit/?id=08fcb249ec7e6f2daaf99f50ece6612cfa5a272c - - http://git.gnome.org/browse/gthumb/commit/?id=66bc3971668f06970594c55c777b5f628882c4e9 - ---- - extensions/exiv2_tools/exiv2-utils.cpp | 99 +++++++++++++------ - extensions/exiv2_tools/gth-metadata-provider-exiv2.c | 23 +++- - extensions/exiv2_tools/main.c | 14 ++ - po/POTFILES.skip | 2 - 4 files changed, 107 insertions(+), 31 deletions(-) - ---- gthumb.orig/extensions/exiv2_tools/exiv2-utils.cpp -+++ gthumb/extensions/exiv2_tools/exiv2-utils.cpp -@@ -57,6 +57,14 @@ const char *_DATE_TAG_NAMES[] = { - NULL - }; - -+const char *_LAST_DATE_TAG_NAMES[] = { -+ "Exif::Image::DateTime", -+ "Xmp::exif::DateTime", -+ "Xmp::xmp::ModifyDate", -+ "Xmp::xmp::MetadataDate", -+ NULL -+}; -+ - const char *_ORIGINAL_DATE_TAG_NAMES[] = { - "Exif::Photo::DateTimeOriginal", - "Xmp::exif::DateTimeOriginal", -@@ -132,11 +140,11 @@ const char *_ORIENTATION_TAG_NAMES[] = { - }; - - const char *_DESCRIPTION_TAG_NAMES[] = { -+ "Iptc::Application2::Caption", -+ "Xmp::dc::description", - "Exif::Photo::UserComment", - "Exif::Image::ImageDescription", -- "Xmp::dc::description", - "Xmp::tiff::ImageDescription", -- "Iptc::Application2::Caption", - "Iptc::Application2::Headline", - NULL - }; -@@ -263,24 +271,15 @@ set_file_info (GFileInfo *info, - - - static void --set_attribute_from_tagset (GFileInfo *info, -- const char *attribute, -- const char *tagset[]) --{ -- GObject *metadata; -- int i; -- char *key; -- char *description; -- char *formatted_value; -- char *raw_value; -- char *type_name; -- -- metadata = NULL; -- for (i = 0; tagset[i] != NULL; i++) { -- metadata = g_file_info_get_attribute_object (info, tagset[i]); -- if (metadata != NULL) -- break; -- } -+set_attribute_from_metadata (GFileInfo *info, -+ const char *attribute, -+ GObject *metadata) -+{ -+ char *key; -+ char *description; -+ char *formatted_value; -+ char *raw_value; -+ char *type_name; - - if (metadata == NULL) - return; -@@ -292,6 +291,7 @@ set_attribute_from_tagset (GFileInfo *i - "raw", &raw_value, - "value-type", &type_name, - NULL); -+ - set_file_info (info, - attribute, - description, -@@ -303,6 +303,26 @@ set_attribute_from_tagset (GFileInfo *i - - - static void -+set_attribute_from_tagset (GFileInfo *info, -+ const char *attribute, -+ const char *tagset[]) -+{ -+ GObject *metadata; -+ int i; -+ -+ metadata = NULL; -+ for (i = 0; tagset[i] != NULL; i++) { -+ metadata = g_file_info_get_attribute_object (info, tagset[i]); -+ if (metadata != NULL) -+ break; -+ } -+ -+ if (metadata != NULL) -+ set_attribute_from_metadata (info, attribute, metadata); -+} -+ -+ -+static void - set_string_list_attribute_from_tagset (GFileInfo *info, - const char *attribute, - const char *tagset[]) -@@ -336,9 +356,32 @@ set_string_list_attribute_from_tagset (G - static void - set_attributes_from_tagsets (GFileInfo *info) - { -- set_attribute_from_tagset (info, "general::datetime", _DATE_TAG_NAMES); -+ set_attribute_from_tagset (info, "general::datetime", _LAST_DATE_TAG_NAMES); -+ if (g_file_info_get_attribute_object (info, "general::datetime") == NULL) -+ set_attribute_from_tagset (info, "general::datetime", _ORIGINAL_DATE_TAG_NAMES); -+ - set_attribute_from_tagset (info, "general::description", _DESCRIPTION_TAG_NAMES); - set_attribute_from_tagset (info, "general::title", _TITLE_TAG_NAMES); -+ -+ /* if iptc::caption and iptc::headline are different use iptc::headline -+ * to set general::title, if not already set. */ -+ -+ if (g_file_info_get_attribute_object (info, "general::title") == NULL) { -+ GObject *iptc_caption; -+ GObject *iptc_headline; -+ -+ iptc_caption = g_file_info_get_attribute_object (info, "Iptc::Application2::Caption"); -+ iptc_headline = g_file_info_get_attribute_object (info, "Iptc::Application2::Headline"); -+ -+ if ((iptc_caption != NULL) -+ && (iptc_headline != NULL) -+ && (g_strcmp0 (gth_metadata_get_raw (GTH_METADATA (iptc_caption)), -+ gth_metadata_get_raw (GTH_METADATA (iptc_headline))) != 0)) -+ { -+ set_attribute_from_metadata (info, "general::title", iptc_headline); -+ } -+ } -+ - set_attribute_from_tagset (info, "general::location", _LOCATION_TAG_NAMES); - set_string_list_attribute_from_tagset (info, "general::tags", _KEYWORDS_TAG_NAMES); - set_attribute_from_tagset (info, "Embedded::Photo::DateTimeOriginal", _ORIGINAL_DATE_TAG_NAMES); -@@ -601,19 +644,19 @@ mandatory_string (Exiv2::ExifData &check - - const char * - gth_main_get_metadata_type (GthMetadata *metadata, -- const char *key) -+ const char *attribute) - { - const char *value_type; - GthMetadataInfo *metadatum_info; - - value_type = gth_metadata_get_value_type (metadata); - if (g_strcmp0 (value_type, "Undefined") == 0) -- value_type = NULL; -+ value_type = NULL; - - if (value_type != NULL) - return value_type; - -- metadatum_info = gth_main_get_metadata_info (key); -+ metadatum_info = gth_main_get_metadata_info (attribute); - if (metadatum_info != NULL) - value_type = metadatum_info->type; - -@@ -655,9 +698,9 @@ exiv2_write_metadata_private (Exiv2::Ima - */ - - const char *raw_value = gth_metadata_get_raw (metadatum); -- const char *value_type = gth_main_get_metadata_type (metadatum, key); -+ const char *value_type = gth_main_get_metadata_type (metadatum, attributes[i]); - -- if ((raw_value != NULL) && (strcmp (raw_value, "") != 0) && (value_type != NULL)) { -+ if ((raw_value != NULL) && (strcmp (raw_value, "") != 0) && (value_type != NULL)) { - Exiv2::Value::AutoPtr value = Exiv2::Value::create (Exiv2::TypeInfo::typeId (value_type)); - value->read (raw_value); - Exiv2::ExifKey exif_key(key); -@@ -750,7 +793,7 @@ exiv2_write_metadata_private (Exiv2::Ima - - try { - const char *raw_value = gth_metadata_get_raw (metadatum); -- const char *value_type = gth_main_get_metadata_type (metadatum, key); -+ const char *value_type = gth_main_get_metadata_type (metadatum, attributes[i]); - - if ((raw_value != NULL) && (strcmp (raw_value, "") != 0) && (value_type != NULL)) { - /* See the exif data code above for an explanation. */ -@@ -786,7 +829,7 @@ exiv2_write_metadata_private (Exiv2::Ima - - try { - const char *raw_value = gth_metadata_get_raw (metadatum); -- const char *value_type = gth_main_get_metadata_type (metadatum, key); -+ const char *value_type = gth_main_get_metadata_type (metadatum, attributes[i]); - - if ((raw_value != NULL) && (strcmp (raw_value, "") != 0) && (value_type != NULL)) { - /* See the exif data code above for an explanation. */ ---- gthumb.orig/extensions/exiv2_tools/gth-metadata-provider-exiv2.c -+++ gthumb/extensions/exiv2_tools/gth-metadata-provider-exiv2.c -@@ -114,9 +114,9 @@ gth_metadata_provider_exiv2_read (GthMet - - - static void --gth_metadata_provider_exiv2_write (GthMetadataProvider *self, -- GthFileData *file_data, -- const char *attributes) -+gth_metadata_provider_exiv2_write (GthMetadataProvider *self, -+ GthFileData *file_data, -+ const char *attributes) - { - void *buffer = NULL; - gsize size; -@@ -134,8 +134,25 @@ gth_metadata_provider_exiv2_write (GthMe - - metadata = g_file_info_get_attribute_object (file_data->info, "general::description"); - if (metadata != NULL) { -+ const char *tags_to_remove[] = { -+ "Exif::Image::ImageDescription", -+ "Xmp::tiff::ImageDescription", -+ "Iptc::Application2::Headline", -+ NULL -+ }; -+ int i; -+ -+ for (i = 0; tags_to_remove[i] != NULL; i++) -+ g_file_info_remove_attribute (file_data->info, tags_to_remove[i]); -+ - g_file_info_set_attribute_object (file_data->info, "Exif::Photo::UserComment", metadata); - g_file_info_set_attribute_object (file_data->info, "Xmp::dc::description", metadata); -+ g_file_info_set_attribute_object (file_data->info, "Iptc::Application2::Caption", metadata); -+ } -+ -+ metadata = g_file_info_get_attribute_object (file_data->info, "general::title"); -+ if (metadata != NULL) { -+ g_file_info_set_attribute_object (file_data->info, "Xmp::dc::title", metadata); - g_file_info_set_attribute_object (file_data->info, "Iptc::Application2::Headline", metadata); - } - ---- gthumb.orig/extensions/exiv2_tools/main.c -+++ gthumb/extensions/exiv2_tools/main.c -@@ -46,6 +46,10 @@ GthMetadataCategory exiv2_metadata_categ - - - GthMetadataInfo exiv2_metadata_info[] = { -+ -+ /* Specify the type of a field to allow to create it if it's not -+ * already present in the image. */ -+ - { "Exif::Image::Make", NULL, "Exif::General", 1, NULL, GTH_METADATA_ALLOW_EVERYWHERE }, - { "Exif::Image::Model", NULL, "Exif::General", 2, NULL, GTH_METADATA_ALLOW_EVERYWHERE }, - { "Exif::Image::Software", NULL, "Exif::General", 3, NULL, GTH_METADATA_ALLOW_IN_PROPERTIES_VIEW }, -@@ -142,6 +146,16 @@ GthMetadataInfo exiv2_metadata_info[] = - - { "Exif::Photo::MakerNote", NULL, "Exif::Other", 0, NULL, GTH_METADATA_ALLOW_NOWHERE }, - -+ { "Xmp::dc::description", NULL, "Xmp::Embedded", 0, "XmpText", GTH_METADATA_ALLOW_IN_PROPERTIES_VIEW }, -+ { "Xmp::dc::title", NULL, "Xmp::Embedded", 0, "XmpText", GTH_METADATA_ALLOW_IN_PROPERTIES_VIEW }, -+ { "Xmp::iptc::Location", NULL, "Xmp::Embedded", 0, "XmpText", GTH_METADATA_ALLOW_IN_PROPERTIES_VIEW }, -+ { "Xmp::iptc::Keywords", NULL, "Xmp::Embedded", 0, "XmpBag", GTH_METADATA_ALLOW_IN_PROPERTIES_VIEW }, -+ -+ { "Iptc::Application2::Headline", NULL, "Iptc", 0, "String", GTH_METADATA_ALLOW_IN_PROPERTIES_VIEW }, -+ { "Iptc::Application2::Caption", NULL, "Iptc", 0, "String", GTH_METADATA_ALLOW_IN_PROPERTIES_VIEW }, -+ { "Iptc::Application2::LocationName", NULL, "Iptc", 0, "String", GTH_METADATA_ALLOW_IN_PROPERTIES_VIEW }, -+ { "Iptc::Application2::Keywords", NULL, "Iptc", 0, "String", GTH_METADATA_ALLOW_IN_PROPERTIES_VIEW }, -+ - { NULL, NULL, NULL, 0, NULL, 0 } - }; - ---- gthumb.orig/po/POTFILES.skip -+++ gthumb/po/POTFILES.skip -@@ -23,3 +23,5 @@ extensions/webalbums/albumtheme.c - - .pc/19-backport_data_migration.patch/data/gthumb.schemas.in - .pc/19-backport_data_migration.patch/gthumb/main.c -+.pc/20-backport_comments_loss_fix.patch/extensions/exiv2_tools/exiv2-utils.cpp -+.pc/20-backport_comments_loss_fix.patch/extensions/exiv2_tools/main.c diff -Nru gthumb-3.0.2/debian/patches/series gthumb-3.2.3/debian/patches/series --- gthumb-3.0.2/debian/patches/series 2012-09-02 21:11:44.000000000 +0000 +++ gthumb-3.2.3/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -#00-fix_ltmain.sh.patch # doesn't work because of autoreconf -01-fix_missing_linkage.patch -02-preserve_upstream_files.patch -03-add_missing_includes.patch -05-fix_locales.patch -07-fix_documentation_xml.patch -10-fix_POTFILES.skip.patch -13-fix_Close_mismatch.patch diff -Nru gthumb-3.0.2/debian/patches/xx-MAINTAINER_MODE.patch gthumb-3.2.3/debian/patches/xx-MAINTAINER_MODE.patch --- gthumb-3.0.2/debian/patches/xx-MAINTAINER_MODE.patch 2012-09-02 21:11:44.000000000 +0000 +++ gthumb-3.2.3/debian/patches/xx-MAINTAINER_MODE.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -Index: gthumb-2.10.7/configure.in -=================================================================== ---- gthumb-2.10.7.orig/configure.in 2007-12-28 09:07:19.000000000 +0100 -+++ gthumb-2.10.7/configure.in 2007-12-28 09:07:38.000000000 +0100 -@@ -5,6 +5,7 @@ - AC_INIT(gthumb, 2.10.7, http://bugzilla.gnome.org/enter_bug.cgi?product=gthumb) - AC_CONFIG_SRCDIR(src/main.c) - AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) -+AM_MAINTAINER_MODE - - AM_CONFIG_HEADER(config.h) - diff -Nru gthumb-3.0.2/debian/patches/xx-MIME_types.dpatch gthumb-3.2.3/debian/patches/xx-MIME_types.dpatch --- gthumb-3.0.2/debian/patches/xx-MIME_types.dpatch 2012-09-02 21:11:44.000000000 +0000 +++ gthumb-3.2.3/debian/patches/xx-MIME_types.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 04_mime_types.dpatch by Remco van de Meent -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad gthumb-2.6.1/data/gthumb.applications /tmp/dpep.ncAcg4/gthumb-2.6.1/data/gthumb.applications ---- gthumb-2.6.1/data/gthumb.applications 2004-11-20 21:26:54.000000000 +0100 -+++ /tmp/dpep.ncAcg4/gthumb-2.6.1/data/gthumb.applications 2004-12-01 10:19:23.000000000 +0100 -@@ -4,4 +4,4 @@ - can_open_multiple_files=true - expects_uris=false - requires_terminal=false -- mime_types=x-directory/normal,image/jpeg,image/gif,image/png,image/tiff,image/x-bmp,image/x-png,image/xpm,image/x-tga -+ mime_types=x-directory/normal,image/jpeg,image/gif,image/png,image/tiff,image/x-bmp,image/x-png,image/xpm,image/x-tga,image/svg+xml diff -Nru gthumb-3.0.2/debian/patches/xx-prevent_GNOME_GThumb.h_modifications.patch gthumb-3.2.3/debian/patches/xx-prevent_GNOME_GThumb.h_modifications.patch --- gthumb-3.0.2/debian/patches/xx-prevent_GNOME_GThumb.h_modifications.patch 2012-09-02 21:11:44.000000000 +0000 +++ gthumb-3.2.3/debian/patches/xx-prevent_GNOME_GThumb.h_modifications.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ ---- gthumb.orig/src/Makefile.am -+++ gthumb/src/Makefile.am -@@ -223,5 +223,7 @@ - lex.albumtheme.c - - CLEANFILES = \ -- $(gnome_gthumb_idl_sources) \ -+ GNOME_GThumb-stubs.c \ -+ GNOME_GThumb-skels.c \ -+ GNOME_GThumb-common.c - gnome_gthumb_idl_stamp ---- gthumb.orig/src/GNOME_GThumb.h -+++ gthumb/src/GNOME_GThumb.h -@@ -14,7 +14,6 @@ - - - /** typedefs **/ --#line 14 "/usr/share/idl/bonobo-2.0/Bonobo.idl" - #include - #if !defined(ORBIT_DECL_GNOME_GThumb_Application) && !defined(_GNOME_GThumb_Application_defined) - #define ORBIT_DECL_GNOME_GThumb_Application 1 diff -Nru gthumb-3.0.2/debian/rules gthumb-3.2.3/debian/rules --- gthumb-3.0.2/debian/rules 2013-01-01 08:39:38.000000000 +0000 +++ gthumb-3.2.3/debian/rules 2013-10-05 14:00:37.000000000 +0000 @@ -4,14 +4,11 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -export DEB_BUILD_HARDENING=1 - override_dh_auto_configure: - dh_auto_configure -- --with-gconf-schema-file-dir=/usr/share/gconf/schemas \ - --disable-clutter \ - --disable-brasero \ - --enable-debug - + dh_auto_configure -- --disable-clutter \ + --disable-libbrasero \ + --enable-libwebp \ + --enable-libopenraw #override_dh_auto_install: # dh_auto_install # [ ! -d $(CURDIR)/debian/tmp/usr/share/icons/ ] || \ @@ -21,7 +18,7 @@ # $(CURDIR)/debian/tmp/usr/share/icons/hicolor/16x16/actions/gthumb-facebook.png override_dh_shlibdeps: - dh_shlibdeps -l/usr/lib/gthumb-2.0:/usr/lib/gthumb-2.0/extensions + dh_shlibdeps -l/usr/lib/gthumb-3.0:/usr/lib/gthumb-3.0/extensions override_dh_strip: dh_strip --keep-debug -X*.la -X*.a --dbg-package=gthumb-dbg diff -Nru gthumb-3.0.2/depcomp gthumb-3.2.3/depcomp --- gthumb-3.0.2/depcomp 2012-08-18 17:23:28.000000000 +0000 +++ gthumb-3.2.3/depcomp 2013-04-30 17:08:00.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2012-07-12.20; # UTC +scriptversion=2012-10-18.11; # UTC -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -27,9 +27,9 @@ case $1 in '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -56,11 +56,65 @@ ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + # A tabulation character. tab=' ' # A newline character. nl=' ' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 @@ -74,6 +128,9 @@ rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -85,32 +142,32 @@ fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp fi if test "$depmode" = msvc7msys; then - # This is just like msvc7 but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvc7 + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 fi if test "$depmode" = xlc; then - # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. - gccflag=-qmakedep=gcc,-MF - depmode=gcc + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -133,8 +190,7 @@ done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -142,13 +198,17 @@ ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -156,15 +216,14 @@ fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" ## This next piece of magic avoids the "deleted header file" problem. @@ -173,15 +232,15 @@ ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' "$nl" < "$tmpdepfile" | ## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as ## well. hp depmode also adds that space, but also prefixes the VPATH ## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -199,8 +258,7 @@ "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -208,7 +266,6 @@ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in @@ -216,19 +273,15 @@ # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr "$nl" ' ' >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; @@ -246,9 +299,8 @@ # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -261,9 +313,7 @@ "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -272,65 +322,37 @@ do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form 'foo.o: dependent.h'. - # Do two passes, one to just change these to - # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" + aix_post_process_depfile ;; -icc) - # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. - # However on - # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output - # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using '\': - # foo.o: sub/foo.c ... \ - # sub/foo.h ... \ - # ... - # tcc 0.9.26 (FIXME still under development at the moment of writing) - # will emit a similar output, but also prepend the continuation lines - # with horizontal tabulation characters. +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). "$@" -MD -MF "$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" - # Each line is of the form 'foo.o: dependent.h', - # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. - # Do two passes, one to just change these to - # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ - < "$tmpdepfile" > "$depfile" - sed ' - s/[ '"$tab"'][ '"$tab"']*/ /g - s/^ *// - s/ *\\*$// - s/^[^:]*: *// - /^$/d - /:$/d - s/$/ :/ - ' < "$tmpdepfile" >> "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; @@ -349,34 +371,37 @@ # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= + set_dir_from "$object" # Use the source, not the object, to determine the base name, since # that's sadly what pgcc will do too. - base=`echo "$source" | sed -e 's|^.*/||' -e 's/\.[-_a-zA-Z0-9]*$//'` - tmpdepfile="$base.d" + set_base_from "$source" + tmpdepfile=$base.d # For projects that build the same source file twice into different object # files, the pgcc approach of using the *source* file root name can cause # problems in parallel builds. Use a locking strategy to avoid stomping on # the same $tmpdepfile. - lockdir="$base.d-lock" - trap "echo '$0: caught signal, cleaning up...' >&2; rm -rf $lockdir" 1 2 13 15 + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 numtries=100 i=$numtries - while test $i -gt 0 ; do + while test $i -gt 0; do # mkdir is a portable test-and-set. - if mkdir $lockdir 2>/dev/null; then + if mkdir "$lockdir" 2>/dev/null; then # This process acquired the lock. "$@" -MD stat=$? # Release the lock. - rm -rf $lockdir + rmdir "$lockdir" break else - ## the lock is being held by a different process, - ## wait until the winning process is done or we timeout - while test -d $lockdir && test $i -gt 0; do + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do sleep 1 i=`expr $i - 1` done @@ -402,8 +427,8 @@ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" # Some versions of the HPUX 10.20 sed can't process this invocation # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -414,9 +439,8 @@ # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -427,8 +451,7 @@ "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -438,76 +461,61 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in 'foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" + + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; msvc7) if test "$libtool" = yes; then @@ -518,8 +526,7 @@ "$@" $showIncludes > "$tmpdepfile" stat=$? grep -v '^Note: including file: ' "$tmpdepfile" - if test "$stat" = 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -596,13 +603,14 @@ # in the target name. This is to cope with DOS-style filenames: # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' "$nl" < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -655,10 +663,12 @@ # makedepend may prepend the VPATH from the source file name to the object. # No need to regex-escape $object, excess matching of '.' is harmless. sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -694,10 +704,10 @@ esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -729,15 +739,15 @@ shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | diff -Nru gthumb-3.0.2/extensions/23hq/Makefile.am gthumb-3.2.3/extensions/23hq/Makefile.am --- gthumb-3.0.2/extensions/23hq/Makefile.am 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/23hq/Makefile.am 2013-04-30 16:56:12.000000000 +0000 @@ -10,9 +10,9 @@ callbacks.h \ main.c -lib23hq_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(GNOME_KEYRING_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb +lib23hq_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(LIBSECRET_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb lib23hq_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -lib23hq_la_LIBADD = $(GTHUMB_LIBS) $(LIBSOUP_LIBS) $(GNOME_KEYRING_LIBS) ../importer/libimporter.la ../export_tools/libexport_tools.la ../flicker_utils/libflicker_utils.la +lib23hq_la_LIBADD = $(GTHUMB_LIBS) $(LIBSOUP_LIBS) $(LIBSECRET_LIBS) ../importer/libimporter.la ../export_tools/libexport_tools.la ../flicker_utils/libflicker_utils.la lib23hq_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) extensioninidir = $(extensiondir) diff -Nru gthumb-3.0.2/extensions/23hq/Makefile.in gthumb-3.2.3/extensions/23hq/Makefile.in --- gthumb-3.0.2/extensions/23hq/Makefile.in 2012-08-20 19:54:10.000000000 +0000 +++ gthumb-3.2.3/extensions/23hq/Makefile.in 2013-07-10 13:33:42.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/23hq -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -154,6 +182,23 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(extensionini_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -186,9 +231,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -202,13 +245,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -237,7 +279,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -253,11 +298,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -274,7 +323,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -304,7 +352,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -370,9 +421,9 @@ @ENABLE_WEB_SERVICES_TRUE@ callbacks.h \ @ENABLE_WEB_SERVICES_TRUE@ main.c -@ENABLE_WEB_SERVICES_TRUE@lib23hq_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(GNOME_KEYRING_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb +@ENABLE_WEB_SERVICES_TRUE@lib23hq_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(LIBSECRET_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb @ENABLE_WEB_SERVICES_TRUE@lib23hq_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -@ENABLE_WEB_SERVICES_TRUE@lib23hq_la_LIBADD = $(GTHUMB_LIBS) $(LIBSOUP_LIBS) $(GNOME_KEYRING_LIBS) ../importer/libimporter.la ../export_tools/libexport_tools.la ../flicker_utils/libflicker_utils.la +@ENABLE_WEB_SERVICES_TRUE@lib23hq_la_LIBADD = $(GTHUMB_LIBS) $(LIBSOUP_LIBS) $(LIBSECRET_LIBS) ../importer/libimporter.la ../export_tools/libexport_tools.la ../flicker_utils/libflicker_utils.la @ENABLE_WEB_SERVICES_TRUE@lib23hq_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) @ENABLE_WEB_SERVICES_TRUE@extensioninidir = $(extensiondir) @ENABLE_WEB_SERVICES_TRUE@extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension) @@ -413,6 +464,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -447,6 +499,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + lib23hq.la: $(lib23hq_la_OBJECTS) $(lib23hq_la_DEPENDENCIES) $(EXTRA_lib23hq_la_DEPENDENCIES) $(AM_V_CCLD)$(lib23hq_la_LINK) $(am_lib23hq_la_rpath) $(lib23hq_la_OBJECTS) $(lib23hq_la_LIBADD) $(LIBS) @@ -465,14 +518,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -529,26 +582,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(extensioninidir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -560,15 +602,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -577,9 +615,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -737,21 +776,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ clean-extensionLTLIBRARIES clean-generic clean-libtool \ - cscopelist ctags distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-extensionLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-extensionLTLIBRARIES \ install-extensioniniDATA install-html install-html-am \ install-info install-info-am install-man install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-extensionLTLIBRARIES \ - uninstall-extensioniniDATA + tags tags-am uninstall uninstall-am \ + uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA @GTHUMB_EXTENSION_IN_RULE@ diff -Nru gthumb-3.0.2/extensions/23hq/actions.c gthumb-3.2.3/extensions/23hq/actions.c --- gthumb-3.0.2/extensions/23hq/actions.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/23hq/actions.c 2013-04-30 16:56:12.000000000 +0000 @@ -30,14 +30,21 @@ static FlickrServer www_23hq_com = { "23", + "23", "http://www.23hq.com", + "http", + + NULL, "http://www.23hq.com/services/auth/", + NULL, + "8960706ee7f4151e893b11837e9c24ce", + "1ff8d1e45c873423", + "http://www.23hq.com/services/rest", "http://www.23hq.com/services/upload/", "www.23hq.com", - "8960706ee7f4151e893b11837e9c24ce", - "1ff8d1e45c873423", - TRUE + TRUE, + FALSE }; diff -Nru gthumb-3.0.2/extensions/Makefile.am gthumb-3.2.3/extensions/Makefile.am --- gthumb-3.0.2/extensions/Makefile.am 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/Makefile.am 2013-04-30 16:56:12.000000000 +0000 @@ -1,3 +1,7 @@ +AFTER_EXIV2 = \ + comments \ + $(NULL) + FLICKR_EXPORTERS = \ 23hq \ flicker \ @@ -37,10 +41,10 @@ bookmarks \ catalogs \ change_date \ - comments \ convert_format \ edit_metadata \ exiv2_tools \ + $(AFTER_EXIV2) \ file_manager \ file_viewer \ gstreamer_utils \ @@ -51,7 +55,6 @@ list_tools \ map_view \ oauth \ - pixbuf_savers \ raw_files \ rename_series \ resize_images \ diff -Nru gthumb-3.0.2/extensions/Makefile.in gthumb-3.2.3/extensions/Makefile.in --- gthumb-3.0.2/extensions/Makefile.in 2012-08-20 19:54:10.000000000 +0000 +++ gthumb-3.2.3/extensions/Makefile.in 2013-07-10 13:33:42.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -328,6 +382,10 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +AFTER_EXIV2 = \ + comments \ + $(NULL) + FLICKR_EXPORTERS = \ 23hq \ flicker \ @@ -367,10 +425,10 @@ bookmarks \ catalogs \ change_date \ - comments \ convert_format \ edit_metadata \ exiv2_tools \ + $(AFTER_EXIV2) \ file_manager \ file_viewer \ gstreamer_utils \ @@ -381,7 +439,6 @@ list_tools \ map_view \ oauth \ - pixbuf_savers \ raw_files \ rename_series \ resize_images \ @@ -440,14 +497,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -468,31 +524,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -508,12 +546,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -525,15 +558,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -542,9 +571,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -716,23 +746,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/bookmarks/Makefile.in gthumb-3.2.3/extensions/bookmarks/Makefile.in --- gthumb-3.0.2/extensions/bookmarks/Makefile.in 2012-08-20 19:54:10.000000000 +0000 +++ gthumb-3.2.3/extensions/bookmarks/Makefile.in 2013-07-10 13:33:42.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/bookmarks -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -145,13 +173,14 @@ am__v_CCLD_1 = SOURCES = $(libbookmarks_la_SOURCES) DIST_SOURCES = $(libbookmarks_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -160,9 +189,29 @@ DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -221,9 +270,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -237,13 +284,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -272,7 +318,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -288,11 +337,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -309,7 +362,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -339,7 +391,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -451,6 +506,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -485,6 +541,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libbookmarks.la: $(libbookmarks_la_OBJECTS) $(libbookmarks_la_DEPENDENCIES) $(EXTRA_libbookmarks_la_DEPENDENCIES) $(AM_V_CCLD)$(libbookmarks_la_LINK) -rpath $(extensiondir) $(libbookmarks_la_OBJECTS) $(libbookmarks_la_LIBADD) $(LIBS) @@ -504,14 +561,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -581,14 +638,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -609,31 +665,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -649,12 +687,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -666,15 +699,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -683,9 +712,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -867,25 +897,23 @@ uninstall-am: uninstall-extensionLTLIBRARIES \ uninstall-extensioniniDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-extensionLTLIBRARIES \ - clean-generic clean-libtool cscopelist cscopelist-recursive \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extensionLTLIBRARIES \ - install-extensioniniDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-extensionLTLIBRARIES clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-extensionLTLIBRARIES install-extensioniniDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA diff -Nru gthumb-3.0.2/extensions/bookmarks/callbacks.c gthumb-3.2.3/extensions/bookmarks/callbacks.c --- gthumb-3.0.2/extensions/bookmarks/callbacks.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/bookmarks/callbacks.c 2013-04-30 16:56:12.000000000 +0000 @@ -208,14 +208,22 @@ static void _gth_browser_update_system_bookmark_list (GthBrowser *browser) { - char *bookmark_file_path; GFile *bookmark_file; GFileInputStream *input_stream; UpdateBookmarksData *data; - bookmark_file_path = g_build_filename (g_get_home_dir (), ".gtk-bookmarks", NULL); - bookmark_file = g_file_new_for_path (bookmark_file_path); - g_free (bookmark_file_path); + /* give priority to XDG_CONFIG_HOME/gtk-3.0/bookmarks if not found + * try the old ~/.gtk-bookmarks */ + bookmark_file = gth_user_dir_get_file_for_read (GTH_DIR_CONFIG, "gtk-3.0", "bookmarks", NULL); + if (! g_file_query_exists (bookmark_file, NULL)) { + char *path; + + g_object_unref (bookmark_file); + path = g_build_filename (g_get_home_dir (), ".gtk-bookmarks", NULL); + bookmark_file = g_file_new_for_path (path); + + g_free (path); + } input_stream = g_file_read (bookmark_file, NULL, NULL); g_object_unref (bookmark_file); diff -Nru gthumb-3.0.2/extensions/bookmarks/data/Makefile.in gthumb-3.2.3/extensions/bookmarks/data/Makefile.in --- gthumb-3.0.2/extensions/bookmarks/data/Makefile.in 2012-08-20 19:54:10.000000000 +0000 +++ gthumb-3.2.3/extensions/bookmarks/data/Makefile.in 2013-07-10 13:33:42.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/bookmarks/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/bookmarks/data/ui/Makefile.in gthumb-3.2.3/extensions/bookmarks/data/ui/Makefile.in --- gthumb-3.0.2/extensions/bookmarks/data/ui/Makefile.in 2012-08-20 19:54:10.000000000 +0000 +++ gthumb-3.2.3/extensions/bookmarks/data/ui/Makefile.in 2013-07-10 13:33:42.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/bookmarks/data/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -381,11 +415,9 @@ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -526,16 +558,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-uiDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-uiDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/bookmarks/dlg-bookmarks.c gthumb-3.2.3/extensions/bookmarks/dlg-bookmarks.c --- gthumb-3.0.2/extensions/bookmarks/dlg-bookmarks.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/bookmarks/dlg-bookmarks.c 2013-04-30 16:56:12.000000000 +0000 @@ -24,30 +24,147 @@ #include -#define UPDATE_DELAY 200 - - typedef struct { GthBrowser *browser; GtkBuilder *builder; GtkWidget *dialog; GtkWidget *uri_list; - gboolean do_not_update; + char *last_selected_uri; gulong bookmarks_changed_id; - gulong update_from_entry_id; + gboolean entry_changed; } DialogData; +static void +entry_activate_cb (GtkEntry *entry, + DialogData *data); + + +static void +set_bookmark_data (DialogData *data, + const char *name, + const char *location) +{ + g_signal_handlers_block_by_func (_gtk_builder_get_widget (data->builder, "entry_name"), entry_activate_cb, data); + g_signal_handlers_block_by_func (_gtk_builder_get_widget (data->builder, "entry_location"), entry_activate_cb, data); + gtk_entry_set_text (GTK_ENTRY (_gtk_builder_get_widget (data->builder, "entry_name")), name); + gtk_entry_set_text (GTK_ENTRY (_gtk_builder_get_widget (data->builder, "entry_location")), location); + g_signal_handlers_unblock_by_func (_gtk_builder_get_widget (data->builder, "entry_location"), entry_activate_cb, data); + g_signal_handlers_unblock_by_func (_gtk_builder_get_widget (data->builder, "entry_name"), entry_activate_cb, data); + + data->entry_changed = FALSE; +} + + +static void +update_dialog_from_bookmark_file (DialogData *data, + const char *uri) +{ + GBookmarkFile *bookmarks; + GFile *file; + char *location; + char *name; + + bookmarks = gth_main_get_default_bookmarks (); + + file = g_file_new_for_uri (uri); + location = g_file_get_parse_name (file); + + name = g_bookmark_file_get_title (bookmarks, uri, NULL); + if (name == NULL) + name = g_file_get_basename (file); + + set_bookmark_data (data, name, location); + + g_free (name); + g_free (location); + g_object_unref (file); +} + + +static void +update_current_entry (DialogData *data, + gboolean *update_selected_uri) +{ + const char *name; + const char *location; + GFile *file; + char *uri; + GBookmarkFile *bookmarks; + + if (update_selected_uri != NULL) + *update_selected_uri = TRUE; + + if (data->last_selected_uri == NULL) + return; + + if (! data->entry_changed) + return; + + data->entry_changed = FALSE; + + name = gtk_entry_get_text (GTK_ENTRY (_gtk_builder_get_widget (data->builder, "entry_name"))); + location = gtk_entry_get_text (GTK_ENTRY (_gtk_builder_get_widget (data->builder, "entry_location"))); + file = g_file_parse_name (location); + uri = g_file_get_uri (file); + + bookmarks = gth_main_get_default_bookmarks (); + gth_uri_list_update_uri (GTH_URI_LIST (data->uri_list), data->last_selected_uri, uri, name); + gth_uri_list_update_bookmarks (GTH_URI_LIST (data->uri_list), bookmarks); + gth_main_bookmarks_changed (); + + if (g_strcmp0 (data->last_selected_uri, uri) != 0) { + g_free (data->last_selected_uri); + data->last_selected_uri = g_strdup (uri); + if (update_selected_uri != NULL) + *update_selected_uri = FALSE; + } + + g_free (uri); + g_object_unref (file); +} + + +static void +uri_list_selection_changed_cb (GtkTreeSelection *treeselection, + gpointer user_data) +{ + DialogData *data = user_data; + GtkTreeModel *model; + GtkTreeIter iter; + char *uri; + gboolean update_selected_uri; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (data->uri_list)); + if (! gtk_tree_selection_get_selected (treeselection, + &model, + &iter)) + { + return; + } + + uri = gth_uri_list_get_uri (GTH_URI_LIST (data->uri_list), &iter); + if (uri == NULL) + return; + + update_current_entry (data, &update_selected_uri); + if (update_selected_uri) { + g_free (data->last_selected_uri); + data->last_selected_uri = uri; + } + update_dialog_from_bookmark_file (data, uri); +} + + /* called when the main dialog is closed. */ static void -destroy_cb (GtkWidget *widget, +destroy_cb (GtkWidget *widget, DialogData *data) { - if (data->update_from_entry_id != 0) - g_source_remove (data->update_from_entry_id); + update_current_entry (data, NULL); gth_browser_set_dialog (data->browser, "bookmarks", NULL); g_signal_handler_disconnect (gth_main_get_default_monitor (), data->bookmarks_changed_id); - + g_object_unref (data->builder); g_free (data); } @@ -60,18 +177,21 @@ char *uri; GBookmarkFile *bookmarks; GError *error = NULL; - + uri = gth_uri_list_get_selected (GTH_URI_LIST (data->uri_list)); if (uri == NULL) return; - + bookmarks = gth_main_get_default_bookmarks (); - if (! g_bookmark_file_remove_item (bookmarks, uri, &error)) { + if (g_bookmark_file_remove_item (bookmarks, uri, &error)) { + gth_uri_list_remove_uri (GTH_URI_LIST (data->uri_list), uri); + gth_main_bookmarks_changed (); + } + else { _gtk_error_dialog_from_gerror_show (GTK_WINDOW (data->dialog), _("Could not remove the bookmark"), error); g_clear_error (&error); } - gth_main_bookmarks_changed (); - + g_free (uri); } @@ -81,14 +201,14 @@ DialogData *data) { char *uri; - + uri = gth_uri_list_get_selected (GTH_URI_LIST (data->uri_list)); if (uri != NULL) { GFile *location; - + location = g_file_new_for_uri (uri); gth_browser_go_to (data->browser, location, NULL); - + g_object_unref (location); g_free (uri); } @@ -99,10 +219,49 @@ bookmarks_changed_cb (GthMonitor *monitor, DialogData *data) { - GBookmarkFile *bookmarks; - + GBookmarkFile *bookmarks; + char *uri; + GtkTreeSelection *selection; + gboolean selected; + + if (data->entry_changed) + return; + + uri = gth_uri_list_get_selected (GTH_URI_LIST (data->uri_list)); + + g_free (data->last_selected_uri); + data->last_selected_uri = NULL; /* do no update the entry */ + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (data->uri_list)); + g_signal_handlers_block_by_func (selection, uri_list_selection_changed_cb, data); bookmarks = gth_main_get_default_bookmarks (); gth_uri_list_set_bookmarks (GTH_URI_LIST (data->uri_list), bookmarks); + g_signal_handlers_unblock_by_func (selection, uri_list_selection_changed_cb, data); + + selected = FALSE; + if (uri != NULL) + selected = gth_uri_list_select_uri (GTH_URI_LIST (data->uri_list), uri); + + if (! selected) { + /* select the last one */ + + char **uris; + char *last_uri; + int i; + + uris = g_bookmark_file_get_uris (bookmarks, NULL); + last_uri = NULL; + for (i = 0; uris[i] != NULL; i++) + last_uri = uris[i]; + if (last_uri != NULL) + gth_uri_list_select_uri (GTH_URI_LIST (data->uri_list), last_uri); + else + set_bookmark_data (data, "", ""); + + g_strfreev (uris); + } + + g_free (uri); } @@ -129,51 +288,28 @@ GtkTreeIter iter; char *uri; GFile *location; - + tree_model = gtk_tree_view_get_model (tree_view); if (! gtk_tree_model_get_iter (tree_model, &iter, path)) return; - + uri = gth_uri_list_get_uri (GTH_URI_LIST (tree_view), &iter); if (uri == NULL) return; - + location = g_file_new_for_uri (uri); gth_browser_go_to (data->browser, location, NULL); - + g_object_unref (location); g_free (uri); } -static gboolean -save_bookmarks_cb (gpointer user_data) +static void +entry_activate_cb (GtkEntry *entry, + DialogData *data) { - DialogData *data = user_data; - const char *name; - const char *location; - GFile *file; - char *uri; - GBookmarkFile *bookmarks; - - if (data->update_from_entry_id != 0) { - g_source_remove (data->update_from_entry_id); - data->update_from_entry_id = 0; - } - - name = gtk_entry_get_text (GTK_ENTRY (_gtk_builder_get_widget (data->builder, "entry_name"))); - location = gtk_entry_get_text (GTK_ENTRY (_gtk_builder_get_widget (data->builder, "entry_location"))); - file = g_file_parse_name (location); - uri = g_file_get_uri (file); - - bookmarks = gth_main_get_default_bookmarks (); - g_bookmark_file_set_title (bookmarks, uri, name); - gth_main_bookmarks_changed (); - - g_free (uri); - g_object_unref (file); - - return FALSE; + update_current_entry (data, NULL); } @@ -181,70 +317,7 @@ entry_changed_cb (GtkEditable *editable, DialogData *data) { - if (data->update_from_entry_id != 0) { - g_source_remove (data->update_from_entry_id); - data->update_from_entry_id = 0; - } - - data->update_from_entry_id = gdk_threads_add_timeout (UPDATE_DELAY, save_bookmarks_cb, data); -} - - -static void -update_dialog_from_bookmark_file (DialogData *data, - const char *uri) -{ - GBookmarkFile *bookmarks; - GFile *file; - char *location; - char *name; - - bookmarks = gth_main_get_default_bookmarks (); - - file = g_file_new_for_uri (uri); - location = g_file_get_parse_name (file); - - name = g_bookmark_file_get_title (bookmarks, uri, NULL); - if (name == NULL) - name = g_strdup (location); - - g_signal_handlers_block_by_func (_gtk_builder_get_widget (data->builder, "entry_name"), entry_changed_cb, data); - g_signal_handlers_block_by_func (_gtk_builder_get_widget (data->builder, "entry_location"), entry_changed_cb, data); - gtk_entry_set_text (GTK_ENTRY (_gtk_builder_get_widget (data->builder, "entry_name")), name); - gtk_entry_set_text (GTK_ENTRY (_gtk_builder_get_widget (data->builder, "entry_location")), location); - g_signal_handlers_unblock_by_func (_gtk_builder_get_widget (data->builder, "entry_location"), entry_changed_cb, data); - g_signal_handlers_unblock_by_func (_gtk_builder_get_widget (data->builder, "entry_name"), entry_changed_cb, data); - - g_free (name); - g_free (location); - g_object_unref (file); -} - - -static void -uri_list_selection_changed_cb (GtkTreeSelection *treeselection, - gpointer user_data) -{ - DialogData *data = user_data; - GtkTreeModel *model; - GtkTreeIter iter; - char *uri; - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (data->uri_list)); - if (! gtk_tree_selection_get_selected (treeselection, - &model, - &iter)) - { - return; - } - - uri = gth_uri_list_get_uri (GTH_URI_LIST (data->uri_list), &iter); - if (uri == NULL) - return; - - update_dialog_from_bookmark_file (data, uri); - - g_free (uri); + data->entry_changed = TRUE; } @@ -259,7 +332,7 @@ GtkWidget *bm_go_to_button; GBookmarkFile *bookmarks; GtkTreeSelection *selection; - + if (gth_browser_get_dialog (browser, "bookmarks") != NULL) { gtk_window_present (GTK_WINDOW (gth_browser_get_dialog (browser, "bookmarks"))); return; @@ -267,9 +340,9 @@ data = g_new0 (DialogData, 1); data->browser = browser; - data->do_not_update = FALSE; data->builder = _gtk_builder_new_from_file ("bookmarks.ui", "bookmarks"); - data->update_from_entry_id = 0; + data->last_selected_uri = NULL; + data->entry_changed = FALSE; /* Get the widgets. */ @@ -282,7 +355,7 @@ bm_remove_button = _gtk_builder_get_widget (data->builder, "bm_remove_button"); bm_close_button = _gtk_builder_get_widget (data->builder, "bm_close_button"); bm_go_to_button = _gtk_builder_get_widget (data->builder, "bm_go_to_button"); - + data->uri_list = gth_uri_list_new (); gtk_widget_show (data->uri_list); gtk_container_add (GTK_CONTAINER (bm_list_container), data->uri_list); @@ -293,38 +366,46 @@ bookmarks = gth_main_get_default_bookmarks (); gth_uri_list_set_bookmarks (GTH_URI_LIST (data->uri_list), bookmarks); - data->bookmarks_changed_id = g_signal_connect (gth_main_get_default_monitor (), + data->bookmarks_changed_id = g_signal_connect (gth_main_get_default_monitor (), "bookmarks-changed", - G_CALLBACK (bookmarks_changed_cb), + G_CALLBACK (bookmarks_changed_cb), data); /* Set the signals handlers. */ - - g_signal_connect (G_OBJECT (data->dialog), + + g_signal_connect (G_OBJECT (data->dialog), "destroy", G_CALLBACK (destroy_cb), data); - g_signal_connect_swapped (G_OBJECT (bm_close_button), + g_signal_connect_swapped (G_OBJECT (bm_close_button), "clicked", G_CALLBACK (gtk_widget_destroy), G_OBJECT (data->dialog)); - g_signal_connect (G_OBJECT (bm_remove_button), + g_signal_connect (G_OBJECT (bm_remove_button), "clicked", G_CALLBACK (remove_cb), data); - g_signal_connect (G_OBJECT (bm_go_to_button), + g_signal_connect (G_OBJECT (bm_go_to_button), "clicked", G_CALLBACK (go_to_cb), data); - g_signal_connect (G_OBJECT (data->uri_list), + g_signal_connect (G_OBJECT (data->uri_list), "order-changed", G_CALLBACK (uri_list_order_changed_cb), data); - g_signal_connect (G_OBJECT (data->uri_list), + g_signal_connect (G_OBJECT (data->uri_list), "row-activated", G_CALLBACK (uri_list_row_activated_cb), data); g_signal_connect (_gtk_builder_get_widget (data->builder, "entry_location"), + "activate", + G_CALLBACK (entry_activate_cb), + data); + g_signal_connect (_gtk_builder_get_widget (data->builder, "entry_name"), + "activate", + G_CALLBACK (entry_activate_cb), + data); + g_signal_connect (_gtk_builder_get_widget (data->builder, "entry_location"), "changed", G_CALLBACK (entry_changed_cb), data); @@ -341,7 +422,7 @@ /* run dialog. */ - gtk_window_set_transient_for (GTK_WINDOW (data->dialog), + gtk_window_set_transient_for (GTK_WINDOW (data->dialog), GTK_WINDOW (browser)); gtk_window_set_modal (GTK_WINDOW (data->dialog), FALSE); gtk_widget_show (data->dialog); diff -Nru gthumb-3.0.2/extensions/burn_disc/Makefile.in gthumb-3.2.3/extensions/burn_disc/Makefile.in --- gthumb-3.0.2/extensions/burn_disc/Makefile.in 2012-08-20 19:54:10.000000000 +0000 +++ gthumb-3.2.3/extensions/burn_disc/Makefile.in 2013-07-10 13:33:43.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/burn_disc -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -151,13 +179,14 @@ am__v_CCLD_1 = SOURCES = $(libburn_disc_la_SOURCES) DIST_SOURCES = $(am__libburn_disc_la_SOURCES_DIST) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -166,9 +195,29 @@ DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = data @@ -227,9 +276,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -243,13 +290,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -278,7 +324,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -294,11 +343,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -315,7 +368,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -345,7 +397,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -457,6 +512,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -491,6 +547,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libburn_disc.la: $(libburn_disc_la_OBJECTS) $(libburn_disc_la_DEPENDENCIES) $(EXTRA_libburn_disc_la_DEPENDENCIES) $(AM_V_CCLD)$(libburn_disc_la_LINK) $(am_libburn_disc_la_rpath) $(libburn_disc_la_OBJECTS) $(libburn_disc_la_LIBADD) $(LIBS) @@ -510,14 +567,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -587,14 +644,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -615,31 +671,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -655,12 +693,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -672,15 +705,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -689,9 +718,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -873,25 +903,23 @@ uninstall-am: uninstall-extensionLTLIBRARIES \ uninstall-extensioniniDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-extensionLTLIBRARIES \ - clean-generic clean-libtool cscopelist cscopelist-recursive \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extensionLTLIBRARIES \ - install-extensioniniDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-extensionLTLIBRARIES clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-extensionLTLIBRARIES install-extensioniniDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA diff -Nru gthumb-3.0.2/extensions/burn_disc/data/Makefile.in gthumb-3.2.3/extensions/burn_disc/data/Makefile.in --- gthumb-3.0.2/extensions/burn_disc/data/Makefile.in 2012-08-20 19:54:10.000000000 +0000 +++ gthumb-3.2.3/extensions/burn_disc/data/Makefile.in 2013-07-10 13:33:43.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/burn_disc/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/burn_disc/data/ui/Makefile.in gthumb-3.2.3/extensions/burn_disc/data/ui/Makefile.in --- gthumb-3.0.2/extensions/burn_disc/data/ui/Makefile.in 2012-08-20 19:54:10.000000000 +0000 +++ gthumb-3.2.3/extensions/burn_disc/data/ui/Makefile.in 2013-07-10 13:33:43.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/burn_disc/data/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -381,11 +415,9 @@ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -526,16 +558,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-uiDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-uiDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/cairo_io/Makefile.am gthumb-3.2.3/extensions/cairo_io/Makefile.am --- gthumb-3.0.2/extensions/cairo_io/Makefile.am 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/Makefile.am 2013-04-30 16:56:12.000000000 +0000 @@ -1,26 +1,74 @@ +SUBDIRS = data + extensiondir = $(pkglibdir)/extensions extension_LTLIBRARIES = libcairo_io.la -libcairo_io_la_SOURCES = \ - cairo-io-png.c \ - cairo-io-png.h \ +ENUM_TYPES = \ + enum-types.h \ + enum-types.c + +HEADER_FILES = \ + preferences.h + +enum-types.h: $(HEADER_FILES) + $(AM_V_GEN)( $(GLIB_MKENUMS) \ + --fhead "#ifndef ENUM_TYPES_H\n#define ENUM_TYPES_H\n\n#include \n\nG_BEGIN_DECLS\n" \ + --fprod "/* enumerations from \"@filename@\" */\n" \ + --vhead "GType @enum_name@_get_type (void);\n#define GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ + --ftail "G_END_DECLS\n\n#endif /* ENUM_TYPES_H */" \ + $^> xgen-$(@F) \ + && mv -f xgen-$(@F) enum-types.h ) + +enum-types.c: $(HEADER_FILES) + $(AM_V_GEN)( $(GLIB_MKENUMS) \ + --fhead "#include \n" \ + --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \ + --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ + --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ + --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ + $^> xgen-$(@F) \ + && mv -f xgen-$(@F) enum-types.c ) + +libcairo_io_la_SOURCES = \ + cairo-image-surface-png.c \ + cairo-image-surface-png.h \ + cairo-image-surface-xcf.c \ + cairo-image-surface-xcf.h \ + gth-image-saver-png.c \ + gth-image-saver-png.h \ + gth-image-saver-tga.c \ + gth-image-saver-tga.h \ + gth-image-saver-tiff.c \ + gth-image-saver-tiff.h \ + preferences.c \ + preferences.h \ main.c if ENABLE_JPEG_TOOLS -libcairo_io_la_SOURCES += \ - cairo-io-jpeg.c \ - cairo-io-jpeg.h +libcairo_io_la_SOURCES += \ + cairo-image-surface-jpeg.c \ + cairo-image-surface-jpeg.h \ + gth-image-saver-jpeg.c \ + gth-image-saver-jpeg.h endif if ENABLE_LIBRSVG -libcairo_io_la_SOURCES += \ - cairo-io-svg.c \ - cairo-io-svg.h +libcairo_io_la_SOURCES += \ + cairo-image-surface-svg.c \ + cairo-image-surface-svg.h +endif + +if ENABLE_LIBWEBP +libcairo_io_la_SOURCES += \ + cairo-image-surface-webp.c \ + cairo-image-surface-webp.h \ + gth-image-saver-webp.c \ + gth-image-saver-webp.h endif libcairo_io_la_CFLAGS = $(GTHUMB_CFLAGS) $(JPEG_CFLAGS) $(LIBRSVG_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb libcairo_io_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -libcairo_io_la_LIBADD = $(GTHUMB_LIBS) $(JPEG_LIBS) $(LIBRSVG_LIBS) +libcairo_io_la_LIBADD = $(GTHUMB_LIBS) $(JPEG_LIBS) $(TIFF_LIBS) $(LIBRSVG_LIBS) $(LIBWEBP_LIBS) if ENABLE_JPEG_TOOLS libcairo_io_la_LIBADD += ../jpeg_utils/libjpeg_utils.la endif diff -Nru gthumb-3.0.2/extensions/cairo_io/Makefile.in gthumb-3.2.3/extensions/cairo_io/Makefile.in --- gthumb-3.0.2/extensions/cairo_io/Makefile.in 2012-08-20 19:54:10.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/Makefile.in 2013-07-10 13:33:43.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,26 +80,34 @@ build_triplet = @build@ host_triplet = @host@ @ENABLE_JPEG_TOOLS_TRUE@am__append_1 = \ -@ENABLE_JPEG_TOOLS_TRUE@ cairo-io-jpeg.c \ -@ENABLE_JPEG_TOOLS_TRUE@ cairo-io-jpeg.h +@ENABLE_JPEG_TOOLS_TRUE@ cairo-image-surface-jpeg.c \ +@ENABLE_JPEG_TOOLS_TRUE@ cairo-image-surface-jpeg.h \ +@ENABLE_JPEG_TOOLS_TRUE@ gth-image-saver-jpeg.c \ +@ENABLE_JPEG_TOOLS_TRUE@ gth-image-saver-jpeg.h @ENABLE_LIBRSVG_TRUE@am__append_2 = \ -@ENABLE_LIBRSVG_TRUE@ cairo-io-svg.c \ -@ENABLE_LIBRSVG_TRUE@ cairo-io-svg.h +@ENABLE_LIBRSVG_TRUE@ cairo-image-surface-svg.c \ +@ENABLE_LIBRSVG_TRUE@ cairo-image-surface-svg.h + +@ENABLE_LIBWEBP_TRUE@am__append_3 = \ +@ENABLE_LIBWEBP_TRUE@ cairo-image-surface-webp.c \ +@ENABLE_LIBWEBP_TRUE@ cairo-image-surface-webp.h \ +@ENABLE_LIBWEBP_TRUE@ gth-image-saver-webp.c \ +@ENABLE_LIBWEBP_TRUE@ gth-image-saver-webp.h -@ENABLE_JPEG_TOOLS_TRUE@am__append_3 = ../jpeg_utils/libjpeg_utils.la +@ENABLE_JPEG_TOOLS_TRUE@am__append_4 = ../jpeg_utils/libjpeg_utils.la subdir = extensions/cairo_io -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -106,13 +142,29 @@ "$(DESTDIR)$(extensioninidir)" LTLIBRARIES = $(extension_LTLIBRARIES) am__DEPENDENCIES_1 = -am__libcairo_io_la_SOURCES_DIST = cairo-io-png.c cairo-io-png.h main.c \ - cairo-io-jpeg.c cairo-io-jpeg.h cairo-io-svg.c cairo-io-svg.h -@ENABLE_JPEG_TOOLS_TRUE@am__objects_1 = \ -@ENABLE_JPEG_TOOLS_TRUE@ libcairo_io_la-cairo-io-jpeg.lo -@ENABLE_LIBRSVG_TRUE@am__objects_2 = libcairo_io_la-cairo-io-svg.lo -am_libcairo_io_la_OBJECTS = libcairo_io_la-cairo-io-png.lo \ - libcairo_io_la-main.lo $(am__objects_1) $(am__objects_2) +am__libcairo_io_la_SOURCES_DIST = cairo-image-surface-png.c \ + cairo-image-surface-png.h cairo-image-surface-xcf.c \ + cairo-image-surface-xcf.h gth-image-saver-png.c \ + gth-image-saver-png.h gth-image-saver-tga.c \ + gth-image-saver-tga.h gth-image-saver-tiff.c \ + gth-image-saver-tiff.h preferences.c preferences.h main.c \ + cairo-image-surface-jpeg.c cairo-image-surface-jpeg.h \ + gth-image-saver-jpeg.c gth-image-saver-jpeg.h \ + cairo-image-surface-svg.c cairo-image-surface-svg.h \ + cairo-image-surface-webp.c cairo-image-surface-webp.h \ + gth-image-saver-webp.c gth-image-saver-webp.h +@ENABLE_JPEG_TOOLS_TRUE@am__objects_1 = libcairo_io_la-cairo-image-surface-jpeg.lo \ +@ENABLE_JPEG_TOOLS_TRUE@ libcairo_io_la-gth-image-saver-jpeg.lo +@ENABLE_LIBRSVG_TRUE@am__objects_2 = libcairo_io_la-cairo-image-surface-svg.lo +@ENABLE_LIBWEBP_TRUE@am__objects_3 = libcairo_io_la-cairo-image-surface-webp.lo \ +@ENABLE_LIBWEBP_TRUE@ libcairo_io_la-gth-image-saver-webp.lo +am_libcairo_io_la_OBJECTS = libcairo_io_la-cairo-image-surface-png.lo \ + libcairo_io_la-cairo-image-surface-xcf.lo \ + libcairo_io_la-gth-image-saver-png.lo \ + libcairo_io_la-gth-image-saver-tga.lo \ + libcairo_io_la-gth-image-saver-tiff.lo \ + libcairo_io_la-preferences.lo libcairo_io_la-main.lo \ + $(am__objects_1) $(am__objects_2) $(am__objects_3) libcairo_io_la_OBJECTS = $(am_libcairo_io_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -158,15 +210,74 @@ am__v_CCLD_1 = SOURCES = $(libcairo_io_la_SOURCES) DIST_SOURCES = $(am__libcairo_io_la_SOURCES_DIST) +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(extensionini_DATA) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -196,9 +307,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -212,13 +321,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -247,7 +355,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -263,11 +374,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -284,7 +399,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -314,7 +428,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -371,14 +488,27 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +SUBDIRS = data extensiondir = $(pkglibdir)/extensions extension_LTLIBRARIES = libcairo_io.la -libcairo_io_la_SOURCES = cairo-io-png.c cairo-io-png.h main.c \ - $(am__append_1) $(am__append_2) +ENUM_TYPES = \ + enum-types.h \ + enum-types.c + +HEADER_FILES = \ + preferences.h + +libcairo_io_la_SOURCES = cairo-image-surface-png.c \ + cairo-image-surface-png.h cairo-image-surface-xcf.c \ + cairo-image-surface-xcf.h gth-image-saver-png.c \ + gth-image-saver-png.h gth-image-saver-tga.c \ + gth-image-saver-tga.h gth-image-saver-tiff.c \ + gth-image-saver-tiff.h preferences.c preferences.h main.c \ + $(am__append_1) $(am__append_2) $(am__append_3) libcairo_io_la_CFLAGS = $(GTHUMB_CFLAGS) $(JPEG_CFLAGS) $(LIBRSVG_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb libcairo_io_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -libcairo_io_la_LIBADD = $(GTHUMB_LIBS) $(JPEG_LIBS) $(LIBRSVG_LIBS) \ - $(am__append_3) +libcairo_io_la_LIBADD = $(GTHUMB_LIBS) $(JPEG_LIBS) $(TIFF_LIBS) \ + $(LIBRSVG_LIBS) $(LIBWEBP_LIBS) $(am__append_4) libcairo_io_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) extensioninidir = $(extensiondir) extensionini_in_files = cairo_io.extension.in.in @@ -388,7 +518,7 @@ BUILT_SOURCES = $(ENUM_TYPES) CLEANFILES = $(BUILT_SOURCES) all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am + $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: .SUFFIXES: .c .lo .o .obj @@ -422,6 +552,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -456,6 +587,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libcairo_io.la: $(libcairo_io_la_OBJECTS) $(libcairo_io_la_DEPENDENCIES) $(EXTRA_libcairo_io_la_DEPENDENCIES) $(AM_V_CCLD)$(libcairo_io_la_LINK) -rpath $(extensiondir) $(libcairo_io_la_OBJECTS) $(libcairo_io_la_LIBADD) $(LIBS) @@ -465,24 +597,32 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcairo_io_la-cairo-io-jpeg.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcairo_io_la-cairo-io-png.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcairo_io_la-cairo-io-svg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcairo_io_la-cairo-image-surface-jpeg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcairo_io_la-cairo-image-surface-png.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcairo_io_la-cairo-image-surface-svg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcairo_io_la-cairo-image-surface-webp.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcairo_io_la-cairo-image-surface-xcf.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcairo_io_la-gth-image-saver-jpeg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcairo_io_la-gth-image-saver-png.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcairo_io_la-gth-image-saver-tga.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcairo_io_la-gth-image-saver-tiff.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcairo_io_la-gth-image-saver-webp.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcairo_io_la-main.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcairo_io_la-preferences.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -491,12 +631,47 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< -libcairo_io_la-cairo-io-png.lo: cairo-io-png.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -MT libcairo_io_la-cairo-io-png.lo -MD -MP -MF $(DEPDIR)/libcairo_io_la-cairo-io-png.Tpo -c -o libcairo_io_la-cairo-io-png.lo `test -f 'cairo-io-png.c' || echo '$(srcdir)/'`cairo-io-png.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcairo_io_la-cairo-io-png.Tpo $(DEPDIR)/libcairo_io_la-cairo-io-png.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cairo-io-png.c' object='libcairo_io_la-cairo-io-png.lo' libtool=yes @AMDEPBACKSLASH@ +libcairo_io_la-cairo-image-surface-png.lo: cairo-image-surface-png.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -MT libcairo_io_la-cairo-image-surface-png.lo -MD -MP -MF $(DEPDIR)/libcairo_io_la-cairo-image-surface-png.Tpo -c -o libcairo_io_la-cairo-image-surface-png.lo `test -f 'cairo-image-surface-png.c' || echo '$(srcdir)/'`cairo-image-surface-png.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcairo_io_la-cairo-image-surface-png.Tpo $(DEPDIR)/libcairo_io_la-cairo-image-surface-png.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cairo-image-surface-png.c' object='libcairo_io_la-cairo-image-surface-png.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -c -o libcairo_io_la-cairo-io-png.lo `test -f 'cairo-io-png.c' || echo '$(srcdir)/'`cairo-io-png.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -c -o libcairo_io_la-cairo-image-surface-png.lo `test -f 'cairo-image-surface-png.c' || echo '$(srcdir)/'`cairo-image-surface-png.c + +libcairo_io_la-cairo-image-surface-xcf.lo: cairo-image-surface-xcf.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -MT libcairo_io_la-cairo-image-surface-xcf.lo -MD -MP -MF $(DEPDIR)/libcairo_io_la-cairo-image-surface-xcf.Tpo -c -o libcairo_io_la-cairo-image-surface-xcf.lo `test -f 'cairo-image-surface-xcf.c' || echo '$(srcdir)/'`cairo-image-surface-xcf.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcairo_io_la-cairo-image-surface-xcf.Tpo $(DEPDIR)/libcairo_io_la-cairo-image-surface-xcf.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cairo-image-surface-xcf.c' object='libcairo_io_la-cairo-image-surface-xcf.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -c -o libcairo_io_la-cairo-image-surface-xcf.lo `test -f 'cairo-image-surface-xcf.c' || echo '$(srcdir)/'`cairo-image-surface-xcf.c + +libcairo_io_la-gth-image-saver-png.lo: gth-image-saver-png.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -MT libcairo_io_la-gth-image-saver-png.lo -MD -MP -MF $(DEPDIR)/libcairo_io_la-gth-image-saver-png.Tpo -c -o libcairo_io_la-gth-image-saver-png.lo `test -f 'gth-image-saver-png.c' || echo '$(srcdir)/'`gth-image-saver-png.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcairo_io_la-gth-image-saver-png.Tpo $(DEPDIR)/libcairo_io_la-gth-image-saver-png.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-image-saver-png.c' object='libcairo_io_la-gth-image-saver-png.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -c -o libcairo_io_la-gth-image-saver-png.lo `test -f 'gth-image-saver-png.c' || echo '$(srcdir)/'`gth-image-saver-png.c + +libcairo_io_la-gth-image-saver-tga.lo: gth-image-saver-tga.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -MT libcairo_io_la-gth-image-saver-tga.lo -MD -MP -MF $(DEPDIR)/libcairo_io_la-gth-image-saver-tga.Tpo -c -o libcairo_io_la-gth-image-saver-tga.lo `test -f 'gth-image-saver-tga.c' || echo '$(srcdir)/'`gth-image-saver-tga.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcairo_io_la-gth-image-saver-tga.Tpo $(DEPDIR)/libcairo_io_la-gth-image-saver-tga.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-image-saver-tga.c' object='libcairo_io_la-gth-image-saver-tga.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -c -o libcairo_io_la-gth-image-saver-tga.lo `test -f 'gth-image-saver-tga.c' || echo '$(srcdir)/'`gth-image-saver-tga.c + +libcairo_io_la-gth-image-saver-tiff.lo: gth-image-saver-tiff.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -MT libcairo_io_la-gth-image-saver-tiff.lo -MD -MP -MF $(DEPDIR)/libcairo_io_la-gth-image-saver-tiff.Tpo -c -o libcairo_io_la-gth-image-saver-tiff.lo `test -f 'gth-image-saver-tiff.c' || echo '$(srcdir)/'`gth-image-saver-tiff.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcairo_io_la-gth-image-saver-tiff.Tpo $(DEPDIR)/libcairo_io_la-gth-image-saver-tiff.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-image-saver-tiff.c' object='libcairo_io_la-gth-image-saver-tiff.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -c -o libcairo_io_la-gth-image-saver-tiff.lo `test -f 'gth-image-saver-tiff.c' || echo '$(srcdir)/'`gth-image-saver-tiff.c + +libcairo_io_la-preferences.lo: preferences.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -MT libcairo_io_la-preferences.lo -MD -MP -MF $(DEPDIR)/libcairo_io_la-preferences.Tpo -c -o libcairo_io_la-preferences.lo `test -f 'preferences.c' || echo '$(srcdir)/'`preferences.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcairo_io_la-preferences.Tpo $(DEPDIR)/libcairo_io_la-preferences.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='preferences.c' object='libcairo_io_la-preferences.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -c -o libcairo_io_la-preferences.lo `test -f 'preferences.c' || echo '$(srcdir)/'`preferences.c libcairo_io_la-main.lo: main.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -MT libcairo_io_la-main.lo -MD -MP -MF $(DEPDIR)/libcairo_io_la-main.Tpo -c -o libcairo_io_la-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c @@ -505,19 +680,40 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -c -o libcairo_io_la-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c -libcairo_io_la-cairo-io-jpeg.lo: cairo-io-jpeg.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -MT libcairo_io_la-cairo-io-jpeg.lo -MD -MP -MF $(DEPDIR)/libcairo_io_la-cairo-io-jpeg.Tpo -c -o libcairo_io_la-cairo-io-jpeg.lo `test -f 'cairo-io-jpeg.c' || echo '$(srcdir)/'`cairo-io-jpeg.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcairo_io_la-cairo-io-jpeg.Tpo $(DEPDIR)/libcairo_io_la-cairo-io-jpeg.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cairo-io-jpeg.c' object='libcairo_io_la-cairo-io-jpeg.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -c -o libcairo_io_la-cairo-io-jpeg.lo `test -f 'cairo-io-jpeg.c' || echo '$(srcdir)/'`cairo-io-jpeg.c - -libcairo_io_la-cairo-io-svg.lo: cairo-io-svg.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -MT libcairo_io_la-cairo-io-svg.lo -MD -MP -MF $(DEPDIR)/libcairo_io_la-cairo-io-svg.Tpo -c -o libcairo_io_la-cairo-io-svg.lo `test -f 'cairo-io-svg.c' || echo '$(srcdir)/'`cairo-io-svg.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcairo_io_la-cairo-io-svg.Tpo $(DEPDIR)/libcairo_io_la-cairo-io-svg.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cairo-io-svg.c' object='libcairo_io_la-cairo-io-svg.lo' libtool=yes @AMDEPBACKSLASH@ +libcairo_io_la-cairo-image-surface-jpeg.lo: cairo-image-surface-jpeg.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -MT libcairo_io_la-cairo-image-surface-jpeg.lo -MD -MP -MF $(DEPDIR)/libcairo_io_la-cairo-image-surface-jpeg.Tpo -c -o libcairo_io_la-cairo-image-surface-jpeg.lo `test -f 'cairo-image-surface-jpeg.c' || echo '$(srcdir)/'`cairo-image-surface-jpeg.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcairo_io_la-cairo-image-surface-jpeg.Tpo $(DEPDIR)/libcairo_io_la-cairo-image-surface-jpeg.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cairo-image-surface-jpeg.c' object='libcairo_io_la-cairo-image-surface-jpeg.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -c -o libcairo_io_la-cairo-io-svg.lo `test -f 'cairo-io-svg.c' || echo '$(srcdir)/'`cairo-io-svg.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -c -o libcairo_io_la-cairo-image-surface-jpeg.lo `test -f 'cairo-image-surface-jpeg.c' || echo '$(srcdir)/'`cairo-image-surface-jpeg.c + +libcairo_io_la-gth-image-saver-jpeg.lo: gth-image-saver-jpeg.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -MT libcairo_io_la-gth-image-saver-jpeg.lo -MD -MP -MF $(DEPDIR)/libcairo_io_la-gth-image-saver-jpeg.Tpo -c -o libcairo_io_la-gth-image-saver-jpeg.lo `test -f 'gth-image-saver-jpeg.c' || echo '$(srcdir)/'`gth-image-saver-jpeg.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcairo_io_la-gth-image-saver-jpeg.Tpo $(DEPDIR)/libcairo_io_la-gth-image-saver-jpeg.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-image-saver-jpeg.c' object='libcairo_io_la-gth-image-saver-jpeg.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -c -o libcairo_io_la-gth-image-saver-jpeg.lo `test -f 'gth-image-saver-jpeg.c' || echo '$(srcdir)/'`gth-image-saver-jpeg.c + +libcairo_io_la-cairo-image-surface-svg.lo: cairo-image-surface-svg.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -MT libcairo_io_la-cairo-image-surface-svg.lo -MD -MP -MF $(DEPDIR)/libcairo_io_la-cairo-image-surface-svg.Tpo -c -o libcairo_io_la-cairo-image-surface-svg.lo `test -f 'cairo-image-surface-svg.c' || echo '$(srcdir)/'`cairo-image-surface-svg.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcairo_io_la-cairo-image-surface-svg.Tpo $(DEPDIR)/libcairo_io_la-cairo-image-surface-svg.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cairo-image-surface-svg.c' object='libcairo_io_la-cairo-image-surface-svg.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -c -o libcairo_io_la-cairo-image-surface-svg.lo `test -f 'cairo-image-surface-svg.c' || echo '$(srcdir)/'`cairo-image-surface-svg.c + +libcairo_io_la-cairo-image-surface-webp.lo: cairo-image-surface-webp.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -MT libcairo_io_la-cairo-image-surface-webp.lo -MD -MP -MF $(DEPDIR)/libcairo_io_la-cairo-image-surface-webp.Tpo -c -o libcairo_io_la-cairo-image-surface-webp.lo `test -f 'cairo-image-surface-webp.c' || echo '$(srcdir)/'`cairo-image-surface-webp.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcairo_io_la-cairo-image-surface-webp.Tpo $(DEPDIR)/libcairo_io_la-cairo-image-surface-webp.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cairo-image-surface-webp.c' object='libcairo_io_la-cairo-image-surface-webp.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -c -o libcairo_io_la-cairo-image-surface-webp.lo `test -f 'cairo-image-surface-webp.c' || echo '$(srcdir)/'`cairo-image-surface-webp.c + +libcairo_io_la-gth-image-saver-webp.lo: gth-image-saver-webp.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -MT libcairo_io_la-gth-image-saver-webp.lo -MD -MP -MF $(DEPDIR)/libcairo_io_la-gth-image-saver-webp.Tpo -c -o libcairo_io_la-gth-image-saver-webp.lo `test -f 'gth-image-saver-webp.c' || echo '$(srcdir)/'`gth-image-saver-webp.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcairo_io_la-gth-image-saver-webp.Tpo $(DEPDIR)/libcairo_io_la-gth-image-saver-webp.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-image-saver-webp.c' object='libcairo_io_la-gth-image-saver-webp.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -c -o libcairo_io_la-gth-image-saver-webp.lo `test -f 'gth-image-saver-webp.c' || echo '$(srcdir)/'`gth-image-saver-webp.c mostlyclean-libtool: -rm -f *.lo @@ -546,26 +742,62 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(extensioninidir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +# This directory's subdirectories are mostly independent; you can cd +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -577,15 +809,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -594,9 +822,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -642,27 +871,53 @@ || exit 1; \ fi; \ done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$(top_distdir)" distdir="$(distdir)" \ dist-hook check-am: all-am check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am + $(MAKE) $(AM_MAKEFLAGS) check-recursive all-am: Makefile $(LTLIBRARIES) $(DATA) -installdirs: +installdirs: installdirs-recursive +installdirs-am: for dir in "$(DESTDIR)$(extensiondir)" "$(DESTDIR)$(extensioninidir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am + $(MAKE) $(AM_MAKEFLAGS) install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -installcheck: installcheck-am +installcheck: installcheck-recursive install-strip: if test -z '$(STRIP)'; then \ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ @@ -687,96 +942,117 @@ @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -clean: clean-am +clean: clean-recursive clean-am: clean-extensionLTLIBRARIES clean-generic clean-libtool \ mostlyclean-am -distclean: distclean-am +distclean: distclean-recursive -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags -dvi: dvi-am +dvi: dvi-recursive dvi-am: -html: html-am +html: html-recursive html-am: -info: info-am +info: info-recursive info-am: install-data-am: install-extensionLTLIBRARIES install-extensioniniDATA -install-dvi: install-dvi-am +install-dvi: install-dvi-recursive install-dvi-am: install-exec-am: -install-html: install-html-am +install-html: install-html-recursive install-html-am: -install-info: install-info-am +install-info: install-info-recursive install-info-am: install-man: -install-pdf: install-pdf-am +install-pdf: install-pdf-recursive install-pdf-am: -install-ps: install-ps-am +install-ps: install-ps-recursive install-ps-am: installcheck-am: -maintainer-clean: maintainer-clean-am +maintainer-clean: maintainer-clean-recursive -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic -mostlyclean: mostlyclean-am +mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool -pdf: pdf-am +pdf: pdf-recursive pdf-am: -ps: ps-am +ps: ps-recursive ps-am: uninstall-am: uninstall-extensionLTLIBRARIES \ uninstall-extensioniniDATA -.MAKE: all check install install-am install-strip +.MAKE: $(am__recursive_targets) all check install install-am \ + install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean \ - clean-extensionLTLIBRARIES clean-generic clean-libtool \ - cscopelist ctags dist-hook distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extensionLTLIBRARIES \ - install-extensioniniDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-extensionLTLIBRARIES clean-generic \ + clean-libtool cscopelist-am ctags ctags-am dist-hook distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-extensionLTLIBRARIES install-extensioniniDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-extensionLTLIBRARIES \ - uninstall-extensioniniDATA + tags tags-am uninstall uninstall-am \ + uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA + +enum-types.h: $(HEADER_FILES) + $(AM_V_GEN)( $(GLIB_MKENUMS) \ + --fhead "#ifndef ENUM_TYPES_H\n#define ENUM_TYPES_H\n\n#include \n\nG_BEGIN_DECLS\n" \ + --fprod "/* enumerations from \"@filename@\" */\n" \ + --vhead "GType @enum_name@_get_type (void);\n#define GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ + --ftail "G_END_DECLS\n\n#endif /* ENUM_TYPES_H */" \ + $^> xgen-$(@F) \ + && mv -f xgen-$(@F) enum-types.h ) + +enum-types.c: $(HEADER_FILES) + $(AM_V_GEN)( $(GLIB_MKENUMS) \ + --fhead "#include \n" \ + --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \ + --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ + --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ + --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ + $^> xgen-$(@F) \ + && mv -f xgen-$(@F) enum-types.c ) @GTHUMB_EXTENSION_IN_RULE@ @GTHUMB_EXTENSION_RULE@ diff -Nru gthumb-3.0.2/extensions/cairo_io/cairo-image-surface-jpeg.c gthumb-3.2.3/extensions/cairo_io/cairo-image-surface-jpeg.c --- gthumb-3.0.2/extensions/cairo_io/cairo-image-surface-jpeg.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/cairo-image-surface-jpeg.c 2013-06-28 14:02:29.000000000 +0000 @@ -0,0 +1,559 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2011 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "cairo-image-surface-jpeg.h" + + +/* error handler data */ + + +struct error_handler_data { + struct jpeg_error_mgr pub; + sigjmp_buf setjmp_buffer; + GError **error; +}; + + +static void +fatal_error_handler (j_common_ptr cinfo) +{ + struct error_handler_data *errmgr; + char buffer[JMSG_LENGTH_MAX]; + + errmgr = (struct error_handler_data *) cinfo->err; + + /* Create the message */ + (* cinfo->err->format_message) (cinfo, buffer); + + /* broken check for *error == NULL for robustness against + * crappy JPEG library + */ + if (errmgr->error && *errmgr->error == NULL) { + g_set_error (errmgr->error, + GDK_PIXBUF_ERROR, + GDK_PIXBUF_ERROR_CORRUPT_IMAGE, + _("Error interpreting JPEG image file: %s"), + buffer); + } + + siglongjmp (errmgr->setjmp_buffer, 1); + + g_assert_not_reached (); +} + + +static void +output_message_handler (j_common_ptr cinfo) +{ + /* This method keeps libjpeg from dumping crap to stderr */ + /* do nothing */ +} + + +/* tables with pre-multiplied values */ + + +static unsigned char *CMYK_Tab = NULL; +static int *YCbCr_R_Cr_Tab = NULL; +static int *YCbCr_G_Cb_Tab = NULL; +static int *YCbCr_G_Cr_Tab = NULL; +static int *YCbCr_B_Cb_Tab = NULL; +static GStaticMutex Tables_Mutex = G_STATIC_MUTEX_INIT; + + +#define SCALE_FACTOR 16 +#define SCALE_UP(x) ((gint32) ((x) * (1L << SCALE_FACTOR) + 0.5)) +#define SCALE_DOWN(x) ((x) >> SCALE_FACTOR) +#define ONE_HALF ((gint32) (1 << (SCALE_FACTOR - 1))) + + +static void +CMYK_table_init (void) +{ + g_static_mutex_lock (&Tables_Mutex); + + if (CMYK_Tab == NULL) { + int v, k, i; + double k1; + + /* tab[k * 256 + v] = v * k / 255.0 */ + + CMYK_Tab = g_new (unsigned char, 256 * 256); + i = 0; + for (k = 0; k <= 255; k++) { + k1 = (double) k / 255.0; + for (v = 0; v <= 255; v++) + CMYK_Tab[i++] = (double) v * k1; + } + } + + g_static_mutex_unlock (&Tables_Mutex); +} + + +static void +YCbCr_tables_init (void) +{ + g_static_mutex_lock (&Tables_Mutex); + + if (YCbCr_R_Cr_Tab == NULL) { + int i, v; + + YCbCr_R_Cr_Tab = g_new (int, 256); + YCbCr_G_Cb_Tab = g_new (int, 256); + YCbCr_G_Cr_Tab = g_new (int, 256); + YCbCr_B_Cb_Tab = g_new (int, 256); + + for (i = 0, v = -128; i <= 255; i++, v++) { + YCbCr_R_Cr_Tab[i] = SCALE_DOWN (SCALE_UP (1.402) * v + ONE_HALF); + YCbCr_G_Cb_Tab[i] = - SCALE_UP (0.34414) * v; + YCbCr_G_Cr_Tab[i] = - SCALE_UP (0.71414) * v + ONE_HALF; + YCbCr_B_Cb_Tab[i] = SCALE_DOWN (SCALE_UP (1.77200) * v + ONE_HALF); + } + } + + g_static_mutex_unlock (&Tables_Mutex); +} + + +GthImage * +_cairo_image_surface_create_from_jpeg (GInputStream *istream, + GthFileData *file_data, + int requested_size, + int *original_width, + int *original_height, + gpointer user_data, + GCancellable *cancellable, + GError **error) +{ + GthImage *image; + gboolean load_scaled; + GthTransform orientation; + int destination_width; + int destination_height; + int line_start; + int line_step; + int pixel_step; + void *in_buffer; + gsize in_buffer_size; + struct error_handler_data jsrcerr; + struct jpeg_decompress_struct srcinfo; + cairo_surface_t *surface; + cairo_surface_metadata_t *metadata; + unsigned char *surface_row; + JSAMPARRAY buffer; + int buffer_stride; + JDIMENSION n_lines; + JSAMPARRAY buffer_row; + int l; + unsigned char *p_surface; + guchar r, g, b; + guint32 pixel; + unsigned char *p_buffer; + int x; + + image = gth_image_new (); + + if (! _g_input_stream_read_all (istream, + &in_buffer, + &in_buffer_size, + cancellable, + error)) + { + return image; + } + + srcinfo.err = jpeg_std_error (&(jsrcerr.pub)); + jsrcerr.pub.error_exit = fatal_error_handler; + jsrcerr.pub.output_message = output_message_handler; + jsrcerr.error = error; + + jpeg_create_decompress (&srcinfo); + + if (sigsetjmp (jsrcerr.setjmp_buffer, 1)) { + g_free (in_buffer); + jpeg_destroy_decompress (&srcinfo); + return image; + } + + _jpeg_memory_src (&srcinfo, in_buffer, in_buffer_size); + + jpeg_read_header (&srcinfo, TRUE); + + srcinfo.out_color_space = srcinfo.jpeg_color_space; /* make all the color space conversions manually */ + + load_scaled = (requested_size > 0) && (requested_size < srcinfo.image_width) && (requested_size < srcinfo.image_height); + if (load_scaled) { + for (srcinfo.scale_denom = 1; srcinfo.scale_denom <= 16; srcinfo.scale_denom++) { + jpeg_calc_output_dimensions (&srcinfo); + if ((srcinfo.output_width < requested_size) || (srcinfo.output_height < requested_size)) { + srcinfo.scale_denom -= 1; + break; + } + } + + if (srcinfo.scale_denom == 0) + srcinfo.scale_denom = srcinfo.scale_num; + + jpeg_calc_output_dimensions (&srcinfo); + } + + jpeg_start_decompress (&srcinfo); + + orientation = _jpeg_exif_orientation (in_buffer, in_buffer_size); + _cairo_image_surface_transform_get_steps (CAIRO_FORMAT_ARGB32, + MIN (srcinfo.output_width, CAIRO_MAX_IMAGE_SIZE), + MIN (srcinfo.output_height, CAIRO_MAX_IMAGE_SIZE), + orientation, + &destination_width, + &destination_height, + &line_start, + &line_step, + &pixel_step); + +#if 0 + g_print ("requested: %d, original [%d, %d] ==> load at [%d, %d]\n", + requested_size, + srcinfo.image_width, + srcinfo.image_height, + destination_width, + destination_height); +#endif + + surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, destination_width, destination_height); + if (cairo_surface_status (surface) != CAIRO_STATUS_SUCCESS) { + /* g_warning ("%s", cairo_status_to_string (cairo_surface_status (surface))); */ + + jpeg_destroy ((j_common_ptr) &srcinfo); + cairo_surface_destroy (surface); + g_free (in_buffer); + + return image; + } + metadata = _cairo_image_surface_get_metadata (surface); + metadata->has_alpha = FALSE; + cairo_surface_flush (surface); + surface_row = cairo_image_surface_get_data (surface) + line_start; + + buffer_stride = srcinfo.output_width * srcinfo.output_components; + buffer = (*srcinfo.mem->alloc_sarray) ((j_common_ptr) &srcinfo, JPOOL_IMAGE, buffer_stride, srcinfo.rec_outbuf_height); + + switch (srcinfo.out_color_space) { + case JCS_CMYK: + { + register unsigned char *cmyk_tab; + int c, m, y, k, ki; + + CMYK_table_init (); + cmyk_tab = CMYK_Tab; + + while (srcinfo.output_scanline < srcinfo.output_height) { + if (g_cancellable_is_cancelled (cancellable)) + break; + + n_lines = jpeg_read_scanlines (&srcinfo, buffer, srcinfo.rec_outbuf_height); + + buffer_row = buffer; + for (l = 0; l < n_lines; l++) { + p_surface = surface_row; + p_buffer = buffer_row[l]; + + for (x = 0; x < srcinfo.output_width; x++) { + if (srcinfo.saw_Adobe_marker) { + c = p_buffer[0]; + m = p_buffer[1]; + y = p_buffer[2]; + k = p_buffer[3]; + } + else { + c = 255 - p_buffer[0]; + m = 255 - p_buffer[1]; + y = 255 - p_buffer[2]; + k = 255 - p_buffer[3]; + } + + ki = k << 8; /* ki = k * 256 */ + r = cmyk_tab[ki + c]; + g = cmyk_tab[ki + m]; + b = cmyk_tab[ki + y]; + pixel = CAIRO_RGBA_TO_UINT32 (r, g, b, 0xff); + memcpy (p_surface, &pixel, sizeof (guint32)); + + p_surface += pixel_step; + p_buffer += 4 /*srcinfo.output_components*/; + } + + surface_row += line_step; + buffer_row += buffer_stride; + } + } + } + break; + + case JCS_GRAYSCALE: + { + while (srcinfo.output_scanline < srcinfo.output_height) { + if (g_cancellable_is_cancelled (cancellable)) + break; + + n_lines = jpeg_read_scanlines (&srcinfo, buffer, srcinfo.rec_outbuf_height); + + buffer_row = buffer; + for (l = 0; l < n_lines; l++) { + p_surface = surface_row; + p_buffer = buffer_row[l]; + + for (x = 0; x < srcinfo.output_width; x++) { + r = g = b = p_buffer[0]; + pixel = CAIRO_RGBA_TO_UINT32 (r, g, b, 0xff); + memcpy (p_surface, &pixel, sizeof (guint32)); + + p_surface += pixel_step; + p_buffer += 1 /*srcinfo.output_components*/; + } + + surface_row += line_step; + buffer_row += buffer_stride; + } + } + } + break; + + case JCS_RGB: + { + while (srcinfo.output_scanline < srcinfo.output_height) { + if (g_cancellable_is_cancelled (cancellable)) + break; + + n_lines = jpeg_read_scanlines (&srcinfo, buffer, srcinfo.rec_outbuf_height); + + buffer_row = buffer; + for (l = 0; l < n_lines; l++) { + p_surface = surface_row; + p_buffer = buffer_row[l]; + + for (x = 0; x < srcinfo.output_width; x++) { + r = p_buffer[0]; + g = p_buffer[1]; + b = p_buffer[2]; + pixel = CAIRO_RGBA_TO_UINT32 (r, g, b, 0xff); + memcpy (p_surface, &pixel, sizeof (guint32)); + + p_surface += pixel_step; + p_buffer += 3 /*srcinfo.output_components*/; + } + + surface_row += line_step; + buffer_row += buffer_stride; + } + } + } + break; + + case JCS_YCbCr: + { + register JSAMPLE *range_limit = srcinfo.sample_range_limit; + register int *r_cr_tab; + register int *g_cb_tab; + register int *g_cr_tab; + register int *b_cb_tab; + int Y, Cb, Cr; + + YCbCr_tables_init (); + r_cr_tab = YCbCr_R_Cr_Tab; + g_cb_tab = YCbCr_G_Cb_Tab; + g_cr_tab = YCbCr_G_Cr_Tab; + b_cb_tab = YCbCr_B_Cb_Tab; + + while (srcinfo.output_scanline < srcinfo.output_height) { + if (g_cancellable_is_cancelled (cancellable)) + break; + + n_lines = jpeg_read_scanlines (&srcinfo, buffer, srcinfo.rec_outbuf_height); + + buffer_row = buffer; + for (l = 0; l < n_lines; l++) { + p_surface = surface_row; + p_buffer = buffer_row[l]; + + for (x = 0; x < srcinfo.output_width; x++) { + Y = p_buffer[0]; + Cb = p_buffer[1]; + Cr = p_buffer[2]; + + r = range_limit[Y + r_cr_tab[Cr]]; + g = range_limit[Y + SCALE_DOWN (g_cb_tab[Cb] + g_cr_tab[Cr])]; + b = range_limit[Y + b_cb_tab[Cb]]; + pixel = CAIRO_RGBA_TO_UINT32 (r, g, b, 0xff); + memcpy (p_surface, &pixel, sizeof (guint32)); + + p_surface += pixel_step; + p_buffer += 3 /*srcinfo.output_components*/; + } + + surface_row += line_step; + buffer_row += buffer_stride; + } + } + } + break; + + case JCS_YCCK: + { + register JSAMPLE *range_limit = srcinfo.sample_range_limit; + register int *r_cr_tab; + register int *g_cb_tab; + register int *g_cr_tab; + register int *b_cb_tab; + register guchar *cmyk_tab; + int Y, Cb, Cr, K, Ki, c, m , y; + + YCbCr_tables_init (); + r_cr_tab = YCbCr_R_Cr_Tab; + g_cb_tab = YCbCr_G_Cb_Tab; + g_cr_tab = YCbCr_G_Cr_Tab; + b_cb_tab = YCbCr_B_Cb_Tab; + + CMYK_table_init (); + cmyk_tab = CMYK_Tab; + + while (srcinfo.output_scanline < srcinfo.output_height) { + if (g_cancellable_is_cancelled (cancellable)) + break; + + n_lines = jpeg_read_scanlines (&srcinfo, buffer, srcinfo.rec_outbuf_height); + + buffer_row = buffer; + for (l = 0; l < n_lines; l++) { + p_surface = surface_row; + p_buffer = buffer_row[l]; + + for (x = 0; x < srcinfo.output_width; x++) { + Y = p_buffer[0]; + Cb = p_buffer[1]; + Cr = p_buffer[2]; + K = p_buffer[3]; + + c = range_limit[255 - (Y + r_cr_tab[Cr])]; + m = range_limit[255 - (Y + SCALE_DOWN (g_cb_tab[Cb] + g_cr_tab[Cr]))]; + y = range_limit[255 - (Y + b_cb_tab[Cb])]; + + Ki = K << 8; /* ki = K * 256 */ + + r = cmyk_tab[Ki + c]; + g = cmyk_tab[Ki + m]; + b = cmyk_tab[Ki + y]; + pixel = CAIRO_RGBA_TO_UINT32 (r, g, b, 0xff); + memcpy (p_surface, &pixel, sizeof (guint32)); + + p_surface += pixel_step; + p_buffer += 4 /*srcinfo.output_components*/; + } + + surface_row += line_step; + buffer_row += buffer_stride; + } + } + } + break; + + case JCS_UNKNOWN: + default: + g_set_error (error, + GDK_PIXBUF_ERROR, + GDK_PIXBUF_ERROR_UNKNOWN_TYPE, + _("Unknown JPEG color space (%d)"), + srcinfo.out_color_space); + break; + } + + if (! g_cancellable_is_cancelled (cancellable)) { + cairo_surface_mark_dirty (surface); + + /* Scale to the requested size */ + + if (load_scaled) { + cairo_surface_t *scaled; + int width; + int height; + + width = destination_width; + height = destination_height; + scale_keeping_ratio (&width, &height, requested_size, requested_size, TRUE); + scaled = _cairo_image_surface_scale (surface, width, height, SCALE_FILTER_BEST, NULL); + + cairo_surface_destroy (surface); + surface = scaled; + } + + /* Set the original dimensions */ + + if ((orientation == GTH_TRANSFORM_ROTATE_90) + || (orientation == GTH_TRANSFORM_ROTATE_270) + || (orientation == GTH_TRANSFORM_TRANSPOSE) + || (orientation == GTH_TRANSFORM_TRANSVERSE)) + { + if (original_width != NULL) + *original_width = srcinfo.image_height; + if (original_height != NULL) + *original_height = srcinfo.image_width; + } + else { + if (original_width != NULL) + *original_width = srcinfo.image_width; + if (original_height != NULL) + *original_height = srcinfo.image_height; + } + + /*_cairo_image_surface_set_attribute_int (surface, "Image::Rotation", rotation); FIXME*/ + + /* FIXME _cairo_image_surface_set_attribute (surface, "Jpeg::ColorSpace", jpeg_color_space_name (srcinfo.jpeg_color_space)); */ + + gth_image_set_cairo_surface (image, surface); + + jpeg_finish_decompress (&srcinfo); + jpeg_destroy_decompress (&srcinfo); + } + else { + jpeg_destroy ((j_common_ptr) &srcinfo); + g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_CANCELLED, ""); + } + + cairo_surface_destroy (surface); + g_free (in_buffer); + + return image; +} + + +#undef SCALE_FACTOR +#undef SCALE_UP +#undef SCALE_DOWN +#undef ONE_HALF diff -Nru gthumb-3.0.2/extensions/cairo_io/cairo-image-surface-jpeg.h gthumb-3.2.3/extensions/cairo_io/cairo-image-surface-jpeg.h --- gthumb-3.0.2/extensions/cairo_io/cairo-image-surface-jpeg.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/cairo-image-surface-jpeg.h 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,41 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2011 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef CAIRO_IMAGE_SURFACE_JPEG_H +#define CAIRO_IMAGE_SURFACE_JPEG_H + +#include +#include + +G_BEGIN_DECLS + +GthImage * _cairo_image_surface_create_from_jpeg (GInputStream *istream, + GthFileData *file_data, + int requested_size, + int *original_width, + int *original_height, + gpointer user_data, + GCancellable *cancellable, + GError **error); + +G_END_DECLS + +#endif /* CAIRO_IMAGE_SURFACE_JPEG_H */ diff -Nru gthumb-3.0.2/extensions/cairo_io/cairo-image-surface-png.c gthumb-3.2.3/extensions/cairo_io/cairo-image-surface-png.c --- gthumb-3.0.2/extensions/cairo_io/cairo-image-surface-png.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/cairo-image-surface-png.c 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,253 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2011 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include "cairo-image-surface-png.h" + +/* starting from libpng version 1.5 it is not possible + * to access inside the PNG struct directly + */ +#define PNG_SETJMP(ptr) setjmp(png_jmpbuf(ptr)) + +#ifdef PNG_LIBPNG_VER +#if PNG_LIBPNG_VER < 10400 +#ifdef PNG_SETJMP +#undef PNG_SETJMP +#endif +#define PNG_SETJMP(ptr) setjmp(ptr->jmpbuf) +#endif +#endif + +typedef struct { + GInputStream *stream; + GCancellable *cancellable; + GError **error; + png_struct *png_ptr; + png_info *png_info_ptr; + cairo_surface_t *surface; +} CairoPngData; + + +static void +_cairo_png_data_destroy (CairoPngData *cairo_png_data) +{ + png_destroy_read_struct (&cairo_png_data->png_ptr, &cairo_png_data->png_info_ptr, NULL); + g_object_unref (cairo_png_data->stream); + cairo_surface_destroy (cairo_png_data->surface); + g_free (cairo_png_data); +} + + +static void +gerror_error_func (png_structp png_ptr, + png_const_charp message) +{ + GError ***error_p = png_get_error_ptr (png_ptr); + GError **error = *error_p; + + if (error != NULL) + *error = g_error_new (G_IO_ERROR, G_IO_ERROR_INVALID_DATA, "%s", message); +} + + +static void +gerror_warning_func (png_structp png_ptr, + png_const_charp message) +{ + /* void: we don't care about warnings */ +} + + +static void +cairo_png_read_data_func (png_structp png_ptr, + png_bytep buffer, + png_size_t size) +{ + CairoPngData *cairo_png_data; + gssize n; + GError *error = NULL; + + cairo_png_data = png_get_io_ptr (png_ptr); + n = g_input_stream_read (cairo_png_data->stream, + buffer, + size, + cairo_png_data->cancellable, + &error); + if (n < 0) { + png_error (png_ptr, error->message); + g_error_free (error); + } +} + + +static void +transform_to_argb32_format_func (png_structp png, + png_row_infop row_info, + png_bytep data) +{ + guint i; + guint32 pixel; + + for (i = 0; i < row_info->rowbytes; i += 4) { + guchar *p_iter = data + i; + guchar r, g, b, a; + + a = p_iter[3]; + if (a == 0xff) { + pixel = CAIRO_RGBA_TO_UINT32 (p_iter[0], p_iter[1], p_iter[2], 0xff); + } + else if (a == 0) { + pixel = 0; + } + else { + r = _cairo_multiply_alpha (p_iter[0], a); + g = _cairo_multiply_alpha (p_iter[1], a); + b = _cairo_multiply_alpha (p_iter[2], a); + pixel = CAIRO_RGBA_TO_UINT32 (r, g, b, a); + } + memcpy (p_iter, &pixel, sizeof (guint32)); + } +} + + +GthImage * +_cairo_image_surface_create_from_png (GInputStream *istream, + GthFileData *file_data, + int requested_size, + int *original_width, + int *original_height, + gpointer user_data, + GCancellable *cancellable, + GError **error) +{ + GthImage *image; + CairoPngData *cairo_png_data; + png_uint_32 width, height; + int bit_depth, color_type, interlace_type; + cairo_surface_metadata_t *metadata; + unsigned char *surface_row; + int rowstride; + png_bytep *row_pointers; + int row; + + image = gth_image_new (); + + cairo_png_data = g_new0 (CairoPngData, 1); + cairo_png_data->cancellable = cancellable; + cairo_png_data->error = error; + cairo_png_data->stream = _g_object_ref (istream); + if (cairo_png_data->stream == NULL) { + _cairo_png_data_destroy (cairo_png_data); + return image; + } + + cairo_png_data->png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, + &cairo_png_data->error, + gerror_error_func, + gerror_warning_func); + if (cairo_png_data->png_ptr == NULL) { + _cairo_png_data_destroy (cairo_png_data); + return image; + } + + cairo_png_data->png_info_ptr = png_create_info_struct (cairo_png_data->png_ptr); + if (cairo_png_data->png_info_ptr == NULL) { + _cairo_png_data_destroy (cairo_png_data); + return image; + } + + if (PNG_SETJMP (cairo_png_data->png_ptr)) { + _cairo_png_data_destroy (cairo_png_data); + return image; + } + + png_set_read_fn (cairo_png_data->png_ptr, cairo_png_data, cairo_png_read_data_func); + png_read_info (cairo_png_data->png_ptr, cairo_png_data->png_info_ptr); + png_get_IHDR (cairo_png_data->png_ptr, + cairo_png_data->png_info_ptr, + &width, + &height, + &bit_depth, + &color_type, + &interlace_type, + NULL, + NULL); + + cairo_png_data->surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height); + if (cairo_surface_status (cairo_png_data->surface) != CAIRO_STATUS_SUCCESS) { + /* g_warning ("%s", cairo_status_to_string (cairo_surface_status (surface))); */ + _cairo_png_data_destroy (cairo_png_data); + return image; + } + + metadata = _cairo_image_surface_get_metadata (cairo_png_data->surface); + metadata->has_alpha = (color_type & PNG_COLOR_MASK_ALPHA); + + /* Set the data transformations */ + + png_set_strip_16 (cairo_png_data->png_ptr); + + png_set_packing (cairo_png_data->png_ptr); + + if (color_type == PNG_COLOR_TYPE_PALETTE) + png_set_palette_to_rgb (cairo_png_data->png_ptr); + + if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8)) + png_set_expand_gray_1_2_4_to_8 (cairo_png_data->png_ptr); + + if (png_get_valid (cairo_png_data->png_ptr, cairo_png_data->png_info_ptr, PNG_INFO_tRNS)) + png_set_tRNS_to_alpha (cairo_png_data->png_ptr); + + png_set_filler (cairo_png_data->png_ptr, 0xff, PNG_FILLER_AFTER); + + if ((color_type == PNG_COLOR_TYPE_GRAY) || (color_type == PNG_COLOR_TYPE_GRAY_ALPHA)) + png_set_gray_to_rgb (cairo_png_data->png_ptr); + + if (interlace_type != PNG_INTERLACE_NONE) + png_set_interlace_handling (cairo_png_data->png_ptr); + + png_set_read_user_transform_fn (cairo_png_data->png_ptr, transform_to_argb32_format_func); + + png_read_update_info (cairo_png_data->png_ptr, cairo_png_data->png_info_ptr); + + /* Read the image */ + + cairo_surface_flush (cairo_png_data->surface); + surface_row = cairo_image_surface_get_data (cairo_png_data->surface); + rowstride = cairo_image_surface_get_stride (cairo_png_data->surface); + row_pointers = g_new (png_bytep, height); + for (row = 0; row < height; row++) { + row_pointers[row] = surface_row; + surface_row += rowstride; + } + png_read_image (cairo_png_data->png_ptr, row_pointers); + png_read_end (cairo_png_data->png_ptr, cairo_png_data->png_info_ptr); + cairo_surface_mark_dirty (cairo_png_data->surface); + if (cairo_surface_status (cairo_png_data->surface) == CAIRO_STATUS_SUCCESS) + gth_image_set_cairo_surface (image, cairo_png_data->surface); + + g_free (row_pointers); + _cairo_png_data_destroy (cairo_png_data); + + return image; +} diff -Nru gthumb-3.0.2/extensions/cairo_io/cairo-image-surface-png.h gthumb-3.2.3/extensions/cairo_io/cairo-image-surface-png.h --- gthumb-3.0.2/extensions/cairo_io/cairo-image-surface-png.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/cairo-image-surface-png.h 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,41 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2011 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef CAIRO_IMAGE_SURFACE_PNG_H +#define CAIRO_IMAGE_SURFACE_PNG_H + +#include +#include + +G_BEGIN_DECLS + +GthImage * _cairo_image_surface_create_from_png (GInputStream *istream, + GthFileData *file_data, + int requested_size, + int *original_width, + int *original_height, + gpointer user_data, + GCancellable *cancellable, + GError **error); + +G_END_DECLS + +#endif /* CAIRO_IMAGE_SURFACE_PNG_H */ diff -Nru gthumb-3.0.2/extensions/cairo_io/cairo-image-surface-svg.c gthumb-3.2.3/extensions/cairo_io/cairo-image-surface-svg.c --- gthumb-3.0.2/extensions/cairo_io/cairo-image-surface-svg.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/cairo-image-surface-svg.c 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,190 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2011 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include "cairo-image-surface-svg.h" + + +/* GthImageSvg (private class) */ + + +#define GTH_IMAGE_SVG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), gth_image_svg_get_type(), GthImageSvg)) + + +typedef struct { + GthImage __parent; + RsvgHandle *rsvg; + int original_width; + int original_height; + double last_zoom; +} GthImageSvg; + + +typedef GthImageClass GthImageSvgClass; + + +static gpointer gth_image_svg_parent_class; + + +G_DEFINE_TYPE (GthImageSvg, gth_image_svg, GTH_TYPE_IMAGE) + + +static void +gth_image_svg_finalize (GObject *object) +{ + GthImageSvg *self; + + self = GTH_IMAGE_SVG (object); + _g_object_unref (self->rsvg); + + G_OBJECT_CLASS (gth_image_svg_parent_class)->finalize (object); +} + + +static void +gth_image_svg_init (GthImageSvg *self) +{ + self->rsvg = NULL; + self->original_width = 0; + self->original_height = 0; + self->last_zoom = 0.0; +} + + +static gboolean +gth_image_svg_get_is_zoomable (GthImage *base) +{ + return (((GthImageSvg *) base)->rsvg != NULL); +} + + +static gboolean +gth_image_svg_set_zoom (GthImage *base, + double zoom, + int *original_width, + int *original_height) +{ + GthImageSvg *self; + cairo_surface_t *surface; + cairo_t *cr; + gboolean changed = FALSE; + + self = GTH_IMAGE_SVG (base); + if (self->rsvg == NULL) + return FALSE; + + if (zoom != self->last_zoom) { + self->last_zoom = zoom; + + surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, + zoom * self->original_width, + zoom * self->original_height); + cr = cairo_create (surface); + cairo_scale (cr, zoom, zoom); + rsvg_handle_render_cairo (self->rsvg, cr); + gth_image_set_cairo_surface (base, surface); + changed = TRUE; + + cairo_destroy (cr); + cairo_surface_destroy (surface); + } + + if (original_width != NULL) + *original_width = self->original_width; + if (original_height != NULL) + *original_height = self->original_height; + + return changed; +} + + +static void +gth_image_svg_class_init (GthImageSvgClass *klass) +{ + GObjectClass *object_class; + GthImageClass *image_class; + + object_class = G_OBJECT_CLASS (klass); + object_class->finalize = gth_image_svg_finalize; + + image_class = GTH_IMAGE_CLASS (klass); + image_class->get_is_zoomable = gth_image_svg_get_is_zoomable; + image_class->set_zoom = gth_image_svg_set_zoom; +} + + +static GthImage * +gth_image_svg_new (void) +{ + return g_object_new (gth_image_svg_get_type (), NULL); +} + + +static void +gth_image_svg_set_handle (GthImageSvg *self, + RsvgHandle *rsvg) +{ + RsvgDimensionData dimension_data; + + if (self->rsvg == rsvg) + return; + + self->rsvg = g_object_ref (rsvg); + + rsvg_handle_get_dimensions (self->rsvg, &dimension_data); + self->original_width = dimension_data.width; + self->original_height = dimension_data.height; + + gth_image_svg_set_zoom (GTH_IMAGE (self), 1.0, NULL, NULL); +} + + +/* -- _cairo_image_surface_create_from_svg -- */ + + +GthImage * +_cairo_image_surface_create_from_svg (GInputStream *istream, + GthFileData *file_data, + int requested_size, + int *original_width, + int *original_height, + gpointer user_data, + GCancellable *cancellable, + GError **error) +{ + GthImage *image; + RsvgHandle *rsvg; + + image = gth_image_svg_new (); + rsvg = rsvg_handle_new_from_stream_sync (istream, + (file_data != NULL ? file_data->file : NULL), + RSVG_HANDLE_FLAGS_NONE, + cancellable, + error); + if (rsvg != NULL) { + gth_image_svg_set_handle (GTH_IMAGE_SVG (image), rsvg); + g_object_unref (rsvg); + } + + return image; +} diff -Nru gthumb-3.0.2/extensions/cairo_io/cairo-image-surface-svg.h gthumb-3.2.3/extensions/cairo_io/cairo-image-surface-svg.h --- gthumb-3.0.2/extensions/cairo_io/cairo-image-surface-svg.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/cairo-image-surface-svg.h 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,41 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef CAIRO_IMAGE_SURFACE_SVG_H +#define CAIRO_IMAGE_SURFACE_SVG_H + +#include +#include + +G_BEGIN_DECLS + +GthImage * _cairo_image_surface_create_from_svg (GInputStream *istream, + GthFileData *file_data, + int requested_size, + int *original_width, + int *original_height, + gpointer user_data, + GCancellable *cancellable, + GError **error); + +G_END_DECLS + +#endif /* CAIRO_IMAGE_SURFACE_SVG_H */ diff -Nru gthumb-3.0.2/extensions/cairo_io/cairo-image-surface-webp.c gthumb-3.2.3/extensions/cairo_io/cairo-image-surface-webp.c --- gthumb-3.0.2/extensions/cairo_io/cairo-image-surface-webp.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/cairo-image-surface-webp.c 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,134 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include +#include "cairo-image-surface-webp.h" + + +#define BUFFER_SIZE (16*1024) + + +GthImage * +_cairo_image_surface_create_from_webp (GInputStream *istream, + GthFileData *file_data, + int requested_size, + int *original_width, + int *original_height, + gpointer user_data, + GCancellable *cancellable, + GError **error) +{ + GthImage *image; + WebPDecoderConfig config; + guchar *buffer; + gssize bytes_read; + int width, height; + cairo_surface_t *surface; + cairo_surface_metadata_t *metadata; + WebPIDecoder *idec; + + image = gth_image_new (); + + if (! WebPInitDecoderConfig (&config)) + return image; + + buffer = g_new (guchar, BUFFER_SIZE); + bytes_read = g_input_stream_read (istream, + buffer, + BUFFER_SIZE, + cancellable, + error); + + if (WebPGetFeatures (buffer, bytes_read, &config.input) != VP8_STATUS_OK) { + g_free (buffer); + return image; + } + + width = config.input.width; + height = config.input.height; + + if (original_width != NULL) + *original_width = width; + if (original_height != NULL) + *original_height = height; + +#if SCALING_WORKS + if (requested_size > 0) + scale_keeping_ratio (&width, &height, requested_size, requested_size, FALSE); +#endif + + surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height); + metadata = _cairo_image_surface_get_metadata (surface); + metadata->has_alpha = (config.input.has_alpha); + + cairo_surface_flush (surface); + + config.options.no_fancy_upsampling = 1; + +#if SCALING_WORKS + if (requested_size > 0) { + config.options.use_scaling = 1; + config.options.scaled_width = width; + config.options.scaled_height = height; + } +#endif + +#if G_BYTE_ORDER == G_LITTLE_ENDIAN + config.output.colorspace = MODE_BGRA; +#elif G_BYTE_ORDER == G_BIG_ENDIAN + config.output.colorspace = MODE_ARGB; +#endif + config.output.u.RGBA.rgba = (uint8_t *) cairo_image_surface_get_data (surface); + config.output.u.RGBA.stride = cairo_image_surface_get_stride (surface); + config.output.u.RGBA.size = cairo_image_surface_get_stride (surface) * height; + config.output.is_external_memory = 1; + + idec = WebPINewDecoder (&config.output); + if (idec == NULL) { + g_free (buffer); + return image; + } + + do { + VP8StatusCode status = WebPIAppend (idec, buffer, bytes_read); + if ((status != VP8_STATUS_OK) && (status != VP8_STATUS_SUSPENDED)) + break; + } + while ((bytes_read = g_input_stream_read (istream, + buffer, + BUFFER_SIZE, + cancellable, + error)) > 0); + + cairo_surface_mark_dirty (surface); + if (cairo_surface_status (surface) == CAIRO_STATUS_SUCCESS) + gth_image_set_cairo_surface (image, surface); + + WebPIDelete (idec); + WebPFreeDecBuffer (&config.output); + + g_free (buffer); + + return image; +} diff -Nru gthumb-3.0.2/extensions/cairo_io/cairo-image-surface-webp.h gthumb-3.2.3/extensions/cairo_io/cairo-image-surface-webp.h --- gthumb-3.0.2/extensions/cairo_io/cairo-image-surface-webp.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/cairo-image-surface-webp.h 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,41 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef CAIRO_IMAGE_SURFACE_WEBP_H +#define CAIRO_IMAGE_SURFACE_WEBP_H + +#include +#include + +G_BEGIN_DECLS + +GthImage * _cairo_image_surface_create_from_webp (GInputStream *istream, + GthFileData *file_data, + int requested_size, + int *original_width, + int *original_height, + gpointer user_data, + GCancellable *cancellable, + GError **error); + +G_END_DECLS + +#endif /* CAIRO_IMAGE_SURFACE_WEBP_H */ diff -Nru gthumb-3.0.2/extensions/cairo_io/cairo-image-surface-xcf.c gthumb-3.2.3/extensions/cairo_io/cairo-image-surface-xcf.c --- gthumb-3.0.2/extensions/cairo_io/cairo-image-surface-xcf.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/cairo-image-surface-xcf.c 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,1528 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2013 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include +#include "cairo-image-surface-xcf.h" + + +/* Optimizations taken from xcftools 1.0.7 written by Henning Makholm + * + * xL : Layer color + * xI : Image color + * aL : Layer alpha + * */ + + +#define TILE_WIDTH 64 +#define MAX_TILE_SIZE (TILE_WIDTH * TILE_WIDTH * 4 * 1.5) +#define ADD_ALPHA(v, a) (add_alpha_table[v][a]) +#define MIN3(x,y,z) ((y) <= (z) ? MIN ((x), (y)) : MIN ((x), (z))) +#define MAX3(x,y,z) ((y) >= (z) ? MAX ((x), (y)) : MAX ((x), (z))) +#define DISSOLVE_SEED 737893334 +#define CLAMP_TEMP(x, min, max) (temp = (x), CLAMP (temp, min, max)) +#define ABS_TEMP2(x) (temp2 = (x), (temp2 < 0) ? -temp2: temp2) +#define CLAMP_PIXEL(x) CLAMP_TEMP (x, 0, 255) +#define GIMP_OP_NORMAL(xL, xI, aL) CLAMP_PIXEL (ADD_ALPHA (xL, aL) + ADD_ALPHA (xI, 255 - aL)) +#define GIMP_OP_LIGHTEN_ONLY(xL, xI) MAX (xI, xL) +#define GIMP_OP_SCREEN(xL, xI) CLAMP_PIXEL (255 ^ ADD_ALPHA (255 - xI, 255 - xL)) +#define GIMP_OP_DODGE(xL, xI) GIMP_OP_DIVIDE (255-xL, xI) +#define GIMP_OP_ADDITION(xL, xI) CLAMP_PIXEL (xI + xL) +#define GIMP_OP_DARKEN_ONLY(xL, xI) MIN (xI, xL) +#define GIMP_OP_MULTIPLY(xL, xI) CLAMP_PIXEL (ADD_ALPHA (xL, xI)) +#define GIMP_OP_BURN(xL, xI) CLAMP_PIXEL (255 - GIMP_OP_DIVIDE (xL, 255 - xI)) +#define GIMP_OP_SOFT_LIGHT(xL, xI) CLAMP_PIXEL (ADD_ALPHA (xI, xI) + 2 * ADD_ALPHA (xL, ADD_ALPHA (xI, 255 - xI))) +#define GIMP_OP_HARD_LIGHT(xL, xI) CLAMP_PIXEL (xL > 128 ? 255 ^ ADD_ALPHA (255 - xI, 2 * (255 - xL)) : ADD_ALPHA (xI, 2 * xL)) +#define GIMP_OP_DIFFERENCE(xL, xI) CLAMP_PIXEL (ABS_TEMP2 (xI - xL)) +#define GIMP_OP_SUBTRACT(xL, xI) CLAMP_PIXEL (xI - xL) +#define GIMP_OP_GRAIN_EXTRACT(xL, xI) CLAMP_PIXEL ((int) xI - xL + 128) +#define GIMP_OP_GRAIN_MERGE(xL, xI) CLAMP_PIXEL ((int) xI + xL - 128) +#define GIMP_OP_DIVIDE(xL, xI) CLAMP_PIXEL ((int) (xI) * 256 / (1 + (xL))) + + +typedef enum { + GIMP_RGB, + GIMP_GRAY, + GIMP_INDEXED +} GimpImageBaseType; + + +typedef enum { + GIMP_COMPRESSION_NONE, + GIMP_COMPRESSION_RLE, + GIMP_COMPRESSION_ZLIB, + GIMP_COMPRESSION_FRACTAL +} GimpCompression; + + +typedef enum { + GIMP_RGB_IMAGE, + GIMP_RGBA_IMAGE, + GIMP_GRAY_IMAGE, + GIMP_GRAYA_IMAGE, + GIMP_INDEXED_IMAGE, + GIMP_INDEXEDA_IMAGE +} GimpImageType; + + +typedef enum { + GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_DISSOLVE, /* (random dithering to discrete alpha) */ + GIMP_LAYER_MODE_BEHIND, /* (not selectable in the GIMP UI) */ + GIMP_LAYER_MODE_MULTIPLY, + GIMP_LAYER_MODE_SCREEN, + GIMP_LAYER_MODE_OVERLAY, + GIMP_LAYER_MODE_DIFFERENCE, + GIMP_LAYER_MODE_ADDITION, + GIMP_LAYER_MODE_SUBTRACT, + GIMP_LAYER_MODE_DARKEN_ONLY, + GIMP_LAYER_MODE_LIGHTEN_ONLY, + GIMP_LAYER_MODE_HUE, /* (H of HSV) */ + GIMP_LAYER_MODE_SATURATION, /* (S of HSV) */ + GIMP_LAYER_MODE_COLOR, /* (H and S of HSL) */ + GIMP_LAYER_MODE_VALUE, /* (V of HSV) */ + GIMP_LAYER_MODE_DIVIDE, + GIMP_LAYER_MODE_DODGE, + GIMP_LAYER_MODE_BURN, + GIMP_LAYER_MODE_HARD_LIGHT, + GIMP_LAYER_MODE_SOFT_LIGHT, /* (XCF version >= 2 only) */ + GIMP_LAYER_MODE_GRAIN_EXTRACT, /* (XCF version >= 2 only) */ + GIMP_LAYER_MODE_GRAIN_MERGE /* (XCF version >= 2 only) */ +} GimpLayerMode; + + +typedef struct { + int n; + guint width; + guint height; + GimpImageType type; + char *name; + guint32 opacity; + gboolean visible; + gboolean floating_selection; + GimpLayerMode mode; + gboolean apply_mask; + gint32 h_offset; + gint32 v_offset; + int stride; + guchar *pixels; + guchar *alpha_mask; + int bpp; + struct { + gboolean dirty; + int rows; + int columns; + int n_tiles; + int last_row_height; + int last_col_width; + } tiles; +} GimpLayer; + + +typedef struct { + guchar color1; + guchar color2; + guchar color3; +} GimpColormap; + + +static int cairo_rgba[4] = { CAIRO_RED, CAIRO_GREEN, CAIRO_BLUE, CAIRO_ALPHA }; +static int cairo_graya[2] = { 0, CAIRO_ALPHA }; +static int cairo_indexed[2] = { 0, CAIRO_ALPHA }; +static guchar add_alpha_table[256][256]; +static GOnce xcf_init_once = G_ONCE_INIT; + + +static gpointer +xcf_init (gpointer data) +{ + int v; + int a; + int r; + + /* add_alpha_table[v][a] = v * a / 255 */ + + for (v = 0; v < 128; v++) { + for (a = 0; a <= v; a++) { + r = (v * a + 127) / 255; + add_alpha_table[v][a] = add_alpha_table[a][v] = r; + add_alpha_table[255-v][a] = add_alpha_table[a][255-v] = a - r; + add_alpha_table[v][255-a] = add_alpha_table[255-a][v] = v - r; + add_alpha_table[255-v][255-a] = add_alpha_table[255-a][255-v] = (255 - a) - (v - r); + } + } + + return NULL; +} + + +/* -- GDataInputStream functions -- */ + + +static char * +_g_data_input_stream_read_c_string (GDataInputStream *stream, + gsize size, + GCancellable *cancellable, + GError **error) +{ + char *string; + + g_return_val_if_fail (size > 0, NULL); + + string = g_new (char, size + 1); + g_input_stream_read (G_INPUT_STREAM (stream), string, size, cancellable, error); + string[size] = 0; + + return string; +} + + +static char * +_g_data_input_stream_read_xcf_string (GDataInputStream *stream, + GCancellable *cancellable, + GError **error) +{ + guint32 n_bytes; + + n_bytes = g_data_input_stream_read_uint32 (stream, cancellable, error); + if (n_bytes == 0) + return NULL; + + return _g_data_input_stream_read_c_string (stream, n_bytes, cancellable, error); +} + + +/* -- GimpLayer -- */ + + +static GimpLayer * +gimp_layer_new (int n) +{ + GimpLayer *layer; + + layer = g_new0 (GimpLayer, 1); + layer->n = n; + layer->width = 0; + layer->height = 0; + layer->type = GIMP_RGBA_IMAGE; + layer->name = NULL; + layer->opacity = 255; + layer->visible = TRUE; + layer->floating_selection = FALSE; + layer->mode = GIMP_LAYER_MODE_NORMAL; + layer->apply_mask = FALSE; + layer->h_offset = 0; + layer->v_offset = 0; + layer->tiles.dirty = TRUE; + layer->tiles.n_tiles = 0; + layer->pixels = NULL; + layer->alpha_mask = NULL; + + return layer; +} + + +static gboolean +gimp_layer_get_tile_size (GimpLayer *layer, + int n_tile, + int bpp, + goffset *offset, + int *width, + int *height) +{ + int tile_row, tile_column; + gsize tile_width; + gsize tile_height; + + if (layer->tiles.dirty) { + layer->tiles.last_col_width = layer->width % TILE_WIDTH; + layer->tiles.last_row_height = layer->height % TILE_WIDTH; + + layer->tiles.columns = layer->width / TILE_WIDTH; + if (layer->tiles.last_col_width > 0) + layer->tiles.columns++; + else + layer->tiles.last_col_width = TILE_WIDTH; + + layer->tiles.rows = layer->height / TILE_WIDTH; + if (layer->tiles.last_row_height > 0) + layer->tiles.rows++; + else + layer->tiles.last_row_height = TILE_WIDTH; + + layer->tiles.n_tiles = layer->tiles.columns * layer->tiles.rows; + layer->tiles.dirty = FALSE; + layer->stride = layer->width * bpp; + } + + if ((n_tile < 0) || (n_tile >= layer->tiles.n_tiles)) + return FALSE; + + tile_column = (n_tile % layer->tiles.columns); + if (tile_column == layer->tiles.columns - 1) + tile_width = layer->tiles.last_col_width; + else + tile_width = TILE_WIDTH; + + tile_row = (n_tile / layer->tiles.columns); + if (tile_row == layer->tiles.rows - 1) + tile_height = layer->tiles.last_row_height; + else + tile_height = TILE_WIDTH; + + *offset = ((tile_row * TILE_WIDTH) * layer->stride) + (tile_column * TILE_WIDTH * bpp); + *width = tile_width; + *height = tile_height; + + return TRUE; +} + + +static void +gimp_layer_free (GimpLayer *layer) +{ + if (layer == NULL) + return; + g_free (layer->pixels); + g_free (layer->alpha_mask); + g_free (layer->name); + g_free (layer); +} + + +/* -- _cairo_image_surface_create_from_xcf -- */ + + +/* RGB <-> HSV */ + + +static void +gimp_rgb_to_hsv (guchar red, + guchar green, + guchar blue, + guchar *hue, + guchar *sat, + guchar *val) +{ + guchar min, max; + + min = MIN3 (red, green, blue); + max = MAX3 (red, green, blue); + + *val = max; + if (*val == 0) { + *hue = *sat = 0; + return; + } + + *sat = 255 * (long)(max - min) / *val; + if (*sat == 0) { + *hue = 0; + return; + } + + if (max == min) + *hue = 0; + else if (max == red) + *hue = 0 + 43 * (green - blue) / (max - min); + else if (max == green) + *hue = 85 + 43 * (blue - red) / (max - min); + else if (max == blue) + *hue = 171 + 43 * (red - green) / (max - min); +} + + +static void +gimp_hsv_to_rgb (guchar hue, + guchar sat, + guchar val, + guchar *red, + guchar *green, + guchar *blue) +{ + guchar region, remainder, p, q, t; + + if (sat == 0) { + *red = *green = *blue = val; + return; + } + + region = hue / 43; + remainder = (hue - (region * 43)) * 6; + + p = (val * (255 - sat)) >> 8; + q = (val * (255 - ((sat * remainder) >> 8))) >> 8; + t = (val * (255 - ((sat * (255 - remainder)) >> 8))) >> 8; + + switch (region) { + case 0: + *red = val; + *green = t; + *blue = p; + break; + case 1: + *red = q; + *green = val; + *blue = p; + break; + case 2: + *red = p; + *green = val; + *blue = t; + break; + case 3: + *red = p; + *green = q; + *blue = val; + break; + case 4: + *red = t; + *green = p; + *blue = val; + break; + default: + *red = val; + *green = p; + *blue = q; + break; + } +} + + +/* RGB <-> HSL */ + + +static void +gimp_rgb_to_hsl (guchar red, + guchar green, + guchar blue, + guchar *hue, + guchar *sat, + guchar *lum) +{ + guchar min, max; + + min = MIN3 (red, green, blue); + max = MAX3 (red, green, blue); + + *lum = (max + min) / 2; + + if (max == min) { + *hue = *sat = 0; + return; + } + + if (*lum < 128) + *sat = 255 * (long) (max - min) / (max + min); + else + *sat = 255 * (long) (max - min) / (512 - max - min); + + if (max == min) + *hue = 0; + else if (max == red) + *hue = 0 + 43 * (green - blue) / (max - min); + else if (max == green) + *hue = 85 + 43 * (blue - red) / (max - min); + else if (max == blue) + *hue = 171 + 43 * (red - green) / (max - min); +} + + +static inline gint +gimp_hsl_value (gdouble n1, + gdouble n2, + gdouble hue) +{ + gdouble value; + + if (hue > 255) + hue -= 255; + else if (hue < 0) + hue += 255; + + if (hue < 42.5) + value = n1 + (n2 - n1) * (hue / 42.5); + else if (hue < 127.5) + value = n2; + else if (hue < 170) + value = n1 + (n2 - n1) * ((170 - hue) / 42.5); + else + value = n1; + + return value * 255.0; +} + + +static void +gimp_hsl_to_rgb (guchar hue, + guchar sat, + guchar lum, + guchar *red, + guchar *green, + guchar *blue) +{ + if (sat == 0) { + *red = lum; + *green = lum; + *blue = lum; + } + else { + gdouble h, s, l, m1, m2; + + h = hue; + s = sat; + l = lum; + + if (l < 128) + m2 = (l * (255 + s)) / 65025.0; + else + m2 = (l + s - (l * s) / 255.0) / 255.0; + + m1 = (l / 127.5) - m2; + + *red = gimp_hsl_value (m1, m2, h + 85); + *green = gimp_hsl_value (m1, m2, h); + *blue = gimp_hsl_value (m1, m2, h - 85); + } +} + + +static void +_cairo_image_surface_paint_layer (cairo_surface_t *image, + GimpLayer *layer) +{ + int image_width; + int image_height; + int image_row_stride; + guchar *image_row; + int layer_width; + int layer_height; + int layer_row_stride; + guchar *layer_row; + guchar *mask_row; + int x, y, width, height; + guchar *image_pixel; + guchar *layer_pixel; + guchar *mask_pixel; + GRand *rand_gen; + int i, j; + guchar r, g, b, a; + int temp, temp2; + guchar image_hue, image_sat, image_val, image_lum; + guchar layer_hue, layer_sat, layer_val, layer_lum; + + if ((image == NULL) || (layer->pixels == NULL)) + return; + + cairo_surface_flush (image); + + image_width = cairo_image_surface_get_width (image); + image_height = cairo_image_surface_get_height (image); + image_row_stride = cairo_image_surface_get_stride (image); + + layer_width = layer->width; + layer_height = layer->height; + layer_row_stride = layer->width * 4; + + /* compute the layer <-> image intersection */ + + { + cairo_region_t *region; + cairo_rectangle_int_t rect; + + rect.x = 0; + rect.y = 0; + rect.width = image_width; + rect.height = image_height; + region = cairo_region_create_rectangle (&rect); + + rect.x = layer->h_offset; + rect.y = layer->v_offset; + rect.width = layer_width; + rect.height = layer_height; + cairo_region_intersect_rectangle (region, &rect); + cairo_region_get_extents (region, &rect); + cairo_region_destroy (region); + + if ((rect.width == 0) || (rect.height == 0)) + return; + + x = rect.x; + y = rect.y; + width = rect.width; + height = rect.height; + } + + image_row = cairo_image_surface_get_data (image) + (y * image_row_stride) + (x * 4); + + x = (layer->h_offset < 0) ? -layer->h_offset : 0; + y = (layer->v_offset < 0) ? -layer->v_offset : 0; + layer_row = layer->pixels + (y * layer_row_stride) + (x * 4); + + mask_row = layer->alpha_mask + (y * layer_width) + x; + + if (layer->mode == GIMP_LAYER_MODE_DISSOLVE) + rand_gen = g_rand_new_with_seed (DISSOLVE_SEED); + + for (i = 0; i < height; i++) { + image_pixel = image_row; + layer_pixel = layer_row; + mask_pixel = mask_row; + + for (j = 0; j < width; j++) { + a = ((layer->bpp == 2) || (layer->bpp == 4)) ? layer_pixel[CAIRO_ALPHA] : 255; + + a = ADD_ALPHA (a, layer->opacity); + if (layer->alpha_mask && (layer->alpha_mask != NULL)) + a = ADD_ALPHA (a, mask_pixel[0]); + + if (a == 0) + goto next_pixel; + + switch (layer->mode) { + case GIMP_LAYER_MODE_NORMAL: + default: + r = layer_pixel[CAIRO_RED]; + g = layer_pixel[CAIRO_GREEN]; + b = layer_pixel[CAIRO_BLUE]; + break; + + case GIMP_LAYER_MODE_DISSOLVE: + if (g_rand_int_range (rand_gen, 0, 256) > a) + goto next_pixel; + r = layer_pixel[CAIRO_RED]; + g = layer_pixel[CAIRO_GREEN]; + b = layer_pixel[CAIRO_BLUE]; + a = 255; + break; + + case GIMP_LAYER_MODE_LIGHTEN_ONLY: + r = GIMP_OP_LIGHTEN_ONLY (layer_pixel[CAIRO_RED], image_pixel[CAIRO_RED]); + g = GIMP_OP_LIGHTEN_ONLY (layer_pixel[CAIRO_GREEN], image_pixel[CAIRO_GREEN]); + b = GIMP_OP_LIGHTEN_ONLY (layer_pixel[CAIRO_BLUE], image_pixel[CAIRO_BLUE]); + break; + + case GIMP_LAYER_MODE_SCREEN: + r = GIMP_OP_SCREEN (layer_pixel[CAIRO_RED], image_pixel[CAIRO_RED]); + g = GIMP_OP_SCREEN (layer_pixel[CAIRO_GREEN], image_pixel[CAIRO_GREEN]); + b = GIMP_OP_SCREEN (layer_pixel[CAIRO_BLUE], image_pixel[CAIRO_BLUE]); + break; + + case GIMP_LAYER_MODE_DODGE: + r = GIMP_OP_DODGE (layer_pixel[CAIRO_RED], image_pixel[CAIRO_RED]); + g = GIMP_OP_DODGE (layer_pixel[CAIRO_GREEN], image_pixel[CAIRO_GREEN]); + b = GIMP_OP_DODGE (layer_pixel[CAIRO_BLUE], image_pixel[CAIRO_BLUE]); + break; + + case GIMP_LAYER_MODE_ADDITION: + r = GIMP_OP_ADDITION (layer_pixel[CAIRO_RED], image_pixel[CAIRO_RED]); + g = GIMP_OP_ADDITION (layer_pixel[CAIRO_GREEN], image_pixel[CAIRO_GREEN]); + b = GIMP_OP_ADDITION (layer_pixel[CAIRO_BLUE], image_pixel[CAIRO_BLUE]); + break; + + case GIMP_LAYER_MODE_DARKEN_ONLY: + r = GIMP_OP_DARKEN_ONLY (layer_pixel[CAIRO_RED], image_pixel[CAIRO_RED]); + g = GIMP_OP_DARKEN_ONLY (layer_pixel[CAIRO_GREEN], image_pixel[CAIRO_GREEN]); + b = GIMP_OP_DARKEN_ONLY (layer_pixel[CAIRO_BLUE], image_pixel[CAIRO_BLUE]); + break; + + case GIMP_LAYER_MODE_MULTIPLY: + r = GIMP_OP_MULTIPLY (layer_pixel[CAIRO_RED], image_pixel[CAIRO_RED]); + g = GIMP_OP_MULTIPLY (layer_pixel[CAIRO_GREEN], image_pixel[CAIRO_GREEN]); + b = GIMP_OP_MULTIPLY (layer_pixel[CAIRO_BLUE], image_pixel[CAIRO_BLUE]); + break; + + case GIMP_LAYER_MODE_BURN: + r = GIMP_OP_BURN (layer_pixel[CAIRO_RED], image_pixel[CAIRO_RED]); + g = GIMP_OP_BURN (layer_pixel[CAIRO_GREEN], image_pixel[CAIRO_GREEN]); + b = GIMP_OP_BURN (layer_pixel[CAIRO_BLUE], image_pixel[CAIRO_BLUE]); + break; + + case GIMP_LAYER_MODE_OVERLAY: + case GIMP_LAYER_MODE_SOFT_LIGHT: + r = GIMP_OP_SOFT_LIGHT (layer_pixel[CAIRO_RED], image_pixel[CAIRO_RED]); + g = GIMP_OP_SOFT_LIGHT (layer_pixel[CAIRO_GREEN], image_pixel[CAIRO_GREEN]); + b = GIMP_OP_SOFT_LIGHT (layer_pixel[CAIRO_BLUE], image_pixel[CAIRO_BLUE]); + break; + + case GIMP_LAYER_MODE_HARD_LIGHT: + r = GIMP_OP_HARD_LIGHT (layer_pixel[CAIRO_RED], image_pixel[CAIRO_RED]); + g = GIMP_OP_HARD_LIGHT (layer_pixel[CAIRO_GREEN], image_pixel[CAIRO_GREEN]); + b = GIMP_OP_HARD_LIGHT (layer_pixel[CAIRO_BLUE], image_pixel[CAIRO_BLUE]); + break; + + case GIMP_LAYER_MODE_DIFFERENCE: + r = GIMP_OP_DIFFERENCE (layer_pixel[CAIRO_RED], image_pixel[CAIRO_RED]); + g = GIMP_OP_DIFFERENCE (layer_pixel[CAIRO_GREEN], image_pixel[CAIRO_GREEN]); + b = GIMP_OP_DIFFERENCE (layer_pixel[CAIRO_BLUE], image_pixel[CAIRO_BLUE]); + break; + + case GIMP_LAYER_MODE_SUBTRACT: + r = GIMP_OP_SUBTRACT (layer_pixel[CAIRO_RED], image_pixel[CAIRO_RED]); + g = GIMP_OP_SUBTRACT (layer_pixel[CAIRO_GREEN], image_pixel[CAIRO_GREEN]); + b = GIMP_OP_SUBTRACT (layer_pixel[CAIRO_BLUE], image_pixel[CAIRO_BLUE]); + break; + + case GIMP_LAYER_MODE_GRAIN_EXTRACT: + r = GIMP_OP_GRAIN_EXTRACT (layer_pixel[CAIRO_RED], image_pixel[CAIRO_RED]); + g = GIMP_OP_GRAIN_EXTRACT (layer_pixel[CAIRO_GREEN], image_pixel[CAIRO_GREEN]); + b = GIMP_OP_GRAIN_EXTRACT (layer_pixel[CAIRO_BLUE], image_pixel[CAIRO_BLUE]); + break; + + case GIMP_LAYER_MODE_GRAIN_MERGE: + r = GIMP_OP_GRAIN_MERGE (layer_pixel[CAIRO_RED], image_pixel[CAIRO_RED]); + g = GIMP_OP_GRAIN_MERGE (layer_pixel[CAIRO_GREEN], image_pixel[CAIRO_GREEN]); + b = GIMP_OP_GRAIN_MERGE (layer_pixel[CAIRO_BLUE], image_pixel[CAIRO_BLUE]); + break; + + case GIMP_LAYER_MODE_DIVIDE: + r = GIMP_OP_DIVIDE (layer_pixel[CAIRO_RED], image_pixel[CAIRO_RED]); + g = GIMP_OP_DIVIDE (layer_pixel[CAIRO_GREEN], image_pixel[CAIRO_GREEN]); + b = GIMP_OP_DIVIDE (layer_pixel[CAIRO_BLUE], image_pixel[CAIRO_BLUE]); + break; + + case GIMP_LAYER_MODE_HUE: + case GIMP_LAYER_MODE_SATURATION: + case GIMP_LAYER_MODE_VALUE: + gimp_rgb_to_hsv (image_pixel[CAIRO_RED], + image_pixel[CAIRO_GREEN], + image_pixel[CAIRO_BLUE], + &image_hue, + &image_sat, + &image_val); + gimp_rgb_to_hsv (layer_pixel[CAIRO_RED], + layer_pixel[CAIRO_GREEN], + layer_pixel[CAIRO_BLUE], + &layer_hue, + &layer_sat, + &layer_val); + + switch (layer->mode) { + case GIMP_LAYER_MODE_HUE: + gimp_hsv_to_rgb (layer_hue, + image_sat, + image_val, + &r, + &g, + &b); + break; + case GIMP_LAYER_MODE_SATURATION: + gimp_hsv_to_rgb (image_hue, + layer_sat, + image_val, + &r, + &g, + &b); + break; + case GIMP_LAYER_MODE_VALUE: + gimp_hsv_to_rgb (image_hue, + image_sat, + layer_val, + &r, + &g, + &b); + break; + default: + g_assert_not_reached (); + break; + } + break; + + case GIMP_LAYER_MODE_COLOR: + gimp_rgb_to_hsl (image_pixel[CAIRO_RED], + image_pixel[CAIRO_GREEN], + image_pixel[CAIRO_BLUE], + &image_hue, + &image_sat, + &image_lum); + gimp_rgb_to_hsl (layer_pixel[CAIRO_RED], + layer_pixel[CAIRO_GREEN], + layer_pixel[CAIRO_BLUE], + &layer_hue, + &layer_sat, + &layer_lum); + gimp_hsl_to_rgb (layer_hue, + layer_sat, + image_lum, + &r, + &g, + &b); + break; + } + + image_pixel[CAIRO_RED] = GIMP_OP_NORMAL (r, image_pixel[CAIRO_RED], a); + image_pixel[CAIRO_GREEN] = GIMP_OP_NORMAL (g, image_pixel[CAIRO_GREEN], a); + image_pixel[CAIRO_BLUE] = GIMP_OP_NORMAL (b, image_pixel[CAIRO_BLUE], a); + image_pixel[CAIRO_ALPHA] = GIMP_OP_NORMAL (255, image_pixel[CAIRO_ALPHA], a); + +next_pixel: + + image_pixel += 4; + layer_pixel += 4; + mask_pixel += 1; + } + + image_row += image_row_stride; + layer_row += layer_row_stride; + mask_row += layer_width; + } + + if (layer->mode == GIMP_LAYER_MODE_DISSOLVE) + g_rand_free (rand_gen); + + cairo_surface_mark_dirty (image); +} + + +static cairo_surface_t * +_cairo_image_surface_create_from_layers (int canvas_width, + int canvas_height, + GimpImageBaseType base_type, + GList *layers) +{ + cairo_surface_t *image; + GList *scan; + + image = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, canvas_width, canvas_height); + + for (scan = layers; scan; scan = scan->next) { + GimpLayer *layer = scan->data; + + if (layer->pixels == NULL) + continue; + + /* the bottommost layer only supports NORMAL and DISSOLVE */ + + if ((scan == layers) && (layer->mode != GIMP_LAYER_MODE_DISSOLVE)) + layer->mode = GIMP_LAYER_MODE_NORMAL; + + /* indexed images only support NORMAL and DISSOLVE */ + + if ((base_type == GIMP_INDEXED) && (layer->mode != GIMP_LAYER_MODE_DISSOLVE)) + layer->mode = GIMP_LAYER_MODE_NORMAL; + + /* modes supported only by RGB images */ + + if (base_type != GIMP_RGB) { + if ((layer->mode == GIMP_LAYER_MODE_HUE) + || (layer->mode == GIMP_LAYER_MODE_SATURATION) + || (layer->mode == GIMP_LAYER_MODE_COLOR) + || (layer->mode == GIMP_LAYER_MODE_VALUE)) + { + layer->mode = GIMP_LAYER_MODE_NORMAL; + } + } + + _cairo_image_surface_paint_layer (image, layer); + + performance (DEBUG_INFO, "end paint layer %d, mode %d", layer->n, layer->mode); + } + + return image; +} + + +static guchar * +read_pixels_from_hierarchy (GDataInputStream *data_stream, + guint32 hierarchy_offset, + GimpLayer *layer, + GimpColormap *colormap, + GimpImageBaseType base_type, + GimpCompression compression, + gboolean is_gimp_channel, + GCancellable *cancellable, + GError **error) +{ + guchar *image_pixels = NULL; + guint32 width; + guint32 height; + guint32 in_bpp; + guint32 out_bpp; + int row_stride; + guint32 level_offset; + GArray *tile_offsets = NULL; + guint32 tile_offset; + guint32 last_tile_offset; + int n_tiles; + int t; + + /* read the hierarchy structure */ + + if (! g_seekable_seek (G_SEEKABLE (data_stream), + hierarchy_offset, + G_SEEK_SET, + cancellable, + error)) + { + return NULL; + } + + width = g_data_input_stream_read_uint32 (data_stream, cancellable, error); + if (*error != NULL) + goto read_error; + + height = g_data_input_stream_read_uint32 (data_stream, cancellable, error); + if (*error != NULL) + goto read_error; + + in_bpp = g_data_input_stream_read_uint32 (data_stream, cancellable, error); + if (*error != NULL) + goto read_error; + + level_offset = g_data_input_stream_read_uint32 (data_stream, cancellable, error); + if (*error != NULL) + goto read_error; + + if (is_gimp_channel) + g_assert (in_bpp == 1); + + if (! is_gimp_channel) + layer->bpp = in_bpp; + + layer->tiles.dirty = TRUE; + + /* read the level structure */ + + if (! g_seekable_seek (G_SEEKABLE (data_stream), + level_offset, + G_SEEK_SET, + cancellable, + error)) + { + goto read_error; + } + + width = g_data_input_stream_read_uint32 (data_stream, cancellable, error); + if (*error != NULL) + goto read_error; + + height = g_data_input_stream_read_uint32 (data_stream, cancellable, error); + if (*error != NULL) + goto read_error; + + /* tiles */ + + out_bpp = is_gimp_channel ? 1 : 4; + row_stride = width * out_bpp; + image_pixels = g_new (guchar, row_stride * height); + + tile_offsets = g_array_new (FALSE, FALSE, sizeof (guint32));; + n_tiles = 0; + last_tile_offset = 0; + while ((tile_offset = g_data_input_stream_read_uint32 (data_stream, cancellable, error)) != 0) { + n_tiles += 1; + last_tile_offset = tile_offset; + g_array_append_val (tile_offsets, tile_offset); + } + tile_offset = last_tile_offset + MAX_TILE_SIZE; + g_array_append_val (tile_offsets, tile_offset); + + if (*error != NULL) + goto read_error; + + if (compression == GIMP_COMPRESSION_RLE) { + guchar *tile_data = NULL; + + /* go to the first tile */ + + tile_offset = g_array_index (tile_offsets, guint32, 0); + if (! g_seekable_seek (G_SEEKABLE (data_stream), + tile_offset, + G_SEEK_SET, + cancellable, + error)) + { + goto read_error; + } + + /* decompress the tile data */ + + tile_data = g_malloc (MAX_TILE_SIZE); + + for (t = 0; t < n_tiles; t++) { + goffset tile_data_size; + guchar *tile_data_p; + guchar *tile_data_limit; + gsize data_read; + goffset tile_pixels_offset; + gsize tile_pixels_size; + int tile_width; + int tile_height; + int c; + + /* read the tile data */ + + tile_data_size = g_array_index (tile_offsets, guint32, t + 1) - g_array_index (tile_offsets, guint32, t); + if (tile_data_size <= 0) + continue; + + data_read = g_input_stream_read (G_INPUT_STREAM (data_stream), tile_data, tile_data_size, cancellable, error); + if (*error != NULL) + goto rle_error; + + /* decompress the channel streams */ + + if (! gimp_layer_get_tile_size (layer, + t, + out_bpp, + &tile_pixels_offset, + &tile_width, + &tile_height)) + { + goto rle_error; + } + + tile_pixels_size = tile_width * tile_height; + tile_data_p = tile_data; + tile_data_limit = tile_data + data_read - 1; + + for (c = 0; c < in_bpp; c++) { + int channel_offset; + guchar *pixels_row; + guchar *pixel; + int size; + int n, p, q, v; + int tile_column; + + if (is_gimp_channel) + channel_offset = 0; + else if (base_type == GIMP_INDEXED) + channel_offset = cairo_indexed[c]; + else if (in_bpp >= 3) + channel_offset = cairo_rgba[c]; + else if (in_bpp <= 2) + channel_offset = cairo_graya[c]; + else + channel_offset = 0; + pixels_row = image_pixels + tile_pixels_offset + channel_offset; + pixel = pixels_row; + + size = tile_pixels_size; + tile_column = 0; + +#define SET_PIXEL(v) { \ + tile_column++; \ + if (tile_column > tile_width) { \ + pixels_row += row_stride; \ + pixel = pixels_row; \ + tile_column = 1; \ + } \ + if ((base_type == GIMP_INDEXED) && (c == 0)) { \ + guchar *color = (guchar *) (colormap + (v)); \ + pixel[CAIRO_RED] = color[0]; \ + pixel[CAIRO_GREEN] = color[1]; \ + pixel[CAIRO_BLUE] = color[2]; \ + } \ + else if (! is_gimp_channel && (in_bpp <= 2) && (c == 0)) { \ + pixel[CAIRO_RED] = (v); \ + pixel[CAIRO_GREEN] = (v); \ + pixel[CAIRO_BLUE] = (v); \ + } \ + else \ + *pixel = (v); \ + pixel += out_bpp; \ +} + + while (size > 0) { + if (tile_data_p > tile_data_limit) + goto rle_error; + + n = *tile_data_p++; + + if ((n >= 0) && (n <= 127)) { + /* byte n For 0 <= n <= 126: a short run of identical bytes + * byte v Repeat this value n+1 times + */ + + /* byte 127 A long run of identical bytes + * byte p + * byte q + * byte v Repeat this value p*256 + q times + */ + + if (n == 127) { + if (tile_data_p + 2 > tile_data_limit) + goto rle_error; + p = *tile_data_p++; + q = *tile_data_p++; + v = *tile_data_p++; + n = (p * 256) + q; + } + else { + if (tile_data_p > tile_data_limit) + goto rle_error; + v = *tile_data_p++; + n++; + } + + size -= n; + if (size < 0) + goto rle_error; + + while (n-- > 0) + SET_PIXEL (v); + } + else if ((n >= 128) && (n <= 255)) { + /* byte 128 A long run of different bytes + * byte p + * byte q + * byte[p*256+q] data Copy these verbatim to the output stream */ + + /* byte n For 129 <= n <= 255: a short run of different bytes + * byte[256-n] data Copy these verbatim to the output stream */ + + if (n == 128) { + if (tile_data_p + 1 > tile_data_limit) + goto rle_error; + p = *tile_data_p++; + q = *tile_data_p++; + n = (p * 256) + q; + } + else + n = 256 - n; + + if (tile_data_p + n - 1 > tile_data_limit) + goto rle_error; + + size -= n; + if (size < 0) + goto rle_error; + + while (n-- > 0) { + v = *tile_data_p++; + SET_PIXEL (v); + } + } + } + } + + } + +rle_error: + + g_free (tile_data); + } + else if (compression == GIMP_COMPRESSION_NONE) { + + /* Gimp doesn't save in uncompressed mode. */ + + } + + performance (DEBUG_INFO, "end read hierarchy"); + + g_array_free (tile_offsets, TRUE); + + return image_pixels; + +read_error: + + g_free (image_pixels); + g_array_free (tile_offsets, TRUE); + + return NULL; +} + + +#undef SET_PIXEL + + +GthImage * +_cairo_image_surface_create_from_xcf (GInputStream *istream, + GthFileData *file_data, + int requested_size, + int *original_width, + int *original_height, + gpointer user_data, + GCancellable *cancellable, + GError **error) +{ + GthImage *image = NULL; + cairo_surface_t *surface; + GDataInputStream *data_stream; + char *file_type; + char *version; + guint32 canvas_width; + guint32 canvas_height; + GimpImageBaseType base_type; + guint32 property_type; + guint32 payload_length; + GimpCompression compression; + GList *layers; + guint32 n_colors; + GimpColormap *colormap; + guint n_properties; + gboolean read_properties; + GArray *layer_offsets; + guint32 layer_offset; + guint n_layers; + guint32 channel_offset; + guint n_channels; + int i; + + performance (DEBUG_INFO, "start loading"); + + g_once (&xcf_init_once, xcf_init, NULL); + + performance (DEBUG_INFO, "end init"); + + data_stream = g_data_input_stream_new (istream); + g_data_input_stream_set_byte_order (data_stream, G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN); + + /* file type magic */ + + file_type = _g_data_input_stream_read_c_string (data_stream, 9, cancellable, error); + if (*error != NULL) + goto out; + + if (g_strcmp0 (file_type, "gimp xcf ") != 0) { + g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_DATA, "Invalid format"); + return NULL; + } + g_free (file_type); + + /* version */ + + version = _g_data_input_stream_read_c_string (data_stream, 5, cancellable, error); + if (*error != NULL) + goto out; + g_free (version); + + /* canvas size */ + + canvas_width = g_data_input_stream_read_uint32 (data_stream, cancellable, error); + if (*error != NULL) + goto out; + + canvas_height = g_data_input_stream_read_uint32 (data_stream, cancellable, error); + if (*error != NULL) + goto out; + + /* base type */ + + base_type = g_data_input_stream_read_uint32 (data_stream, cancellable, error); + if (*error != NULL) + goto out; + + /* properties */ + + compression = GIMP_COMPRESSION_RLE; + layers = NULL; + colormap = NULL; + + read_properties = TRUE; + n_properties = 0; + while (read_properties) { + property_type = g_data_input_stream_read_uint32 (data_stream, cancellable, error); + if (*error != NULL) + goto out; + + payload_length = g_data_input_stream_read_uint32 (data_stream, cancellable, error); + if (*error != NULL) + goto out; + + n_properties += 1; + + switch (property_type) { + case 0: /* PROP_END */ + read_properties = FALSE; + break; + + case 1: /* PROP_COLORMAP */ + n_colors = g_data_input_stream_read_uint32 (data_stream, cancellable, error); + if (*error != NULL) + goto out; + + if (base_type == GIMP_INDEXED) { + int i; + guchar *c; + + colormap = g_new (GimpColormap, n_colors); + c = (guchar *) colormap; + for (i = 0; i < n_colors; i++) { + c[0] = g_data_input_stream_read_byte (data_stream, cancellable, error); + if (*error != NULL) + goto out; + + c[1] = g_data_input_stream_read_byte (data_stream, cancellable, error); + if (*error != NULL) + goto out; + + c[2] = g_data_input_stream_read_byte (data_stream, cancellable, error); + if (*error != NULL) + goto out; + + c += 3; + } + } + else { /* when skipping the colormap do not trust the payload_length value. */ + g_input_stream_skip (G_INPUT_STREAM (data_stream), (n_colors * 3), cancellable, error); + if (*error != NULL) + goto out; + } + break; + + case 17: /* PROP_COMPRESSION */ + compression = g_data_input_stream_read_byte (data_stream, cancellable, error); + if (*error != NULL) + goto out; + break; + + default: + g_input_stream_skip (G_INPUT_STREAM (data_stream), payload_length, cancellable, error); + if (*error != NULL) + goto out; + break; + } + } + + /* layers */ + + n_layers = 0; + layer_offsets = g_array_new (FALSE, FALSE, sizeof (guint32)); + while ((layer_offset = g_data_input_stream_read_uint32 (data_stream, cancellable, error)) != 0) { + n_layers += 1; + g_array_append_val (layer_offsets, layer_offset); + } + + /* channels */ + + n_channels = 0; + while ((channel_offset = g_data_input_stream_read_uint32 (data_stream, cancellable, error)) != 0) + n_channels += 1; + + if (*error != NULL) + goto out; + + /* read the layers */ + + performance (DEBUG_INFO, "start read layers"); + + for (i = 0; i < n_layers; i++) { + GimpLayer *layer; + guint32 hierarchy_offset; + guint32 mask_offset; + char *mask_name; + + layer_offset = g_array_index (layer_offsets, guint32, i); + + if (! g_seekable_seek (G_SEEKABLE (data_stream), + layer_offset, + G_SEEK_SET, + cancellable, + error)) + { + goto out; + } + + layer = gimp_layer_new (i); + layers = g_list_prepend (layers, layer); + + /* size */ + + layer->width = g_data_input_stream_read_uint32 (data_stream, cancellable, error); + if (*error != NULL) + goto out; + + layer->height = g_data_input_stream_read_uint32 (data_stream, cancellable, error); + if (*error != NULL) + goto out; + + /* type */ + + layer->type = g_data_input_stream_read_uint32 (data_stream, cancellable, error); + if (*error != NULL) + goto out; + + /* name */ + + layer->name = _g_data_input_stream_read_xcf_string (data_stream, cancellable, error); + if (*error != NULL) + goto out; + + /* properties */ + + read_properties = TRUE; + n_properties = 0; + while (read_properties) { + property_type = g_data_input_stream_read_uint32 (data_stream, cancellable, error); + if (*error != NULL) + goto out; + + payload_length = g_data_input_stream_read_uint32 (data_stream, cancellable, error); + if (*error != NULL) + goto out; + + n_properties += 1; + + switch (property_type) { + case 0: /* PROP_END */ + read_properties = FALSE; + break; + + case 5: /* PROP_FLOATING_SELECTION */ + layer->floating_selection = TRUE; + g_input_stream_skip (G_INPUT_STREAM (data_stream), payload_length, cancellable, error); + break; + + case 6: /* PROP_OPACITY */ + layer->opacity = g_data_input_stream_read_uint32 (data_stream, cancellable, error); + break; + + case 7: /* PROP_MODE */ + layer->mode = g_data_input_stream_read_uint32 (data_stream, cancellable, error); + break; + + case 8: /* PROP_VISIBLE */ + layer->visible = g_data_input_stream_read_uint32 (data_stream, cancellable, error); + break; + + case 11: /* PROP_APPLY_MASK */ + layer->apply_mask = (g_data_input_stream_read_uint32 (data_stream, cancellable, error) == 1); + break; + + case 15: /* PROP_OFFSETS */ + layer->h_offset = g_data_input_stream_read_uint32 (data_stream, cancellable, error); + if (*error != NULL) + goto out; + + layer->v_offset = g_data_input_stream_read_uint32 (data_stream, cancellable, error); + break; + + default: + g_input_stream_skip (G_INPUT_STREAM (data_stream), payload_length, cancellable, error); + break; + } + + if (*error != NULL) + goto out; + } + + /* hierarchy structure offset */ + + hierarchy_offset = g_data_input_stream_read_uint32 (data_stream, cancellable, error); + if (*error != NULL) + goto out; + + /* layer mask offset */ + + mask_offset = g_data_input_stream_read_uint32 (data_stream, cancellable, error); + if (*error != NULL) + goto out; + + /* the layer image */ + + if (layer->floating_selection || ! layer->visible || (layer->opacity == 0)) + continue; + + layer->pixels = read_pixels_from_hierarchy (data_stream, hierarchy_offset, layer, colormap, base_type, compression, FALSE, cancellable, error); + if (*error != NULL) + goto out; + + /* read the mask */ + + if (! layer->apply_mask || (mask_offset == 0)) + continue; + + if (! g_seekable_seek (G_SEEKABLE (data_stream), + mask_offset, + G_SEEK_SET, + cancellable, + error)) + { + goto out; + } + + /* mask width, height and name */ + + /*mask_width = */ g_data_input_stream_read_uint32 (data_stream, cancellable, error); + if (*error != NULL) + goto out; + + /*mask_height = */ g_data_input_stream_read_uint32 (data_stream, cancellable, error); + if (*error != NULL) + goto out; + + mask_name = _g_data_input_stream_read_xcf_string (data_stream, cancellable, error); + if (*error != NULL) + goto out; + + g_free (mask_name); + + /* mask properties */ + + read_properties = TRUE; + n_properties = 0; + while (read_properties) { + property_type = g_data_input_stream_read_uint32 (data_stream, cancellable, error); + if (*error != NULL) + goto out; + + payload_length = g_data_input_stream_read_uint32 (data_stream, cancellable, error); + if (*error != NULL) + goto out; + + n_properties += 1; + + switch (property_type) { + case 0: /* PROP_END */ + read_properties = FALSE; + break; + + default: + g_input_stream_skip (G_INPUT_STREAM (data_stream), payload_length, cancellable, error); + if (*error != NULL) + goto out; + break; + } + } + + /* the mask image */ + + hierarchy_offset = g_data_input_stream_read_uint32 (data_stream, cancellable, error); + if (*error != NULL) + goto out; + + layer->alpha_mask = read_pixels_from_hierarchy (data_stream, hierarchy_offset, layer, colormap, base_type, compression, TRUE, cancellable, error); + if (*error != NULL) + goto out; + } + + performance (DEBUG_INFO, "end read layers"); + + surface = _cairo_image_surface_create_from_layers (canvas_width, canvas_height, base_type, layers); + image = gth_image_new_for_surface (surface); + cairo_surface_destroy (surface); + + performance (DEBUG_INFO, "end rendering"); + +out: + + g_list_free_full (layers, (GDestroyNotify) gimp_layer_free); + if (layer_offsets != NULL) + g_array_free (layer_offsets, TRUE); + g_free (colormap); + if (data_stream != NULL) + g_object_unref (data_stream); + + return image; +} diff -Nru gthumb-3.0.2/extensions/cairo_io/cairo-image-surface-xcf.h gthumb-3.2.3/extensions/cairo_io/cairo-image-surface-xcf.h --- gthumb-3.0.2/extensions/cairo_io/cairo-image-surface-xcf.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/cairo-image-surface-xcf.h 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,41 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2013 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef CAIRO_IMAGE_SURFACE_XCF_H +#define CAIRO_IMAGE_SURFACE_XCF_H + +#include +#include + +G_BEGIN_DECLS + +GthImage * _cairo_image_surface_create_from_xcf (GInputStream *istream, + GthFileData *file_data, + int requested_size, + int *original_width, + int *original_height, + gpointer user_data, + GCancellable *cancellable, + GError **error); + +G_END_DECLS + +#endif /* CAIRO_IMAGE_SURFACE_XCF_H */ diff -Nru gthumb-3.0.2/extensions/cairo_io/cairo-io-jpeg.c gthumb-3.2.3/extensions/cairo_io/cairo-io-jpeg.c --- gthumb-3.0.2/extensions/cairo_io/cairo-io-jpeg.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/cairo-io-jpeg.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,547 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2011 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "cairo-io-jpeg.h" - - -/* error handler data */ - - -struct error_handler_data { - struct jpeg_error_mgr pub; - sigjmp_buf setjmp_buffer; - GError **error; -}; - - -static void -fatal_error_handler (j_common_ptr cinfo) -{ - struct error_handler_data *errmgr; - char buffer[JMSG_LENGTH_MAX]; - - errmgr = (struct error_handler_data *) cinfo->err; - - /* Create the message */ - (* cinfo->err->format_message) (cinfo, buffer); - - /* broken check for *error == NULL for robustness against - * crappy JPEG library - */ - if (errmgr->error && *errmgr->error == NULL) { - g_set_error (errmgr->error, - GDK_PIXBUF_ERROR, - GDK_PIXBUF_ERROR_CORRUPT_IMAGE, - _("Error interpreting JPEG image file: %s"), - buffer); - } - - siglongjmp (errmgr->setjmp_buffer, 1); - - g_assert_not_reached (); -} - - -static void -output_message_handler (j_common_ptr cinfo) -{ - /* This method keeps libjpeg from dumping crap to stderr */ - /* do nothing */ -} - - -/* tables with pre-multiplied values */ - - -static unsigned char *CMYK_Tab = NULL; -static int *YCbCr_R_Cr_Tab = NULL; -static int *YCbCr_G_Cb_Tab = NULL; -static int *YCbCr_G_Cr_Tab = NULL; -static int *YCbCr_B_Cb_Tab = NULL; - - -#define SCALE_FACTOR 16 -#define SCALE_UP(x) ((gint32) ((x) * (1L << SCALE_FACTOR) + 0.5)) -#define SCALE_DOWN(x) ((x) >> SCALE_FACTOR) -#define ONE_HALF ((gint32) (1 << (SCALE_FACTOR - 1))) - - -static void -CMYK_table_init (void) -{ - if (CMYK_Tab == NULL) { - int v, k, i; - double k1; - - /* tab[k * 256 + v] = v * k / 255.0 */ - - CMYK_Tab = g_new (unsigned char, 256 * 256); - i = 0; - for (k = 0; k <= 255; k++) { - k1 = (double) k / 255.0; - for (v = 0; v <= 255; v++) - CMYK_Tab[i++] = (double) v * k1; - } - } -} - - -static void -YCbCr_tables_init (void) -{ - if (YCbCr_R_Cr_Tab == NULL) { - int i, v; - - YCbCr_R_Cr_Tab = g_new (int, 256); - YCbCr_G_Cb_Tab = g_new (int, 256); - YCbCr_G_Cr_Tab = g_new (int, 256); - YCbCr_B_Cb_Tab = g_new (int, 256); - - for (i = 0, v = -128; i <= 255; i++, v++) { - YCbCr_R_Cr_Tab[i] = SCALE_DOWN (SCALE_UP(1.402) * v + ONE_HALF); - YCbCr_G_Cb_Tab[i] = - SCALE_UP (0.34414) * v; - YCbCr_G_Cr_Tab[i] = - SCALE_UP (0.71414) * v + ONE_HALF; - YCbCr_B_Cb_Tab[i] = SCALE_DOWN (SCALE_UP(1.77200) * v + ONE_HALF); - } - } -} - - -GthImage * -_cairo_image_surface_create_from_jpeg (GthFileData *file_data, - int requested_size, - int *original_width, - int *original_height, - gpointer user_data, - GCancellable *cancellable, - GError **error) -{ - GthImage *image; - gboolean load_scaled; - GthTransform orientation; - int destination_width; - int destination_height; - int line_start; - int line_step; - int pixel_step; - void *in_buffer; - gsize in_buffer_size; - struct error_handler_data jsrcerr; - struct jpeg_decompress_struct srcinfo; - cairo_surface_t *surface; - cairo_surface_metadata_t *metadata; - unsigned char *surface_row; - JSAMPARRAY buffer; - int buffer_stride; - JDIMENSION n_lines; - JSAMPARRAY buffer_row; - int l; - unsigned char *p_surface; - guchar r, g, b; - guint32 pixel; - unsigned char *p_buffer; - int x; - - image = gth_image_new (); - - if (! g_load_file_in_buffer (file_data->file, - &in_buffer, - &in_buffer_size, - cancellable, - error)) - { - return image; - } - - srcinfo.err = jpeg_std_error (&(jsrcerr.pub)); - jsrcerr.pub.error_exit = fatal_error_handler; - jsrcerr.pub.output_message = output_message_handler; - jsrcerr.error = error; - - jpeg_create_decompress (&srcinfo); - - if (sigsetjmp (jsrcerr.setjmp_buffer, 1)) { - g_free (in_buffer); - jpeg_destroy_decompress (&srcinfo); - return image; - } - - _jpeg_memory_src (&srcinfo, in_buffer, in_buffer_size); - - jpeg_read_header (&srcinfo, TRUE); - - srcinfo.out_color_space = srcinfo.jpeg_color_space; /* make all the color space conversions manually */ - - load_scaled = (requested_size > 0) && (requested_size < srcinfo.image_width) && (requested_size < srcinfo.image_height); - if (load_scaled) { - for (srcinfo.scale_denom = 1; srcinfo.scale_denom <= 16; srcinfo.scale_denom++) { - jpeg_calc_output_dimensions (&srcinfo); - if ((srcinfo.output_width < requested_size) || (srcinfo.output_height < requested_size)) { - srcinfo.scale_denom += 1; - break; - } - } - - if (srcinfo.scale_denom == 0) - srcinfo.scale_denom = srcinfo.scale_num; - - jpeg_calc_output_dimensions (&srcinfo); - } - - jpeg_start_decompress (&srcinfo); - - orientation = _jpeg_exif_orientation (in_buffer, in_buffer_size); - _cairo_image_surface_transform_get_steps (CAIRO_FORMAT_ARGB32, - MIN (srcinfo.output_width, CAIRO_MAX_IMAGE_SIZE), - MIN (srcinfo.output_height, CAIRO_MAX_IMAGE_SIZE), - orientation, - &destination_width, - &destination_height, - &line_start, - &line_step, - &pixel_step); - -#if 0 - g_print ("requested: %d, original [%d, %d] ==> load at [%d, %d]\n", - requested_size, - srcinfo.image_width, - srcinfo.image_height, - destination_width, - destination_height); -#endif - - surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, destination_width, destination_height); - if (cairo_surface_status (surface) != CAIRO_STATUS_SUCCESS) { - /* g_warning ("%s", cairo_status_to_string (cairo_surface_status (surface))); */ - - jpeg_destroy ((j_common_ptr) &srcinfo); - cairo_surface_destroy (surface); - g_free (in_buffer); - - return image; - } - metadata = _cairo_image_surface_get_metadata (surface); - metadata->has_alpha = FALSE; - cairo_surface_flush (surface); - surface_row = cairo_image_surface_get_data (surface) + line_start; - - buffer_stride = srcinfo.output_width * srcinfo.output_components; - buffer = (*srcinfo.mem->alloc_sarray) ((j_common_ptr) &srcinfo, JPOOL_IMAGE, buffer_stride, srcinfo.rec_outbuf_height); - - switch (srcinfo.out_color_space) { - case JCS_CMYK: - { - register unsigned char *cmyk_tab; - int c, m, y, k, ki; - - CMYK_table_init (); - cmyk_tab = CMYK_Tab; - - while (srcinfo.output_scanline < srcinfo.output_height) { - if (g_cancellable_is_cancelled (cancellable)) - break; - - n_lines = jpeg_read_scanlines (&srcinfo, buffer, srcinfo.rec_outbuf_height); - - buffer_row = buffer; - for (l = 0; l < n_lines; l++) { - p_surface = surface_row; - p_buffer = buffer_row[l]; - - for (x = 0; x < srcinfo.output_width; x++) { - if (srcinfo.saw_Adobe_marker) { - c = p_buffer[0]; - m = p_buffer[1]; - y = p_buffer[2]; - k = p_buffer[3]; - } - else { - c = 255 - p_buffer[0]; - m = 255 - p_buffer[1]; - y = 255 - p_buffer[2]; - k = 255 - p_buffer[3]; - } - - ki = k << 8; /* ki = k * 256 */ - r = cmyk_tab[ki + c]; - g = cmyk_tab[ki + m]; - b = cmyk_tab[ki + y]; - pixel = CAIRO_RGBA_TO_UINT32 (r, g, b, 0xff); - memcpy (p_surface, &pixel, sizeof (guint32)); - - p_surface += pixel_step; - p_buffer += 4 /*srcinfo.output_components*/; - } - - surface_row += line_step; - buffer_row += buffer_stride; - } - } - } - break; - - case JCS_GRAYSCALE: - { - while (srcinfo.output_scanline < srcinfo.output_height) { - if (g_cancellable_is_cancelled (cancellable)) - break; - - n_lines = jpeg_read_scanlines (&srcinfo, buffer, srcinfo.rec_outbuf_height); - - buffer_row = buffer; - for (l = 0; l < n_lines; l++) { - p_surface = surface_row; - p_buffer = buffer_row[l]; - - for (x = 0; x < srcinfo.output_width; x++) { - r = g = b = p_buffer[0]; - pixel = CAIRO_RGBA_TO_UINT32 (r, g, b, 0xff); - memcpy (p_surface, &pixel, sizeof (guint32)); - - p_surface += pixel_step; - p_buffer += 1 /*srcinfo.output_components*/; - } - - surface_row += line_step; - buffer_row += buffer_stride; - } - } - } - break; - - case JCS_RGB: - { - while (srcinfo.output_scanline < srcinfo.output_height) { - if (g_cancellable_is_cancelled (cancellable)) - break; - - n_lines = jpeg_read_scanlines (&srcinfo, buffer, srcinfo.rec_outbuf_height); - - buffer_row = buffer; - for (l = 0; l < n_lines; l++) { - p_surface = surface_row; - p_buffer = buffer_row[l]; - - for (x = 0; x < srcinfo.output_width; x++) { - r = p_buffer[0]; - g = p_buffer[1]; - b = p_buffer[2]; - pixel = CAIRO_RGBA_TO_UINT32 (r, g, b, 0xff); - memcpy (p_surface, &pixel, sizeof (guint32)); - - p_surface += pixel_step; - p_buffer += 3 /*srcinfo.output_components*/; - } - - surface_row += line_step; - buffer_row += buffer_stride; - } - } - } - break; - - case JCS_YCbCr: - { - register JSAMPLE *range_limit = srcinfo.sample_range_limit; - register int *r_cr_tab; - register int *g_cb_tab; - register int *g_cr_tab; - register int *b_cb_tab; - int Y, Cb, Cr; - - YCbCr_tables_init (); - r_cr_tab = YCbCr_R_Cr_Tab; - g_cb_tab = YCbCr_G_Cb_Tab; - g_cr_tab = YCbCr_G_Cr_Tab; - b_cb_tab = YCbCr_B_Cb_Tab; - - while (srcinfo.output_scanline < srcinfo.output_height) { - if (g_cancellable_is_cancelled (cancellable)) - break; - - n_lines = jpeg_read_scanlines (&srcinfo, buffer, srcinfo.rec_outbuf_height); - - buffer_row = buffer; - for (l = 0; l < n_lines; l++) { - p_surface = surface_row; - p_buffer = buffer_row[l]; - - for (x = 0; x < srcinfo.output_width; x++) { - Y = p_buffer[0]; - Cb = p_buffer[1]; - Cr = p_buffer[2]; - - r = range_limit[Y + r_cr_tab[Cr]]; - g = range_limit[Y + SCALE_DOWN (g_cb_tab[Cb] + g_cr_tab[Cr])]; - b = range_limit[Y + b_cb_tab[Cb]]; - pixel = CAIRO_RGBA_TO_UINT32 (r, g, b, 0xff); - memcpy (p_surface, &pixel, sizeof (guint32)); - - p_surface += pixel_step; - p_buffer += 3 /*srcinfo.output_components*/; - } - - surface_row += line_step; - buffer_row += buffer_stride; - } - } - } - break; - - case JCS_YCCK: - { - register JSAMPLE *range_limit = srcinfo.sample_range_limit; - register int *r_cr_tab; - register int *g_cb_tab; - register int *g_cr_tab; - register int *b_cb_tab; - register guchar *cmyk_tab; - int Y, Cb, Cr, K, Ki, c, m , y; - - YCbCr_tables_init (); - r_cr_tab = YCbCr_R_Cr_Tab; - g_cb_tab = YCbCr_G_Cb_Tab; - g_cr_tab = YCbCr_G_Cr_Tab; - b_cb_tab = YCbCr_B_Cb_Tab; - - CMYK_table_init (); - cmyk_tab = CMYK_Tab; - - while (srcinfo.output_scanline < srcinfo.output_height) { - if (g_cancellable_is_cancelled (cancellable)) - break; - - n_lines = jpeg_read_scanlines (&srcinfo, buffer, srcinfo.rec_outbuf_height); - - buffer_row = buffer; - for (l = 0; l < n_lines; l++) { - p_surface = surface_row; - p_buffer = buffer_row[l]; - - for (x = 0; x < srcinfo.output_width; x++) { - Y = p_buffer[0]; - Cb = p_buffer[1]; - Cr = p_buffer[2]; - K = p_buffer[3]; - - c = range_limit[255 - (Y + r_cr_tab[Cr])]; - m = range_limit[255 - (Y + SCALE_DOWN (g_cb_tab[Cb] + g_cr_tab[Cr]))]; - y = range_limit[255 - (Y + b_cb_tab[Cb])]; - - Ki = K << 8; /* ki = K * 256 */ - - r = cmyk_tab[Ki + c]; - g = cmyk_tab[Ki + m]; - b = cmyk_tab[Ki + y]; - pixel = CAIRO_RGBA_TO_UINT32 (r, g, b, 0xff); - memcpy (p_surface, &pixel, sizeof (guint32)); - - p_surface += pixel_step; - p_buffer += 4 /*srcinfo.output_components*/; - } - - surface_row += line_step; - buffer_row += buffer_stride; - } - } - } - break; - - case JCS_UNKNOWN: - default: - g_set_error (error, - GDK_PIXBUF_ERROR, - GDK_PIXBUF_ERROR_UNKNOWN_TYPE, - _("Unknown JPEG color space (%d)"), - srcinfo.out_color_space); - break; - } - - if (! g_cancellable_is_cancelled (cancellable)) { - cairo_surface_mark_dirty (surface); - - /* Scale to the requested size */ - - if (load_scaled) { - cairo_surface_t *scaled; - int width; - int height; - - width = destination_width; - height = destination_height; - scale_keeping_ratio (&width, &height, requested_size, requested_size, TRUE); - scaled = _cairo_image_surface_scale_to (surface, width, height, CAIRO_FILTER_BILINEAR); - - cairo_surface_destroy (surface); - surface = scaled; - } - - /* Set the original dimensions */ - - if ((orientation == GTH_TRANSFORM_ROTATE_90) - || (orientation == GTH_TRANSFORM_ROTATE_270) - || (orientation == GTH_TRANSFORM_TRANSPOSE) - || (orientation == GTH_TRANSFORM_TRANSVERSE)) - { - if (original_width != NULL) - *original_width = srcinfo.image_height; - if (original_height != NULL) - *original_height = srcinfo.image_width; - } - else { - if (original_width != NULL) - *original_width = srcinfo.image_width; - if (original_height != NULL) - *original_height = srcinfo.image_height; - } - - /*_cairo_image_surface_set_attribute_int (surface, "Image::Rotation", rotation); FIXME*/ - - /* FIXME _cairo_image_surface_set_attribute (surface, "Jpeg::ColorSpace", jpeg_color_space_name (srcinfo.jpeg_color_space)); */ - - gth_image_set_cairo_surface (image, surface); - - jpeg_finish_decompress (&srcinfo); - jpeg_destroy_decompress (&srcinfo); - } - else - jpeg_destroy ((j_common_ptr) &srcinfo); - - cairo_surface_destroy (surface); - g_free (in_buffer); - - return image; -} - - -#undef SCALE_FACTOR -#undef SCALE_UP -#undef SCALE_DOWN -#undef ONE_HALF diff -Nru gthumb-3.0.2/extensions/cairo_io/cairo-io-jpeg.h gthumb-3.2.3/extensions/cairo_io/cairo-io-jpeg.h --- gthumb-3.0.2/extensions/cairo_io/cairo-io-jpeg.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/cairo-io-jpeg.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2011 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef CAIRO_IO_JPEG_H -#define CAIRO_IO_JPEG_H - -#include -#include - -G_BEGIN_DECLS - -GthImage * _cairo_image_surface_create_from_jpeg (GthFileData *file_data, - int requested_size, - int *original_width, - int *original_height, - gpointer user_data, - GCancellable *cancellable, - GError **error); - -G_END_DECLS - -#endif /* CAIRO_IO_JPEG_H */ diff -Nru gthumb-3.0.2/extensions/cairo_io/cairo-io-png.c gthumb-3.2.3/extensions/cairo_io/cairo-io-png.c --- gthumb-3.0.2/extensions/cairo_io/cairo-io-png.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/cairo-io-png.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,252 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2011 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include "cairo-io-png.h" - -/* starting from libpng version 1.5 it is not possible - * to access inside the PNG struct directly - */ -#define PNG_SETJMP(ptr) setjmp(png_jmpbuf(ptr)) - -#ifdef PNG_LIBPNG_VER -#if PNG_LIBPNG_VER < 10400 -#ifdef PNG_SETJMP -#undef PNG_SETJMP -#endif -#define PNG_SETJMP(ptr) setjmp(ptr->jmpbuf) -#endif -#endif - -typedef struct { - GFileInputStream *stream; - GCancellable *cancellable; - GError **error; - png_struct *png_ptr; - png_info *png_info_ptr; - cairo_surface_t *surface; -} CairoPngData; - - -static void -_cairo_png_data_destroy (CairoPngData *cairo_png_data) -{ - png_destroy_read_struct (&cairo_png_data->png_ptr, &cairo_png_data->png_info_ptr, NULL); - g_object_unref (cairo_png_data->stream); - cairo_surface_destroy (cairo_png_data->surface); - g_free (cairo_png_data); -} - - -static void -gerror_error_func (png_structp png_ptr, - png_const_charp message) -{ - GError ***error_p = png_get_error_ptr (png_ptr); - GError **error = *error_p; - - if (error != NULL) - *error = g_error_new (G_IO_ERROR, G_IO_ERROR_INVALID_DATA, "%s", message); -} - - -static void -gerror_warning_func (png_structp png_ptr, - png_const_charp message) -{ - /* void: we don't care about warnings */ -} - - -static void -cairo_png_read_data_func (png_structp png_ptr, - png_bytep buffer, - png_size_t size) -{ - CairoPngData *cairo_png_data; - gssize n; - GError *error = NULL; - - cairo_png_data = png_get_io_ptr (png_ptr); - n = g_input_stream_read (G_INPUT_STREAM (cairo_png_data->stream), - buffer, - size, - cairo_png_data->cancellable, - &error); - if (n < 0) { - png_error (png_ptr, error->message); - g_error_free (error); - } -} - - -static void -transform_to_argb32_format_func (png_structp png, - png_row_infop row_info, - png_bytep data) -{ - guint i; - guint32 pixel; - - for (i = 0; i < row_info->rowbytes; i += 4) { - guchar *p_iter = data + i; - guchar r, g, b, a; - - a = p_iter[3]; - if (a == 0xff) { - pixel = CAIRO_RGBA_TO_UINT32 (p_iter[0], p_iter[1], p_iter[2], 0xff); - } - else if (a == 0) { - pixel = 0; - } - else { - r = _cairo_multiply_alpha (p_iter[0], a); - g = _cairo_multiply_alpha (p_iter[1], a); - b = _cairo_multiply_alpha (p_iter[2], a); - pixel = CAIRO_RGBA_TO_UINT32 (r, g, b, a); - } - memcpy (p_iter, &pixel, sizeof (guint32)); - } -} - - -GthImage * -_cairo_image_surface_create_from_png (GthFileData *file_data, - int requested_size, - int *original_width, - int *original_height, - gpointer user_data, - GCancellable *cancellable, - GError **error) -{ - GthImage *image; - CairoPngData *cairo_png_data; - png_uint_32 width, height; - int bit_depth, color_type, interlace_type; - cairo_surface_metadata_t *metadata; - unsigned char *surface_row; - int rowstride; - png_bytep *row_pointers; - int row; - - image = gth_image_new (); - - cairo_png_data = g_new0 (CairoPngData, 1); - cairo_png_data->cancellable = cancellable; - cairo_png_data->error = error; - cairo_png_data->stream = g_file_read (file_data->file, cancellable, error); - if (cairo_png_data->stream == NULL) { - _cairo_png_data_destroy (cairo_png_data); - return image; - } - - cairo_png_data->png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, - &cairo_png_data->error, - gerror_error_func, - gerror_warning_func); - if (cairo_png_data->png_ptr == NULL) { - _cairo_png_data_destroy (cairo_png_data); - return image; - } - - cairo_png_data->png_info_ptr = png_create_info_struct (cairo_png_data->png_ptr); - if (cairo_png_data->png_info_ptr == NULL) { - _cairo_png_data_destroy (cairo_png_data); - return image; - } - - if (PNG_SETJMP(cairo_png_data->png_ptr)) { - _cairo_png_data_destroy (cairo_png_data); - return image; - } - - png_set_read_fn (cairo_png_data->png_ptr, cairo_png_data, cairo_png_read_data_func); - png_read_info (cairo_png_data->png_ptr, cairo_png_data->png_info_ptr); - png_get_IHDR (cairo_png_data->png_ptr, - cairo_png_data->png_info_ptr, - &width, - &height, - &bit_depth, - &color_type, - &interlace_type, - NULL, - NULL); - - cairo_png_data->surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height); - if (cairo_surface_status (cairo_png_data->surface) != CAIRO_STATUS_SUCCESS) { - /* g_warning ("%s", cairo_status_to_string (cairo_surface_status (surface))); */ - _cairo_png_data_destroy (cairo_png_data); - return image; - } - - metadata = _cairo_image_surface_get_metadata (cairo_png_data->surface); - metadata->has_alpha = (color_type & PNG_COLOR_MASK_ALPHA); - - /* Set the data transformations */ - - png_set_strip_16 (cairo_png_data->png_ptr); - - png_set_packing (cairo_png_data->png_ptr); - - if (color_type == PNG_COLOR_TYPE_PALETTE) - png_set_palette_to_rgb (cairo_png_data->png_ptr); - - if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8)) - png_set_expand_gray_1_2_4_to_8 (cairo_png_data->png_ptr); - - if (png_get_valid (cairo_png_data->png_ptr, cairo_png_data->png_info_ptr, PNG_INFO_tRNS)) - png_set_tRNS_to_alpha (cairo_png_data->png_ptr); - - png_set_filler (cairo_png_data->png_ptr, 0xff, PNG_FILLER_AFTER); - - if ((color_type == PNG_COLOR_TYPE_GRAY) || (color_type == PNG_COLOR_TYPE_GRAY_ALPHA)) - png_set_gray_to_rgb (cairo_png_data->png_ptr); - - if (interlace_type != PNG_INTERLACE_NONE) - png_set_interlace_handling (cairo_png_data->png_ptr); - - png_set_read_user_transform_fn (cairo_png_data->png_ptr, transform_to_argb32_format_func); - - png_read_update_info (cairo_png_data->png_ptr, cairo_png_data->png_info_ptr); - - /* Read the image */ - - cairo_surface_flush (cairo_png_data->surface); - surface_row = cairo_image_surface_get_data (cairo_png_data->surface); - rowstride = cairo_image_surface_get_stride (cairo_png_data->surface); - row_pointers = g_new (png_bytep, height); - for (row = 0; row < height; row++) { - row_pointers[row] = surface_row; - surface_row += rowstride; - } - png_read_image (cairo_png_data->png_ptr, row_pointers); - png_read_end (cairo_png_data->png_ptr, cairo_png_data->png_info_ptr); - cairo_surface_mark_dirty (cairo_png_data->surface); - if (cairo_surface_status (cairo_png_data->surface) == CAIRO_STATUS_SUCCESS) - gth_image_set_cairo_surface (image, cairo_png_data->surface); - - g_free (row_pointers); - _cairo_png_data_destroy (cairo_png_data); - - return image; -} diff -Nru gthumb-3.0.2/extensions/cairo_io/cairo-io-png.h gthumb-3.2.3/extensions/cairo_io/cairo-io-png.h --- gthumb-3.0.2/extensions/cairo_io/cairo-io-png.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/cairo-io-png.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2011 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef CAIRO_IO_PNG_H -#define CAIRO_IO_PNG_H - -#include -#include - -G_BEGIN_DECLS - -GthImage * _cairo_image_surface_create_from_png (GthFileData *file_data, - int requested_size, - int *original_width, - int *original_height, - gpointer user_data, - GCancellable *cancellable, - GError **error); - -G_END_DECLS - -#endif /* CAIRO_IO_PNG_H */ diff -Nru gthumb-3.0.2/extensions/cairo_io/cairo-io-svg.c gthumb-3.2.3/extensions/cairo_io/cairo-io-svg.c --- gthumb-3.0.2/extensions/cairo_io/cairo-io-svg.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/cairo-io-svg.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,189 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2011 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include -#include "cairo-io-svg.h" - - -/* GthImageSvg (private class) */ - - -#define GTH_IMAGE_SVG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), gth_image_svg_get_type(), GthImageSvg)) - - -typedef struct { - GthImage __parent; - RsvgHandle *rsvg; - int original_width; - int original_height; - double last_zoom; -} GthImageSvg; - - -typedef GthImageClass GthImageSvgClass; - - -static gpointer gth_image_svg_parent_class; - - -G_DEFINE_TYPE (GthImageSvg, gth_image_svg, GTH_TYPE_IMAGE) - - -static void -gth_image_svg_finalize (GObject *object) -{ - GthImageSvg *self; - - self = GTH_IMAGE_SVG (object); - _g_object_unref (self->rsvg); - - G_OBJECT_CLASS (gth_image_svg_parent_class)->finalize (object); -} - - -static void -gth_image_svg_init (GthImageSvg *self) -{ - self->rsvg = NULL; - self->original_width = 0; - self->original_height = 0; - self->last_zoom = 0.0; -} - - -static gboolean -gth_image_svg_get_is_zoomable (GthImage *base) -{ - return (((GthImageSvg *) base)->rsvg != NULL); -} - - -static gboolean -gth_image_svg_set_zoom (GthImage *base, - double zoom, - int *original_width, - int *original_height) -{ - GthImageSvg *self; - cairo_surface_t *surface; - cairo_t *cr; - gboolean changed = FALSE; - - self = GTH_IMAGE_SVG (base); - if (self->rsvg == NULL) - return FALSE; - - if (zoom != self->last_zoom) { - self->last_zoom = zoom; - - surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, - zoom * self->original_width, - zoom * self->original_height); - cr = cairo_create (surface); - cairo_scale (cr, zoom, zoom); - rsvg_handle_render_cairo (self->rsvg, cr); - gth_image_set_cairo_surface (base, surface); - changed = TRUE; - - cairo_destroy (cr); - cairo_surface_destroy (surface); - } - - if (original_width != NULL) - *original_width = self->original_width; - if (original_height != NULL) - *original_height = self->original_height; - - return changed; -} - - -static void -gth_image_svg_class_init (GthImageSvgClass *klass) -{ - GObjectClass *object_class; - GthImageClass *image_class; - - object_class = G_OBJECT_CLASS (klass); - object_class->finalize = gth_image_svg_finalize; - - image_class = GTH_IMAGE_CLASS (klass); - image_class->get_is_zoomable = gth_image_svg_get_is_zoomable; - image_class->set_zoom = gth_image_svg_set_zoom; -} - - -static GthImage * -gth_image_svg_new (void) -{ - return g_object_new (gth_image_svg_get_type (), NULL); -} - - -static void -gth_image_svg_set_handle (GthImageSvg *self, - RsvgHandle *rsvg) -{ - RsvgDimensionData dimension_data; - - if (self->rsvg == rsvg) - return; - - self->rsvg = g_object_ref (rsvg); - - rsvg_handle_get_dimensions (self->rsvg, &dimension_data); - self->original_width = dimension_data.width; - self->original_height = dimension_data.height; - - gth_image_svg_set_zoom (GTH_IMAGE (self), 1.0, NULL, NULL); -} - - -/* -- _cairo_image_surface_create_from_svg -- */ - - -GthImage * -_cairo_image_surface_create_from_svg (GthFileData *file_data, - int requested_size, - int *original_width, - int *original_height, - gpointer user_data, - GCancellable *cancellable, - GError **error) -{ - GthImage *image; - RsvgHandle *rsvg; - - image = gth_image_svg_new (); - rsvg = rsvg_handle_new_from_gfile_sync (file_data->file, - RSVG_HANDLE_FLAGS_NONE, - cancellable, - error); - if (rsvg != NULL) { - gth_image_svg_set_handle (GTH_IMAGE_SVG (image), rsvg); - g_object_unref (rsvg); - } - - return image; -} diff -Nru gthumb-3.0.2/extensions/cairo_io/cairo-io-svg.h gthumb-3.2.3/extensions/cairo_io/cairo-io-svg.h --- gthumb-3.0.2/extensions/cairo_io/cairo-io-svg.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/cairo-io-svg.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2012 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef CAIRO_IO_SVG_H -#define CAIRO_IO_SVG_H - -#include -#include - -G_BEGIN_DECLS - -GthImage * _cairo_image_surface_create_from_svg (GthFileData *file_data, - int requested_size, - int *original_width, - int *original_height, - gpointer user_data, - GCancellable *cancellable, - GError **error); - -G_END_DECLS - -#endif /* CAIRO_IO_SVG_H */ diff -Nru gthumb-3.0.2/extensions/cairo_io/data/Makefile.am gthumb-3.2.3/extensions/cairo_io/data/Makefile.am --- gthumb-3.0.2/extensions/cairo_io/data/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/data/Makefile.am 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,3 @@ +SUBDIRS = ui + +-include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/cairo_io/data/Makefile.in gthumb-3.2.3/extensions/cairo_io/data/Makefile.in --- gthumb-3.0.2/extensions/cairo_io/data/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/data/Makefile.in 2013-07-10 13:33:43.000000000 +0000 @@ -0,0 +1,701 @@ +# Makefile.in generated by automake 1.14 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = extensions/cairo_io/data +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" +ACLOCAL = @ACLOCAL@ +ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BISON = @BISON@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CLUTTER_CFLAGS = @CLUTTER_CFLAGS@ +CLUTTER_LIBS = @CLUTTER_LIBS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +EXIV2_CFLAGS = @EXIV2_CFLAGS@ +EXIV2_LIBS = @EXIV2_LIBS@ +EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ +FGREP = @FGREP@ +FLEX = @FLEX@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ +GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ +GSTREAMER_LIBS = @GSTREAMER_LIBS@ +GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ +GTHUMB_CFLAGS = @GTHUMB_CFLAGS@ +GTHUMB_EXTENSION_IN_RULE = @GTHUMB_EXTENSION_IN_RULE@ +GTHUMB_EXTENSION_RULE = @GTHUMB_EXTENSION_RULE@ +GTHUMB_IMPLIB = @GTHUMB_IMPLIB@ +GTHUMB_LIBS = @GTHUMB_LIBS@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +HELP_DIR = @HELP_DIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ +JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBRASERO_CFLAGS = @LIBBRASERO_CFLAGS@ +LIBBRASERO_LIBS = @LIBBRASERO_LIBS@ +LIBCHAMPLAIN_CFLAGS = @LIBCHAMPLAIN_CFLAGS@ +LIBCHAMPLAIN_LIBS = @LIBCHAMPLAIN_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ +LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ +LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ +LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ +LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ +LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ +LIBSOUP_LIBS = @LIBSOUP_LIBS@ +LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +M_LIBS = @M_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@ +SMCLIENT_LIBS = @SMCLIENT_LIBS@ +STRIP = @STRIP@ +TIFF_LIBS = @TIFF_LIBS@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ +WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ +XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +SUBDIRS = ui +all: all-recursive + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/cairo_io/data/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign extensions/cairo_io/data/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +# This directory's subdirectories are mostly independent; you can cd +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +html-am: + +info: info-recursive + +info-am: + +install-data-am: + +install-dvi: install-dvi-recursive + +install-dvi-am: + +install-exec-am: + +install-html: install-html-recursive + +install-html-am: + +install-info: install-info-recursive + +install-info-am: + +install-man: + +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: + +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am + + +-include $(top_srcdir)/git.mk + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru gthumb-3.0.2/extensions/cairo_io/data/ui/Makefile.am gthumb-3.2.3/extensions/cairo_io/data/ui/Makefile.am --- gthumb-3.0.2/extensions/cairo_io/data/ui/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/data/ui/Makefile.am 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,11 @@ +uidir = $(pkgdatadir)/ui +ui_DATA = \ + jpeg-options.ui \ + png-options.ui \ + save-options-preferences.ui \ + tga-options.ui \ + tiff-options.ui \ + webp-options.ui +EXTRA_DIST = $(ui_DATA) + +-include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/cairo_io/data/ui/Makefile.in gthumb-3.2.3/extensions/cairo_io/data/ui/Makefile.in --- gthumb-3.0.2/extensions/cairo_io/data/ui/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/data/ui/Makefile.in 2013-07-10 13:33:43.000000000 +0000 @@ -0,0 +1,584 @@ +# Makefile.in generated by automake 1.14 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = extensions/cairo_io/data/ui +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(uidir)" +DATA = $(ui_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BISON = @BISON@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CLUTTER_CFLAGS = @CLUTTER_CFLAGS@ +CLUTTER_LIBS = @CLUTTER_LIBS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +EXIV2_CFLAGS = @EXIV2_CFLAGS@ +EXIV2_LIBS = @EXIV2_LIBS@ +EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ +FGREP = @FGREP@ +FLEX = @FLEX@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ +GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ +GSTREAMER_LIBS = @GSTREAMER_LIBS@ +GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ +GTHUMB_CFLAGS = @GTHUMB_CFLAGS@ +GTHUMB_EXTENSION_IN_RULE = @GTHUMB_EXTENSION_IN_RULE@ +GTHUMB_EXTENSION_RULE = @GTHUMB_EXTENSION_RULE@ +GTHUMB_IMPLIB = @GTHUMB_IMPLIB@ +GTHUMB_LIBS = @GTHUMB_LIBS@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +HELP_DIR = @HELP_DIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ +JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBRASERO_CFLAGS = @LIBBRASERO_CFLAGS@ +LIBBRASERO_LIBS = @LIBBRASERO_LIBS@ +LIBCHAMPLAIN_CFLAGS = @LIBCHAMPLAIN_CFLAGS@ +LIBCHAMPLAIN_LIBS = @LIBCHAMPLAIN_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ +LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ +LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ +LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ +LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ +LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ +LIBSOUP_LIBS = @LIBSOUP_LIBS@ +LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +M_LIBS = @M_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@ +SMCLIENT_LIBS = @SMCLIENT_LIBS@ +STRIP = @STRIP@ +TIFF_LIBS = @TIFF_LIBS@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ +WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ +XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +uidir = $(pkgdatadir)/ui +ui_DATA = \ + jpeg-options.ui \ + png-options.ui \ + save-options-preferences.ui \ + tga-options.ui \ + tiff-options.ui \ + webp-options.ui + +EXTRA_DIST = $(ui_DATA) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/cairo_io/data/ui/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign extensions/cairo_io/data/ui/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-uiDATA: $(ui_DATA) + @$(NORMAL_INSTALL) + @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(uidir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(uidir)" || exit $$?; \ + done + +uninstall-uiDATA: + @$(NORMAL_UNINSTALL) + @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(uidir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-uiDATA + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-uiDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-uiDATA + + +-include $(top_srcdir)/git.mk + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru gthumb-3.0.2/extensions/cairo_io/data/ui/jpeg-options.ui gthumb-3.2.3/extensions/cairo_io/data/ui/jpeg-options.ui --- gthumb-3.0.2/extensions/cairo_io/data/ui/jpeg-options.ui 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/data/ui/jpeg-options.ui 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,187 @@ + + + + + + + + + + + True + False + 6 + vertical + 12 + + + True + False + 6 + + + True + False + _Default extension: + True + jpeg_default_extension_combobox + + + False + True + 0 + + + + + True + False + jpeg_default_ext_liststore + + + + 0 + + + + + False + True + 1 + + + + + False + True + 0 + + + + + True + False + 6 + 6 + + + True + False + 0 + _Quality: + True + jpeg_quality_hscale + + + 0 + 0 + 1 + 1 + + + + + True + False + 0 + _Smoothing: + True + jpeg_smooth_hscale + + + 0 + 1 + 1 + 1 + + + + + Opti_mize + False + True + True + False + False + True + 0 + True + + + 0 + 2 + 2 + 1 + + + + + _Progressive + False + True + True + False + False + True + 0 + True + + + 0 + 3 + 2 + 1 + + + + + True + True + True + jpeg_quality_adjustment + 1 + left + + + 1 + 0 + 1 + 1 + + + + + True + True + True + jpeg_smooth_adjustment + 1 + left + + + 1 + 1 + 1 + 1 + + + + + False + True + 1 + + + + + 100 + 75 + 0.5 + 1 + + + 100 + 0.5 + 1 + + diff -Nru gthumb-3.0.2/extensions/cairo_io/data/ui/png-options.ui gthumb-3.2.3/extensions/cairo_io/data/ui/png-options.ui --- gthumb-3.0.2/extensions/cairo_io/data/ui/png-options.ui 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/data/ui/png-options.ui 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,57 @@ + + + + + 9 + 6 + 1 + 1 + + + True + False + 6 + vertical + + + True + False + 12 + + + True + False + Compression _level: + True + png_compression_hscale + + + False + True + 0 + + + + + True + True + png_compression_adjustment + 1 + 0 + left + + + True + True + 1 + + + + + False + True + 0 + + + + diff -Nru gthumb-3.0.2/extensions/cairo_io/data/ui/save-options-preferences.ui gthumb-3.2.3/extensions/cairo_io/data/ui/save-options-preferences.ui --- gthumb-3.0.2/extensions/cairo_io/data/ui/save-options-preferences.ui 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/data/ui/save-options-preferences.ui 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + True + False + 12 + vertical + 12 + + + True + False + 0 + Default options: + + + + + + False + True + 0 + + + + + True + False + 12 + + + 120 + True + True + in + + + True + True + file_type_liststore + False + False + 0 + + + + + + + + + 2 + + + + + + + + + False + True + 0 + + + + + True + False + vertical + + + True + False + 0 + + + + + + False + True + 0 + + + + + True + False + + + False + True + 1 + + + + + True + False + 6 + False + False + + + True + True + 2 + + + + + False + True + 1 + + + + + True + True + 1 + + + + diff -Nru gthumb-3.0.2/extensions/cairo_io/data/ui/tga-options.ui gthumb-3.2.3/extensions/cairo_io/data/ui/tga-options.ui --- gthumb-3.0.2/extensions/cairo_io/data/ui/tga-options.ui 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/data/ui/tga-options.ui 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,27 @@ + + + + + True + False + 6 + vertical + + + _RLE compression + True + True + False + False + True + 0 + True + + + False + True + 0 + + + + diff -Nru gthumb-3.0.2/extensions/cairo_io/data/ui/tiff-options.ui gthumb-3.2.3/extensions/cairo_io/data/ui/tiff-options.ui --- gthumb-3.0.2/extensions/cairo_io/data/ui/tiff-options.ui 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/data/ui/tiff-options.ui 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,330 @@ + + + + + + + + + + + 1 + 10000 + 72 + 1 + 10 + + + True + False + 6 + vertical + 12 + + + True + False + 6 + + + True + False + _Default extension: + True + tiff_default_extension_combobox + + + False + True + 0 + + + + + True + False + tiff_default_ext_liststore + + + + 0 + + + + + False + True + 1 + + + + + False + True + 0 + + + + + True + False + vertical + 6 + + + True + False + 0 + Compression + True + + + + + + False + True + 0 + + + + + True + False + 12 + vertical + 6 + + + _No compression + False + True + True + False + False + True + 0 + True + True + + + False + True + 0 + + + + + No_rmal (Deflate) + False + True + True + False + False + True + 0 + True + tiff_comp_none_radiobutton + + + False + True + 1 + + + + + _Loss compression (JPEG) + False + True + True + False + False + True + 0 + True + tiff_comp_none_radiobutton + + + False + True + 2 + + + + + False + True + 1 + + + + + False + True + 1 + + + + + True + False + vertical + 6 + + + True + False + 0 + Resolution + True + + + + + + False + True + 0 + + + + + True + False + 12 + 6 + 6 + + + True + False + 0 + _Horizontal: + True + tiff_hdpi_spinbutton + + + 0 + 0 + 1 + 1 + + + + + True + False + 0 + _Vertical: + True + tiff_vdpi_spinbutton + + + 0 + 1 + 1 + 1 + + + + + True + False + 6 + + + True + True + ● + True + tiff_hdpi_adjustment + + + False + True + 0 + + + + + True + False + dpi + + + False + True + 1 + + + + + 1 + 0 + 1 + 1 + + + + + True + False + 6 + + + True + True + ● + True + tiff_vdpi_adjustment + + + False + True + 0 + + + + + True + False + dpi + + + False + True + 1 + + + + + 1 + 1 + 1 + 1 + + + + + False + True + 1 + + + + + False + True + 2 + + + + + 1 + 10000 + 72 + 1 + 10 + + diff -Nru gthumb-3.0.2/extensions/cairo_io/data/ui/webp-options.ui gthumb-3.2.3/extensions/cairo_io/data/ui/webp-options.ui --- gthumb-3.0.2/extensions/cairo_io/data/ui/webp-options.ui 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/data/ui/webp-options.ui 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,121 @@ + + + + + 6 + 4 + 1 + 1 + + + 100 + 75 + 1 + 10 + + + True + False + 6 + vertical + 12 + + + True + False + 6 + 6 + + + True + False + 0 + _Quality: + True + quality_scale + + + 0 + 0 + 1 + 1 + + + + + True + False + 0 + _Method: + True + method_scale + + + 0 + 1 + 1 + 1 + + + + + _Lossless + False + True + True + False + False + True + 0 + True + + + 0 + 2 + 2 + 1 + + + + + True + True + True + quality_adjustment + 1 + 0 + left + + + 1 + 0 + 1 + 1 + + + + + True + True + True + method_adjustment + 1 + 0 + left + + + 1 + 1 + 1 + 1 + + + + + False + True + 0 + + + + diff -Nru gthumb-3.0.2/extensions/cairo_io/gth-image-saver-jpeg.c gthumb-3.2.3/extensions/cairo_io/gth-image-saver-jpeg.c --- gthumb-3.0.2/extensions/cairo_io/gth-image-saver-jpeg.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/gth-image-saver-jpeg.c 2013-06-28 13:35:25.000000000 +0000 @@ -0,0 +1,534 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2009 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#ifdef HAVE_LIBJPEG +#include +#include +#include +#include +#include +#include +#include +#endif /* HAVE_LIBJPEG */ +#include +#include +#include "gth-image-saver-jpeg.h" +#include "preferences.h" + + +G_DEFINE_TYPE (GthImageSaverJpeg, gth_image_saver_jpeg, GTH_TYPE_IMAGE_SAVER) + + +struct _GthImageSaverJpegPrivate { + GtkBuilder *builder; + GSettings *settings; + char *default_ext; +}; + + +static void +gth_image_saver_jpeg_finalize (GObject *object) +{ + GthImageSaverJpeg *self = GTH_IMAGE_SAVER_JPEG (object); + + _g_object_unref (self->priv->settings); + _g_object_unref (self->priv->builder); + g_free (self->priv->default_ext); + + G_OBJECT_CLASS (gth_image_saver_jpeg_parent_class)->finalize (object); +} + + +static const char * +gth_image_saver_jpeg_get_default_ext (GthImageSaver *base) +{ + GthImageSaverJpeg *self = GTH_IMAGE_SAVER_JPEG (base); + + if (self->priv->default_ext == NULL) + self->priv->default_ext = g_settings_get_string (self->priv->settings, PREF_JPEG_DEFAULT_EXT); + + return self->priv->default_ext; +} + + +static GtkWidget * +gth_image_saver_jpeg_get_control (GthImageSaver *base) +{ + GthImageSaverJpeg *self = GTH_IMAGE_SAVER_JPEG (base); + char **extensions; + int i; + int active_idx; + + if (self->priv->builder == NULL) + self->priv->builder = _gtk_builder_new_from_file ("jpeg-options.ui", "cairo_io"); + + active_idx = 0; + extensions = g_strsplit (gth_image_saver_get_extensions (base), " ", -1); + for (i = 0; extensions[i] != NULL; i++) { + GtkTreeIter iter; + + gtk_list_store_append (GTK_LIST_STORE (gtk_builder_get_object (self->priv->builder, "jpeg_default_ext_liststore")), &iter); + gtk_list_store_set (GTK_LIST_STORE (gtk_builder_get_object (self->priv->builder, "jpeg_default_ext_liststore")), + &iter, + 0, extensions[i], + -1); + if (g_str_equal (extensions[i], gth_image_saver_get_default_ext (base))) + active_idx = i; + } + gtk_combo_box_set_active (GTK_COMBO_BOX (_gtk_builder_get_widget (self->priv->builder, "jpeg_default_extension_combobox")), active_idx); + g_strfreev (extensions); + + gtk_adjustment_set_value (GTK_ADJUSTMENT (_gtk_builder_get_widget (self->priv->builder, "jpeg_quality_adjustment")), + g_settings_get_int (self->priv->settings, PREF_JPEG_QUALITY)); + gtk_adjustment_set_value (GTK_ADJUSTMENT (_gtk_builder_get_widget (self->priv->builder, "jpeg_smooth_adjustment")), + g_settings_get_int (self->priv->settings, PREF_JPEG_SMOOTHING)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "jpeg_optimize_checkbutton")), + g_settings_get_boolean (self->priv->settings, PREF_JPEG_OPTIMIZE)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "jpeg_progressive_checkbutton")), + g_settings_get_boolean (self->priv->settings, PREF_JPEG_PROGRESSIVE)); + + return _gtk_builder_get_widget (self->priv->builder, "jpeg_options"); +} + + +static void +gth_image_saver_jpeg_save_options (GthImageSaver *base) +{ + GthImageSaverJpeg *self = GTH_IMAGE_SAVER_JPEG (base); + GtkTreeIter iter; + + if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (_gtk_builder_get_widget (self->priv->builder, "jpeg_default_extension_combobox")), &iter)) { + g_free (self->priv->default_ext); + gtk_tree_model_get (GTK_TREE_MODEL (gtk_builder_get_object (self->priv->builder, "jpeg_default_ext_liststore")), + &iter, + 0, &self->priv->default_ext, + -1); + g_settings_set_string (self->priv->settings, PREF_JPEG_DEFAULT_EXT, self->priv->default_ext); + } + g_settings_set_int (self->priv->settings, PREF_JPEG_QUALITY, (int) gtk_adjustment_get_value (GTK_ADJUSTMENT (_gtk_builder_get_widget (self->priv->builder, "jpeg_quality_adjustment")))); + g_settings_set_int (self->priv->settings, PREF_JPEG_SMOOTHING, (int) gtk_adjustment_get_value (GTK_ADJUSTMENT (_gtk_builder_get_widget (self->priv->builder, "jpeg_smooth_adjustment")))); + g_settings_set_boolean (self->priv->settings, PREF_JPEG_OPTIMIZE, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "jpeg_optimize_checkbutton")))); + g_settings_set_boolean (self->priv->settings, PREF_JPEG_PROGRESSIVE, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "jpeg_progressive_checkbutton")))); +} + + +static gboolean +gth_image_saver_jpeg_can_save (GthImageSaver *self, + const char *mime_type) +{ +#ifdef HAVE_LIBJPEG + + return g_content_type_equals (mime_type, "image/jpeg"); + +#else /* ! HAVE_LIBJPEG */ + + GSList *formats; + GSList *scan; + GdkPixbufFormat *jpeg_format; + + if (! g_content_type_equals (mime_type, "image/jpeg")) + return FALSE; + + formats = gdk_pixbuf_get_formats (); + jpeg_format = NULL; + for (scan = formats; (jpeg_format == NULL) && (scan != NULL); scan = g_slist_next (scan)) { + GdkPixbufFormat *format = scan->data; + char **mime_types; + int i; + + mime_types = gdk_pixbuf_format_get_mime_types (format); + for (i = 0; mime_types[i] != NULL; i++) + if (g_content_type_equals (mime_types[i], "image/jpeg")) + break; + + if (mime_types[i] == NULL) + continue; + + if (! gdk_pixbuf_format_is_writable (format)) + continue; + + jpeg_format = format; + } + + return jpeg_format != NULL; + +#endif /* HAVE_LIBJPEG */ +} + + +#ifdef HAVE_LIBJPEG + + +/* error handler data */ + +struct error_handler_data { + struct jpeg_error_mgr pub; + sigjmp_buf setjmp_buffer; + GError **error; +}; + + +static void +fatal_error_handler (j_common_ptr cinfo) +{ + struct error_handler_data *errmgr; + char buffer[JMSG_LENGTH_MAX]; + + errmgr = (struct error_handler_data *) cinfo->err; + + /* Create the message */ + (* cinfo->err->format_message) (cinfo, buffer); + + /* broken check for *error == NULL for robustness against + * crappy JPEG library + */ + if (errmgr->error && *errmgr->error == NULL) { + g_set_error (errmgr->error, + GDK_PIXBUF_ERROR, + GDK_PIXBUF_ERROR_CORRUPT_IMAGE, + "Error interpreting JPEG image file (%s)", + buffer); + } + + siglongjmp (errmgr->setjmp_buffer, 1); + + g_assert_not_reached (); +} + + +static void +output_message_handler (j_common_ptr cinfo) +{ + /* This method keeps libjpeg from dumping crap to stderr */ + /* do nothing */ +} + + +static gboolean +_cairo_surface_write_as_jpeg (cairo_surface_t *image, + char **buffer, + gsize *buffer_size, + char **keys, + char **values, + GError **error) +{ + struct jpeg_compress_struct cinfo; + struct error_handler_data jerr; + guchar *buf = NULL; + guchar *pixels = NULL; + volatile int quality = 85; /* default; must be between 0 and 100 */ + volatile int smoothing = 0; + volatile gboolean optimize = FALSE; +#ifdef HAVE_PROGRESSIVE_JPEG + volatile gboolean progressive = FALSE; +#endif + int w, h = 0; + int rowstride = 0; + + if (keys && *keys) { + char **kiter = keys; + char **viter = values; + + while (*kiter) { + if (strcmp (*kiter, "quality") == 0) { + char *endptr = NULL; + quality = strtol (*viter, &endptr, 10); + + if (endptr == *viter) { + g_set_error (error, + GDK_PIXBUF_ERROR, + GDK_PIXBUF_ERROR_BAD_OPTION, + "JPEG quality must be a value between 0 and 100; value '%s' could not be parsed.", + *viter); + + return FALSE; + } + + if (quality < 0 || quality > 100) { + g_set_error (error, + GDK_PIXBUF_ERROR, + GDK_PIXBUF_ERROR_BAD_OPTION, + "JPEG quality must be a value between 0 and 100; value '%d' is not allowed.", + quality); + + return FALSE; + } + } + else if (strcmp (*kiter, "smooth") == 0) { + char *endptr = NULL; + smoothing = strtol (*viter, &endptr, 10); + + if (endptr == *viter) { + g_set_error (error, + GDK_PIXBUF_ERROR, + GDK_PIXBUF_ERROR_BAD_OPTION, + "JPEG smoothing must be a value between 0 and 100; value '%s' could not be parsed.", + *viter); + + return FALSE; + } + + if (smoothing < 0 || smoothing > 100) { + g_set_error (error, + GDK_PIXBUF_ERROR, + GDK_PIXBUF_ERROR_BAD_OPTION, + "JPEG smoothing must be a value between 0 and 100; value '%d' is not allowed.", + smoothing); + + return FALSE; + } + } + else if (strcmp (*kiter, "optimize") == 0) { + if (strcmp (*viter, "yes") == 0) + optimize = TRUE; + else if (strcmp (*viter, "no") == 0) + optimize = FALSE; + else { + g_set_error (error, + GDK_PIXBUF_ERROR, + GDK_PIXBUF_ERROR_BAD_OPTION, + "JPEG optimize option must be 'yes' or 'no', value is: %s", *viter); + + return FALSE; + } + } +#ifdef HAVE_PROGRESSIVE_JPEG + else if (strcmp (*kiter, "progressive") == 0) { + if (strcmp (*viter, "yes") == 0) + progressive = TRUE; + else if (strcmp (*viter, "no") == 0) + progressive = FALSE; + else { + g_set_error (error, + GDK_PIXBUF_ERROR, + GDK_PIXBUF_ERROR_BAD_OPTION, + "JPEG progressive option must be 'yes' or 'no', value is: %s", *viter); + + return FALSE; + } + } +#endif + else { + g_warning ("Bad option name '%s' passed to JPEG saver", *kiter); + return FALSE; + } + + ++kiter; + ++viter; + } + } + + rowstride = cairo_image_surface_get_stride (image); + w = cairo_image_surface_get_width (image); + h = cairo_image_surface_get_height (image); + pixels = cairo_image_surface_get_data (image); + g_return_val_if_fail (pixels != NULL, FALSE); + + /* allocate a small buffer to convert image data */ + + buf = g_try_malloc (w * 3 * sizeof (guchar)); + if (! buf) { + g_set_error (error, + GDK_PIXBUF_ERROR, + GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY, + "Couldn't allocate memory for loading JPEG file"); + return FALSE; + } + + /* set up error handling */ + + cinfo.err = jpeg_std_error (&(jerr.pub)); + jerr.pub.error_exit = fatal_error_handler; + jerr.pub.output_message = output_message_handler; + jerr.error = error; + if (sigsetjmp (jerr.setjmp_buffer, 1)) { + jpeg_destroy_compress (&cinfo); + g_free (buf); + return FALSE; + } + + /* setup compress params */ + + jpeg_create_compress (&cinfo); + _jpeg_memory_dest (&cinfo, (void **)buffer, buffer_size); + + cinfo.image_width = w; + cinfo.image_height = h; + cinfo.input_components = 3; + cinfo.in_color_space = JCS_RGB; + + /* set up jepg compression parameters */ + + jpeg_set_defaults (&cinfo); + jpeg_set_quality (&cinfo, quality, TRUE); + cinfo.smoothing_factor = smoothing; + cinfo.optimize_coding = optimize; + +#ifdef HAVE_PROGRESSIVE_JPEG + if (progressive) + jpeg_simple_progression (&cinfo); +#endif /* HAVE_PROGRESSIVE_JPEG */ + + jpeg_start_compress (&cinfo, TRUE); + + /* go one scanline at a time... and save */ + while (cinfo.next_scanline < cinfo.image_height) { + JSAMPROW *jbuf; + + /* convert scanline from RGBA to RGB packed */ + + _cairo_copy_line_as_rgba_big_endian (buf, pixels, w, FALSE); + + /* write scanline */ + jbuf = (JSAMPROW *)(&buf); + jpeg_write_scanlines (&cinfo, jbuf, 1); + + pixels += rowstride; + } + + /* finish off */ + + jpeg_finish_compress (&cinfo); + jpeg_destroy_compress (&cinfo); + g_free (buf); + + return TRUE; +} + + +#endif /* HAVE_LIBJPEG */ + + +static gboolean +gth_image_saver_jpeg_save_image (GthImageSaver *base, + GthImage *image, + char **buffer, + gsize *buffer_size, + const char *mime_type, + GCancellable *cancellable, + GError **error) +{ +#ifdef HAVE_LIBJPEG + GthImageSaverJpeg *self = GTH_IMAGE_SAVER_JPEG (base); + char **option_keys; + char **option_values; + int i = -1; + int i_value; + cairo_surface_t *surface; + gboolean result; + + option_keys = g_malloc (sizeof (char *) * 5); + option_values = g_malloc (sizeof (char *) * 5); + + i++; + i_value = g_settings_get_int (self->priv->settings, PREF_JPEG_QUALITY); + option_keys[i] = g_strdup ("quality"); + option_values[i] = g_strdup_printf ("%d", i_value); + + i++; + i_value = g_settings_get_int (self->priv->settings, PREF_JPEG_SMOOTHING); + option_keys[i] = g_strdup ("smooth"); + option_values[i] = g_strdup_printf ("%d", i_value); + + i++; + i_value = g_settings_get_boolean (self->priv->settings, PREF_JPEG_OPTIMIZE); + option_keys[i] = g_strdup ("optimize"); + option_values[i] = g_strdup (i_value != 0 ? "yes" : "no"); + + i++; + i_value = g_settings_get_boolean (self->priv->settings, PREF_JPEG_PROGRESSIVE); + option_keys[i] = g_strdup ("progressive"); + option_values[i] = g_strdup (i_value != 0 ? "yes" : "no"); + + i++; + option_keys[i] = NULL; + option_values[i] = NULL; + + surface = gth_image_get_cairo_surface (image); + result = _cairo_surface_write_as_jpeg (surface, + buffer, + buffer_size, + option_keys, + option_values, + error); + + cairo_surface_destroy (surface); + g_strfreev (option_keys); + g_strfreev (option_values); + +#else /* ! HAVE_LIBJPEG */ + + GdkPixbuf *pixbuf; + char *pixbuf_type; + gboolean result; + + pixbuf = gth_image_get_pixbuf (image); + pixbuf_type = get_pixbuf_type_from_mime_type (mime_type); + result = gdk_pixbuf_save_to_bufferv (pixbuf, + buffer, + buffer_size, + pixbuf_type, + NULL, + NULL, + error); + + g_free (pixbuf_type); + g_object_unref (pixbuf); + +#endif /* HAVE_LIBJPEG */ + + return result; +} + + +static void +gth_image_saver_jpeg_class_init (GthImageSaverJpegClass *klass) +{ + GObjectClass *object_class; + GthImageSaverClass *image_saver_class; + + g_type_class_add_private (klass, sizeof (GthImageSaverJpegPrivate)); + + object_class = G_OBJECT_CLASS (klass); + object_class->finalize = gth_image_saver_jpeg_finalize; + + image_saver_class = GTH_IMAGE_SAVER_CLASS (klass); + image_saver_class->id = "jpeg"; + image_saver_class->display_name = _("JPEG"); + image_saver_class->mime_type = "image/jpeg"; + image_saver_class->extensions = "jpeg jpg"; + image_saver_class->get_default_ext = gth_image_saver_jpeg_get_default_ext; + image_saver_class->get_control = gth_image_saver_jpeg_get_control; + image_saver_class->save_options = gth_image_saver_jpeg_save_options; + image_saver_class->can_save = gth_image_saver_jpeg_can_save; + image_saver_class->save_image = gth_image_saver_jpeg_save_image; +} + + +static void +gth_image_saver_jpeg_init (GthImageSaverJpeg *self) +{ + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_IMAGE_SAVER_JPEG, GthImageSaverJpegPrivate); + self->priv->settings = g_settings_new (GTHUMB_IMAGE_SAVERS_JPEG_SCHEMA); + self->priv->builder = NULL; + self->priv->default_ext = NULL; +} diff -Nru gthumb-3.0.2/extensions/cairo_io/gth-image-saver-jpeg.h gthumb-3.2.3/extensions/cairo_io/gth-image-saver-jpeg.h --- gthumb-3.0.2/extensions/cairo_io/gth-image-saver-jpeg.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/gth-image-saver-jpeg.h 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,56 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2009 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef GTH_IMAGE_SAVER_JPEG_H +#define GTH_IMAGE_SAVER_JPEG_H + +#include +#include + +G_BEGIN_DECLS + +#define GTH_TYPE_IMAGE_SAVER_JPEG (gth_image_saver_jpeg_get_type ()) +#define GTH_IMAGE_SAVER_JPEG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_IMAGE_SAVER_JPEG, GthImageSaverJpeg)) +#define GTH_IMAGE_SAVER_JPEG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTH_IMAGE_SAVER_JPEG_TYPE, GthImageSaverJpegClass)) +#define GTH_IS_IMAGE_SAVER_JPEG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_IMAGE_SAVER_JPEG)) +#define GTH_IS_IMAGE_SAVER_JPEG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTH_TYPE_IMAGE_SAVER_JPEG)) +#define GTH_IMAGE_SAVER_JPEG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTH_TYPE_IMAGE_SAVER_JPEG, GthImageSaverJpegClass)) + +typedef struct _GthImageSaverJpeg GthImageSaverJpeg; +typedef struct _GthImageSaverJpegClass GthImageSaverJpegClass; +typedef struct _GthImageSaverJpegPrivate GthImageSaverJpegPrivate; + +struct _GthImageSaverJpeg +{ + GthImageSaver __parent; + GthImageSaverJpegPrivate *priv; +}; + +struct _GthImageSaverJpegClass +{ + GthImageSaverClass __parent_class; +}; + +GType gth_image_saver_jpeg_get_type (void); + +G_END_DECLS + +#endif /* GTH_IMAGE_SAVER_JPEG_H */ diff -Nru gthumb-3.0.2/extensions/cairo_io/gth-image-saver-png.c gthumb-3.2.3/extensions/cairo_io/gth-image-saver-png.c --- gthumb-3.0.2/extensions/cairo_io/gth-image-saver-png.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/gth-image-saver-png.c 2013-06-28 13:35:25.000000000 +0000 @@ -0,0 +1,369 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2009 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include +#include "gth-image-saver-png.h" +#include "preferences.h" + + +/* starting from libpng version 1.5 it is not possible + * to access inside the PNG struct directly + */ +#define PNG_SETJMP(ptr) setjmp(png_jmpbuf(ptr)) + +#ifdef PNG_LIBPNG_VER +#if PNG_LIBPNG_VER < 10400 +#ifdef PNG_SETJMP +#undef PNG_SETJMP +#endif +#define PNG_SETJMP(ptr) setjmp(ptr->jmpbuf) +#endif +#endif + + +G_DEFINE_TYPE (GthImageSaverPng, gth_image_saver_png, GTH_TYPE_IMAGE_SAVER) + + +struct _GthImageSaverPngPrivate { + GtkBuilder *builder; + GSettings *settings; +}; + + +static void +gth_image_saver_png_finalize (GObject *object) +{ + GthImageSaverPng *self = GTH_IMAGE_SAVER_PNG (object); + + _g_object_unref (self->priv->builder); + _g_object_unref (self->priv->settings); + G_OBJECT_CLASS (gth_image_saver_png_parent_class)->finalize (object); +} + + +static GtkWidget * +gth_image_saver_png_get_control (GthImageSaver *base) +{ + GthImageSaverPng *self = GTH_IMAGE_SAVER_PNG (base); + + if (self->priv->builder == NULL) + self->priv->builder = _gtk_builder_new_from_file ("png-options.ui", "cairo_io"); + + gtk_adjustment_set_value (GTK_ADJUSTMENT (_gtk_builder_get_widget (self->priv->builder, "png_compression_adjustment")), + g_settings_get_int (self->priv->settings, PREF_PNG_COMPRESSION_LEVEL)); + + return _gtk_builder_get_widget (self->priv->builder, "png_options"); +} + + +static void +gth_image_saver_png_save_options (GthImageSaver *base) +{ + GthImageSaverPng *self = GTH_IMAGE_SAVER_PNG (base); + + g_settings_set_int (self->priv->settings, PREF_PNG_COMPRESSION_LEVEL, (int) gtk_adjustment_get_value (GTK_ADJUSTMENT (_gtk_builder_get_widget (self->priv->builder, "png_compression_adjustment")))); +} + + +static gboolean +gth_image_saver_png_can_save (GthImageSaver *self, + const char *mime_type) +{ + return g_content_type_equals (mime_type, "image/png"); +} + + +typedef struct { + GError **error; + png_struct *png_ptr; + png_info *png_info_ptr; + GthBufferData *buffer_data; +} CairoPngData; + + +static void +_cairo_png_data_destroy (CairoPngData *cairo_png_data) +{ + png_destroy_write_struct (&cairo_png_data->png_ptr, &cairo_png_data->png_info_ptr); + gth_buffer_data_free (cairo_png_data->buffer_data, FALSE); + g_free (cairo_png_data); +} + + +static void +gerror_error_func (png_structp png_ptr, + png_const_charp message) +{ + GError ***error_p = png_get_error_ptr (png_ptr); + GError **error = *error_p; + + if (error != NULL) + *error = g_error_new (G_IO_ERROR, G_IO_ERROR_INVALID_DATA, "%s", message); +} + + +static void +gerror_warning_func (png_structp png_ptr, + png_const_charp message) +{ + /* void: we don't care about warnings */ +} + + +static void +cairo_png_write_data_func (png_structp png_ptr, + png_bytep buffer, + png_size_t size) +{ + CairoPngData *cairo_png_data; + GError *error; + + cairo_png_data = png_get_io_ptr (png_ptr); + if (! gth_buffer_data_write (cairo_png_data->buffer_data, buffer, size, &error)) { + png_error (png_ptr, error->message); + g_error_free (error); + } +} + + +static void +cairo_png_flush_data_func (png_structp png_ptr) +{ + /* we are saving in a buffer, no need to flush */ +} + + +static gboolean +_cairo_surface_write_as_png (cairo_surface_t *image, + char **buffer, + gsize *buffer_size, + char **keys, + char **values, + GError **error) +{ + int compression_level; + int width, height; + gboolean alpha; + guchar *pixels, *ptr, *buf; + int rowstride; + CairoPngData *cairo_png_data; + png_color_8 sig_bit; + int bpp; + int row; + + compression_level = 6; + + if (keys && *keys) { + char **kiter = keys; + char **viter = values; + + while (*kiter) { + if (strcmp (*kiter, "compression") == 0) { + if (*viter == NULL) { + g_set_error (error, + G_IO_ERROR, + G_IO_ERROR_INVALID_DATA, + "Must specify a compression level"); + return FALSE; + } + + compression_level = atoi (*viter); + + if (compression_level < 0 || compression_level > 9) { + g_set_error (error, + G_IO_ERROR, + G_IO_ERROR_INVALID_DATA, + "Unsupported compression level passed to the PNG saver"); + return FALSE; + } + } + else { + g_warning ("Bad option name '%s' passed to the PNG saver", *kiter); + return FALSE; + } + + ++kiter; + ++viter; + } + } + + width = cairo_image_surface_get_width (image); + height = cairo_image_surface_get_height (image); + alpha = _cairo_image_surface_get_has_alpha (image); + pixels = cairo_image_surface_get_data (image); + rowstride = cairo_image_surface_get_stride (image); + + cairo_png_data = g_new0 (CairoPngData, 1); + cairo_png_data->error = error; + cairo_png_data->buffer_data = gth_buffer_data_new (); + + cairo_png_data->png_ptr = png_create_write_struct (PNG_LIBPNG_VER_STRING, + &cairo_png_data->error, + gerror_error_func, + gerror_warning_func); + if (cairo_png_data->png_ptr == NULL) { + _cairo_png_data_destroy (cairo_png_data); + return FALSE; + } + + cairo_png_data->png_info_ptr = png_create_info_struct (cairo_png_data->png_ptr); + if (cairo_png_data->png_info_ptr == NULL) { + _cairo_png_data_destroy (cairo_png_data); + return FALSE; + } + + if (PNG_SETJMP (cairo_png_data->png_ptr)) { + _cairo_png_data_destroy (cairo_png_data); + return FALSE; + } + + png_set_write_fn (cairo_png_data->png_ptr, + cairo_png_data, + cairo_png_write_data_func, + cairo_png_flush_data_func); + + /* Set the image information here */ + + png_set_IHDR (cairo_png_data->png_ptr, + cairo_png_data->png_info_ptr, + width, + height, + 8, + (alpha ? PNG_COLOR_TYPE_RGBA : PNG_COLOR_TYPE_RGB), + PNG_INTERLACE_NONE, + PNG_COMPRESSION_TYPE_BASE, + PNG_FILTER_TYPE_BASE); + + /* Options */ + + sig_bit.red = 8; + sig_bit.green = 8; + sig_bit.blue = 8; + if (alpha) + sig_bit.alpha = 8; + png_set_sBIT (cairo_png_data->png_ptr, cairo_png_data->png_info_ptr, &sig_bit); + + png_set_compression_level (cairo_png_data->png_ptr, compression_level); + + /* Write the file header information. */ + + png_write_info (cairo_png_data->png_ptr, cairo_png_data->png_info_ptr); + + /* Write the image */ + + bpp = alpha ? 4 : 3; + buf = g_new (guchar, width * bpp); + ptr = pixels; + for (row = 0; row < height; ++row) { + _cairo_copy_line_as_rgba_big_endian (buf, ptr, width, alpha); + png_write_rows (cairo_png_data->png_ptr, &buf, 1); + + ptr += rowstride; + } + g_free (buf); + + png_write_end (cairo_png_data->png_ptr, cairo_png_data->png_info_ptr); + gth_buffer_data_get (cairo_png_data->buffer_data, buffer, buffer_size); + + _cairo_png_data_destroy (cairo_png_data); + + return TRUE; +} + + +static gboolean +gth_image_saver_png_save_image (GthImageSaver *base, + GthImage *image, + char **buffer, + gsize *buffer_size, + const char *mime_type, + GCancellable *cancellable, + GError **error) +{ + GthImageSaverPng *self = GTH_IMAGE_SAVER_PNG (base); + cairo_surface_t *surface; + char **option_keys; + char **option_values; + int i = -1; + int i_value; + gboolean result; + + option_keys = g_malloc (sizeof (char *) * 2); + option_values = g_malloc (sizeof (char *) * 2); + + i++; + i_value = g_settings_get_int (self->priv->settings, PREF_PNG_COMPRESSION_LEVEL); + option_keys[i] = g_strdup ("compression");; + option_values[i] = g_strdup_printf ("%d", i_value); + + i++; + option_keys[i] = NULL; + option_values[i] = NULL; + + surface = gth_image_get_cairo_surface (image); + result = _cairo_surface_write_as_png (surface, + buffer, + buffer_size, + option_keys, + option_values, + error); + + cairo_surface_destroy (surface); + g_strfreev (option_keys); + g_strfreev (option_values); + + return result; +} + + +static void +gth_image_saver_png_class_init (GthImageSaverPngClass *klass) +{ + GObjectClass *object_class; + GthImageSaverClass *image_saver_class; + + g_type_class_add_private (klass, sizeof (GthImageSaverPngPrivate)); + + object_class = G_OBJECT_CLASS (klass); + object_class->finalize = gth_image_saver_png_finalize; + + image_saver_class = GTH_IMAGE_SAVER_CLASS (klass); + image_saver_class->id = "png"; + image_saver_class->display_name = _("PNG"); + image_saver_class->mime_type = "image/png"; + image_saver_class->extensions = "png"; + image_saver_class->get_default_ext = NULL; + image_saver_class->get_control = gth_image_saver_png_get_control; + image_saver_class->save_options = gth_image_saver_png_save_options; + image_saver_class->can_save = gth_image_saver_png_can_save; + image_saver_class->save_image = gth_image_saver_png_save_image; +} + + +static void +gth_image_saver_png_init (GthImageSaverPng *self) +{ + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_IMAGE_SAVER_PNG, GthImageSaverPngPrivate); + self->priv->settings = g_settings_new (GTHUMB_IMAGE_SAVERS_PNG_SCHEMA); +} diff -Nru gthumb-3.0.2/extensions/cairo_io/gth-image-saver-png.h gthumb-3.2.3/extensions/cairo_io/gth-image-saver-png.h --- gthumb-3.0.2/extensions/cairo_io/gth-image-saver-png.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/gth-image-saver-png.h 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,56 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2009 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef GTH_IMAGE_SAVER_PNG_H +#define GTH_IMAGE_SAVER_PNG_H + +#include +#include + +G_BEGIN_DECLS + +#define GTH_TYPE_IMAGE_SAVER_PNG (gth_image_saver_png_get_type ()) +#define GTH_IMAGE_SAVER_PNG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_IMAGE_SAVER_PNG, GthImageSaverPng)) +#define GTH_IMAGE_SAVER_PNG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTH_IMAGE_SAVER_PNG_TYPE, GthImageSaverPngClass)) +#define GTH_IS_IMAGE_SAVER_PNG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_IMAGE_SAVER_PNG)) +#define GTH_IS_IMAGE_SAVER_PNG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTH_TYPE_IMAGE_SAVER_PNG)) +#define GTH_IMAGE_SAVER_PNG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTH_TYPE_IMAGE_SAVER_PNG, GthImageSaverPngClass)) + +typedef struct _GthImageSaverPng GthImageSaverPng; +typedef struct _GthImageSaverPngClass GthImageSaverPngClass; +typedef struct _GthImageSaverPngPrivate GthImageSaverPngPrivate; + +struct _GthImageSaverPng +{ + GthImageSaver __parent; + GthImageSaverPngPrivate *priv; +}; + +struct _GthImageSaverPngClass +{ + GthImageSaverClass __parent_class; +}; + +GType gth_image_saver_png_get_type (void); + +G_END_DECLS + +#endif /* GTH_IMAGE_SAVER_PNG_H */ diff -Nru gthumb-3.0.2/extensions/cairo_io/gth-image-saver-tga.c gthumb-3.2.3/extensions/cairo_io/gth-image-saver-tga.c --- gthumb-3.0.2/extensions/cairo_io/gth-image-saver-tga.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/gth-image-saver-tga.c 2013-06-28 13:35:25.000000000 +0000 @@ -0,0 +1,360 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2009 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include "gth-image-saver-tga.h" +#include "preferences.h" + + +G_DEFINE_TYPE (GthImageSaverTga, gth_image_saver_tga, GTH_TYPE_IMAGE_SAVER) + + +struct _GthImageSaverTgaPrivate { + GtkBuilder *builder; + GSettings *settings; +}; + + +static void +gth_image_saver_tga_finalize (GObject *object) +{ + GthImageSaverTga *self = GTH_IMAGE_SAVER_TGA (object); + + _g_object_unref (self->priv->builder); + _g_object_unref (self->priv->settings); + G_OBJECT_CLASS (gth_image_saver_tga_parent_class)->finalize (object); +} + + +static GtkWidget * +gth_image_saver_tga_get_control (GthImageSaver *base) +{ + GthImageSaverTga *self = GTH_IMAGE_SAVER_TGA (base); + + if (self->priv->builder == NULL) + self->priv->builder = _gtk_builder_new_from_file ("tga-options.ui", "cairo_io"); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tga_rle_compression_checkbutton")), + g_settings_get_boolean (self->priv->settings, PREF_TGA_RLE_COMPRESSION)); + + return _gtk_builder_get_widget (self->priv->builder, "tga_options"); +} + + +static void +gth_image_saver_tga_save_options (GthImageSaver *base) +{ + GthImageSaverTga *self = GTH_IMAGE_SAVER_TGA (base); + + g_settings_set_boolean (self->priv->settings, PREF_TGA_RLE_COMPRESSION, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tga_rle_compression_checkbutton")))); +} + + +static gboolean +gth_image_saver_tga_can_save (GthImageSaver *self, + const char *mime_type) +{ + return g_content_type_equals (mime_type, "image/tga") || g_content_type_equals (mime_type, "image/x-tga"); +} + + +/* -- _gdk_pixbuf_save_as_tga -- */ + + +/* TRUEVISION-XFILE magic signature string */ +static guchar magic[18] = { + 0x54, 0x52, 0x55, 0x45, 0x56, 0x49, 0x53, 0x49, 0x4f, + 0x4e, 0x2d, 0x58, 0x46, 0x49, 0x4c, 0x45, 0x2e, 0x0 +}; + + +static gboolean +rle_write (GthBufferData *buffer_data, + guchar *buffer, + guint width, + guint bytes, + GError **error) +{ + int repeat = 0; + int direct = 0; + guchar *from = buffer; + guint x; + + for (x = 1; x < width; ++x) { + if (memcmp (buffer, buffer + bytes, bytes)) { + /* next pixel is different */ + if (repeat) { + gth_buffer_data_putc (buffer_data, 128 + repeat, error); + gth_buffer_data_write (buffer_data, from, bytes, error); + from = buffer + bytes; /* point to first different pixel */ + repeat = 0; + direct = 0; + } + else + direct += 1; + } + else { + /* next pixel is the same */ + if (direct) { + gth_buffer_data_putc (buffer_data, direct - 1, error); + gth_buffer_data_write (buffer_data, from, bytes * direct, error); + from = buffer; /* point to first identical pixel */ + direct = 0; + repeat = 1; + } + else + repeat += 1; + } + + if (repeat == 128) { + gth_buffer_data_putc (buffer_data, 255, error); + gth_buffer_data_write (buffer_data, from, bytes, error); + from = buffer + bytes; + direct = 0; + repeat = 0; + } + else if (direct == 128) { + gth_buffer_data_putc (buffer_data, 127, error); + gth_buffer_data_write (buffer_data, from, bytes * direct, error); + from = buffer + bytes; + direct = 0; + repeat = 0; + } + + buffer += bytes; + } + + if (repeat > 0) { + gth_buffer_data_putc (buffer_data, 128 + repeat, error); + gth_buffer_data_write (buffer_data, from, bytes, error); + } + else { + gth_buffer_data_putc (buffer_data, direct, error); + gth_buffer_data_write (buffer_data, from, bytes * (direct + 1), error); + } + + return TRUE; +} + + +static gboolean +_cairo_surface_write_as_tga (cairo_surface_t *image, + char **buffer, + gsize *buffer_size, + char **keys, + char **values, + GError **error) +{ + GthBufferData *buffer_data; + int out_bpp = 0; + int row; + guchar header[18]; + guchar footer[26]; + gboolean rle_compression; + gboolean alpha; + guchar *pixels, *ptr, *buf; + int width, height; + int rowstride; + + rle_compression = TRUE; + + if (keys && *keys) { + char **kiter = keys; + char **viter = values; + + while (*kiter) { + if (strcmp (*kiter, "compression") == 0) { + if (*viter == NULL) { + g_set_error (error, + GDK_PIXBUF_ERROR, + GDK_PIXBUF_ERROR_BAD_OPTION, + "Must specify a compression type"); + return FALSE; + } + + if (strcmp (*viter, "none") == 0) + rle_compression = FALSE; + + else if (strcmp (*viter, "rle") == 0) + rle_compression = TRUE; + + else { + g_set_error (error, + GDK_PIXBUF_ERROR, + GDK_PIXBUF_ERROR_BAD_OPTION, + "Unsupported compression type passed to the TGA saver"); + return FALSE; + } + } + else { + g_warning ("Bad option name '%s' passed to the TGA saver", *kiter); + return FALSE; + } + + ++kiter; + ++viter; + } + } + + width = cairo_image_surface_get_width (image); + height = cairo_image_surface_get_height (image); + alpha = _cairo_image_surface_get_has_alpha (image); + pixels = cairo_image_surface_get_data (image); + rowstride = cairo_image_surface_get_stride (image); + + buffer_data = gth_buffer_data_new (); + + /* write the header */ + + header[0] = 0; /* No image identifier / description */ + header[1] = 0; + header[2] = rle_compression ? 10 : 2; + header[3] = header[4] = header[5] = header[6] = header[7] = 0; + header[8] = header[9] = 0; /* xorigin */ + header[10] = header[11] = 0; /* yorigin */ + header[12] = width % 256; + header[13] = width / 256; + header[14] = height % 256; + header[15] = height / 256; + if (alpha) { + out_bpp = 4; + header[16] = 32; /* bpp */ + header[17] = 0x28; /* alpha + orientation */ + } + else { + out_bpp = 3; + header[16] = 24; /* bpp */ + header[17] = 0x20; /* alpha + orientation */ + } + gth_buffer_data_write (buffer_data, header, sizeof (header), error); + + /* allocate a small buffer to convert image data */ + buf = g_try_malloc (width * out_bpp * sizeof (guchar)); + if (! buf) { + g_set_error_literal (error, + GDK_PIXBUF_ERROR, + GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY, + _("Insufficient memory")); + return FALSE; + } + + ptr = pixels; + for (row = 0; row < height; ++row) { + _cairo_copy_line_as_rgba_little_endian (buf, ptr, width, alpha); + + if (rle_compression) + rle_write (buffer_data, buf, width, out_bpp, error); + else + gth_buffer_data_write (buffer_data, buf, width * out_bpp, error); + + ptr += rowstride; + } + + g_free (buf); + + /* write the footer */ + + memset (footer, 0, 8); /* No extensions, no developer directory */ + memcpy (footer + 8, magic, sizeof (magic)); /* magic signature */ + gth_buffer_data_write (buffer_data, footer, sizeof (footer), error); + + gth_buffer_data_get (buffer_data, buffer, buffer_size); + gth_buffer_data_free (buffer_data, FALSE); + + return TRUE; +} + + +static gboolean +gth_image_saver_tga_save_image (GthImageSaver *base, + GthImage *image, + char **buffer, + gsize *buffer_size, + const char *mime_type, + GCancellable *cancellable, + GError **error) +{ + GthImageSaverTga *self = GTH_IMAGE_SAVER_TGA (base); + char **option_keys; + char **option_values; + int i = -1; + cairo_surface_t *surface; + gboolean result; + + option_keys = g_malloc (sizeof (char *) * 2); + option_values = g_malloc (sizeof (char *) * 2); + + i++; + option_keys[i] = g_strdup ("compression"); + option_values[i] = g_strdup (g_settings_get_boolean (self->priv->settings, PREF_TGA_RLE_COMPRESSION) ? "rle" : "none"); + + i++; + option_keys[i] = NULL; + option_values[i] = NULL; + + surface = gth_image_get_cairo_surface (image); + result = _cairo_surface_write_as_tga (surface, + buffer, + buffer_size, + option_keys, + option_values, + error); + + cairo_surface_destroy (surface); + g_strfreev (option_keys); + g_strfreev (option_values); + + return result; +} + + +static void +gth_image_saver_tga_class_init (GthImageSaverTgaClass *klass) +{ + GObjectClass *object_class; + GthImageSaverClass *image_saver_class; + + g_type_class_add_private (klass, sizeof (GthImageSaverTgaPrivate)); + + object_class = G_OBJECT_CLASS (klass); + object_class->finalize = gth_image_saver_tga_finalize; + + image_saver_class = GTH_IMAGE_SAVER_CLASS (klass); + image_saver_class->id = "tga"; + image_saver_class->display_name = _("TGA"); + image_saver_class->mime_type = "image/x-tga"; + image_saver_class->extensions = "tga"; + image_saver_class->get_default_ext = NULL; + image_saver_class->get_control = gth_image_saver_tga_get_control; + image_saver_class->save_options = gth_image_saver_tga_save_options; + image_saver_class->can_save = gth_image_saver_tga_can_save; + image_saver_class->save_image = gth_image_saver_tga_save_image; +} + + +static void +gth_image_saver_tga_init (GthImageSaverTga *self) +{ + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_IMAGE_SAVER_TGA, GthImageSaverTgaPrivate); + self->priv->settings = g_settings_new (GTHUMB_IMAGE_SAVERS_TGA_SCHEMA); +} diff -Nru gthumb-3.0.2/extensions/cairo_io/gth-image-saver-tga.h gthumb-3.2.3/extensions/cairo_io/gth-image-saver-tga.h --- gthumb-3.0.2/extensions/cairo_io/gth-image-saver-tga.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/gth-image-saver-tga.h 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,56 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2009 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef GTH_IMAGE_SAVER_TGA_H +#define GTH_IMAGE_SAVER_TGA_H + +#include +#include + +G_BEGIN_DECLS + +#define GTH_TYPE_IMAGE_SAVER_TGA (gth_image_saver_tga_get_type ()) +#define GTH_IMAGE_SAVER_TGA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_IMAGE_SAVER_TGA, GthImageSaverTga)) +#define GTH_IMAGE_SAVER_TGA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTH_TYPE_IMAGE_SAVER_TGA, GthImageSaverTgaClass)) +#define GTH_IS_IMAGE_SAVER_TGA(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_IMAGE_SAVER_TGA)) +#define GTH_IS_IMAGE_SAVER_TGA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTH_TYPE_IMAGE_SAVER_TGA)) +#define GTH_IMAGE_SAVER_TGA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTH_TYPE_IMAGE_SAVER_TGA, GthImageSaverTgaClass)) + +typedef struct _GthImageSaverTga GthImageSaverTga; +typedef struct _GthImageSaverTgaClass GthImageSaverTgaClass; +typedef struct _GthImageSaverTgaPrivate GthImageSaverTgaPrivate; + +struct _GthImageSaverTga +{ + GthImageSaver __parent; + GthImageSaverTgaPrivate *priv; +}; + +struct _GthImageSaverTgaClass +{ + GthImageSaverClass __parent_class; +}; + +GType gth_image_saver_tga_get_type (void); + +G_END_DECLS + +#endif /* GTH_IMAGE_SAVER_TGA_H */ diff -Nru gthumb-3.0.2/extensions/cairo_io/gth-image-saver-tiff.c gthumb-3.2.3/extensions/cairo_io/gth-image-saver-tiff.c --- gthumb-3.0.2/extensions/cairo_io/gth-image-saver-tiff.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/gth-image-saver-tiff.c 2013-06-28 13:35:25.000000000 +0000 @@ -0,0 +1,577 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2009 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#ifdef HAVE_LIBTIFF +#include +#endif /* HAVE_LIBTIFF */ +#include +#include +#include "enum-types.h" +#include "gth-image-saver-tiff.h" +#include "preferences.h" + + +G_DEFINE_TYPE (GthImageSaverTiff, gth_image_saver_tiff, GTH_TYPE_IMAGE_SAVER) + + +struct _GthImageSaverTiffPrivate { + GSettings *settings; + GtkBuilder *builder; + char *default_ext; +}; + + +static void +gth_image_saver_tiff_finalize (GObject *object) +{ + GthImageSaverTiff *self = GTH_IMAGE_SAVER_TIFF (object); + + _g_object_unref (self->priv->settings); + _g_object_unref (self->priv->builder); + g_free (self->priv->default_ext); + + G_OBJECT_CLASS (gth_image_saver_tiff_parent_class)->finalize (object); +} + + +static const char * +gth_image_saver_tiff_get_default_ext (GthImageSaver *base) +{ + GthImageSaverTiff *self = GTH_IMAGE_SAVER_TIFF (base); + + if (self->priv->default_ext == NULL) + self->priv->default_ext = g_settings_get_string (self->priv->settings, PREF_TIFF_DEFAULT_EXT); + + return self->priv->default_ext; +} + + +static GtkWidget * +gth_image_saver_tiff_get_control (GthImageSaver *base) +{ +#ifdef HAVE_LIBTIFF + + GthImageSaverTiff *self = GTH_IMAGE_SAVER_TIFF (base); + char **extensions; + int i; + int active_idx; + GthTiffCompression compression_type; + + if (self->priv->builder == NULL) + self->priv->builder = _gtk_builder_new_from_file ("tiff-options.ui", "cairo_io"); + + active_idx = 0; + extensions = g_strsplit (gth_image_saver_get_extensions (base), " ", -1); + for (i = 0; extensions[i] != NULL; i++) { + GtkTreeIter iter; + + gtk_list_store_append (GTK_LIST_STORE (gtk_builder_get_object (self->priv->builder, "tiff_default_ext_liststore")), &iter); + gtk_list_store_set (GTK_LIST_STORE (gtk_builder_get_object (self->priv->builder, "tiff_default_ext_liststore")), + &iter, + 0, extensions[i], + -1); + if (g_str_equal (extensions[i], gth_image_saver_get_default_ext (base))) + active_idx = i; + } + gtk_combo_box_set_active (GTK_COMBO_BOX (_gtk_builder_get_widget (self->priv->builder, "tiff_default_extension_combobox")), active_idx); + g_strfreev (extensions); + + compression_type = g_settings_get_enum (self->priv->settings, PREF_TIFF_COMPRESSION); + switch (compression_type) { + case GTH_TIFF_COMPRESSION_NONE: + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tiff_comp_none_radiobutton")), TRUE); + break; + case GTH_TIFF_COMPRESSION_DEFLATE: + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tiff_comp_deflate_radiobutton")), TRUE); + break; + case GTH_TIFF_COMPRESSION_JPEG: + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tiff_comp_jpeg_radiobutton")), TRUE); + break; + } + + gtk_spin_button_set_value (GTK_SPIN_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tiff_hdpi_spinbutton")), + g_settings_get_int (self->priv->settings, PREF_TIFF_HORIZONTAL_RES)); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tiff_vdpi_spinbutton")), + g_settings_get_int (self->priv->settings, PREF_TIFF_VERTICAL_RES)); + + return _gtk_builder_get_widget (self->priv->builder, "tiff_options"); + +#else /* ! HAVE_LIBTIFF */ + + return GTH_IMAGE_SAVER_CLASS (gth_image_saver_tiff_parent_class)->get_control (base); + +#endif /* HAVE_LIBTIFF */ +} + + +static void +gth_image_saver_tiff_save_options (GthImageSaver *base) +{ +#ifdef HAVE_LIBTIFF + + GthImageSaverTiff *self = GTH_IMAGE_SAVER_TIFF (base); + GtkTreeIter iter; + GthTiffCompression compression_type; + + if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (_gtk_builder_get_widget (self->priv->builder, "tiff_default_extension_combobox")), &iter)) { + g_free (self->priv->default_ext); + gtk_tree_model_get (GTK_TREE_MODEL (gtk_builder_get_object (self->priv->builder, "tiff_default_ext_liststore")), + &iter, + 0, &self->priv->default_ext, + -1); + g_settings_set_string (self->priv->settings, PREF_TIFF_DEFAULT_EXT, self->priv->default_ext); + } + + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tiff_comp_none_radiobutton")))) + compression_type = GTH_TIFF_COMPRESSION_NONE; + else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tiff_comp_deflate_radiobutton")))) + compression_type = GTH_TIFF_COMPRESSION_DEFLATE; + else + compression_type = GTH_TIFF_COMPRESSION_JPEG; + g_settings_set_enum (self->priv->settings, PREF_TIFF_COMPRESSION, compression_type); + + g_settings_set_int (self->priv->settings, PREF_TIFF_HORIZONTAL_RES, (int) gtk_spin_button_get_value (GTK_SPIN_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tiff_hdpi_spinbutton")))); + g_settings_set_int (self->priv->settings, PREF_TIFF_VERTICAL_RES, (int) gtk_spin_button_get_value (GTK_SPIN_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tiff_vdpi_spinbutton")))); + +#endif /* HAVE_LIBTIFF */ +} + + +static gboolean +gth_image_saver_tiff_can_save (GthImageSaver *self, + const char *mime_type) +{ +#ifdef HAVE_LIBTIFF + + return g_content_type_equals (mime_type, "image/tiff"); + +#else /* ! HAVE_LIBTIFF */ + + GSList *formats; + GSList *scan; + GdkPixbufFormat *tiff_format; + + if (! g_content_type_equals (mime_type, "image/tiff")) + return FALSE; + + formats = gdk_pixbuf_get_formats (); + tiff_format = NULL; + for (scan = formats; (tiff_format == NULL) && (scan != NULL); scan = g_slist_next (scan)) { + GdkPixbufFormat *format = scan->data; + char **mime_types; + int i; + + mime_types = gdk_pixbuf_format_get_mime_types (format); + for (i = 0; mime_types[i] != NULL; i++) + if (g_content_type_equals (mime_types[i], "image/tiff")) + break; + + if (mime_types[i] == NULL) + continue; + + if (! gdk_pixbuf_format_is_writable (format)) + continue; + + tiff_format = format; + } + + return tiff_format != NULL; + +#endif /* HAVE_LIBTIFF */ +} + + +#ifdef HAVE_LIBTIFF + + +/* -- gth_image_saver_tiff_save_pixbuf -- */ + + +#define TILE_HEIGHT 40 /* FIXME */ + + +static tsize_t +tiff_save_read (thandle_t handle, tdata_t buf, tsize_t size) +{ + return -1; +} + + +static tsize_t +tiff_save_write (thandle_t handle, tdata_t buf, tsize_t size) +{ + GthBufferData *buffer_data = (GthBufferData *)handle; + + gth_buffer_data_write (buffer_data, buf, size, NULL); + return size; +} + + +static toff_t +tiff_save_seek (thandle_t handle, toff_t offset, int whence) +{ + GthBufferData *buffer_data = (GthBufferData *)handle; + + return gth_buffer_data_seek (buffer_data, offset, whence); +} + + +static int +tiff_save_close (thandle_t context) +{ + return 0; +} + + +static toff_t +tiff_save_size (thandle_t handle) +{ + return -1; +} + + +static gboolean +_cairo_surface_write_as_tiff (cairo_surface_t *image, + char **buffer, + gsize *buffer_size, + char **keys, + char **values, + GError **error) +{ + GthBufferData *buffer_data; + TIFF *tif; + int cols, rows, row; + glong rowsperstrip; + gushort compression; + int alpha; + gshort predictor; + gshort photometric; + gshort samplesperpixel; + gshort bitspersample; + gushort extra_samples[1]; + int rowstride; + guchar *pixels, *ptr, *buf; + int horizontal_dpi = 72, vertical_dpi = 72; + gboolean save_resolution = FALSE; + + compression = COMPRESSION_DEFLATE; + + if (keys && *keys) { + char **kiter = keys; + char **viter = values; + + while (*kiter) { + if (strcmp (*kiter, "compression") == 0) { + if (*viter == NULL) { + g_set_error (error, + GDK_PIXBUF_ERROR, + GDK_PIXBUF_ERROR_BAD_OPTION, + "Must specify a compression type"); + return FALSE; + } + + if (strcmp (*viter, "none") == 0) + compression = COMPRESSION_NONE; + else if (strcmp (*viter, "pack bits") == 0) + compression = COMPRESSION_PACKBITS; + else if (strcmp (*viter, "lzw") == 0) + compression = COMPRESSION_LZW; + else if (strcmp (*viter, "deflate") == 0) + compression = COMPRESSION_DEFLATE; + else if (strcmp (*viter, "jpeg") == 0) + compression = COMPRESSION_JPEG; + else { + g_set_error (error, + GDK_PIXBUF_ERROR, + GDK_PIXBUF_ERROR_BAD_OPTION, + "Unsupported compression type passed to the TIFF saver"); + return FALSE; + } + } + else if (strcmp (*kiter, "vertical dpi") == 0) { + char *endptr = NULL; + vertical_dpi = strtol (*viter, &endptr, 10); + save_resolution = TRUE; + + if (endptr == *viter) { + g_set_error (error, + GDK_PIXBUF_ERROR, + GDK_PIXBUF_ERROR_BAD_OPTION, + "TIFF vertical dpi must be a value greater than 0; value '%s' could not be parsed.", + *viter); + return FALSE; + } + + if (vertical_dpi < 0) { + g_set_error (error, + GDK_PIXBUF_ERROR, + GDK_PIXBUF_ERROR_BAD_OPTION, + "TIFF vertical dpi must be a value greater than 0; value '%d' is not allowed.", + vertical_dpi); + return FALSE; + } + } + else if (strcmp (*kiter, "horizontal dpi") == 0) { + char *endptr = NULL; + horizontal_dpi = strtol (*viter, &endptr, 10); + save_resolution = TRUE; + + if (endptr == *viter) { + g_set_error (error, + GDK_PIXBUF_ERROR, + GDK_PIXBUF_ERROR_BAD_OPTION, + "TIFF horizontal dpi must be a value greater than 0; value '%s' could not be parsed.", + *viter); + return FALSE; + } + + if (horizontal_dpi < 0) { + g_set_error (error, + GDK_PIXBUF_ERROR, + GDK_PIXBUF_ERROR_BAD_OPTION, + "TIFF horizontal dpi must be a value greater than 0; value '%d' is not allowed.", + horizontal_dpi); + return FALSE; + } + } + else { + g_warning ("Bad option name '%s' passed to the TIFF saver", *kiter); + return FALSE; + } + + ++kiter; + ++viter; + } + } + + predictor = 0; + rowsperstrip = TILE_HEIGHT; + + buffer_data = gth_buffer_data_new (); + tif = TIFFClientOpen ("gth-tiff-writer", "w", buffer_data, + tiff_save_read, tiff_save_write, + tiff_save_seek, tiff_save_close, + tiff_save_size, + NULL, NULL); + if (tif == NULL) { + g_set_error_literal (error, + GDK_PIXBUF_ERROR, + GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY, + "Couldn't allocate memory for writing TIFF file"); + return FALSE; + } + + cols = cairo_image_surface_get_width (image); + rows = cairo_image_surface_get_height (image); + alpha = _cairo_image_surface_get_has_alpha (image); + pixels = cairo_image_surface_get_data (image); + rowstride = cairo_image_surface_get_stride (image); + + predictor = 2; + bitspersample = 8; + photometric = PHOTOMETRIC_RGB; + + if (alpha) + samplesperpixel = 4; + else + samplesperpixel = 3; + + /* Set TIFF parameters. */ + + TIFFSetField (tif, TIFFTAG_SUBFILETYPE, 0); + TIFFSetField (tif, TIFFTAG_IMAGEWIDTH, cols); + TIFFSetField (tif, TIFFTAG_IMAGELENGTH, rows); + TIFFSetField (tif, TIFFTAG_BITSPERSAMPLE, bitspersample); + TIFFSetField (tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT); + TIFFSetField (tif, TIFFTAG_COMPRESSION, compression); + + if ((compression == COMPRESSION_LZW || compression == COMPRESSION_DEFLATE) + && (predictor != 0)) + { + TIFFSetField (tif, TIFFTAG_PREDICTOR, predictor); + } + + if (alpha) { + extra_samples [0] = EXTRASAMPLE_ASSOCALPHA; + TIFFSetField (tif, TIFFTAG_EXTRASAMPLES, 1, extra_samples); + } + + TIFFSetField (tif, TIFFTAG_PHOTOMETRIC, photometric); + /*TIFFSetField (tif, TIFFTAG_DOCUMENTNAME, filename);*/ + TIFFSetField (tif, TIFFTAG_SAMPLESPERPIXEL, samplesperpixel); + TIFFSetField (tif, TIFFTAG_ROWSPERSTRIP, rowsperstrip); + TIFFSetField (tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); + + if (save_resolution) { + TIFFSetField (tif, TIFFTAG_XRESOLUTION, (double) horizontal_dpi); + TIFFSetField (tif, TIFFTAG_YRESOLUTION, (double) vertical_dpi); + TIFFSetField (tif, TIFFTAG_RESOLUTIONUNIT, RESUNIT_INCH); + } + + buf = g_try_malloc (cols * samplesperpixel * sizeof (guchar)); + if (! buf) { + g_set_error_literal (error, + GDK_PIXBUF_ERROR, + GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY, + _("Insufficient memory")); + return FALSE; + } + + /* Now write the TIFF data. */ + ptr = pixels; + for (row = 0; row < rows; row++) { + _cairo_copy_line_as_rgba_big_endian (buf, ptr, cols, alpha); + if (TIFFWriteScanline (tif, buf, row, 0) < 0) { + g_set_error (error, + GDK_PIXBUF_ERROR, + GDK_PIXBUF_ERROR_FAILED, + "TIFF Failed a scanline write on row %d", + row); + return FALSE; + } + + ptr += rowstride; + } + + g_free (buf); + + TIFFFlushData (tif); + TIFFClose (tif); + + gth_buffer_data_get (buffer_data, buffer, buffer_size); + gth_buffer_data_free (buffer_data, FALSE); + + return TRUE; +} + + +#endif /* HAVE_LIBTIFF */ + + +static gboolean +gth_image_saver_tiff_save_image (GthImageSaver *base, + GthImage *image, + char **buffer, + gsize *buffer_size, + const char *mime_type, + GCancellable *cancellable, + GError **error) +{ +#ifdef HAVE_LIBTIFF + GthImageSaverTiff *self = GTH_IMAGE_SAVER_TIFF (base); + char **option_keys; + char **option_values; + int i = -1; + int i_value; + cairo_surface_t *surface; + gboolean result; + + option_keys = g_malloc (sizeof (char *) * 4); + option_values = g_malloc (sizeof (char *) * 4); + + i++; + option_keys[i] = g_strdup ("compression");; + option_values[i] = g_settings_get_string (self->priv->settings, PREF_TIFF_COMPRESSION); + + i++; + i_value = g_settings_get_int (self->priv->settings, PREF_TIFF_VERTICAL_RES); + option_keys[i] = g_strdup ("vertical dpi");; + option_values[i] = g_strdup_printf ("%d", i_value); + + i++; + i_value = g_settings_get_int (self->priv->settings, PREF_TIFF_HORIZONTAL_RES); + option_keys[i] = g_strdup ("horizontal dpi");; + option_values[i] = g_strdup_printf ("%d", i_value); + + i++; + option_keys[i] = NULL; + option_values[i] = NULL; + + surface = gth_image_get_cairo_surface (image); + result = _cairo_surface_write_as_tiff (surface, + buffer, + buffer_size, + option_keys, + option_values, + error); + + cairo_surface_destroy (surface); + g_strfreev (option_keys); + g_strfreev (option_values); + +#else /* ! HAVE_LIBTIFF */ + + GdkPixbuf *pixbuf; + char *pixbuf_type; + gboolean result; + + pixbuf = gth_image_get_pixbuf (image); + pixbuf_type = get_pixbuf_type_from_mime_type (mime_type); + result = gdk_pixbuf_save_to_bufferv (pixbuf, + buffer, + buffer_size, + pixbuf_type, + NULL, + NULL, + error); + + g_free (pixbuf_type); + g_object_unref (pixbuf); + +#endif /* HAVE_LIBTIFF */ + + return result; +} + + +static void +gth_image_saver_tiff_class_init (GthImageSaverTiffClass *klass) +{ + GObjectClass *object_class; + GthImageSaverClass *image_saver_class; + + g_type_class_add_private (klass, sizeof (GthImageSaverTiffPrivate)); + + object_class = G_OBJECT_CLASS (klass); + object_class->finalize = gth_image_saver_tiff_finalize; + + image_saver_class = GTH_IMAGE_SAVER_CLASS (klass); + image_saver_class->id = "tiff"; + image_saver_class->display_name = _("TIFF"); + image_saver_class->mime_type = "image/tiff"; + image_saver_class->extensions = "tiff tif"; + image_saver_class->get_default_ext = gth_image_saver_tiff_get_default_ext; + image_saver_class->get_control = gth_image_saver_tiff_get_control; + image_saver_class->save_options = gth_image_saver_tiff_save_options; + image_saver_class->can_save = gth_image_saver_tiff_can_save; + image_saver_class->save_image = gth_image_saver_tiff_save_image; +} + + +static void +gth_image_saver_tiff_init (GthImageSaverTiff *self) +{ + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_IMAGE_SAVER_TIFF, GthImageSaverTiffPrivate); + self->priv->settings = g_settings_new (GTHUMB_IMAGE_SAVERS_TIFF_SCHEMA); + self->priv->builder = NULL; + self->priv->default_ext = NULL; +} diff -Nru gthumb-3.0.2/extensions/cairo_io/gth-image-saver-tiff.h gthumb-3.2.3/extensions/cairo_io/gth-image-saver-tiff.h --- gthumb-3.0.2/extensions/cairo_io/gth-image-saver-tiff.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/gth-image-saver-tiff.h 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,56 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2009 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef GTH_IMAGE_SAVER_TIFF_H +#define GTH_IMAGE_SAVER_TIFF_H + +#include +#include + +G_BEGIN_DECLS + +#define GTH_TYPE_IMAGE_SAVER_TIFF (gth_image_saver_tiff_get_type ()) +#define GTH_IMAGE_SAVER_TIFF(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_IMAGE_SAVER_TIFF, GthImageSaverTiff)) +#define GTH_IMAGE_SAVER_TIFF_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTH_IMAGE_SAVER_TIFF_TYPE, GthImageSaverTiffClass)) +#define GTH_IS_IMAGE_SAVER_TIFF(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_IMAGE_SAVER_TIFF)) +#define GTH_IS_IMAGE_SAVER_TIFF_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTH_TYPE_IMAGE_SAVER_TIFF)) +#define GTH_IMAGE_SAVER_TIFF_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTH_TYPE_IMAGE_SAVER_TIFF, GthImageSaverTiffClass)) + +typedef struct _GthImageSaverTiff GthImageSaverTiff; +typedef struct _GthImageSaverTiffClass GthImageSaverTiffClass; +typedef struct _GthImageSaverTiffPrivate GthImageSaverTiffPrivate; + +struct _GthImageSaverTiff +{ + GthImageSaver __parent; + GthImageSaverTiffPrivate *priv; +}; + +struct _GthImageSaverTiffClass +{ + GthImageSaverClass __parent_class; +}; + +GType gth_image_saver_tiff_get_type (void); + +G_END_DECLS + +#endif /* GTH_IMAGE_SAVER_TIFF_H */ diff -Nru gthumb-3.0.2/extensions/cairo_io/gth-image-saver-webp.c gthumb-3.2.3/extensions/cairo_io/gth-image-saver-webp.c --- gthumb-3.0.2/extensions/cairo_io/gth-image-saver-webp.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/gth-image-saver-webp.c 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,398 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2009 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include +#include "gth-image-saver-webp.h" +#include "preferences.h" + + +#define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x))) + + +G_DEFINE_TYPE (GthImageSaverWebp, gth_image_saver_webp, GTH_TYPE_IMAGE_SAVER) + + +struct _GthImageSaverWebpPrivate { + GtkBuilder *builder; + GSettings *settings; +}; + + +static void +gth_image_saver_webp_finalize (GObject *object) +{ + GthImageSaverWebp *self = GTH_IMAGE_SAVER_WEBP (object); + + _g_object_unref (self->priv->builder); + _g_object_unref (self->priv->settings); + G_OBJECT_CLASS (gth_image_saver_webp_parent_class)->finalize (object); +} + + +static GtkWidget * +gth_image_saver_webp_get_control (GthImageSaver *base) +{ + GthImageSaverWebp *self = GTH_IMAGE_SAVER_WEBP (base); + + if (self->priv->builder == NULL) + self->priv->builder = _gtk_builder_new_from_file ("webp-options.ui", "cairo_io"); + + gtk_adjustment_set_value (GTK_ADJUSTMENT (GET_WIDGET ("quality_adjustment")), + g_settings_get_int (self->priv->settings, PREF_WEBP_QUALITY)); + gtk_adjustment_set_value (GTK_ADJUSTMENT (GET_WIDGET ("method_adjustment")), + g_settings_get_int (self->priv->settings, PREF_WEBP_METHOD)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("lossless_checkbutton")), + g_settings_get_boolean (self->priv->settings, PREF_WEBP_LOSSLESS)); + + return GET_WIDGET ("webp_options"); +} + + +static void +gth_image_saver_webp_save_options (GthImageSaver *base) +{ + GthImageSaverWebp *self = GTH_IMAGE_SAVER_WEBP (base); + + g_settings_set_int (self->priv->settings, PREF_WEBP_QUALITY, (int) gtk_adjustment_get_value (GTK_ADJUSTMENT (GET_WIDGET ("quality_adjustment")))); + g_settings_set_int (self->priv->settings, PREF_WEBP_METHOD, (int) gtk_adjustment_get_value (GTK_ADJUSTMENT (GET_WIDGET ("method_adjustment")))); + g_settings_set_boolean (self->priv->settings, PREF_WEBP_LOSSLESS, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("lossless_checkbutton")))); +} + + +static gboolean +gth_image_saver_webp_can_save (GthImageSaver *self, + const char *mime_type) +{ + return g_content_type_equals (mime_type, "image/webp"); +} + + +typedef struct { + GError **error; + GthBufferData *buffer_data; + int success; +} CairoWebpData; + + +static void +_cairo_webp_data_destroy (CairoWebpData *cairo_webp_data) +{ + gth_buffer_data_free (cairo_webp_data->buffer_data, ! cairo_webp_data->success); + g_free (cairo_webp_data); +} + + +static int +cairo_webp_writer_func (const uint8_t *data, + size_t data_size, + const WebPPicture *picture) +{ + CairoWebpData *cairo_webp_data = picture->custom_ptr; + + cairo_webp_data->success = gth_buffer_data_write (cairo_webp_data->buffer_data, + (void *) data, + data_size, + cairo_webp_data->error); + + return cairo_webp_data->success; +} + + +static int +_WebPPictureImportCairoSurface (WebPPicture *const picture, + cairo_surface_t *image) +{ + int stride; + guchar *src_row; + uint32_t *dest_row; + int y, x; + guchar r, g, b, a; + + if (_cairo_image_surface_get_has_alpha (image)) + picture->colorspace |= WEBP_CSP_ALPHA_BIT; + else + picture->colorspace &= ~WEBP_CSP_ALPHA_BIT; + + if (! WebPPictureAlloc (picture)) + return 0; + + stride = cairo_image_surface_get_stride (image); + src_row = cairo_image_surface_get_data (image); + dest_row = picture->argb; + + for (y= 0; y < cairo_image_surface_get_height (image); y++) { + guchar *pixel = src_row; + + for (x = 0; x < cairo_image_surface_get_width (image); x++) { + CAIRO_GET_RGBA (pixel, r, g, b, a); + dest_row[x] = ((a << 24) | (r << 16) | (g << 8) | b); + + pixel += 4; + } + + src_row += stride; + dest_row += picture->argb_stride; + } + + return 1; +} + + +static gboolean +_cairo_surface_write_as_webp (cairo_surface_t *image, + char **buffer, + gsize *buffer_size, + char **keys, + char **values, + GError **error) +{ + gboolean lossless; + int quality; + int method; + WebPConfig config; + CairoWebpData *cairo_webp_data; + WebPPicture pic; + + lossless = TRUE; + quality = 75; + method = 4; + + if (keys && *keys) { + char **kiter = keys; + char **viter = values; + + while (*kiter) { + if (strcmp (*kiter, "lossless") == 0) { + if (*viter == NULL) { + g_set_error (error, + G_IO_ERROR, + G_IO_ERROR_INVALID_DATA, + "Must specify a value for the 'lossless' option"); + return FALSE; + } + + lossless = atoi (*viter); + + if (lossless < 0 || lossless > 1) { + g_set_error (error, + G_IO_ERROR, + G_IO_ERROR_INVALID_DATA, + "Invalid value set for the 'lossless' option of the WebP saver"); + return FALSE; + } + } + else if (strcmp (*kiter, "quality") == 0) { + if (*viter == NULL) { + g_set_error (error, + G_IO_ERROR, + G_IO_ERROR_INVALID_DATA, + "Must specify a quality value to the WebP saver"); + return FALSE; + } + + quality = atoi (*viter); + + if (quality < 0 || quality > 100) { + g_set_error (error, + G_IO_ERROR, + G_IO_ERROR_INVALID_DATA, + "Unsupported quality value passed to the WebP saver"); + return FALSE; + } + } + else if (strcmp (*kiter, "method") == 0) { + if (*viter == NULL) { + g_set_error (error, + G_IO_ERROR, + G_IO_ERROR_INVALID_DATA, + "Must specify a method value to the WebP saver"); + return FALSE; + } + + method = atoi (*viter); + + if (method < 0 || method > 6) { + g_set_error (error, + G_IO_ERROR, + G_IO_ERROR_INVALID_DATA, + "Unsupported method value passed to the WebP saver"); + return FALSE; + } + } + else { + g_warning ("Bad option name '%s' passed to the WebP saver", *kiter); + return FALSE; + } + + ++kiter; + ++viter; + } + } + + if (! WebPConfigInit (&config)) { + g_set_error (error, + G_IO_ERROR, + G_IO_ERROR_INVALID_DATA, + "Version error"); + return FALSE; + } + + config.lossless = lossless; + config.quality = quality; + config.method = method; + + if (! WebPValidateConfig (&config)) { + g_set_error (error, + G_IO_ERROR, + G_IO_ERROR_INVALID_DATA, + "Config error"); + return FALSE; + } + + cairo_webp_data = g_new0 (CairoWebpData, 1); + cairo_webp_data->error = error; + cairo_webp_data->buffer_data = gth_buffer_data_new (); + cairo_webp_data->success = FALSE; + + WebPPictureInit (&pic); + pic.width = cairo_image_surface_get_width (image); + pic.height = cairo_image_surface_get_height (image); + pic.writer = cairo_webp_writer_func; + pic.custom_ptr = cairo_webp_data; + pic.use_argb = TRUE; + + if (_WebPPictureImportCairoSurface (&pic, image)) { + int ok = WebPEncode (&config, &pic); + WebPPictureFree (&pic); + + if (cairo_webp_data->success && ! ok) { + g_set_error (cairo_webp_data->error, + G_IO_ERROR, + G_IO_ERROR_INVALID_DATA, + "Encoding error: %d", pic.error_code); + cairo_webp_data->success = FALSE; + } + } + else { + g_set_error (cairo_webp_data->error, + G_IO_ERROR, + G_IO_ERROR_INVALID_DATA, + "Memory error"); + cairo_webp_data->success = FALSE; + } + + if (cairo_webp_data->success) + gth_buffer_data_get (cairo_webp_data->buffer_data, buffer, buffer_size); + + _cairo_webp_data_destroy (cairo_webp_data); + + return TRUE; +} + + +static gboolean +gth_image_saver_webp_save_image (GthImageSaver *base, + GthImage *image, + char **buffer, + gsize *buffer_size, + const char *mime_type, + GCancellable *cancellable, + GError **error) +{ + GthImageSaverWebp *self = GTH_IMAGE_SAVER_WEBP (base); + cairo_surface_t *surface; + char **option_keys; + char **option_values; + int i = -1; + int i_value; + gboolean result; + + option_keys = g_new (char *, 4); + option_values = g_new (char *, 4); + + i++; + i_value = g_settings_get_boolean (self->priv->settings, PREF_WEBP_LOSSLESS); + option_keys[i] = g_strdup ("lossless");; + option_values[i] = g_strdup_printf ("%d", i_value); + + i++; + i_value = g_settings_get_int (self->priv->settings, PREF_WEBP_QUALITY); + option_keys[i] = g_strdup ("quality");; + option_values[i] = g_strdup_printf ("%d", i_value); + + i++; + i_value = g_settings_get_int (self->priv->settings, PREF_WEBP_METHOD); + option_keys[i] = g_strdup ("method");; + option_values[i] = g_strdup_printf ("%d", i_value); + + i++; + option_keys[i] = NULL; + option_values[i] = NULL; + + surface = gth_image_get_cairo_surface (image); + result = _cairo_surface_write_as_webp (surface, + buffer, + buffer_size, + option_keys, + option_values, + error); + + cairo_surface_destroy (surface); + g_strfreev (option_keys); + g_strfreev (option_values); + + return result; +} + + +static void +gth_image_saver_webp_class_init (GthImageSaverWebpClass *klass) +{ + GObjectClass *object_class; + GthImageSaverClass *image_saver_class; + + g_type_class_add_private (klass, sizeof (GthImageSaverWebpPrivate)); + + object_class = G_OBJECT_CLASS (klass); + object_class->finalize = gth_image_saver_webp_finalize; + + image_saver_class = GTH_IMAGE_SAVER_CLASS (klass); + image_saver_class->id = "webp"; + image_saver_class->display_name = _("WebP"); + image_saver_class->mime_type = "image/webp"; + image_saver_class->extensions = "webp"; + image_saver_class->get_default_ext = NULL; + image_saver_class->get_control = gth_image_saver_webp_get_control; + image_saver_class->save_options = gth_image_saver_webp_save_options; + image_saver_class->can_save = gth_image_saver_webp_can_save; + image_saver_class->save_image = gth_image_saver_webp_save_image; +} + + +static void +gth_image_saver_webp_init (GthImageSaverWebp *self) +{ + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_IMAGE_SAVER_WEBP, GthImageSaverWebpPrivate); + self->priv->settings = g_settings_new (GTHUMB_IMAGE_SAVERS_WEBP_SCHEMA); +} diff -Nru gthumb-3.0.2/extensions/cairo_io/gth-image-saver-webp.h gthumb-3.2.3/extensions/cairo_io/gth-image-saver-webp.h --- gthumb-3.0.2/extensions/cairo_io/gth-image-saver-webp.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/gth-image-saver-webp.h 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,56 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef GTH_IMAGE_SAVER_WEBP_H +#define GTH_IMAGE_SAVER_WEBP_H + +#include +#include + +G_BEGIN_DECLS + +#define GTH_TYPE_IMAGE_SAVER_WEBP (gth_image_saver_webp_get_type ()) +#define GTH_IMAGE_SAVER_WEBP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_IMAGE_SAVER_WEBP, GthImageSaverWebp)) +#define GTH_IMAGE_SAVER_WEBP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTH_IMAGE_SAVER_WEBP_TYPE, GthImageSaverWebpClass)) +#define GTH_IS_IMAGE_SAVER_WEBP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_IMAGE_SAVER_WEBP)) +#define GTH_IS_IMAGE_SAVER_WEBP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTH_TYPE_IMAGE_SAVER_WEBP)) +#define GTH_IMAGE_SAVER_WEBP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTH_TYPE_IMAGE_SAVER_WEBP, GthImageSaverWebpClass)) + +typedef struct _GthImageSaverWebp GthImageSaverWebp; +typedef struct _GthImageSaverWebpClass GthImageSaverWebpClass; +typedef struct _GthImageSaverWebpPrivate GthImageSaverWebpPrivate; + +struct _GthImageSaverWebp +{ + GthImageSaver __parent; + GthImageSaverWebpPrivate *priv; +}; + +struct _GthImageSaverWebpClass +{ + GthImageSaverClass __parent_class; +}; + +GType gth_image_saver_webp_get_type (void); + +G_END_DECLS + +#endif /* GTH_IMAGE_SAVER_WEBP_H */ diff -Nru gthumb-3.0.2/extensions/cairo_io/main.c gthumb-3.2.3/extensions/cairo_io/main.c --- gthumb-3.0.2/extensions/cairo_io/main.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/main.c 2013-04-30 16:56:12.000000000 +0000 @@ -22,9 +22,17 @@ #include #include -#include "cairo-io-jpeg.h" -#include "cairo-io-png.h" -#include "cairo-io-svg.h" +#include "cairo-image-surface-jpeg.h" +#include "cairo-image-surface-png.h" +#include "cairo-image-surface-svg.h" +#include "cairo-image-surface-webp.h" +#include "cairo-image-surface-xcf.h" +#include "gth-image-saver-jpeg.h" +#include "gth-image-saver-png.h" +#include "gth-image-saver-tga.h" +#include "gth-image-saver-tiff.h" +#include "gth-image-saver-webp.h" +#include "preferences.h" G_MODULE_EXPORT void @@ -35,17 +43,40 @@ GTH_IMAGE_FORMAT_CAIRO_SURFACE, "image/jpeg", NULL); + gth_main_register_type ("image-saver", GTH_TYPE_IMAGE_SAVER_JPEG); #endif + gth_main_register_image_loader_func (_cairo_image_surface_create_from_png, GTH_IMAGE_FORMAT_CAIRO_SURFACE, "image/png", NULL); + #ifdef HAVE_LIBRSVG gth_main_register_image_loader_func (_cairo_image_surface_create_from_svg, GTH_IMAGE_FORMAT_CAIRO_SURFACE, "image/svg+xml", NULL); #endif + + gth_main_register_type ("image-saver", GTH_TYPE_IMAGE_SAVER_PNG); + gth_main_register_type ("image-saver", GTH_TYPE_IMAGE_SAVER_TGA); + gth_main_register_type ("image-saver", GTH_TYPE_IMAGE_SAVER_TIFF); + +#ifdef HAVE_LIBWEBP + gth_main_register_image_loader_func (_cairo_image_surface_create_from_webp, + GTH_IMAGE_FORMAT_CAIRO_SURFACE, + "image/webp", + NULL); + gth_main_register_type ("image-saver", GTH_TYPE_IMAGE_SAVER_WEBP); +#endif + + gth_main_register_image_loader_func (_cairo_image_surface_create_from_xcf, + GTH_IMAGE_FORMAT_CAIRO_SURFACE, + "image/x-xcf", + NULL); + + gth_hook_add_callback ("dlg-preferences-construct", 30, G_CALLBACK (ci__dlg_preferences_construct_cb), NULL); + gth_hook_add_callback ("dlg-preferences-apply", 10, G_CALLBACK (ci__dlg_preferences_apply_cb), NULL); } diff -Nru gthumb-3.0.2/extensions/cairo_io/preferences.c gthumb-3.2.3/extensions/cairo_io/preferences.c --- gthumb-3.0.2/extensions/cairo_io/preferences.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/preferences.c 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,161 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2009 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include "preferences.h" + + +#define GET_WIDGET(name) _gtk_builder_get_widget (data->builder, (name)) +#define BROWSER_DATA_KEY "save-options-preference-data" + + +enum { + FILE_TYPE_COLUMN_N, + FILE_TYPE_COLUMN_OBJ, + FILE_TYPE_COLUMN_DISPLAY_NAME +}; + + +typedef struct { + GtkBuilder *builder; + GList *image_saver; +} BrowserData; + + +static void +browser_data_free (BrowserData *data) +{ + _g_object_list_unref (data->image_saver); + g_object_unref (data->builder); + g_free (data); +} + + +static void +treeselection_changed_cb (GtkTreeSelection *treeselection, + gpointer user_data) +{ + GtkWidget *dialog = user_data; + BrowserData *data; + GtkTreeIter iter; + int page_n; + GthImageSaver *image_saver; + + data = g_object_get_data (G_OBJECT (dialog), BROWSER_DATA_KEY); + g_return_if_fail (data != NULL); + + if (! gtk_tree_selection_get_selected (treeselection, NULL, &iter)) + return; + + gtk_tree_model_get (GTK_TREE_MODEL (gtk_builder_get_object (data->builder, "file_type_liststore")), &iter, + FILE_TYPE_COLUMN_N, &page_n, + FILE_TYPE_COLUMN_OBJ, &image_saver, + -1); + gtk_notebook_set_current_page (GTK_NOTEBOOK (_gtk_builder_get_widget (data->builder, "options_notebook")), page_n); + gtk_label_set_text (GTK_LABEL (_gtk_builder_get_widget (data->builder, "file_type_label")), gth_image_saver_get_display_name (image_saver)); + + g_object_unref (image_saver); +} + + +void +ci__dlg_preferences_construct_cb (GtkWidget *dialog, + GthBrowser *browser, + GtkBuilder *dialog_builder) +{ + BrowserData *data; + GtkWidget *notebook; + GtkWidget *page; + GtkListStore *model; + GArray *image_saver_types; + int i; + GtkTreeSelection *treeselection; + GtkTreePath *path; + GtkWidget *label; + + data = g_new0 (BrowserData, 1); + data->builder = _gtk_builder_new_from_file ("save-options-preferences.ui", "cairo_io"); + + notebook = _gtk_builder_get_widget (dialog_builder, "notebook"); + + page = _gtk_builder_get_widget (data->builder, "preferences_page"); + gtk_widget_show (page); + + model = (GtkListStore *) gtk_builder_get_object (data->builder, "file_type_liststore"); + image_saver_types = gth_main_get_type_set ("image-saver"); + for (i = 0; (image_saver_types != NULL) && (i < image_saver_types->len); i++) { + GthImageSaver *image_saver; + GtkTreeIter iter; + GtkWidget *options; + + image_saver = g_object_new (g_array_index (image_saver_types, GType, i), NULL); + + gtk_list_store_append (model, &iter); + gtk_list_store_set (model, &iter, + FILE_TYPE_COLUMN_N, i, + FILE_TYPE_COLUMN_OBJ, image_saver, + FILE_TYPE_COLUMN_DISPLAY_NAME, gth_image_saver_get_display_name (image_saver), + -1); + + options = gth_image_saver_get_control (image_saver); + gtk_widget_show (options); + gtk_notebook_append_page (GTK_NOTEBOOK (_gtk_builder_get_widget (data->builder, "options_notebook")), options, NULL); + + data->image_saver = g_list_prepend (data->image_saver, image_saver); + } + + treeselection = gtk_tree_view_get_selection (GTK_TREE_VIEW (_gtk_builder_get_widget (data->builder, "file_type_treeview"))); + gtk_tree_selection_set_mode (treeselection, GTK_SELECTION_BROWSE); + g_signal_connect (treeselection, + "changed", + G_CALLBACK (treeselection_changed_cb), + dialog); + + label = gtk_label_new (_("Saving")); + gtk_widget_show (label); + + gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, label); + g_object_set_data_full (G_OBJECT (dialog), BROWSER_DATA_KEY, data, (GDestroyNotify) browser_data_free); + + path = gtk_tree_path_new_first (); + gtk_tree_selection_select_path (treeselection, path); + gtk_tree_path_free (path); +} + + +void +ci__dlg_preferences_apply_cb (GtkWidget *dialog, + GthBrowser *browser, + GtkBuilder *builder) +{ + BrowserData *data; + GList *scan; + + data = g_object_get_data (G_OBJECT (dialog), BROWSER_DATA_KEY); + g_return_if_fail (data != NULL); + + for (scan = data->image_saver; scan; scan = scan->next) { + GthImageSaver *image_saver = scan->data; + gth_image_saver_save_options (image_saver); + } +} diff -Nru gthumb-3.0.2/extensions/cairo_io/preferences.h gthumb-3.2.3/extensions/cairo_io/preferences.h --- gthumb-3.0.2/extensions/cairo_io/preferences.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/cairo_io/preferences.h 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,81 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2009 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef PREFERENCES_H +#define PREFERENCES_H + +#include + + +typedef enum { + GTH_TIFF_COMPRESSION_NONE, + GTH_TIFF_COMPRESSION_DEFLATE, + GTH_TIFF_COMPRESSION_JPEG +} GthTiffCompression; + + +/* schemas */ + +#define GTHUMB_IMAGE_SAVERS GTHUMB_SCHEMA ".pixbuf-savers" +#define GTHUMB_IMAGE_SAVERS_JPEG_SCHEMA GTHUMB_IMAGE_SAVERS ".jpeg" +#define GTHUMB_IMAGE_SAVERS_PNG_SCHEMA GTHUMB_IMAGE_SAVERS ".png" +#define GTHUMB_IMAGE_SAVERS_TGA_SCHEMA GTHUMB_IMAGE_SAVERS ".tga" +#define GTHUMB_IMAGE_SAVERS_TIFF_SCHEMA GTHUMB_IMAGE_SAVERS ".tiff" +#define GTHUMB_IMAGE_SAVERS_WEBP_SCHEMA GTHUMB_IMAGE_SAVERS ".webp" + +/* keys: jpeg */ + +#define PREF_JPEG_DEFAULT_EXT "default-ext" +#define PREF_JPEG_QUALITY "quality" +#define PREF_JPEG_SMOOTHING "smoothing" +#define PREF_JPEG_OPTIMIZE "optimize" +#define PREF_JPEG_PROGRESSIVE "progressive" + +/* keys: png */ + +#define PREF_PNG_COMPRESSION_LEVEL "compression-level" + +/* keys: tga */ + +#define PREF_TGA_RLE_COMPRESSION "rle-compression" + +/* keys: tiff */ + +#define PREF_TIFF_DEFAULT_EXT "default-ext" +#define PREF_TIFF_COMPRESSION "compression" +#define PREF_TIFF_HORIZONTAL_RES "horizontal-resolution" +#define PREF_TIFF_VERTICAL_RES "vertical-resolution" + +/* keys: webp */ + +#define PREF_WEBP_LOSSLESS "lossless" +#define PREF_WEBP_QUALITY "quality" +#define PREF_WEBP_METHOD "method" + + +void ci__dlg_preferences_construct_cb (GtkWidget *dialog, + GthBrowser *browser, + GtkBuilder *builder); +void ci__dlg_preferences_apply_cb (GtkWidget *dialog, + GthBrowser *browser, + GtkBuilder *builder); + +#endif /* PREFERENCES_H */ diff -Nru gthumb-3.0.2/extensions/catalogs/Makefile.in gthumb-3.2.3/extensions/catalogs/Makefile.in --- gthumb-3.0.2/extensions/catalogs/Makefile.in 2012-08-20 19:54:11.000000000 +0000 +++ gthumb-3.2.3/extensions/catalogs/Makefile.in 2013-07-10 13:33:43.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/catalogs -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -150,13 +178,14 @@ am__v_CCLD_1 = SOURCES = $(libcatalogs_la_SOURCES) DIST_SOURCES = $(libcatalogs_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -165,9 +194,29 @@ DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -226,9 +275,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -242,13 +289,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -277,7 +323,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -293,11 +342,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -314,7 +367,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -344,7 +396,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -466,6 +521,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -500,6 +556,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libcatalogs.la: $(libcatalogs_la_OBJECTS) $(libcatalogs_la_DEPENDENCIES) $(EXTRA_libcatalogs_la_DEPENDENCIES) $(AM_V_CCLD)$(libcatalogs_la_LINK) -rpath $(extensiondir) $(libcatalogs_la_OBJECTS) $(libcatalogs_la_LIBADD) $(LIBS) @@ -524,14 +581,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -636,14 +693,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -664,31 +720,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -704,12 +742,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -721,15 +754,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -738,9 +767,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -922,25 +952,23 @@ uninstall-am: uninstall-extensionLTLIBRARIES \ uninstall-extensioniniDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-extensionLTLIBRARIES \ - clean-generic clean-libtool cscopelist cscopelist-recursive \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extensionLTLIBRARIES \ - install-extensioniniDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-extensionLTLIBRARIES clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-extensionLTLIBRARIES install-extensioniniDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA diff -Nru gthumb-3.0.2/extensions/catalogs/callbacks.c gthumb-3.2.3/extensions/catalogs/callbacks.c --- gthumb-3.0.2/extensions/catalogs/callbacks.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/catalogs/callbacks.c 2013-04-30 16:56:12.000000000 +0000 @@ -187,7 +187,7 @@ void catalogs__initialize_cb (void) { - gth_user_dir_make_dir_for_file (GTH_DIR_DATA, GTHUMB_DIR, "catalogs", "dummy", NULL); + gth_user_dir_mkdir_with_parents (GTH_DIR_DATA, GTHUMB_DIR, "catalogs", NULL); } @@ -804,13 +804,13 @@ gio_file = gth_catalog_file_to_gio_file (rename_data->location); catalog_data = gth_catalog_to_data (catalog, &catalog_data_size); - if (! g_write_file (gio_file, - FALSE, - G_FILE_CREATE_NONE, - catalog_data, - catalog_data_size, - NULL, - &error)) + if (! _g_file_write (gio_file, + FALSE, + G_FILE_CREATE_NONE, + catalog_data, + catalog_data_size, + NULL, + &error)) { g_warning ("%s", error->message); g_clear_error (&error); diff -Nru gthumb-3.0.2/extensions/catalogs/data/Makefile.in gthumb-3.2.3/extensions/catalogs/data/Makefile.in --- gthumb-3.0.2/extensions/catalogs/data/Makefile.in 2012-08-20 19:54:11.000000000 +0000 +++ gthumb-3.2.3/extensions/catalogs/data/Makefile.in 2013-07-10 13:33:43.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/catalogs/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/catalogs/data/ui/Makefile.in gthumb-3.2.3/extensions/catalogs/data/ui/Makefile.in --- gthumb-3.0.2/extensions/catalogs/data/ui/Makefile.in 2012-08-20 19:54:11.000000000 +0000 +++ gthumb-3.2.3/extensions/catalogs/data/ui/Makefile.in 2013-07-10 13:33:43.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/catalogs/data/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -386,11 +420,9 @@ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -531,16 +563,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-uiDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-uiDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/catalogs/dlg-add-to-catalog.c gthumb-3.2.3/extensions/catalogs/dlg-add-to-catalog.c --- gthumb-3.0.2/extensions/catalogs/dlg-add-to-catalog.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/catalogs/dlg-add-to-catalog.c 2013-04-30 16:56:12.000000000 +0000 @@ -144,14 +144,14 @@ buffer = gth_catalog_to_data (add_data->catalog, &length); gio_file = gth_catalog_file_to_gio_file (add_data->catalog_file); - g_write_file_async (gio_file, - buffer, - length, - TRUE, - G_PRIORITY_DEFAULT, - NULL, - catalog_save_done_cb, - add_data); + _g_file_write_async (gio_file, + buffer, + length, + TRUE, + G_PRIORITY_DEFAULT, + NULL, + catalog_save_done_cb, + add_data); g_object_unref (gio_file); } diff -Nru gthumb-3.0.2/extensions/catalogs/dlg-catalog-properties.c gthumb-3.2.3/extensions/catalogs/dlg-catalog-properties.c --- gthumb-3.0.2/extensions/catalogs/dlg-catalog-properties.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/catalogs/dlg-catalog-properties.c 2013-04-30 16:56:12.000000000 +0000 @@ -127,14 +127,14 @@ gio_file = gth_catalog_file_to_gio_file (data->file_data->file); buffer = gth_catalog_to_data (data->catalog, &size); - g_write_file_async (gio_file, - buffer, - size, - TRUE, - G_PRIORITY_DEFAULT, - NULL, - catalog_saved_cb, - data); + _g_file_write_async (gio_file, + buffer, + size, + TRUE, + G_PRIORITY_DEFAULT, + NULL, + catalog_saved_cb, + data); g_object_unref (gio_file); } diff -Nru gthumb-3.0.2/extensions/catalogs/gth-catalog.c gthumb-3.2.3/extensions/catalogs/gth-catalog.c --- gthumb-3.0.2/extensions/catalogs/gth-catalog.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/catalogs/gth-catalog.c 2013-04-30 16:56:12.000000000 +0000 @@ -582,11 +582,11 @@ list_data->list_ready_func = ready_func; list_data->user_data = user_data; - g_load_file_async (catalog->priv->file, - G_PRIORITY_DEFAULT, - catalog->priv->cancellable, - list__catalog_buffer_ready_cb, - list_data); + _g_file_load_async (catalog->priv->file, + G_PRIORITY_DEFAULT, + catalog->priv->cancellable, + list__catalog_buffer_ready_cb, + list_data); } @@ -785,15 +785,7 @@ GFile * gth_catalog_get_base (void) { - char *catalogs_dir; - GFile *base; - - catalogs_dir = gth_user_dir_get_file (GTH_DIR_DATA, GTHUMB_DIR, "catalogs", NULL); - base = g_file_new_for_path (catalogs_dir); - - g_free (catalogs_dir); - - return base; + return gth_user_dir_get_file_for_read (GTH_DIR_DATA, GTHUMB_DIR, "catalogs", NULL); } @@ -1080,11 +1072,11 @@ load_data->user_data = user_data; gio_file = gth_catalog_file_to_gio_file (file); - g_load_file_async (gio_file, - G_PRIORITY_DEFAULT, - cancellable, - load__catalog_buffer_ready_cb, - load_data); + _g_file_load_async (gio_file, + G_PRIORITY_DEFAULT, + cancellable, + load__catalog_buffer_ready_cb, + load_data); g_object_unref (gio_file); } @@ -1137,7 +1129,7 @@ gsize buffer_size; gio_file = gth_catalog_file_to_gio_file (file); - if (! g_load_file_in_buffer (gio_file, &buffer, &buffer_size, NULL, NULL)) + if (! _g_file_load_in_buffer (gio_file, &buffer, &buffer_size, NULL, NULL)) return NULL; catalog = gth_hook_invoke_get ("gth-catalog-load-from-data", buffer); @@ -1168,13 +1160,13 @@ if (gio_parent != NULL) g_file_make_directory_with_parents (gio_parent, NULL, NULL); data = gth_catalog_to_data (catalog, &size); - if (! g_write_file (gio_file, - FALSE, - G_FILE_CREATE_NONE, - data, - size, - NULL, - &error)) + if (! _g_file_write (gio_file, + FALSE, + G_FILE_CREATE_NONE, + data, + size, + NULL, + &error)) { g_warning ("%s", error->message); g_clear_error (&error); diff -Nru gthumb-3.0.2/extensions/catalogs/gth-file-source-catalogs.c gthumb-3.2.3/extensions/catalogs/gth-file-source-catalogs.c --- gthumb-3.0.2/extensions/catalogs/gth-file-source-catalogs.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/catalogs/gth-file-source-catalogs.c 2013-04-30 16:56:12.000000000 +0000 @@ -253,14 +253,14 @@ catalog_buffer = gth_catalog_to_data (metadata_op->catalog, &catalog_size); gio_file = gth_catalog_file_to_gio_file (metadata_op->file_data->file); - g_write_file_async (gio_file, - catalog_buffer, - catalog_size, - TRUE, - G_PRIORITY_DEFAULT, - gth_file_source_get_cancellable (GTH_FILE_SOURCE (metadata_op->catalogs)), - write_metadata_write_buffer_ready_cb, - metadata_op); + _g_file_write_async (gio_file, + catalog_buffer, + catalog_size, + TRUE, + G_PRIORITY_DEFAULT, + gth_file_source_get_cancellable (GTH_FILE_SOURCE (metadata_op->catalogs)), + write_metadata_write_buffer_ready_cb, + metadata_op); g_object_unref (gio_file); } @@ -301,11 +301,11 @@ metadata_op->catalog = gth_catalog_new (); gio_file = gth_file_source_to_gio_file (file_source, file_data->file); gth_catalog_set_file (metadata_op->catalog, gio_file); - g_load_file_async (gio_file, - G_PRIORITY_DEFAULT, - gth_file_source_get_cancellable (file_source), - write_metadata_load_buffer_ready_cb, - metadata_op); + _g_file_load_async (gio_file, + G_PRIORITY_DEFAULT, + gth_file_source_get_cancellable (file_source), + write_metadata_load_buffer_ready_cb, + metadata_op); g_object_unref (gio_file); g_free (uri); @@ -837,14 +837,14 @@ buffer = gth_catalog_to_data (cod->catalog, &size); gio_file = gth_catalog_file_to_gio_file (cod->destination->file); - g_write_file_async (gio_file, - buffer, - size, - TRUE, - G_PRIORITY_DEFAULT, - NULL, - copy__catalog_save_done_cb, - cod); + _g_file_write_async (gio_file, + buffer, + size, + TRUE, + G_PRIORITY_DEFAULT, + NULL, + copy__catalog_save_done_cb, + cod); g_object_unref (gio_file); } @@ -1255,14 +1255,14 @@ buffer = gth_catalog_to_data (catalog, &size); gio_file = gth_file_source_to_gio_file (reorder_data->file_source, reorder_data->destination->file); - g_write_file_async (gio_file, - buffer, - size, - TRUE, - G_PRIORITY_DEFAULT, - gth_file_source_get_cancellable (reorder_data->file_source), - reorder_buffer_ready_cb, - reorder_data); + _g_file_write_async (gio_file, + buffer, + size, + TRUE, + G_PRIORITY_DEFAULT, + gth_file_source_get_cancellable (reorder_data->file_source), + reorder_buffer_ready_cb, + reorder_data); g_object_unref (gio_file); } @@ -1399,14 +1399,14 @@ return; } - g_write_file_async (data->gio_file, - catalog_buffer, - catalog_size, - TRUE, - G_PRIORITY_DEFAULT, - NULL, - remove_files__catalog_save_done_cb, - data); + _g_file_write_async (data->gio_file, + catalog_buffer, + catalog_size, + TRUE, + G_PRIORITY_DEFAULT, + NULL, + remove_files__catalog_save_done_cb, + data); } @@ -1422,11 +1422,11 @@ data->file_data_list = gth_file_data_list_dup (file_list); data->gio_file = gth_main_get_gio_file (location->file); - g_load_file_async (data->gio_file, - G_PRIORITY_DEFAULT, - NULL, - catalog_buffer_ready_cb, - data); + _g_file_load_async (data->gio_file, + G_PRIORITY_DEFAULT, + NULL, + catalog_buffer_ready_cb, + data); } diff -Nru gthumb-3.0.2/extensions/catalogs/gth-organize-task.c gthumb-3.2.3/extensions/catalogs/gth-organize-task.c --- gthumb-3.0.2/extensions/catalogs/gth-organize-task.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/catalogs/gth-organize-task.c 2013-04-30 16:56:12.000000000 +0000 @@ -797,11 +797,11 @@ icon = g_themed_icon_new ("file-catalog"); self->priv->icon_pixbuf = _g_icon_get_pixbuf (icon, - _gtk_icon_get_pixel_size (GET_WIDGET ("organization_treeview"), GTK_ICON_SIZE_MENU), - gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GET_WIDGET ("organization_treeview")))); + _gtk_widget_lookup_for_size (GET_WIDGET ("organization_treeview"), GTK_ICON_SIZE_MENU), + _gtk_widget_get_icon_theme (GET_WIDGET ("organization_treeview"))); g_object_unref (icon); - self->priv->file_list = gth_file_list_new (gth_grid_view_new (), GTH_FILE_LIST_TYPE_NORMAL, FALSE); + self->priv->file_list = gth_file_list_new (gth_grid_view_new (), GTH_FILE_LIST_MODE_NORMAL, FALSE); gth_file_list_set_caption (GTH_FILE_LIST (self->priv->file_list), "standard::display-name"); gtk_widget_show (self->priv->file_list); gtk_box_pack_start (GTK_BOX (GET_WIDGET ("preview_box")), self->priv->file_list, TRUE, TRUE, 0); diff -Nru gthumb-3.0.2/extensions/change_date/Makefile.in gthumb-3.2.3/extensions/change_date/Makefile.in --- gthumb-3.0.2/extensions/change_date/Makefile.in 2012-08-20 19:54:11.000000000 +0000 +++ gthumb-3.2.3/extensions/change_date/Makefile.in 2013-07-10 13:33:43.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/change_date -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -147,13 +175,14 @@ am__v_CCLD_1 = SOURCES = $(libchange_date_la_SOURCES) DIST_SOURCES = $(libchange_date_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -162,9 +191,29 @@ DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -223,9 +272,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -239,13 +286,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -274,7 +320,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -290,11 +339,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -311,7 +364,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -341,7 +393,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -456,6 +511,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -490,6 +546,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libchange_date.la: $(libchange_date_la_OBJECTS) $(libchange_date_la_DEPENDENCIES) $(EXTRA_libchange_date_la_DEPENDENCIES) $(AM_V_CCLD)$(libchange_date_la_LINK) -rpath $(extensiondir) $(libchange_date_la_OBJECTS) $(libchange_date_la_LIBADD) $(LIBS) @@ -510,14 +567,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -594,14 +651,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -622,31 +678,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -662,12 +700,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -679,15 +712,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -696,9 +725,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -880,25 +910,23 @@ uninstall-am: uninstall-extensionLTLIBRARIES \ uninstall-extensioniniDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-extensionLTLIBRARIES \ - clean-generic clean-libtool cscopelist cscopelist-recursive \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extensionLTLIBRARIES \ - install-extensioniniDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-extensionLTLIBRARIES clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-extensionLTLIBRARIES install-extensioniniDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA diff -Nru gthumb-3.0.2/extensions/change_date/data/Makefile.in gthumb-3.2.3/extensions/change_date/data/Makefile.in --- gthumb-3.0.2/extensions/change_date/data/Makefile.in 2012-08-20 19:54:11.000000000 +0000 +++ gthumb-3.2.3/extensions/change_date/data/Makefile.in 2013-07-10 13:33:43.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/change_date/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/change_date/data/ui/Makefile.in gthumb-3.2.3/extensions/change_date/data/ui/Makefile.in --- gthumb-3.0.2/extensions/change_date/data/ui/Makefile.in 2012-08-20 19:54:11.000000000 +0000 +++ gthumb-3.2.3/extensions/change_date/data/ui/Makefile.in 2013-07-10 13:33:43.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/change_date/data/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -381,11 +415,9 @@ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -526,16 +558,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-uiDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-uiDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/change_date/data/ui/change-date.ui gthumb-3.2.3/extensions/change_date/data/ui/change-date.ui --- gthumb-3.0.2/extensions/change_date/data/ui/change-date.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/change_date/data/ui/change-date.ui 2013-04-30 16:56:12.000000000 +0000 @@ -1,43 +1,109 @@ - + - - - - 59 - 1 - 10 - - - 59 - 1 - 10 - - - 999999 - 1 - 10 + + + + + + + + + + + + + - + + + False 5 Change Date False normal - + True + False + vertical 6 + + + True + False + end + + + gtk-help + False + True + True + True + False + True + + + False + False + 0 + True + + + + + gtk-cancel + False + True + True + True + False + True + + + False + False + 1 + + + + + gtk-execute + False + True + True + True + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False 5 12 True + False 6 True + False 0 Change the following values: @@ -46,24 +112,30 @@ False + True 0 True + False 12 True + False 6 _Last modified date + False True True False + False True + 0 True @@ -75,10 +147,13 @@ Co_mment date + False True True False + False True + 0 True @@ -87,41 +162,31 @@ 1 - - - Exif DateTimeOriginal tag - True - True - False - True - True - - - False - False - 2 - - + True + True 1 False + True 0 True + False 6 True + False 0 Change to: @@ -130,28 +195,35 @@ False + True 0 True + False 12 True + False 6 True + False 6 The _following date: + False True True False + False True + 0 True True @@ -164,10 +236,12 @@ True + False 12 True + False @@ -175,6 +249,8 @@ + True + True 1 @@ -188,10 +264,13 @@ File _modified date + False True True False + False True + 0 True to_following_date_radiobutton @@ -204,10 +283,13 @@ File c_reation date + False True True False + False True + 0 True to_following_date_radiobutton @@ -220,10 +302,13 @@ Date p_hoto was taken + False True True False + False True + 0 True to_following_date_radiobutton @@ -236,25 +321,31 @@ True + False 6 True + False 6 True + False True - 4 + False A_djust by + False True True False + False True + 0.5 True to_following_date_radiobutton @@ -276,15 +367,22 @@ True + False 3 3 6 6 + + + + + + True True - ● + ● 5 True time_h_adjustment @@ -294,14 +392,14 @@ 1 2 - + True True - ● + ● 5 True time_m_adjustment @@ -313,14 +411,14 @@ 2 1 2 - + True True - ● + ● 5 True time_s_adjustment @@ -332,12 +430,13 @@ 2 2 3 - + True + False 0 hours @@ -350,6 +449,7 @@ True + False 0 minutes @@ -364,6 +464,7 @@ True + False 0 seconds @@ -384,6 +485,7 @@ True + False adjust_sign_liststore 0 @@ -396,6 +498,8 @@ + True + True 1 @@ -408,6 +512,8 @@ + True + True 4 @@ -415,72 +521,23 @@ + True + True 1 False + True 1 - 1 - - - - - True - end - - - gtk-help - True - True - True - True - - - False - False - 0 - True - - - - - gtk-cancel - True - True - True - True - - - False - False - 1 - - - - - gtk-execute - True - True - True - True - - - False - False - 2 - - - - False - end - 0 + True + 1 @@ -491,18 +548,19 @@ ok_button - - - - - - - - + - - - - - - + + 999999 + 1 + 10 + + + 59 + 1 + 10 + + + 59 + 1 + 10 diff -Nru gthumb-3.0.2/extensions/change_date/dlg-change-date.c gthumb-3.2.3/extensions/change_date/dlg-change-date.c --- gthumb-3.0.2/extensions/change_date/dlg-change-date.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/change_date/dlg-change-date.c 2013-04-30 16:56:12.000000000 +0000 @@ -70,8 +70,6 @@ change_fields |= GTH_CHANGE_LAST_MODIFIED_DATE; if (IS_ACTIVE (GET_WIDGET ("change_comment_checkbutton"))) change_fields |= GTH_CHANGE_COMMENT_DATE; - if (IS_ACTIVE (GET_WIDGET ("change_datetimeoriginal_checkbutton"))) - change_fields |= GTH_CHANGE_EXIF_DATETIMEORIGINAL_TAG; change_type = 0; time_adjustment = 0; @@ -99,7 +97,6 @@ g_settings_set_boolean (data->settings, PREF_CHANGE_DATE_SET_LAST_MODIFIED_DATE, (change_fields & GTH_CHANGE_LAST_MODIFIED_DATE) == GTH_CHANGE_LAST_MODIFIED_DATE); g_settings_set_boolean (data->settings, PREF_CHANGE_DATE_SET_COMMENT_DATE, (change_fields & GTH_CHANGE_COMMENT_DATE) == GTH_CHANGE_COMMENT_DATE); - g_settings_set_boolean (data->settings, PREF_CHANGE_DATE_SET_EXIF_DATETIMEORIGINAL_TAG, (change_fields & GTH_CHANGE_EXIF_DATETIMEORIGINAL_TAG) == GTH_CHANGE_EXIF_DATETIMEORIGINAL_TAG); g_settings_set_boolean (data->settings, PREF_CHANGE_DATE_TO_FOLLOWING_DATE, change_type == GTH_CHANGE_TO_FOLLOWING_DATE); if (change_type == GTH_CHANGE_TO_FOLLOWING_DATE) { @@ -144,8 +141,7 @@ { gtk_widget_set_sensitive (GET_WIDGET ("ok_button"), (IS_ACTIVE (GET_WIDGET ("change_last_modified_checkbutton")) - || IS_ACTIVE (GET_WIDGET ("change_comment_checkbutton")) - || IS_ACTIVE (GET_WIDGET ("change_datetimeoriginal_checkbutton")))); + || IS_ACTIVE (GET_WIDGET ("change_comment_checkbutton")))); gtk_widget_set_sensitive (data->date_selector, IS_ACTIVE (GET_WIDGET ("to_following_date_radiobutton"))); gtk_widget_set_sensitive (GET_WIDGET ("time_box"), IS_ACTIVE (GET_WIDGET ("adjust_time_radiobutton"))); @@ -195,8 +191,6 @@ g_settings_get_boolean (data->settings, PREF_CHANGE_DATE_SET_LAST_MODIFIED_DATE)); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("change_comment_checkbutton")), g_settings_get_boolean (data->settings, PREF_CHANGE_DATE_SET_COMMENT_DATE)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("change_datetimeoriginal_checkbutton")), - g_settings_get_boolean (data->settings, PREF_CHANGE_DATE_SET_EXIF_DATETIMEORIGINAL_TAG)); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("to_following_date_radiobutton")), g_settings_get_boolean (data->settings, PREF_CHANGE_DATE_TO_FOLLOWING_DATE)); @@ -282,10 +276,6 @@ "clicked", G_CALLBACK (radio_button_clicked), data); - g_signal_connect (GET_WIDGET ("change_datetimeoriginal_checkbutton"), - "clicked", - G_CALLBACK (radio_button_clicked), - data); g_signal_connect (GET_WIDGET ("to_following_date_radiobutton"), "clicked", G_CALLBACK (radio_button_clicked), diff -Nru gthumb-3.0.2/extensions/change_date/gth-change-date-task.c gthumb-3.2.3/extensions/change_date/gth-change-date-task.c --- gthumb-3.0.2/extensions/change_date/gth-change-date-task.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/change_date/gth-change-date-task.c 2013-04-30 16:56:12.000000000 +0000 @@ -251,14 +251,6 @@ if ((m != NULL) && _g_time_val_from_exif_date (gth_metadata_get_raw (m), &time_val)) gth_datetime_from_timeval (date_time, &time_val); } - else if (field & GTH_CHANGE_EXIF_DATETIMEORIGINAL_TAG) { - GthMetadata *m; - GTimeVal time_val; - - m = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "Exif::Photo::DateTimeOriginal"); - if ((m != NULL) && _g_time_val_from_exif_date (gth_metadata_get_raw (m), &time_val)) - gth_datetime_from_timeval (date_time, &time_val); - } } @@ -294,12 +286,6 @@ if (gth_datetime_valid (date_time)) set_date_metadata (file_data, "general::datetime", date_time, self->priv->time_offset); } - if (self->priv->fields & GTH_CHANGE_EXIF_DATETIMEORIGINAL_TAG) { - gth_datetime_clear (date_time); - set_date_time_from_field (self, date_time, GTH_CHANGE_EXIF_DATETIMEORIGINAL_TAG, file_data); - if (gth_datetime_valid (date_time)) - set_date_metadata (file_data, "Exif::Photo::DateTimeOriginal", date_time, self->priv->time_offset); - } } else { gth_datetime_clear (date_time); @@ -308,9 +294,6 @@ if (self->priv->fields & GTH_CHANGE_COMMENT_DATE) { set_date_metadata (file_data, "general::datetime", date_time, 0); } - if (self->priv->fields & GTH_CHANGE_EXIF_DATETIMEORIGINAL_TAG) { - set_date_metadata (file_data, "Exif::Photo::DateTimeOriginal", date_time, 0); - } } } } @@ -318,14 +301,12 @@ attribute_v = g_ptr_array_new (); if (self->priv->fields & GTH_CHANGE_COMMENT_DATE) g_ptr_array_add (attribute_v, "general::datetime"); - if (self->priv->fields & GTH_CHANGE_EXIF_DATETIMEORIGINAL_TAG) - g_ptr_array_add (attribute_v, "Exif::Photo::DateTimeOriginal"); if (attribute_v->len > 0) { char *attributes; attributes = _g_string_array_join (attribute_v, ","); _g_write_metadata_async (self->priv->file_list, - (self->priv->fields & GTH_CHANGE_EXIF_DATETIMEORIGINAL_TAG) ? GTH_METADATA_WRITE_FORCE_EMBEDDED : GTH_METADATA_WRITE_DEFAULT, + GTH_METADATA_WRITE_DEFAULT, attributes, gth_task_get_cancellable (GTH_TASK (self)), write_metadata_ready_cb, diff -Nru gthumb-3.0.2/extensions/change_date/gth-change-date-task.h gthumb-3.2.3/extensions/change_date/gth-change-date-task.h --- gthumb-3.0.2/extensions/change_date/gth-change-date-task.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/change_date/gth-change-date-task.h 2013-04-30 16:56:12.000000000 +0000 @@ -29,8 +29,7 @@ typedef enum { GTH_CHANGE_LAST_MODIFIED_DATE = 1 << 0, - GTH_CHANGE_COMMENT_DATE = 1 << 1, - GTH_CHANGE_EXIF_DATETIMEORIGINAL_TAG = 1 << 2, + GTH_CHANGE_COMMENT_DATE = 1 << 1 } GthChangeFields; typedef enum { diff -Nru gthumb-3.0.2/extensions/change_date/preferences.h gthumb-3.2.3/extensions/change_date/preferences.h --- gthumb-3.0.2/extensions/change_date/preferences.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/change_date/preferences.h 2013-04-30 16:56:12.000000000 +0000 @@ -34,7 +34,6 @@ #define PREF_CHANGE_DATE_SET_LAST_MODIFIED_DATE "set-last-modified-date" #define PREF_CHANGE_DATE_SET_COMMENT_DATE "set-comment-date" -#define PREF_CHANGE_DATE_SET_EXIF_DATETIMEORIGINAL_TAG "set-exif-datetimeoriginal-tag" #define PREF_CHANGE_DATE_TO_FOLLOWING_DATE "to-following-date" #define PREF_CHANGE_DATE_DATE "date" #define PREF_CHANGE_DATE_TO_FILE_MODIFIED_DATE "to-file-modified-date" diff -Nru gthumb-3.0.2/extensions/comments/Makefile.am gthumb-3.2.3/extensions/comments/Makefile.am --- gthumb-3.0.2/extensions/comments/Makefile.am 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/comments/Makefile.am 2013-04-30 16:56:12.000000000 +0000 @@ -22,6 +22,9 @@ libcomments_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb libcomments_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) libcomments_la_LIBADD = $(GTHUMB_LIBS) +if ENABLE_EXIV2 +libcomments_la_LIBADD += ../exiv2_tools/libexiv2_tools.la +endif libcomments_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) extensioninidir = $(extensiondir) diff -Nru gthumb-3.0.2/extensions/comments/Makefile.in gthumb-3.2.3/extensions/comments/Makefile.in --- gthumb-3.0.2/extensions/comments/Makefile.in 2012-08-20 19:54:11.000000000 +0000 +++ gthumb-3.2.3/extensions/comments/Makefile.in 2013-07-10 13:33:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,18 +79,19 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@ENABLE_EXIV2_TRUE@am__append_1 = ../exiv2_tools/libexiv2_tools.la subdir = extensions/comments -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -149,13 +178,14 @@ am__v_CCLD_1 = SOURCES = $(libcomments_la_SOURCES) DIST_SOURCES = $(libcomments_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -164,9 +194,29 @@ DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -225,9 +275,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -241,13 +289,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -276,7 +323,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -292,11 +342,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -313,7 +367,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -343,7 +396,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -421,7 +477,7 @@ libcomments_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb libcomments_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -libcomments_la_LIBADD = $(GTHUMB_LIBS) +libcomments_la_LIBADD = $(GTHUMB_LIBS) $(am__append_1) libcomments_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) extensioninidir = $(extensiondir) extensionini_in_files = comments.extension.in.in @@ -462,6 +518,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -496,6 +553,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libcomments.la: $(libcomments_la_OBJECTS) $(libcomments_la_DEPENDENCIES) $(EXTRA_libcomments_la_DEPENDENCIES) $(AM_V_CCLD)$(libcomments_la_LINK) -rpath $(extensiondir) $(libcomments_la_OBJECTS) $(libcomments_la_LIBADD) $(LIBS) @@ -518,14 +576,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -616,14 +674,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -644,31 +701,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -684,12 +723,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -701,15 +735,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -718,9 +748,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -902,25 +933,23 @@ uninstall-am: uninstall-extensionLTLIBRARIES \ uninstall-extensioniniDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-extensionLTLIBRARIES \ - clean-generic clean-libtool cscopelist cscopelist-recursive \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extensionLTLIBRARIES \ - install-extensioniniDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-extensionLTLIBRARIES clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-extensionLTLIBRARIES install-extensioniniDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA diff -Nru gthumb-3.0.2/extensions/comments/data/Makefile.in gthumb-3.2.3/extensions/comments/data/Makefile.in --- gthumb-3.0.2/extensions/comments/data/Makefile.in 2012-08-20 19:54:11.000000000 +0000 +++ gthumb-3.2.3/extensions/comments/data/Makefile.in 2013-07-10 13:33:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/comments/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/comments/data/ui/Makefile.in gthumb-3.2.3/extensions/comments/data/ui/Makefile.in --- gthumb-3.0.2/extensions/comments/data/ui/Makefile.in 2012-08-20 19:54:11.000000000 +0000 +++ gthumb-3.2.3/extensions/comments/data/ui/Makefile.in 2013-07-10 13:33:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/comments/data/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -381,11 +415,9 @@ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -526,16 +558,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-uiDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-uiDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/comments/gth-comment.c gthumb-3.2.3/extensions/comments/gth-comment.c --- gthumb-3.0.2/extensions/comments/gth-comment.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/comments/gth-comment.c 2013-04-30 16:56:12.000000000 +0000 @@ -289,7 +289,7 @@ if (comment_file == NULL) return NULL; - if (! g_load_file_in_buffer (comment_file, &zipped_buffer, &zipped_size, cancellable, error)) { + if (! _g_file_load_in_buffer (comment_file, &zipped_buffer, &zipped_size, cancellable, error)) { g_object_unref (comment_file); return NULL; } @@ -603,135 +603,130 @@ void -gth_comment_synchronize_metadata (GList *file_list) +gth_comment_update_from_general_attributes (GthFileData *file_data) { - GList *scan; + gboolean write_comment; + GthMetadata *metadata; + GthStringList *comment_categories; + GList *scan; + const char *text; + GthComment *comment; + GthStringList *categories; - for (scan = file_list; scan; scan = scan->next) { - GthFileData *file_data = scan->data; - gboolean write_comment; - GthMetadata *metadata; - GthStringList *comment_categories; - GList *scan; - const char *text; - GthComment *comment; - GthStringList *categories; - - write_comment = FALSE; - - comment = gth_comment_new (); - gth_comment_set_note (comment, g_file_info_get_attribute_string (file_data->info, "comment::note")); - gth_comment_set_caption (comment, g_file_info_get_attribute_string (file_data->info, "comment::caption")); - gth_comment_set_place (comment, g_file_info_get_attribute_string (file_data->info, "comment::place")); + write_comment = FALSE; - metadata = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "comment::time"); - if (metadata != NULL) - gth_comment_set_time_from_exif_format (comment, gth_metadata_get_raw (metadata)); - - metadata = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "comment::categories"); - comment_categories = gth_metadata_get_string_list (metadata); - if (comment_categories != NULL) - for (scan = gth_string_list_get_list (comment_categories); scan; scan = scan->next) - gth_comment_add_category (comment, (char *) scan->data); - - gth_comment_set_rating (comment, g_file_info_get_attribute_int32 (file_data->info, "comment::rating")); - - /* sync embedded data and .comment data if required */ + comment = gth_comment_new (); + gth_comment_set_note (comment, g_file_info_get_attribute_string (file_data->info, "comment::note")); + gth_comment_set_caption (comment, g_file_info_get_attribute_string (file_data->info, "comment::caption")); + gth_comment_set_place (comment, g_file_info_get_attribute_string (file_data->info, "comment::place")); + + metadata = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "comment::time"); + if (metadata != NULL) + gth_comment_set_time_from_exif_format (comment, gth_metadata_get_raw (metadata)); + + metadata = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "comment::categories"); + comment_categories = gth_metadata_get_string_list (metadata); + if (comment_categories != NULL) + for (scan = gth_string_list_get_list (comment_categories); scan; scan = scan->next) + gth_comment_add_category (comment, (char *) scan->data); + + gth_comment_set_rating (comment, g_file_info_get_attribute_int32 (file_data->info, "comment::rating")); + + /* sync embedded data and .comment data if required */ + + metadata = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "general::description"); + if (metadata != NULL) { + text = g_file_info_get_attribute_string (file_data->info, "comment::note"); + if (! dom_str_equal (gth_metadata_get_formatted (metadata), text)) { + gth_comment_set_note (comment, gth_metadata_get_formatted (metadata)); + write_comment = TRUE; + } + } - metadata = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "general::description"); - if (metadata != NULL) { - text = g_file_info_get_attribute_string (file_data->info, "comment::note"); - if (! dom_str_equal (gth_metadata_get_formatted (metadata), text)) { - gth_comment_set_note (comment, gth_metadata_get_formatted (metadata)); - write_comment = TRUE; - } + metadata = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "general::title"); + if (metadata != NULL) { + text = g_file_info_get_attribute_string (file_data->info, "comment::caption"); + if (! dom_str_equal (gth_metadata_get_formatted (metadata), text)) { + gth_comment_set_caption (comment, gth_metadata_get_formatted (metadata)); + write_comment = TRUE; } + } - metadata = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "general::title"); - if (metadata != NULL) { - text = g_file_info_get_attribute_string (file_data->info, "comment::caption"); - if (! dom_str_equal (gth_metadata_get_formatted (metadata), text)) { - gth_comment_set_caption (comment, gth_metadata_get_formatted (metadata)); - write_comment = TRUE; - } + metadata = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "general::location"); + if (metadata != NULL) { + text = g_file_info_get_attribute_string (file_data->info, "comment::place"); + if (! dom_str_equal (gth_metadata_get_formatted (metadata), text)) { + gth_comment_set_place (comment, gth_metadata_get_formatted (metadata)); + write_comment = TRUE; } + } - metadata = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "general::location"); + metadata = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "general::datetime"); + if (metadata != NULL) { + text = gth_metadata_get_raw (metadata); + metadata = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "comment::time"); if (metadata != NULL) { - text = g_file_info_get_attribute_string (file_data->info, "comment::place"); - if (! dom_str_equal (gth_metadata_get_formatted (metadata), text)) { - gth_comment_set_place (comment, gth_metadata_get_formatted (metadata)); + if (! dom_str_equal (gth_metadata_get_raw (metadata), text)) { + gth_comment_set_time_from_exif_format (comment, gth_metadata_get_raw (metadata)); write_comment = TRUE; } } + } - metadata = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "general::datetime"); - if (metadata != NULL) { - text = gth_metadata_get_raw (metadata); - metadata = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "comment::time"); - if (metadata != NULL) { - if (! dom_str_equal (gth_metadata_get_raw (metadata), text)) { - gth_comment_set_time_from_exif_format (comment, gth_metadata_get_raw (metadata)); - write_comment = TRUE; - } - } - } + metadata = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "general::tags"); + categories = gth_metadata_get_string_list (metadata); + if (categories != NULL) { + metadata = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "comment::categories"); + comment_categories = gth_metadata_get_string_list (metadata); + if (! gth_string_list_equal (categories, comment_categories)) { + GList *scan; - metadata = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "general::tags"); - categories = gth_metadata_get_string_list (metadata); - if (categories != NULL) { - metadata = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "comment::categories"); - comment_categories = gth_metadata_get_string_list (metadata); - if (! gth_string_list_equal (categories, comment_categories)) { - GList *scan; - - gth_comment_clear_categories (comment); - for (scan = gth_string_list_get_list (categories); scan; scan = scan->next) - gth_comment_add_category (comment, scan->data); - write_comment = TRUE; - } + gth_comment_clear_categories (comment); + for (scan = gth_string_list_get_list (categories); scan; scan = scan->next) + gth_comment_add_category (comment, scan->data); + write_comment = TRUE; } + } - if (write_comment) { - GFile *comment_file; - GFile *comment_directory; - char *buffer; - gsize size; - - comment_file = gth_comment_get_comment_file (file_data->file); - comment_directory = g_file_get_parent (comment_file); - if (! g_file_query_exists (comment_directory, NULL)) - g_file_make_directory (comment_directory, NULL, NULL); - - buffer = gth_comment_to_data (comment, &size); - g_write_file (comment_file, - FALSE, - G_FILE_CREATE_NONE, - buffer, - size, - NULL, - NULL); - - { - GFile *parent; - GList *list; - - parent = g_file_get_parent (file_data->file); - list = g_list_prepend (NULL, file_data->file); - gth_monitor_folder_changed (gth_main_get_default_monitor (), - parent, - list, - GTH_MONITOR_EVENT_CHANGED); - - g_list_free (list); - g_object_unref (parent); - } + if (write_comment) { + GFile *comment_file; + GFile *comment_directory; + char *buffer; + gsize size; + + comment_file = gth_comment_get_comment_file (file_data->file); + comment_directory = g_file_get_parent (comment_file); + if (! g_file_query_exists (comment_directory, NULL)) + g_file_make_directory (comment_directory, NULL, NULL); + + buffer = gth_comment_to_data (comment, &size); + _g_file_write (comment_file, + FALSE, + G_FILE_CREATE_NONE, + buffer, + size, + NULL, + NULL); + + { + GFile *parent; + GList *list; + + parent = g_file_get_parent (file_data->file); + list = g_list_prepend (NULL, file_data->file); + gth_monitor_folder_changed (gth_main_get_default_monitor (), + parent, + list, + GTH_MONITOR_EVENT_CHANGED); - g_free (buffer); - g_object_unref (comment_directory); - g_object_unref (comment_file); + g_list_free (list); + g_object_unref (parent); } - g_object_unref (comment); + g_free (buffer); + g_object_unref (comment_directory); + g_object_unref (comment_file); } + + g_object_unref (comment); } diff -Nru gthumb-3.0.2/extensions/comments/gth-comment.h gthumb-3.2.3/extensions/comments/gth-comment.h --- gthumb-3.0.2/extensions/comments/gth-comment.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/comments/gth-comment.h 2013-04-30 16:56:12.000000000 +0000 @@ -82,6 +82,7 @@ GthTime * gth_comment_get_time_of_day (GthComment *comment); char * gth_comment_get_time_as_exif_format (GthComment *comment); void gth_comment_update_general_attributes (GthFileData *file_data); -void gth_comment_synchronize_metadata (GList *file_list /* GthFileData list */); +void gth_comment_update_from_general_attributes + (GthFileData *file_data); #endif /* GTH_COMMENT_H */ diff -Nru gthumb-3.0.2/extensions/comments/gth-import-metadata-task.c gthumb-3.2.3/extensions/comments/gth-import-metadata-task.c --- gthumb-3.0.2/extensions/comments/gth-import-metadata-task.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/comments/gth-import-metadata-task.c 2013-04-30 16:56:12.000000000 +0000 @@ -117,14 +117,14 @@ gth_hook_invoke ("delete-metadata", file, &tmp_buffer, &count); - g_write_file_async (file, - tmp_buffer, - count, - TRUE, - G_PRIORITY_DEFAULT, - gth_task_get_cancellable (GTH_TASK (self)), - write_file_ready_cb, - self); + _g_file_write_async (file, + tmp_buffer, + count, + TRUE, + G_PRIORITY_DEFAULT, + gth_task_get_cancellable (GTH_TASK (self)), + write_file_ready_cb, + self); } @@ -139,11 +139,11 @@ } file = self->priv->current->data; - g_load_file_async (file, - G_PRIORITY_DEFAULT, - gth_task_get_cancellable (GTH_TASK (self)), - load_file_ready_cb, - self); + _g_file_load_async (file, + G_PRIORITY_DEFAULT, + gth_task_get_cancellable (GTH_TASK (self)), + load_file_ready_cb, + self); } @@ -176,8 +176,12 @@ /* Synchronization is done in _g_query_metadata_async if both * PREF_GENERAL_STORE_METADATA_IN_FILES and PREF_COMMENTS_SYNCHRONIZE * are true. */ - if (! store_metadata_in_files || ! synchronize) - gth_comment_synchronize_metadata (file_data_list); + if (! store_metadata_in_files || ! synchronize) { + GList *scan; + + for (scan = file_data_list; scan; scan = scan->next) + gth_comment_update_from_general_attributes ((GthFileData *) scan->data); + } gth_task_completed (GTH_TASK (self), NULL); } diff -Nru gthumb-3.0.2/extensions/comments/gth-metadata-provider-comment.c gthumb-3.2.3/extensions/comments/gth-metadata-provider-comment.c --- gthumb-3.0.2/extensions/comments/gth-metadata-provider-comment.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/comments/gth-metadata-provider-comment.c 2013-04-30 16:56:12.000000000 +0000 @@ -73,6 +73,8 @@ char *comment_time; comment = gth_comment_new_for_file (file_data->file, cancellable, NULL); + g_file_info_set_attribute_boolean (file_data->info, "comment::no-comment-file", (comment == NULL)); + if (comment == NULL) return; @@ -209,7 +211,7 @@ comment_folder = g_file_get_parent (comment_file); g_file_make_directory (comment_folder, NULL, NULL); - g_write_file (comment_file, FALSE, 0, data, length, cancellable, NULL); + _g_file_write (comment_file, FALSE, 0, data, length, cancellable, NULL); g_object_unref (comment_folder); g_object_unref (comment_file); diff -Nru gthumb-3.0.2/extensions/comments/main.c gthumb-3.2.3/extensions/comments/main.c --- gthumb-3.0.2/extensions/comments/main.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/comments/main.c 2013-04-30 16:56:12.000000000 +0000 @@ -23,6 +23,7 @@ #include #include #include +#include #include "callbacks.h" #include "dlg-comments-preferences.h" #include "gth-comment.h" @@ -83,6 +84,7 @@ { GSettings *settings; gboolean store_metadata_in_files; + GList *scan; gboolean synchronize; settings = g_settings_new (GTHUMB_GENERAL_SCHEMA); @@ -90,28 +92,49 @@ g_object_unref (settings); if (! store_metadata_in_files) { - GList *scan; - /* if PREF_GENERAL_STORE_METADATA_IN_FILES is false, avoid to * synchronize the .comment metadata because the embedded * metadata is likely to be out-of-date. * Give priority to the .comment metadata which, if present, * is the most up-to-date. */ - for (scan = file_list; scan; scan = scan->next) - gth_comment_update_general_attributes ((GthFileData *) scan->data); + gboolean can_read_embedded_attributes; - return; - } + can_read_embedded_attributes = gth_main_extension_is_active ("exiv2_tools"); - settings = g_settings_new (GTHUMB_COMMENTS_SCHEMA); - synchronize = g_settings_get_boolean (settings, PREF_COMMENTS_SYNCHRONIZE); - g_object_unref (settings); + for (scan = file_list; scan; scan = scan->next) { + GthFileData *file_data = scan->data; - if (! synchronize) - return; + /* If PREF_GENERAL_STORE_METADATA_IN_FILES is false and + * there is no comment file then we are reading + * the image metadata for the first time, in this + * case update the .comment metadata with the + * embedded metadata. */ + if (g_file_info_get_attribute_boolean (file_data->info, "comment::no-comment-file")) { + if (can_read_embedded_attributes) { + exiv2_update_general_attributes (file_data->info); + gth_comment_update_from_general_attributes (file_data); + } + } + else + gth_comment_update_general_attributes ((GthFileData *) scan->data); + } + } + else { + /* if PREF_GENERAL_STORE_METADATA_IN_FILES is true, update the .comment + * metadata with the embedded metadata. + */ + + settings = g_settings_new (GTHUMB_COMMENTS_SCHEMA); + synchronize = g_settings_get_boolean (settings, PREF_COMMENTS_SYNCHRONIZE); + g_object_unref (settings); + + if (! synchronize) + return; - gth_comment_synchronize_metadata (file_list); + for (scan = file_list; scan; scan = scan->next) + gth_comment_update_from_general_attributes ((GthFileData *) scan->data); + } } diff -Nru gthumb-3.0.2/extensions/contact_sheet/Makefile.in gthumb-3.2.3/extensions/contact_sheet/Makefile.in --- gthumb-3.0.2/extensions/contact_sheet/Makefile.in 2012-08-20 19:54:11.000000000 +0000 +++ gthumb-3.2.3/extensions/contact_sheet/Makefile.in 2013-07-10 13:33:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,17 +81,17 @@ host_triplet = @host@ @ENABLE_JPEG_TOOLS_TRUE@am__append_1 = ../image_rotation/libimage_rotation.la subdir = extensions/contact_sheet -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -154,13 +182,14 @@ am__v_CCLD_1 = SOURCES = $(libcontact_sheet_la_SOURCES) DIST_SOURCES = $(libcontact_sheet_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -169,9 +198,29 @@ DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -230,9 +279,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -246,13 +293,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -281,7 +327,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -297,11 +346,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -318,7 +371,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -348,7 +400,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -485,6 +540,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -519,6 +575,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libcontact_sheet.la: $(libcontact_sheet_la_OBJECTS) $(libcontact_sheet_la_DEPENDENCIES) $(EXTRA_libcontact_sheet_la_DEPENDENCIES) $(AM_V_CCLD)$(libcontact_sheet_la_LINK) -rpath $(extensiondir) $(libcontact_sheet_la_OBJECTS) $(libcontact_sheet_la_LIBADD) $(LIBS) @@ -543,14 +600,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -655,14 +712,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -683,31 +739,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -723,12 +761,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -740,15 +773,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -757,9 +786,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -948,25 +978,24 @@ uninstall-am: uninstall-extensionLTLIBRARIES \ uninstall-extensioniniDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ - cscopelist-recursive ctags-recursive install install-am \ - install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-extensionLTLIBRARIES \ - clean-generic clean-libtool cscopelist cscopelist-recursive \ - ctags ctags-recursive dist-hook distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extensionLTLIBRARIES \ - install-extensioniniDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +.MAKE: $(am__recursive_targets) all check install install-am \ + install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-extensionLTLIBRARIES clean-generic \ + clean-libtool cscopelist-am ctags ctags-am dist-hook distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-extensionLTLIBRARIES install-extensioniniDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA diff -Nru gthumb-3.0.2/extensions/contact_sheet/data/Makefile.in gthumb-3.2.3/extensions/contact_sheet/data/Makefile.in --- gthumb-3.0.2/extensions/contact_sheet/data/Makefile.in 2012-08-20 19:54:11.000000000 +0000 +++ gthumb-3.2.3/extensions/contact_sheet/data/Makefile.in 2013-07-10 13:33:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/contact_sheet/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/contact_sheet/data/contact_sheet_themes/Makefile.in gthumb-3.2.3/extensions/contact_sheet/data/contact_sheet_themes/Makefile.in --- gthumb-3.0.2/extensions/contact_sheet/data/contact_sheet_themes/Makefile.in 2012-08-20 19:54:11.000000000 +0000 +++ gthumb-3.2.3/extensions/contact_sheet/data/contact_sheet_themes/Makefile.in 2013-07-10 13:33:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/contact_sheet/data/contact_sheet_themes -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(themedir)" DATA = $(theme_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -386,11 +420,9 @@ @list='$(theme_DATA)'; test -n "$(themedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(themedir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -531,16 +563,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-themeDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-themeDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-themeDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-themeDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/contact_sheet/data/ui/Makefile.in gthumb-3.2.3/extensions/contact_sheet/data/ui/Makefile.in --- gthumb-3.0.2/extensions/contact_sheet/data/ui/Makefile.in 2012-08-20 19:54:11.000000000 +0000 +++ gthumb-3.2.3/extensions/contact_sheet/data/ui/Makefile.in 2013-07-10 13:33:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/contact_sheet/data/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -385,11 +419,9 @@ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -530,16 +562,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-uiDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-uiDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/contact_sheet/dlg-contact-sheet.c gthumb-3.2.3/extensions/contact_sheet/dlg-contact-sheet.c --- gthumb-3.0.2/extensions/contact_sheet/dlg-contact-sheet.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/contact_sheet/dlg-contact-sheet.c 2013-07-03 09:34:13.000000000 +0000 @@ -238,6 +238,7 @@ gth_browser_exec_task (data->browser, task, FALSE); gtk_widget_destroy (data->dialog); + g_object_unref (task); g_free (thumbnail_caption); g_free (theme_name); g_free (file_extension); @@ -323,11 +324,11 @@ } file = g_file_get_child (dir, g_file_info_get_name (file_info)); - if (! g_load_file_in_buffer (file, - (void **) &buffer, - &size, - NULL, - NULL)) + if (! _g_file_load_in_buffer (file, + (void **) &buffer, + &size, + NULL, + NULL)) { g_object_unref (file); g_object_unref (file_info); @@ -368,7 +369,6 @@ static void load_themes (DialogData *data) { - char *style_path; GFile *style_dir; int visible_columns; int col_spacing; @@ -379,11 +379,9 @@ /* local themes */ - style_path = gth_user_dir_get_file (GTH_DIR_DATA, GTHUMB_DIR, "contact_sheet_themes", NULL); - style_dir = g_file_new_for_path (style_path); + style_dir = gth_user_dir_get_file_for_read (GTH_DIR_DATA, GTHUMB_DIR, "contact_sheet_themes", NULL); add_themes_from_dir (data, style_dir, TRUE); g_object_unref (style_dir); - g_free (style_path); /* system themes */ @@ -472,12 +470,10 @@ new_theme = theme->file == NULL; if (theme->file == NULL) { - char *themes_path; GFile *themes_dir; - gth_user_dir_make_dir_for_file (GTH_DIR_DATA, GTHUMB_DIR, "contact_sheet_themes", "themename.cst", NULL); - themes_path = gth_user_dir_get_file (GTH_DIR_DATA, GTHUMB_DIR, "contact_sheet_themes", NULL); - themes_dir = g_file_new_for_path (themes_path); + gth_user_dir_mkdir_with_parents (GTH_DIR_DATA, GTHUMB_DIR, "contact_sheet_themes", NULL); + themes_dir = gth_user_dir_get_file_for_read (GTH_DIR_DATA, GTHUMB_DIR, "contact_sheet_themes", NULL); theme->file = _g_file_create_unique (themes_dir, theme->display_name, ".cst", @@ -488,7 +484,6 @@ } g_object_unref (themes_dir); - g_free (themes_path); if (theme->file == NULL) return; @@ -501,13 +496,13 @@ return; } - if (! g_write_file (theme->file, - FALSE, - G_FILE_CREATE_NONE, - buffer, - buffer_size, - NULL, - &error)) + if (! _g_file_write (theme->file, + FALSE, + G_FILE_CREATE_NONE, + buffer, + buffer_size, + NULL, + &error)) { _gtk_error_dialog_from_gerror_run (GTK_WINDOW (data->dialog), _("Could not save the theme"), error); g_clear_error (&error); @@ -726,7 +721,7 @@ else s_value = g_strdup (get_home_uri ()); } - gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (GET_WIDGET ("destination_filechooserbutton")), s_value); + gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (GET_WIDGET ("destination_filechooserbutton")), s_value); g_free (s_value); s_value = _g_settings_get_uri (data->settings, PREF_CONTACT_SHEET_TEMPLATE); @@ -735,20 +730,20 @@ default_mime_type = g_settings_get_string (data->settings, PREF_CONTACT_SHEET_MIME_TYPE); active_index = 0; - savers = gth_main_get_type_set ("pixbuf-saver"); + savers = gth_main_get_type_set ("image-saver"); for (i = 0; (savers != NULL) && (i < savers->len); i++) { - GthPixbufSaver *saver; + GthImageSaver *saver; GtkTreeIter iter; saver = g_object_new (g_array_index (savers, GType, i), NULL); - if (g_str_equal (default_mime_type, gth_pixbuf_saver_get_mime_type (saver))) + if (g_str_equal (default_mime_type, gth_image_saver_get_mime_type (saver))) active_index = i; gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("filetype_liststore")), &iter); gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("filetype_liststore")), &iter, - FILE_TYPE_COLUMN_MIME_TYPE, gth_pixbuf_saver_get_mime_type (saver), - FILE_TYPE_COLUMN_DEFAULT_EXTENSION, gth_pixbuf_saver_get_default_ext (saver), + FILE_TYPE_COLUMN_MIME_TYPE, gth_image_saver_get_mime_type (saver), + FILE_TYPE_COLUMN_DEFAULT_EXTENSION, gth_image_saver_get_default_ext (saver), -1); g_object_unref (saver); diff -Nru gthumb-3.0.2/extensions/contact_sheet/dlg-image-wall.c gthumb-3.2.3/extensions/contact_sheet/dlg-image-wall.c --- gthumb-3.0.2/extensions/contact_sheet/dlg-image-wall.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/contact_sheet/dlg-image-wall.c 2013-07-03 09:34:13.000000000 +0000 @@ -154,7 +154,7 @@ theme = gth_contact_sheet_theme_new (); theme->background_type = GTH_CONTACT_SHEET_BACKGROUND_TYPE_SOLID; - gdk_color_parse ("#000", &theme->background_color1); + gdk_rgba_parse (&theme->background_color1, "#000"); theme->frame_style = GTH_CONTACT_SHEET_FRAME_STYLE_NONE; theme->frame_hpadding = 0; theme->frame_vpadding = 0; @@ -184,6 +184,7 @@ gth_browser_exec_task (data->browser, task, FALSE); gtk_widget_destroy (data->dialog); + g_object_unref (task); gth_contact_sheet_theme_unref (theme); g_free (file_extension); g_free (mime_type); @@ -259,7 +260,7 @@ else s_value = g_strdup (get_home_uri ()); } - gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (GET_WIDGET ("destination_filechooserbutton")), s_value); + gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (GET_WIDGET ("destination_filechooserbutton")), s_value); g_free (s_value); s_value = _g_settings_get_uri (data->settings, PREF_IMAGE_WALL_TEMPLATE); @@ -268,20 +269,20 @@ default_mime_type = g_settings_get_string (data->settings, PREF_IMAGE_WALL_MIME_TYPE); active_index = 0; - savers = gth_main_get_type_set ("pixbuf-saver"); + savers = gth_main_get_type_set ("image-saver"); for (i = 0; (savers != NULL) && (i < savers->len); i++) { - GthPixbufSaver *saver; + GthImageSaver *saver; GtkTreeIter iter; saver = g_object_new (g_array_index (savers, GType, i), NULL); - if (g_str_equal (default_mime_type, gth_pixbuf_saver_get_mime_type (saver))) + if (g_str_equal (default_mime_type, gth_image_saver_get_mime_type (saver))) active_index = i; gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("filetype_liststore")), &iter); gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("filetype_liststore")), &iter, - FILE_TYPE_COLUMN_MIME_TYPE, gth_pixbuf_saver_get_mime_type (saver), - FILE_TYPE_COLUMN_DEFAULT_EXTENSION, gth_pixbuf_saver_get_default_ext (saver), + FILE_TYPE_COLUMN_MIME_TYPE, gth_image_saver_get_mime_type (saver), + FILE_TYPE_COLUMN_DEFAULT_EXTENSION, gth_image_saver_get_default_ext (saver), -1); g_object_unref (saver); diff -Nru gthumb-3.0.2/extensions/contact_sheet/gth-contact-sheet-creator.c gthumb-3.2.3/extensions/contact_sheet/gth-contact-sheet-creator.c --- gthumb-3.0.2/extensions/contact_sheet/gth-contact-sheet-creator.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/contact_sheet/gth-contact-sheet-creator.c 2013-04-30 16:56:12.000000000 +0000 @@ -35,10 +35,10 @@ typedef struct { - GthFileData *file_data; - GdkPixbuf *thumbnail; - int original_width; - int original_height; + GthFileData *file_data; + cairo_surface_t *thumbnail; + int original_width; + int original_height; } ItemData; @@ -60,7 +60,7 @@ static void item_data_free (ItemData *item_data) { - _g_object_unref (item_data->thumbnail); + cairo_surface_destroy (item_data->thumbnail); _g_object_unref (item_data->file_data); g_free (item_data); } @@ -100,7 +100,6 @@ PangoLayout *pango_layout; GthImageLoader *image_loader; - GthPixbufSaver *pixbuf_saver; GList *files; /* ItemData list */ GList *current_file; /* Next file to be loaded. */ gint n_files; /* Used for the progress signal. */ @@ -349,37 +348,40 @@ int page_n, GError **error) { - GdkPixbuf *pixbuf; - char *buffer; - gsize size; - - pixbuf = _gdk_pixbuf_new_from_cairo_context (self->priv->cr); - if (! gth_pixbuf_saver_save_pixbuf (self->priv->pixbuf_saver, - pixbuf, - &buffer, - &size, - self->priv->mime_type, - error)) + GthImage *image; + char *buffer; + gsize size; + + image = gth_image_new (); + gth_image_set_cairo_surface (image, cairo_get_target (self->priv->cr)); + if (! gth_image_save_to_buffer (image, + self->priv->mime_type, + NULL, + &buffer, + &size, + gth_task_get_cancellable (GTH_TASK (self)), + error)) { - g_object_unref (pixbuf); + g_object_unref (image); return FALSE; } - if (! g_write_file (self->priv->destination_file, - FALSE, - G_FILE_CREATE_REPLACE_DESTINATION, - buffer, - size, - gth_task_get_cancellable (GTH_TASK (self)), - error)) + if (! _g_file_write (self->priv->destination_file, + FALSE, + G_FILE_CREATE_REPLACE_DESTINATION, + buffer, + size, + gth_task_get_cancellable (GTH_TASK (self)), + error)) { - g_object_unref (pixbuf); + g_object_unref (image); return FALSE; } - self->priv->created_files = g_list_prepend (self->priv->created_files, g_object_ref (self->priv->destination_file)); + self->priv->created_files = g_list_prepend (self->priv->created_files, + g_object_ref (self->priv->destination_file)); - g_object_unref (pixbuf); + g_object_unref (image); /* image map file. */ @@ -477,7 +479,7 @@ static void paint_text (GthContactSheetCreator *self, const char *font_name, - GdkColor *color, + GdkRGBA *color, int x, int y, int width, @@ -500,7 +502,7 @@ x += self->priv->theme->frame_border; cairo_save (self->priv->cr); - gdk_cairo_set_source_color (self->priv->cr, color); + gdk_cairo_set_source_rgba (self->priv->cr, color); pango_cairo_update_layout (self->priv->cr, self->priv->pango_layout); cairo_move_to (self->priv->cr, x, y); pango_cairo_show_layout (self->priv->cr, self->priv->pango_layout); @@ -591,10 +593,10 @@ static void paint_image (GthContactSheetCreator *self, cairo_rectangle_int_t *image_rect, - GdkPixbuf *image) + cairo_surface_t *image) { cairo_save (self->priv->cr); - gdk_cairo_set_source_pixbuf (self->priv->cr, image, image_rect->x, image_rect->y); + cairo_set_source_surface (self->priv->cr, image, image_rect->x, image_rect->y); cairo_rectangle (self->priv->cr, image_rect->x, image_rect->y, image_rect->width, image_rect->height); cairo_fill (self->priv->cr); cairo_restore (self->priv->cr); @@ -613,9 +615,6 @@ GList *scan; GError *error = NULL; - if (self->priv->pixbuf_saver == NULL) - self->priv->pixbuf_saver = gth_main_get_pixbuf_saver (self->priv->mime_type); - columns = ((self->priv->page_width - self->priv->theme->col_spacing) / (self->priv->thumb_width + (self->priv->theme->frame_hpadding * 2) + self->priv->theme->col_spacing)); first_row = TRUE; begin_page (self, ++page_n); @@ -724,8 +723,8 @@ int thumbnail_height; cairo_rectangle_int_t image_rect; - thumbnail_width = gdk_pixbuf_get_width (row_item->thumbnail); - thumbnail_height = gdk_pixbuf_get_height (row_item->thumbnail); + thumbnail_width = cairo_image_surface_get_width (row_item->thumbnail); + thumbnail_height = cairo_image_surface_get_height (row_item->thumbnail); image_rect.x = x + (frame_width - thumbnail_width) / 2; image_rect.y = y + (frame_height - thumbnail_height) / 2; @@ -923,7 +922,7 @@ { GthContactSheetCreator *self = user_data; GthImage *image = NULL; - GdkPixbuf *pixbuf; + cairo_surface_t *image_surface; int original_width; int original_height; GError *error = NULL; @@ -940,17 +939,17 @@ return; } - pixbuf = gth_image_get_pixbuf (image); + image_surface = gth_image_get_cairo_surface (image); item_data = self->priv->current_file->data; if (self->priv->squared_thumbnails) - item_data->thumbnail = _gdk_pixbuf_scale_squared (pixbuf, MIN (self->priv->thumb_height, self->priv->thumb_width), GDK_INTERP_BILINEAR); + item_data->thumbnail = _cairo_image_surface_scale_squared (image_surface, MIN (self->priv->thumb_height, self->priv->thumb_width), SCALE_FILTER_BEST, NULL); else - item_data->thumbnail = g_object_ref (pixbuf); + item_data->thumbnail = cairo_surface_reference (image_surface); item_data->original_width = original_width; item_data->original_height = original_height; - g_object_unref (pixbuf); + cairo_surface_destroy (image_surface); g_object_unref (image); self->priv->current_file = self->priv->current_file->next; @@ -1032,7 +1031,6 @@ _g_object_list_unref (self->priv->created_files); g_list_foreach (self->priv->files, (GFunc) item_data_free, NULL); g_list_free (self->priv->files); - _g_object_unref (self->priv->pixbuf_saver); _g_object_unref (self->priv->image_loader); _g_object_unref (self->priv->pango_layout); _g_object_unref (self->priv->pango_context); @@ -1084,7 +1082,6 @@ self->priv->pango_context = NULL; self->priv->pango_layout = NULL; self->priv->image_loader = NULL; - self->priv->pixbuf_saver = NULL; self->priv->files = NULL; self->priv->created_files = NULL; self->priv->imagemap_file = NULL; diff -Nru gthumb-3.0.2/extensions/contact_sheet/gth-contact-sheet-theme-dialog.c gthumb-3.2.3/extensions/contact_sheet/gth-contact-sheet-theme-dialog.c --- gthumb-3.0.2/extensions/contact_sheet/gth-contact-sheet-theme-dialog.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/contact_sheet/gth-contact-sheet-theme-dialog.c 2013-04-30 16:56:12.000000000 +0000 @@ -90,7 +90,7 @@ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("solid_color_radiobutton")))) { self->priv->theme->background_type = GTH_CONTACT_SHEET_BACKGROUND_TYPE_SOLID; - gtk_color_button_get_color (GTK_COLOR_BUTTON (GET_WIDGET ("solid_color_colorpicker")), &self->priv->theme->background_color1); + gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("solid_color_colorpicker")), &self->priv->theme->background_color1); } else { gboolean h_gradient_active = FALSE; @@ -101,42 +101,42 @@ if (h_gradient_active && v_gradient_active) { self->priv->theme->background_type = GTH_CONTACT_SHEET_BACKGROUND_TYPE_FULL; - gtk_color_button_get_color (GTK_COLOR_BUTTON (GET_WIDGET ("h_gradient_1_colorpicker")), &self->priv->theme->background_color1); - gtk_color_button_get_color (GTK_COLOR_BUTTON (GET_WIDGET ("h_gradient_2_colorpicker")), &self->priv->theme->background_color2); - gtk_color_button_get_color (GTK_COLOR_BUTTON (GET_WIDGET ("v_gradient_1_colorpicker")), &self->priv->theme->background_color3); - gtk_color_button_get_color (GTK_COLOR_BUTTON (GET_WIDGET ("v_gradient_2_colorpicker")), &self->priv->theme->background_color4); + gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("h_gradient_1_colorpicker")), &self->priv->theme->background_color1); + gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("h_gradient_2_colorpicker")), &self->priv->theme->background_color2); + gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("v_gradient_1_colorpicker")), &self->priv->theme->background_color3); + gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("v_gradient_2_colorpicker")), &self->priv->theme->background_color4); } else if (h_gradient_active) { self->priv->theme->background_type = GTH_CONTACT_SHEET_BACKGROUND_TYPE_HORIZONTAL; - gtk_color_button_get_color (GTK_COLOR_BUTTON (GET_WIDGET ("h_gradient_1_colorpicker")), &self->priv->theme->background_color1); - gtk_color_button_get_color (GTK_COLOR_BUTTON (GET_WIDGET ("h_gradient_2_colorpicker")), &self->priv->theme->background_color2); + gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("h_gradient_1_colorpicker")), &self->priv->theme->background_color1); + gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("h_gradient_2_colorpicker")), &self->priv->theme->background_color2); } else if (v_gradient_active) { self->priv->theme->background_type = GTH_CONTACT_SHEET_BACKGROUND_TYPE_VERTICAL; - gtk_color_button_get_color (GTK_COLOR_BUTTON (GET_WIDGET ("v_gradient_1_colorpicker")), &self->priv->theme->background_color1); - gtk_color_button_get_color (GTK_COLOR_BUTTON (GET_WIDGET ("v_gradient_2_colorpicker")), &self->priv->theme->background_color2); + gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("v_gradient_1_colorpicker")), &self->priv->theme->background_color1); + gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("v_gradient_2_colorpicker")), &self->priv->theme->background_color2); } } /* frame */ self->priv->theme->frame_style = gtk_combo_box_get_active (GTK_COMBO_BOX (GET_WIDGET ("frame_style_combobox"))); - gtk_color_button_get_color (GTK_COLOR_BUTTON (GET_WIDGET ("frame_colorpicker")), &self->priv->theme->frame_color); + gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("frame_colorpicker")), &self->priv->theme->frame_color); /* header */ self->priv->theme->header_font_name = g_strdup (gtk_font_button_get_font_name (GTK_FONT_BUTTON (GET_WIDGET ("header_fontpicker")))); - gtk_color_button_get_color (GTK_COLOR_BUTTON (GET_WIDGET ("header_colorpicker")), &self->priv->theme->header_color); + gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("header_colorpicker")), &self->priv->theme->header_color); /* footer */ self->priv->theme->footer_font_name = g_strdup (gtk_font_button_get_font_name (GTK_FONT_BUTTON (GET_WIDGET ("footer_fontpicker")))); - gtk_color_button_get_color (GTK_COLOR_BUTTON (GET_WIDGET ("footer_colorpicker")), &self->priv->theme->footer_color); + gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("footer_colorpicker")), &self->priv->theme->footer_color); /* caption */ self->priv->theme->caption_font_name = g_strdup (gtk_font_button_get_font_name (GTK_FONT_BUTTON (GET_WIDGET ("caption_fontpicker")))); - gtk_color_button_get_color (GTK_COLOR_BUTTON (GET_WIDGET ("caption_colorpicker")), &self->priv->theme->caption_color); + gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("caption_colorpicker")), &self->priv->theme->caption_color); } @@ -153,13 +153,13 @@ gpointer user_data) { GthContactSheetThemeDialog *self = user_data; - GdkColor color1; - GdkColor color2; + GdkRGBA color1; + GdkRGBA color2; - gtk_color_button_get_color (GTK_COLOR_BUTTON (GET_WIDGET ("h_gradient_1_colorpicker")), &color1); - gtk_color_button_get_color (GTK_COLOR_BUTTON (GET_WIDGET ("h_gradient_2_colorpicker")), &color2); - gtk_color_button_set_color (GTK_COLOR_BUTTON (GET_WIDGET ("h_gradient_2_colorpicker")), &color1); - gtk_color_button_set_color (GTK_COLOR_BUTTON (GET_WIDGET ("h_gradient_1_colorpicker")), &color2); + gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("h_gradient_1_colorpicker")), &color1); + gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("h_gradient_2_colorpicker")), &color2); + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("h_gradient_2_colorpicker")), &color1); + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("h_gradient_1_colorpicker")), &color2); update_preview (self); } @@ -169,13 +169,13 @@ gpointer user_data) { GthContactSheetThemeDialog *self = user_data; - GdkColor color1; - GdkColor color2; + GdkRGBA color1; + GdkRGBA color2; - gtk_color_button_get_color (GTK_COLOR_BUTTON (GET_WIDGET ("v_gradient_1_colorpicker")), &color1); - gtk_color_button_get_color (GTK_COLOR_BUTTON (GET_WIDGET ("v_gradient_2_colorpicker")), &color2); - gtk_color_button_set_color (GTK_COLOR_BUTTON (GET_WIDGET ("v_gradient_2_colorpicker")), &color1); - gtk_color_button_set_color (GTK_COLOR_BUTTON (GET_WIDGET ("v_gradient_1_colorpicker")), &color2); + gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("v_gradient_1_colorpicker")), &color1); + gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("v_gradient_2_colorpicker")), &color2); + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("v_gradient_2_colorpicker")), &color1); + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("v_gradient_1_colorpicker")), &color2); update_preview (self); } @@ -316,22 +316,22 @@ theme->display_name = g_strdup (_("New theme")); theme->background_type = GTH_CONTACT_SHEET_BACKGROUND_TYPE_SOLID; - gdk_color_parse ("#fff", &theme->background_color1); - gdk_color_parse ("#fff", &theme->background_color2); - gdk_color_parse ("#fff", &theme->background_color3); - gdk_color_parse ("#fff", &theme->background_color4); + gdk_rgba_parse (&theme->background_color1, "#fff"); + gdk_rgba_parse (&theme->background_color2, "#fff"); + gdk_rgba_parse (&theme->background_color3, "#fff"); + gdk_rgba_parse (&theme->background_color4, "#fff"); theme->frame_style = GTH_CONTACT_SHEET_FRAME_STYLE_SIMPLE_WITH_SHADOW; - gdk_color_parse ("#000", &theme->frame_color); + gdk_rgba_parse (&theme->frame_color, "#000"); theme->header_font_name = g_strdup ("Sans 22"); - gdk_color_parse ("#000", &theme->frame_color); + gdk_rgba_parse (&theme->frame_color, "#000"); theme->footer_font_name = g_strdup ("Sans Bold 12"); - gdk_color_parse ("#000", &theme->footer_color); + gdk_rgba_parse (&theme->footer_color, "#000"); theme->caption_font_name = g_strdup ("Sans 8"); - gdk_color_parse ("#000", &theme->caption_color); + gdk_rgba_parse (&theme->caption_color, "#000"); return theme; } @@ -353,38 +353,38 @@ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("v_gradient_checkbutton")), (theme->background_type == GTH_CONTACT_SHEET_BACKGROUND_TYPE_VERTICAL) || (theme->background_type == GTH_CONTACT_SHEET_BACKGROUND_TYPE_FULL)); if (theme->background_type == GTH_CONTACT_SHEET_BACKGROUND_TYPE_SOLID) { - gtk_color_button_set_color (GTK_COLOR_BUTTON (GET_WIDGET ("solid_color_colorpicker")), &theme->background_color1); - gtk_color_button_set_color (GTK_COLOR_BUTTON (GET_WIDGET ("h_gradient_1_colorpicker")), &theme->background_color1); - gtk_color_button_set_color (GTK_COLOR_BUTTON (GET_WIDGET ("h_gradient_2_colorpicker")), &theme->background_color1); - gtk_color_button_set_color (GTK_COLOR_BUTTON (GET_WIDGET ("v_gradient_1_colorpicker")), &theme->background_color1); - gtk_color_button_set_color (GTK_COLOR_BUTTON (GET_WIDGET ("v_gradient_2_colorpicker")), &theme->background_color1); + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("solid_color_colorpicker")), &theme->background_color1); + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("h_gradient_1_colorpicker")), &theme->background_color1); + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("h_gradient_2_colorpicker")), &theme->background_color1); + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("v_gradient_1_colorpicker")), &theme->background_color1); + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("v_gradient_2_colorpicker")), &theme->background_color1); } else if (theme->background_type == GTH_CONTACT_SHEET_BACKGROUND_TYPE_FULL) { - gtk_color_button_set_color (GTK_COLOR_BUTTON (GET_WIDGET ("solid_color_colorpicker")), &theme->background_color1); - gtk_color_button_set_color (GTK_COLOR_BUTTON (GET_WIDGET ("h_gradient_1_colorpicker")), &theme->background_color1); - gtk_color_button_set_color (GTK_COLOR_BUTTON (GET_WIDGET ("h_gradient_2_colorpicker")), &theme->background_color2); - gtk_color_button_set_color (GTK_COLOR_BUTTON (GET_WIDGET ("v_gradient_1_colorpicker")), &theme->background_color3); - gtk_color_button_set_color (GTK_COLOR_BUTTON (GET_WIDGET ("v_gradient_2_colorpicker")), &theme->background_color4); + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("solid_color_colorpicker")), &theme->background_color1); + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("h_gradient_1_colorpicker")), &theme->background_color1); + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("h_gradient_2_colorpicker")), &theme->background_color2); + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("v_gradient_1_colorpicker")), &theme->background_color3); + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("v_gradient_2_colorpicker")), &theme->background_color4); } else { - gtk_color_button_set_color (GTK_COLOR_BUTTON (GET_WIDGET ("solid_color_colorpicker")), &theme->background_color1); - gtk_color_button_set_color (GTK_COLOR_BUTTON (GET_WIDGET ("h_gradient_1_colorpicker")), &theme->background_color1); - gtk_color_button_set_color (GTK_COLOR_BUTTON (GET_WIDGET ("h_gradient_2_colorpicker")), &theme->background_color2); - gtk_color_button_set_color (GTK_COLOR_BUTTON (GET_WIDGET ("v_gradient_1_colorpicker")), &theme->background_color1); - gtk_color_button_set_color (GTK_COLOR_BUTTON (GET_WIDGET ("v_gradient_2_colorpicker")), &theme->background_color2); + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("solid_color_colorpicker")), &theme->background_color1); + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("h_gradient_1_colorpicker")), &theme->background_color1); + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("h_gradient_2_colorpicker")), &theme->background_color2); + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("v_gradient_1_colorpicker")), &theme->background_color1); + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("v_gradient_2_colorpicker")), &theme->background_color2); } gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("frame_style_combobox")), theme->frame_style); - gtk_color_button_set_color (GTK_COLOR_BUTTON (GET_WIDGET ("frame_colorpicker")), &theme->frame_color); + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("frame_colorpicker")), &theme->frame_color); gtk_font_button_set_font_name (GTK_FONT_BUTTON (GET_WIDGET ("header_fontpicker")), theme->header_font_name); - gtk_color_button_set_color (GTK_COLOR_BUTTON (GET_WIDGET ("header_colorpicker")), &theme->header_color); + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("header_colorpicker")), &theme->header_color); gtk_font_button_set_font_name (GTK_FONT_BUTTON (GET_WIDGET ("footer_fontpicker")), theme->footer_font_name); - gtk_color_button_set_color (GTK_COLOR_BUTTON (GET_WIDGET ("footer_colorpicker")), &theme->footer_color); + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("footer_colorpicker")), &theme->footer_color); gtk_font_button_set_font_name (GTK_FONT_BUTTON (GET_WIDGET ("caption_fontpicker")), theme->caption_font_name); - gtk_color_button_set_color (GTK_COLOR_BUTTON (GET_WIDGET ("caption_colorpicker")), &theme->caption_color); + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (GET_WIDGET ("caption_colorpicker")), &theme->caption_color); update_preview (self); } diff -Nru gthumb-3.0.2/extensions/contact_sheet/gth-contact-sheet-theme.c gthumb-3.2.3/extensions/contact_sheet/gth-contact-sheet-theme.c --- gthumb-3.0.2/extensions/contact_sheet/gth-contact-sheet-theme.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/contact_sheet/gth-contact-sheet-theme.c 2013-04-30 16:56:12.000000000 +0000 @@ -35,31 +35,31 @@ static void -_g_key_file_get_color (GKeyFile *key_file, - char *group_name, - char *key, - GdkColor *color, - GError **error) +_g_key_file_get_rgba (GKeyFile *key_file, + char *group_name, + char *key, + GdkRGBA *color, + GError **error) { char *spec; spec = g_key_file_get_string (key_file, group_name, key, error); if (spec != NULL) - gdk_color_parse (spec, color); + gdk_rgba_parse (color, spec); g_free (spec); } static void -_g_key_file_set_color (GKeyFile *key_file, - char *group_name, - char *key, - GdkColor *color) +_g_key_file_set_rgba (GKeyFile *key_file, + char *group_name, + char *key, + GdkRGBA *color) { char *color_value; - color_value = gdk_color_to_string (color); + color_value = gdk_rgba_to_string (color); g_key_file_set_string (key_file, group_name, key, color_value); g_free (color_value); @@ -99,25 +99,25 @@ theme->background_type = _g_enum_type_get_value_by_nick (GTH_TYPE_CONTACT_SHEET_BACKGROUND_TYPE, nick)->value; g_free (nick); - _g_key_file_get_color (key_file, "Background", "Color1", &theme->background_color1, NULL); - _g_key_file_get_color (key_file, "Background", "Color2", &theme->background_color2, NULL); - _g_key_file_get_color (key_file, "Background", "Color3", &theme->background_color3, NULL); - _g_key_file_get_color (key_file, "Background", "Color4", &theme->background_color4, NULL); + _g_key_file_get_rgba (key_file, "Background", "Color1", &theme->background_color1, NULL); + _g_key_file_get_rgba (key_file, "Background", "Color2", &theme->background_color2, NULL); + _g_key_file_get_rgba (key_file, "Background", "Color3", &theme->background_color3, NULL); + _g_key_file_get_rgba (key_file, "Background", "Color4", &theme->background_color4, NULL); nick = g_key_file_get_string (key_file, "Frame", "Style", NULL); theme->frame_style = _g_enum_type_get_value_by_nick (GTH_TYPE_CONTACT_SHEET_FRAME_STYLE, nick)->value; g_free (nick); - _g_key_file_get_color (key_file, "Frame", "Color", &theme->frame_color, NULL); + _g_key_file_get_rgba (key_file, "Frame", "Color", &theme->frame_color, NULL); theme->header_font_name = g_key_file_get_string (key_file, "Header", "Font", NULL); - _g_key_file_get_color (key_file, "Header", "Color", &theme->header_color, NULL); + _g_key_file_get_rgba (key_file, "Header", "Color", &theme->header_color, NULL); theme->footer_font_name = g_key_file_get_string (key_file, "Footer", "Font", NULL); - _g_key_file_get_color (key_file, "Footer", "Color", &theme->footer_color, NULL); + _g_key_file_get_rgba (key_file, "Footer", "Color", &theme->footer_color, NULL); theme->caption_font_name = g_key_file_get_string (key_file, "Caption", "Font", NULL); - _g_key_file_get_color (key_file, "Caption", "Color", &theme->caption_color, NULL); + _g_key_file_get_rgba (key_file, "Caption", "Color", &theme->caption_color, NULL); return theme; } @@ -159,26 +159,26 @@ g_key_file_set_string (key_file, "Theme", "Name", theme->display_name); g_key_file_set_string (key_file, "Background", "Type", _g_enum_type_get_value (GTH_TYPE_CONTACT_SHEET_BACKGROUND_TYPE, theme->background_type)->value_nick); - _g_key_file_set_color (key_file, "Background", "Color1", &theme->background_color1); + _g_key_file_set_rgba (key_file, "Background", "Color1", &theme->background_color1); if (theme->background_type != GTH_CONTACT_SHEET_BACKGROUND_TYPE_SOLID) { - _g_key_file_set_color (key_file, "Background", "Color2", &theme->background_color2); + _g_key_file_set_rgba (key_file, "Background", "Color2", &theme->background_color2); if (theme->background_type == GTH_CONTACT_SHEET_BACKGROUND_TYPE_FULL) { - _g_key_file_set_color (key_file, "Background", "Color3", &theme->background_color3); - _g_key_file_set_color (key_file, "Background", "Color4", &theme->background_color4); + _g_key_file_set_rgba (key_file, "Background", "Color3", &theme->background_color3); + _g_key_file_set_rgba (key_file, "Background", "Color4", &theme->background_color4); } } g_key_file_set_string (key_file, "Frame", "Style", _g_enum_type_get_value (GTH_TYPE_CONTACT_SHEET_FRAME_STYLE, theme->frame_style)->value_nick); - _g_key_file_set_color (key_file, "Frame", "Color", &theme->frame_color); + _g_key_file_set_rgba (key_file, "Frame", "Color", &theme->frame_color); g_key_file_set_string (key_file, "Header", "Font", theme->header_font_name); - _g_key_file_set_color (key_file, "Header", "Color", &theme->header_color); + _g_key_file_set_rgba (key_file, "Header", "Color", &theme->header_color); g_key_file_set_string (key_file, "Footer", "Font", theme->footer_font_name); - _g_key_file_set_color (key_file, "Footer", "Color", &theme->footer_color); + _g_key_file_set_rgba (key_file, "Footer", "Color", &theme->footer_color); g_key_file_set_string (key_file, "Caption", "Font", theme->caption_font_name); - _g_key_file_set_color (key_file, "Caption", "Color", &theme->caption_color); + _g_key_file_set_rgba (key_file, "Caption", "Color", &theme->caption_color); *buffer = g_key_file_to_data (key_file, count, error); @@ -223,21 +223,18 @@ { cairo_surface_t *surface; cairo_pattern_t *pattern; - cairo_color_t color; switch (theme->background_type) { case GTH_CONTACT_SHEET_BACKGROUND_TYPE_SOLID: - gdk_cairo_set_source_color (cr, &theme->background_color1); + gdk_cairo_set_source_rgba (cr, &theme->background_color1); cairo_rectangle (cr, 0, 0, width, height); cairo_fill (cr); break; case GTH_CONTACT_SHEET_BACKGROUND_TYPE_VERTICAL: pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, height); - _gdk_color_to_cairo_color (&theme->background_color1, &color); - cairo_pattern_add_color_stop_rgba (pattern, 0.0, color.r, color.g, color.b, 1.0); - _gdk_color_to_cairo_color (&theme->background_color2, &color); - cairo_pattern_add_color_stop_rgba (pattern, height, color.r, color.g, color.b, 1.0); + cairo_pattern_add_color_stop_rgba (pattern, 0.0, theme->background_color1.red, theme->background_color1.green, theme->background_color1.blue, theme->background_color1.alpha); + cairo_pattern_add_color_stop_rgba (pattern, height, theme->background_color2.red, theme->background_color2.green, theme->background_color2.blue, theme->background_color2.alpha); cairo_pattern_set_filter (pattern, CAIRO_FILTER_BEST); cairo_set_source (cr, pattern); cairo_rectangle (cr, 0, 0, width, height); @@ -247,10 +244,8 @@ case GTH_CONTACT_SHEET_BACKGROUND_TYPE_HORIZONTAL: pattern = cairo_pattern_create_linear (0.0, 0.0, width, 0.0); - _gdk_color_to_cairo_color (&theme->background_color1, &color); - cairo_pattern_add_color_stop_rgba (pattern, 0.0, color.r, color.g, color.b, 1.0); - _gdk_color_to_cairo_color (&theme->background_color2, &color); - cairo_pattern_add_color_stop_rgba (pattern, width, color.r, color.g, color.b, 1.0); + cairo_pattern_add_color_stop_rgba (pattern, 0.0, theme->background_color1.red, theme->background_color1.green, theme->background_color1.blue, theme->background_color1.alpha); + cairo_pattern_add_color_stop_rgba (pattern, width, theme->background_color2.red, theme->background_color2.green, theme->background_color2.blue, theme->background_color2.alpha); cairo_pattern_set_filter (pattern, CAIRO_FILTER_BEST); cairo_set_source (cr, pattern); cairo_rectangle (cr, 0, 0, width, height); @@ -296,7 +291,7 @@ break; case GTH_CONTACT_SHEET_FRAME_STYLE_SIMPLE: - gdk_cairo_set_source_color (cr, &theme->frame_color); + gdk_cairo_set_source_rgba (cr, &theme->frame_color); _cairo_draw_frame (cr, image_rect->x, image_rect->y, @@ -313,7 +308,7 @@ image_rect->height, 5); - gdk_cairo_set_source_color (cr, &theme->frame_color); + gdk_cairo_set_source_rgba (cr, &theme->frame_color); _cairo_draw_frame (cr, image_rect->x, image_rect->y, @@ -419,7 +414,7 @@ paint_text (GthContactSheetTheme *theme, cairo_t *cr, const char *font_name, - GdkColor *color, + GdkRGBA *color, int x, int y, int width, @@ -463,7 +458,7 @@ pango_layout_get_pixel_extents (pango_layout, NULL, &bounds); cairo_save (cr); - gdk_cairo_set_source_color (cr, color); + gdk_cairo_set_source_rgba (cr, color); pango_cairo_update_layout (cr, pango_layout); if (footer) cairo_move_to (cr, x, y - bounds.height - 2); diff -Nru gthumb-3.0.2/extensions/contact_sheet/gth-contact-sheet-theme.h gthumb-3.2.3/extensions/contact_sheet/gth-contact-sheet-theme.h --- gthumb-3.0.2/extensions/contact_sheet/gth-contact-sheet-theme.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/contact_sheet/gth-contact-sheet-theme.h 2013-04-30 16:56:12.000000000 +0000 @@ -50,25 +50,25 @@ char *display_name; GthContactSheetBackgroundType background_type; - GdkColor background_color1; - GdkColor background_color2; - GdkColor background_color3; - GdkColor background_color4; + GdkRGBA background_color1; + GdkRGBA background_color2; + GdkRGBA background_color3; + GdkRGBA background_color4; GthContactSheetFrameStyle frame_style; - GdkColor frame_color; + GdkRGBA frame_color; int frame_hpadding; int frame_vpadding; int frame_border; char *header_font_name; - GdkColor header_color; + GdkRGBA header_color; char *footer_font_name; - GdkColor footer_color; + GdkRGBA footer_color; char *caption_font_name; - GdkColor caption_color; + GdkRGBA caption_color; int caption_spacing; int row_spacing; diff -Nru gthumb-3.0.2/extensions/convert_format/Makefile.in gthumb-3.2.3/extensions/convert_format/Makefile.in --- gthumb-3.0.2/extensions/convert_format/Makefile.in 2012-08-20 19:54:12.000000000 +0000 +++ gthumb-3.2.3/extensions/convert_format/Makefile.in 2013-07-10 13:33:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/convert_format -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -146,13 +174,14 @@ am__v_CCLD_1 = SOURCES = $(libconvert_format_la_SOURCES) DIST_SOURCES = $(libconvert_format_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -161,9 +190,29 @@ DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -222,9 +271,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -238,13 +285,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -273,7 +319,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -289,11 +338,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -310,7 +363,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -340,7 +392,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -453,6 +508,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -487,6 +543,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libconvert_format.la: $(libconvert_format_la_OBJECTS) $(libconvert_format_la_DEPENDENCIES) $(EXTRA_libconvert_format_la_DEPENDENCIES) $(AM_V_CCLD)$(libconvert_format_la_LINK) -rpath $(extensiondir) $(libconvert_format_la_OBJECTS) $(libconvert_format_la_LIBADD) $(LIBS) @@ -506,14 +563,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -583,14 +640,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -611,31 +667,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -651,12 +689,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -668,15 +701,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -685,9 +714,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -869,25 +899,23 @@ uninstall-am: uninstall-extensionLTLIBRARIES \ uninstall-extensioniniDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-extensionLTLIBRARIES \ - clean-generic clean-libtool cscopelist cscopelist-recursive \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extensionLTLIBRARIES \ - install-extensioniniDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-extensionLTLIBRARIES clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-extensionLTLIBRARIES install-extensioniniDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA diff -Nru gthumb-3.0.2/extensions/convert_format/data/Makefile.in gthumb-3.2.3/extensions/convert_format/data/Makefile.in --- gthumb-3.0.2/extensions/convert_format/data/Makefile.in 2012-08-20 19:54:12.000000000 +0000 +++ gthumb-3.2.3/extensions/convert_format/data/Makefile.in 2013-07-10 13:33:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/convert_format/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/convert_format/data/ui/Makefile.in gthumb-3.2.3/extensions/convert_format/data/ui/Makefile.in --- gthumb-3.0.2/extensions/convert_format/data/ui/Makefile.in 2012-08-20 19:54:12.000000000 +0000 +++ gthumb-3.2.3/extensions/convert_format/data/ui/Makefile.in 2013-07-10 13:33:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/convert_format/data/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -381,11 +415,9 @@ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -526,16 +558,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-uiDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-uiDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/convert_format/dlg-convert-format.c gthumb-3.2.3/extensions/convert_format/dlg-convert-format.c --- gthumb-3.0.2/extensions/convert_format/dlg-convert-format.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/convert_format/dlg-convert-format.c 2013-04-30 17:01:04.000000000 +0000 @@ -68,10 +68,12 @@ } -static void -convert_step (GthPixbufTask *pixbuf_task) +static gpointer +exec_convert (GthAsyncTask *task, + gpointer user_data) { - pixbuf_task->dest = gdk_pixbuf_copy (pixbuf_task->src); + gth_image_task_copy_source_to_destination (GTH_IMAGE_TASK (task)); + return NULL; } @@ -90,23 +92,22 @@ -1); g_settings_set_string (data->settings, PREF_CONVERT_FORMAT_MIME_TYPE, mime_type); - convert_task = gth_pixbuf_task_new (_("Converting images"), - TRUE, + convert_task = gth_image_task_new (_("Converting images"), NULL, - convert_step, + exec_convert, NULL, NULL, NULL); - list_task = gth_pixbuf_list_task_new (data->browser, - data->file_list, - GTH_PIXBUF_TASK (convert_task)); - gth_pixbuf_list_task_set_overwrite_mode (GTH_PIXBUF_LIST_TASK (list_task), GTH_OVERWRITE_ASK); - gth_pixbuf_list_task_set_output_mime_type (GTH_PIXBUF_LIST_TASK (list_task), mime_type); + list_task = gth_image_list_task_new (data->browser, + data->file_list, + GTH_IMAGE_TASK (convert_task)); + gth_image_list_task_set_overwrite_mode (GTH_IMAGE_LIST_TASK (list_task), GTH_OVERWRITE_ASK); + gth_image_list_task_set_output_mime_type (GTH_IMAGE_LIST_TASK (list_task), mime_type); if (data->use_destination) { GFile *destination; destination = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (GET_WIDGET ("destination_filechooserbutton"))); - gth_pixbuf_list_task_set_destination (GTH_PIXBUF_LIST_TASK (list_task), destination); + gth_image_list_task_set_destination (GTH_IMAGE_LIST_TASK (list_task), destination); g_object_unref (destination); } @@ -158,7 +159,7 @@ /* Set widgets data. */ - savers = gth_main_get_type_set ("pixbuf-saver"); + savers = gth_main_get_type_set ("image-saver"); if (savers != NULL) { char *default_mime_type; GthIconCache *icon_cache; @@ -170,14 +171,14 @@ list_store = (GtkListStore *) GET_WIDGET ("mime_type_liststore"); for (i = 0; i < savers->len; i++) { GType saver_type; - GthPixbufSaver *saver; + GthImageSaver *saver; const char *mime_type; GdkPixbuf *pixbuf; GtkTreeIter iter; saver_type = g_array_index (savers, GType, i); saver = g_object_new (saver_type, NULL); - mime_type = gth_pixbuf_saver_get_mime_type (saver); + mime_type = gth_image_saver_get_mime_type (saver); pixbuf = gth_icon_cache_get_pixbuf (icon_cache, g_content_type_get_icon (mime_type)); gtk_list_store_append (list_store, &iter); gtk_list_store_set (list_store, &iter, @@ -198,9 +199,9 @@ } first_file_data = (GthFileData *) data->file_list->data; - gtk_file_chooser_set_file (GTK_FILE_CHOOSER (GET_WIDGET ("destination_filechooserbutton")), - first_file_data->file, - NULL); + _gtk_file_chooser_set_file_parent (GTK_FILE_CHOOSER (GET_WIDGET ("destination_filechooserbutton")), + first_file_data->file, + NULL); /* Set the signals handlers. */ diff -Nru gthumb-3.0.2/extensions/desktop_background/Makefile.in gthumb-3.2.3/extensions/desktop_background/Makefile.in --- gthumb-3.0.2/extensions/desktop_background/Makefile.in 2012-08-20 19:54:12.000000000 +0000 +++ gthumb-3.2.3/extensions/desktop_background/Makefile.in 2013-07-10 13:33:45.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/desktop_background -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -153,6 +181,23 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(extensionini_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -185,9 +230,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -201,13 +244,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -236,7 +278,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -252,11 +297,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -273,7 +322,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -303,7 +351,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -413,6 +464,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -447,6 +499,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libdesktop_background.la: $(libdesktop_background_la_OBJECTS) $(libdesktop_background_la_DEPENDENCIES) $(EXTRA_libdesktop_background_la_DEPENDENCIES) $(AM_V_CCLD)$(libdesktop_background_la_LINK) -rpath $(extensiondir) $(libdesktop_background_la_OBJECTS) $(libdesktop_background_la_LIBADD) $(LIBS) @@ -465,14 +518,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -529,26 +582,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(extensioninidir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -560,15 +602,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -577,9 +615,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -737,21 +776,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ clean-extensionLTLIBRARIES clean-generic clean-libtool \ - cscopelist ctags distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-extensionLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-extensionLTLIBRARIES \ install-extensioniniDATA install-html install-html-am \ install-info install-info-am install-man install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-extensionLTLIBRARIES \ - uninstall-extensioniniDATA + tags tags-am uninstall uninstall-am \ + uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA @GTHUMB_EXTENSION_IN_RULE@ diff -Nru gthumb-3.0.2/extensions/desktop_background/actions.c gthumb-3.2.3/extensions/desktop_background/actions.c --- gthumb-3.0.2/extensions/desktop_background/actions.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/desktop_background/actions.c 2013-04-30 16:56:12.000000000 +0000 @@ -28,39 +28,75 @@ #define DESKTOP_BACKGROUND_PROPERTIES_COMMAND "gnome-control-center background" #define DESKTOP_BACKGROUND_SCHEMA "org.gnome.desktop.background" -#define DESKTOP_BACKGROUND_KEY "picture-uri" +#define DESKTOP_BACKGROUND_FILE_KEY "picture-uri" +#define DESKTOP_BACKGROUND_STYLE_KEY "picture-options" -static GFile * -get_current_wallpaper (void) +typedef enum { + BACKGROUND_STYLE_NONE, + BACKGROUND_STYLE_WALLPAPER, + BACKGROUND_STYLE_CENTERED, + BACKGROUND_STYLE_SCALED, + BACKGROUND_STYLE_STRETCHED, + BACKGROUND_STYLE_ZOOM, + BACKGROUND_STYLE_SPANNED +} BackgroundStyle; + + +typedef struct { + GFile *file; + BackgroundStyle background_style; +} WallpaperStyle; + + +typedef struct { + GthBrowser *browser; + WallpaperStyle old_style; + WallpaperStyle new_style; + gulong response_id; +} WallpaperData; + + +static void +wallpaper_style_init (WallpaperStyle *style) +{ + style->file = NULL; + style->background_style = BACKGROUND_STYLE_WALLPAPER; +} + + +static void +wallpaper_style_init_from_current (WallpaperStyle *style) { - GFile *file = NULL; GSettings *settings; char *uri; settings = g_settings_new (DESKTOP_BACKGROUND_SCHEMA); - uri = g_settings_get_string (settings, DESKTOP_BACKGROUND_KEY); - if (uri != NULL) - file = g_file_new_for_uri (uri); + uri = g_settings_get_string (settings, DESKTOP_BACKGROUND_FILE_KEY); + style->file = (uri != NULL) ? g_file_new_for_uri (uri) : NULL; + style->background_style = g_settings_get_enum (settings, DESKTOP_BACKGROUND_STYLE_KEY); g_free (uri); g_object_unref (settings); - - return file; } static void -set_current_wallpaper_file (GFile *file) +wallpaper_style_set_as_current (WallpaperStyle *style) { char *uri; - uri = g_file_get_uri (file); + if (style->file == NULL) + return; + + uri = g_file_get_uri (style->file); if (uri != NULL) { GSettings *settings; settings = g_settings_new (DESKTOP_BACKGROUND_SCHEMA); - g_settings_set_string (settings, DESKTOP_BACKGROUND_KEY, uri); + g_settings_set_string (settings, DESKTOP_BACKGROUND_FILE_KEY, uri); + g_settings_set_enum (settings, DESKTOP_BACKGROUND_STYLE_KEY, style->background_style); + g_object_unref (settings); } @@ -68,27 +104,23 @@ } -typedef struct { - GthBrowser *browser; - GFile *old_file; - GFile *new_file; - gulong response_id; -} WallpaperData; +static void +wallpaper_style_free (WallpaperStyle *style) +{ + _g_object_unref (style->file); + wallpaper_style_init (style); +} static GFile * get_wallpaper_file_n (int n) { char *name; - char *filename; GFile *file; name = g_strdup_printf ("wallpaper%d.jpeg", n); - gth_user_dir_make_dir_for_file (GTH_DIR_DATA, GTHUMB_DIR, name, NULL); - filename = gth_user_dir_get_file (GTH_DIR_DATA, GTHUMB_DIR, name, NULL); - file = g_file_new_for_path (filename); + file = gth_user_dir_get_file_for_write (GTH_DIR_DATA, GTHUMB_DIR, name, NULL); - g_free (filename); g_free (name); return file; @@ -96,7 +128,7 @@ static GFile * -get_wallpaper_file (void) +get_new_wallpaper_file (void) { GFile *wallpaper_file; @@ -111,7 +143,7 @@ g_file_delete (wallpaper_file, NULL, NULL); } - return wallpaper_file; + return wallpaper_file; } @@ -120,11 +152,11 @@ { WallpaperData *wdata; - wdata = g_new0 (WallpaperData, 1); wdata->browser = browser; - wdata->old_file = get_current_wallpaper (); - wdata->new_file = get_wallpaper_file (); + wallpaper_style_init_from_current (&wdata->old_style); + wallpaper_style_init (&wdata->new_style); + wdata->new_style.file = get_new_wallpaper_file (); return wdata; } @@ -134,8 +166,8 @@ wallpaper_data_free (WallpaperData *wdata) { g_signal_handler_disconnect (gth_browser_get_infobar (wdata->browser), wdata->response_id); - _g_object_unref (wdata->old_file); - _g_object_unref (wdata->new_file); + wallpaper_style_free (&wdata->old_style); + wallpaper_style_free (&wdata->new_style); g_free (wdata); } @@ -165,8 +197,7 @@ break; case _RESPONSE_UNDO: - if (wdata->old_file != NULL) - set_current_wallpaper_file (wdata->old_file); + wallpaper_style_set_as_current (&wdata->old_style); break; } @@ -180,7 +211,7 @@ { GtkWidget *infobar; - set_current_wallpaper_file (wdata->new_file); + wallpaper_style_set_as_current (&wdata->new_style); infobar = gth_browser_get_infobar (wdata->browser); gth_info_bar_set_icon (GTH_INFO_BAR (infobar), GTK_STOCK_DIALOG_INFO); @@ -189,7 +220,7 @@ char *name; char *msg; - name = _g_file_get_display_name (wdata->new_file); + name = _g_file_get_display_name (wdata->new_style.file); msg = g_strdup_printf ("The image \"%s\" has been set as desktop background", name); gth_info_bar_set_primary_text (GTH_INFO_BAR (infobar), msg); @@ -207,7 +238,7 @@ NULL); gtk_info_bar_set_response_sensitive (GTK_INFO_BAR (infobar), _RESPONSE_UNDO, - wdata->old_file != NULL); + wdata->old_style.file != NULL); wdata->response_id = g_signal_connect (infobar, "response", G_CALLBACK (infobar_response_cb), @@ -218,9 +249,9 @@ static void -wallpaper_save_ready_cb (GthFileData *a, - GError *error, - gpointer user_data) +save_wallpaper_task_completed_cb (GthTask *task, + GError *error, + gpointer user_data) { WallpaperData *wdata = user_data; @@ -259,53 +290,61 @@ { WallpaperData *wdata; gboolean saving_wallpaper = FALSE; - GthFileData *file_data; GList *items; GList *file_list; + GthFileData *file_data; + const char *mime_type; wdata = wallpaper_data_new (browser); - if (gth_main_extension_is_active ("image_viewer") && gth_browser_get_file_modified (browser)) { + items = gth_file_selection_get_selected (GTH_FILE_SELECTION (gth_browser_get_file_list_view (browser))); + file_list = gth_file_list_get_files (GTH_FILE_LIST (gth_browser_get_file_list (browser)), items); + file_data = (file_list != NULL) ? file_list->data : NULL; + mime_type = (file_data != NULL) ? gth_file_data_get_mime_type (file_data) : NULL; + + if (gth_main_extension_is_active ("image_viewer") + && (gth_browser_get_file_modified (browser) || ! _gdk_pixbuf_mime_type_is_readable (mime_type))) + { GtkWidget *viewer_page; viewer_page = gth_browser_get_viewer_page (browser); if (viewer_page != NULL) { - GdkPixbuf *pixbuf; + GthImage *image; + GthTask *task; + + image = gth_image_new_for_surface (gth_image_viewer_page_get_image (GTH_IMAGE_VIEWER_PAGE (viewer_page))); + file_data = gth_file_data_new (wdata->new_style.file, NULL); + task = gth_save_image_task_new (image, + "image/jpeg", + file_data, + GTH_OVERWRITE_RESPONSE_YES); + g_signal_connect (task, + "completed", + G_CALLBACK (save_wallpaper_task_completed_cb), + wdata); + gth_browser_exec_task (GTH_BROWSER (browser), task, FALSE); - pixbuf = gth_image_viewer_page_get_pixbuf (GTH_IMAGE_VIEWER_PAGE (viewer_page)); - file_data = gth_file_data_new (wdata->new_file, NULL); - _gdk_pixbuf_save_async (pixbuf, - file_data, - "image/jpeg", - TRUE, - wallpaper_save_ready_cb, - wdata); saving_wallpaper = TRUE; - g_object_unref (pixbuf); + _g_object_unref (task); + g_object_unref (image); } } if (saving_wallpaper) return; - items = gth_file_selection_get_selected (GTH_FILE_SELECTION (gth_browser_get_file_list_view (browser))); - file_list = gth_file_list_get_files (GTH_FILE_LIST (gth_browser_get_file_list (browser)), items); - if (file_list == NULL) - return; - - file_data = file_list->data; if (file_data == NULL) return; if (g_file_is_native (file_data->file)) { - _g_object_unref (wdata->new_file); - wdata->new_file = g_file_dup (file_data->file); + _g_object_unref (wdata->new_style.file); + wdata->new_style.file = g_file_dup (file_data->file); wallpaper_data_set (wdata); } else g_file_copy_async (file_data->file, - wdata->new_file, + wdata->new_style.file, G_FILE_COPY_OVERWRITE, G_PRIORITY_DEFAULT, NULL, diff -Nru gthumb-3.0.2/extensions/edit_metadata/Makefile.in gthumb-3.2.3/extensions/edit_metadata/Makefile.in --- gthumb-3.0.2/extensions/edit_metadata/Makefile.in 2012-08-20 19:54:12.000000000 +0000 +++ gthumb-3.2.3/extensions/edit_metadata/Makefile.in 2013-07-10 13:33:45.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/edit_metadata -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -152,13 +180,14 @@ am__v_CCLD_1 = SOURCES = $(libedit_metadata_la_SOURCES) DIST_SOURCES = $(libedit_metadata_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -167,9 +196,29 @@ DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -228,9 +277,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -244,13 +291,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -279,7 +325,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -295,11 +344,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -316,7 +369,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -346,7 +398,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -472,6 +527,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -506,6 +562,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libedit_metadata.la: $(libedit_metadata_la_OBJECTS) $(libedit_metadata_la_DEPENDENCIES) $(EXTRA_libedit_metadata_la_DEPENDENCIES) $(AM_V_CCLD)$(libedit_metadata_la_LINK) -rpath $(extensiondir) $(libedit_metadata_la_OBJECTS) $(libedit_metadata_la_LIBADD) $(LIBS) @@ -532,14 +589,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -658,14 +715,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -686,31 +742,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -726,12 +764,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -743,15 +776,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -760,9 +789,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -944,25 +974,23 @@ uninstall-am: uninstall-extensionLTLIBRARIES \ uninstall-extensioniniDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-extensionLTLIBRARIES \ - clean-generic clean-libtool cscopelist cscopelist-recursive \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extensionLTLIBRARIES \ - install-extensioniniDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-extensionLTLIBRARIES clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-extensionLTLIBRARIES install-extensioniniDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA diff -Nru gthumb-3.0.2/extensions/edit_metadata/data/Makefile.in gthumb-3.2.3/extensions/edit_metadata/data/Makefile.in --- gthumb-3.0.2/extensions/edit_metadata/data/Makefile.in 2012-08-20 19:54:12.000000000 +0000 +++ gthumb-3.2.3/extensions/edit_metadata/data/Makefile.in 2013-07-10 13:33:45.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/edit_metadata/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/edit_metadata/data/ui/Makefile.in gthumb-3.2.3/extensions/edit_metadata/data/ui/Makefile.in --- gthumb-3.0.2/extensions/edit_metadata/data/ui/Makefile.in 2012-08-20 19:54:12.000000000 +0000 +++ gthumb-3.2.3/extensions/edit_metadata/data/ui/Makefile.in 2013-07-10 13:33:45.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/edit_metadata/data/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -381,11 +415,9 @@ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -526,16 +558,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-uiDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-uiDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/edit_metadata/gth-delete-metadata-task.c gthumb-3.2.3/extensions/edit_metadata/gth-delete-metadata-task.c --- gthumb-3.0.2/extensions/edit_metadata/gth-delete-metadata-task.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/edit_metadata/gth-delete-metadata-task.c 2013-04-30 16:56:12.000000000 +0000 @@ -115,14 +115,14 @@ gth_hook_invoke ("delete-metadata", file, &tmp_buffer, &count); - g_write_file_async (file, - tmp_buffer, - count, - TRUE, - G_PRIORITY_DEFAULT, - gth_task_get_cancellable (GTH_TASK (self)), - write_file_ready_cb, - self); + _g_file_write_async (file, + tmp_buffer, + count, + TRUE, + G_PRIORITY_DEFAULT, + gth_task_get_cancellable (GTH_TASK (self)), + write_file_ready_cb, + self); } @@ -137,11 +137,11 @@ } file = self->priv->current->data; - g_load_file_async (file, - G_PRIORITY_DEFAULT, - gth_task_get_cancellable (GTH_TASK (self)), - load_file_ready_cb, - self); + _g_file_load_async (file, + G_PRIORITY_DEFAULT, + gth_task_get_cancellable (GTH_TASK (self)), + load_file_ready_cb, + self); } diff -Nru gthumb-3.0.2/extensions/exiv2_tools/Makefile.in gthumb-3.2.3/extensions/exiv2_tools/Makefile.in --- gthumb-3.0.2/extensions/exiv2_tools/Makefile.in 2012-08-20 19:54:12.000000000 +0000 +++ gthumb-3.2.3/extensions/exiv2_tools/Makefile.in 2013-07-10 13:33:45.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/exiv2_tools -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -170,13 +198,14 @@ am__v_CXXLD_1 = SOURCES = $(libexiv2_tools_la_SOURCES) DIST_SOURCES = $(am__libexiv2_tools_la_SOURCES_DIST) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -185,9 +214,29 @@ DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = data @@ -246,9 +295,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -262,13 +309,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -297,7 +343,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -313,11 +362,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -334,7 +387,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -364,7 +416,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -476,6 +531,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -510,6 +566,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libexiv2_tools.la: $(libexiv2_tools_la_OBJECTS) $(libexiv2_tools_la_DEPENDENCIES) $(EXTRA_libexiv2_tools_la_DEPENDENCIES) $(AM_V_CXXLD)$(libexiv2_tools_la_LINK) $(am_libexiv2_tools_la_rpath) $(libexiv2_tools_la_OBJECTS) $(libexiv2_tools_la_LIBADD) $(LIBS) @@ -529,14 +586,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -627,14 +684,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -655,31 +711,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -695,12 +733,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -712,15 +745,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -729,9 +758,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -913,25 +943,23 @@ uninstall-am: uninstall-extensionLTLIBRARIES \ uninstall-extensioniniDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-extensionLTLIBRARIES \ - clean-generic clean-libtool cscopelist cscopelist-recursive \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extensionLTLIBRARIES \ - install-extensioniniDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-extensionLTLIBRARIES clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-extensionLTLIBRARIES install-extensioniniDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA diff -Nru gthumb-3.0.2/extensions/exiv2_tools/data/Makefile.in gthumb-3.2.3/extensions/exiv2_tools/data/Makefile.in --- gthumb-3.0.2/extensions/exiv2_tools/data/Makefile.in 2012-08-20 19:54:12.000000000 +0000 +++ gthumb-3.2.3/extensions/exiv2_tools/data/Makefile.in 2013-07-10 13:33:45.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/exiv2_tools/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/exiv2_tools/data/ui/Makefile.in gthumb-3.2.3/extensions/exiv2_tools/data/ui/Makefile.in --- gthumb-3.0.2/extensions/exiv2_tools/data/ui/Makefile.in 2012-08-20 19:54:12.000000000 +0000 +++ gthumb-3.2.3/extensions/exiv2_tools/data/ui/Makefile.in 2013-07-10 13:33:45.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/exiv2_tools/data/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -381,11 +415,9 @@ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -526,16 +558,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-uiDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-uiDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/exiv2_tools/exiv2-utils.cpp gthumb-3.2.3/extensions/exiv2_tools/exiv2-utils.cpp --- gthumb-3.0.2/extensions/exiv2_tools/exiv2-utils.cpp 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/exiv2_tools/exiv2-utils.cpp 2013-04-30 16:56:12.000000000 +0000 @@ -542,12 +542,10 @@ } -static void -set_attributes_from_tagsets (GFileInfo *info) +extern "C" +void +exiv2_update_general_attributes (GFileInfo *info) { - clear_studip_comments_from_tagset (info, _DESCRIPTION_TAG_NAMES); - clear_studip_comments_from_tagset (info, _TITLE_TAG_NAMES); - set_attribute_from_tagset (info, "general::datetime", _ORIGINAL_DATE_TAG_NAMES); set_attribute_from_tagset (info, "general::description", _DESCRIPTION_TAG_NAMES); set_attribute_from_tagset (info, "general::title", _TITLE_TAG_NAMES); @@ -574,6 +572,19 @@ set_attribute_from_tagset (info, "general::location", _LOCATION_TAG_NAMES); set_string_list_attribute_from_tagset (info, "general::tags", _KEYWORDS_TAG_NAMES); set_attribute_from_tagset (info, "general::rating", _RATING_TAG_NAMES); +} + + +static void +set_attributes_from_tagsets (GFileInfo *info, + gboolean update_general_attributes) +{ + clear_studip_comments_from_tagset (info, _DESCRIPTION_TAG_NAMES); + clear_studip_comments_from_tagset (info, _TITLE_TAG_NAMES); + + if (update_general_attributes) + exiv2_update_general_attributes (info); + set_attribute_from_tagset (info, "Embedded::Photo::DateTimeOriginal", _ORIGINAL_DATE_TAG_NAMES); set_attribute_from_tagset (info, "Embedded::Image::Orientation", _ORIENTATION_TAG_NAMES); } @@ -602,7 +613,8 @@ static void exiv2_read_metadata (Exiv2::Image::AutoPtr image, - GFileInfo *info) + GFileInfo *info, + gboolean update_general_attributes) { image->readMetadata(); @@ -659,9 +671,10 @@ raw_value.str().c_str(), "Iptc", md->typeName()); - - add_metadata_to_hash (table, metadata); - _g_object_unref (metadata); + if (metadata != NULL) { + add_metadata_to_hash (table, metadata); + g_object_unref (metadata); + } } set_file_info_from_hash (info, table); @@ -690,22 +703,23 @@ raw_value.str().c_str(), "Xmp::Embedded", md->typeName()); + if (metadata != NULL) { + if ((g_strcmp0 (md->typeName(), "XmpBag") == 0) + || (g_strcmp0 (md->typeName(), "XmpSeq") == 0)) + { + add_string_list_to_metadata (metadata, *md); + } - if ((g_strcmp0 (md->typeName(), "XmpBag") == 0) - || (g_strcmp0 (md->typeName(), "XmpSeq") == 0)) - { - add_string_list_to_metadata (metadata, *md); + add_metadata_to_hash (table, metadata); + g_object_unref (metadata); } - - add_metadata_to_hash (table, metadata); - _g_object_unref (metadata); } set_file_info_from_hash (info, table); g_hash_table_unref (table); } - set_attributes_from_tagsets (info); + set_attributes_from_tagsets (info, update_general_attributes); } @@ -719,6 +733,7 @@ gboolean exiv2_read_metadata_from_file (GFile *file, GFileInfo *info, + gboolean update_general_attributes, GCancellable *cancellable, GError **error) { @@ -742,7 +757,7 @@ } // Set the log level to only show errors (and suppress warnings, informational and debug messages) Exiv2::LogMsg::setLevel(Exiv2::LogMsg::error); - exiv2_read_metadata (image, info); + exiv2_read_metadata (image, info, update_general_attributes); } catch (Exiv2::AnyError& e) { if (error != NULL) @@ -759,6 +774,7 @@ exiv2_read_metadata_from_buffer (void *buffer, gsize buffer_size, GFileInfo *info, + gboolean update_general_attributes, GError **error) { try { @@ -770,7 +786,7 @@ return FALSE; } - exiv2_read_metadata (image, info); + exiv2_read_metadata (image, info, update_general_attributes); } catch (Exiv2::AnyError& e) { if (error != NULL) @@ -807,7 +823,8 @@ extern "C" gboolean exiv2_read_sidecar (GFile *file, - GFileInfo *info) + GFileInfo *info, + gboolean update_general_attributes) { try { char *path; @@ -847,15 +864,16 @@ raw_value.str().c_str(), "Xmp::Sidecar", md->typeName()); + if (metadata != NULL) { + if ((g_strcmp0 (md->typeName(), "XmpBag") == 0) + || (g_strcmp0 (md->typeName(), "XmpSeq") == 0)) + { + add_string_list_to_metadata (metadata, *md); + } - if ((g_strcmp0 (md->typeName(), "XmpBag") == 0) - || (g_strcmp0 (md->typeName(), "XmpSeq") == 0)) - { - add_string_list_to_metadata (metadata, *md); + add_metadata_to_hash (table, metadata); + g_object_unref (metadata); } - - add_metadata_to_hash (table, metadata); - _g_object_unref (metadata); } set_file_info_from_hash (info, table); @@ -863,7 +881,7 @@ } Exiv2::XmpParser::terminate(); - set_attributes_from_tagsets (info); + set_attributes_from_tagsets (info, update_general_attributes); } catch (Exiv2::AnyError& e) { std::cerr << "Caught Exiv2 exception '" << e << "'\n"; @@ -957,7 +975,7 @@ static Exiv2::DataBuf exiv2_write_metadata_private (Exiv2::Image::AutoPtr image, GFileInfo *info, - GdkPixbuf *pixbuf) + GthImage *image_data) { static char *software_name = NULL; char **attributes; @@ -1028,17 +1046,25 @@ // Update the dimension tags with actual image values + cairo_surface_t *surface = NULL; int width = 0; int height = 0; - if (pixbuf != NULL) { - width = gdk_pixbuf_get_width (pixbuf); - if (width > 0) + if (image_data != NULL) + surface = gth_image_get_cairo_surface (image_data); + + if (surface != NULL) { + width = cairo_image_surface_get_width (surface); + if (width > 0) { ed["Exif.Photo.PixelXDimension"] = width; + ed["Exif.Image.ImageWidth"] = width; + } - height = gdk_pixbuf_get_height (pixbuf); - if (height > 0) + height = cairo_image_surface_get_height (surface); + if (height > 0) { ed["Exif.Photo.PixelYDimension"] = height; + ed["Exif.Image.ImageLength"] = height; + } ed["Exif.Image.Orientation"] = 1; } @@ -1046,15 +1072,24 @@ // Update the thumbnail Exiv2::ExifThumb thumb(ed); - if ((pixbuf != NULL) && (width > 0) && (height > 0)) { - GdkPixbuf *thumb_pixbuf; - char *buffer; - gsize buffer_size; + if ((surface != NULL) && (width > 0) && (height > 0)) { + cairo_surface_t *thumbnail; + GthImage *thumbnail_data; + char *buffer; + gsize buffer_size; scale_keeping_ratio (&width, &height, 128, 128, FALSE); - thumb_pixbuf = _gdk_pixbuf_scale_simple_safe (pixbuf, width, height, GDK_INTERP_BILINEAR); - if (gdk_pixbuf_save_to_buffer (thumb_pixbuf, &buffer, &buffer_size, "jpeg", NULL, NULL)) { - thumb.setJpegThumbnail ((Exiv2::byte*) buffer, buffer_size); + thumbnail = _cairo_image_surface_scale (surface, width, height, SCALE_FILTER_BEST, NULL); + thumbnail_data = gth_image_new_for_surface (thumbnail); + if (gth_image_save_to_buffer (thumbnail_data, + "image/jpeg", + NULL, + &buffer, + &buffer_size, + NULL, + NULL)) + { + thumb.setJpegThumbnail ((Exiv2::byte *) buffer, buffer_size); ed["Exif.Thumbnail.XResolution"] = 72; ed["Exif.Thumbnail.YResolution"] = 72; ed["Exif.Thumbnail.ResolutionUnit"] = 2; @@ -1063,11 +1098,15 @@ else thumb.erase(); - g_object_unref (thumb_pixbuf); + g_object_unref (thumbnail_data); + cairo_surface_destroy (thumbnail); } else thumb.erase(); + if (surface != NULL) + cairo_surface_destroy (surface); + // Update the DateTime tag if (g_file_info_get_attribute_object (info, "Exif::Image::DateTime") == NULL) { @@ -1214,14 +1253,14 @@ extern "C" gboolean -exiv2_write_metadata (SavePixbufData *data) +exiv2_write_metadata (GthImageSaveData *data) { - if (exiv2_supports_writes (data->mime_type)) { + if (exiv2_supports_writes (data->mime_type) && (data->file_data != NULL)) { try { Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open ((Exiv2::byte*) data->buffer, data->buffer_size); g_assert (image.get() != 0); - Exiv2::DataBuf buf = exiv2_write_metadata_private (image, data->file_data->info, data->pixbuf); + Exiv2::DataBuf buf = exiv2_write_metadata_private (image, data->file_data->info, data->image); g_free (data->buffer); data->buffer = g_memdup (buf.pData_, buf.size_); @@ -1244,14 +1283,14 @@ exiv2_write_metadata_to_buffer (void **buffer, gsize *buffer_size, GFileInfo *info, - GdkPixbuf *pixbuf, + GthImage *image_data, GError **error) { try { Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open ((Exiv2::byte*) *buffer, *buffer_size); g_assert (image.get() != 0); - Exiv2::DataBuf buf = exiv2_write_metadata_private (image, info, pixbuf); + Exiv2::DataBuf buf = exiv2_write_metadata_private (image, info, image_data); g_free (*buffer); *buffer = g_memdup (buf.pData_, buf.size_); @@ -1366,7 +1405,7 @@ double ratio_delta = (image_ratio > thumbnail_ratio) ? (image_ratio - thumbnail_ratio) : (thumbnail_ratio - image_ratio); if ((ratio_delta > MAX_RATIO_ERROR_TOLERANCE) /* the tolerance is used because the reduced image can have a slightly different ratio due to rounding errors */ - || (MAX (pixbuf_width, pixbuf_height) < (requested_size * 0.90))) /* ignore the embedded image if it's too small compared to the requested size */ + || (MAX (pixbuf_width, pixbuf_height) < requested_size)) /* ignore the embedded image if it's too small compared to the requested size */ { g_object_unref (pixbuf); return NULL; @@ -1381,7 +1420,7 @@ TRUE)) { GdkPixbuf *tmp = pixbuf; - pixbuf = gdk_pixbuf_scale_simple (tmp, pixbuf_width, pixbuf_height, GDK_INTERP_BILINEAR); + pixbuf = _gdk_pixbuf_scale_simple_safe (tmp, pixbuf_width, pixbuf_height, GDK_INTERP_BILINEAR); g_object_unref (tmp); } diff -Nru gthumb-3.0.2/extensions/exiv2_tools/exiv2-utils.h gthumb-3.2.3/extensions/exiv2_tools/exiv2-utils.h --- gthumb-3.0.2/extensions/exiv2_tools/exiv2-utils.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/exiv2_tools/exiv2-utils.h 2013-04-30 16:56:12.000000000 +0000 @@ -36,30 +36,34 @@ extern const char *_KEYWORDS_TAG_NAMES[]; extern const char *_RATING_TAG_NAMES[]; -gboolean exiv2_read_metadata_from_file (GFile *file, - GFileInfo *info, - GCancellable *cancellable, - GError **error); -gboolean exiv2_read_metadata_from_buffer (void *buffer, - gsize buffer_size, - GFileInfo *info, - GError **error); -GFile * exiv2_get_sidecar (GFile *file); -gboolean exiv2_read_sidecar (GFile *file, - GFileInfo *info); -gboolean exiv2_supports_writes (const char *mime_type); -gboolean exiv2_write_metadata (SavePixbufData *data); -gboolean exiv2_write_metadata_to_buffer (void **buffer, - gsize *buffer_size, - GFileInfo *info, - GdkPixbuf *pixbuf, /* optional */ - GError **error); -gboolean exiv2_clear_metadata (void **buffer, - gsize *buffer_size, - GError **error); -GdkPixbuf *exiv2_generate_thumbnail (const char *uri, - const char *mime_type, - int size); +gboolean exiv2_read_metadata_from_file (GFile *file, + GFileInfo *info, + gboolean update_general_attributes, + GCancellable *cancellable, + GError **error); +gboolean exiv2_read_metadata_from_buffer (void *buffer, + gsize buffer_size, + GFileInfo *info, + gboolean update_general_attributes, + GError **error); +GFile * exiv2_get_sidecar (GFile *file); +gboolean exiv2_read_sidecar (GFile *file, + GFileInfo *info, + gboolean update_general_attributes); +void exiv2_update_general_attributes (GFileInfo *info); +gboolean exiv2_supports_writes (const char *mime_type); +gboolean exiv2_write_metadata (GthImageSaveData *data); +gboolean exiv2_write_metadata_to_buffer (void **buffer, + gsize *buffer_size, + GFileInfo *info, + GthImage *image_data, /* optional */ + GError **error); +gboolean exiv2_clear_metadata (void **buffer, + gsize *buffer_size, + GError **error); +GdkPixbuf *exiv2_generate_thumbnail (const char *uri, + const char *mime_type, + int size); G_END_DECLS diff -Nru gthumb-3.0.2/extensions/exiv2_tools/gth-metadata-provider-exiv2.c gthumb-3.2.3/extensions/exiv2_tools/gth-metadata-provider-exiv2.c --- gthumb-3.0.2/extensions/exiv2_tools/gth-metadata-provider-exiv2.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/exiv2_tools/gth-metadata-provider-exiv2.c 2013-04-30 16:56:12.000000000 +0000 @@ -94,21 +94,34 @@ static void -gth_metadata_provider_exiv2_read (GthMetadataProvider *self, +gth_metadata_provider_exiv2_read (GthMetadataProvider *base, GthFileData *file_data, const char *attributes, GCancellable *cancellable) { - GFile *sidecar; - GthFileData *sidecar_file_data; + GthMetadataProviderExiv2 *self = GTH_METADATA_PROVIDER_EXIV2 (base); + GFile *sidecar; + GthFileData *sidecar_file_data; + gboolean update_general_attributes; if (! g_content_type_is_a (gth_file_data_get_mime_type (file_data), "image/*")) return; + /* The embedded metadata is likely to be outdated if the user chooses to + * not store metadata in files. */ + + if (self->priv->general_settings == NULL) + self->priv->general_settings = g_settings_new (GTHUMB_GENERAL_SCHEMA); + update_general_attributes = g_settings_get_boolean (self->priv->general_settings, PREF_GENERAL_STORE_METADATA_IN_FILES); + /* this function is executed in a secondary thread, so calling * slow sync functions is not a problem. */ - exiv2_read_metadata_from_file (file_data->file, file_data->info, cancellable, NULL); + exiv2_read_metadata_from_file (file_data->file, + file_data->info, + update_general_attributes, + cancellable, + NULL); /* sidecar data */ @@ -117,7 +130,9 @@ if (g_file_query_exists (sidecar_file_data->file, cancellable)) { gth_file_data_update_info (sidecar_file_data, "time::*"); if (g_file_query_exists (sidecar_file_data->file, cancellable)) - exiv2_read_sidecar (sidecar_file_data->file, file_data->info); + exiv2_read_sidecar (sidecar_file_data->file, + file_data->info, + update_general_attributes); } g_object_unref (sidecar_file_data); @@ -142,13 +157,14 @@ if (self->priv->general_settings == NULL) self->priv->general_settings = g_settings_new (GTHUMB_GENERAL_SCHEMA); - if (! (flags & GTH_METADATA_WRITE_FORCE_EMBEDDED) && ! g_settings_get_boolean (self->priv->general_settings, PREF_GENERAL_STORE_METADATA_IN_FILES)) + if (! (flags & GTH_METADATA_WRITE_FORCE_EMBEDDED) + && ! g_settings_get_boolean (self->priv->general_settings, PREF_GENERAL_STORE_METADATA_IN_FILES)) return; if (! exiv2_supports_writes (gth_file_data_get_mime_type (file_data))) return; - if (! g_load_file_in_buffer (file_data->file, &buffer, &size, cancellable, &error)) + if (! _g_file_load_in_buffer (file_data->file, &buffer, &size, cancellable, &error)) return; metadata = g_file_info_get_attribute_object (file_data->info, "general::description"); @@ -284,13 +300,13 @@ { GFileInfo *tmp_info; - g_write_file (file_data->file, - FALSE, - G_FILE_CREATE_NONE, - buffer, - size, - cancellable, - &error); + _g_file_write (file_data->file, + FALSE, + G_FILE_CREATE_NONE, + buffer, + size, + cancellable, + &error); tmp_info = g_file_info_new (); g_file_info_set_attribute_uint64 (tmp_info, diff -Nru gthumb-3.0.2/extensions/exiv2_tools/main.c gthumb-3.2.3/extensions/exiv2_tools/main.c --- gthumb-3.0.2/extensions/exiv2_tools/main.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/exiv2_tools/main.c 2013-04-30 16:56:12.000000000 +0000 @@ -204,7 +204,12 @@ GFileInfo *info; info = g_file_info_new (); - if (exiv2_read_metadata_from_buffer (tran_info->in_buffer, tran_info->in_buffer_size, info, NULL)) { + if (exiv2_read_metadata_from_buffer (tran_info->in_buffer, + tran_info->in_buffer_size, + info, + FALSE, + NULL)) + { GthMetadata *metadata; update_exif_dimensions (info, tran_info->transformation); @@ -235,6 +240,7 @@ { GTimeVal *pta, *ptb; GTimeVal ta, tb; + int result; pta = NULL; if (gth_file_data_get_digitalization_time (a, &ta)) @@ -248,7 +254,17 @@ if (ptb == NULL) ptb = gth_file_data_get_modification_time (b); - return _g_time_val_cmp (pta, ptb); + result = _g_time_val_cmp (pta, ptb); + if (result == 0) { + const char *key_a, *key_b; + + key_a = gth_file_data_get_filename_sort_key (a); + key_b = gth_file_data_get_filename_sort_key (b); + + result = strcmp (key_a, key_b); + } + + return result; } @@ -279,7 +295,7 @@ gth_main_register_type ("edit-comment-dialog-page", GTH_TYPE_EDIT_IPTC_PAGE); gth_hook_add_callback ("delete-metadata", 10, G_CALLBACK (exiv2_delete_metadata_cb), NULL); } - gth_hook_add_callback ("save-pixbuf", 10, G_CALLBACK (exiv2_write_metadata), NULL); + gth_hook_add_callback ("save-image", 10, G_CALLBACK (exiv2_write_metadata), NULL); if (gth_hook_present ("jpegtran-after")) gth_hook_add_callback ("jpegtran-after", 10, G_CALLBACK (exiv2_jpeg_tran_cb), NULL); gth_hook_add_callback ("generate-thumbnail", 10, G_CALLBACK (exiv2_generate_thumbnail), NULL); diff -Nru gthumb-3.0.2/extensions/export_tools/Makefile.in gthumb-3.2.3/extensions/export_tools/Makefile.in --- gthumb-3.0.2/extensions/export_tools/Makefile.in 2012-08-20 19:54:12.000000000 +0000 +++ gthumb-3.2.3/extensions/export_tools/Makefile.in 2013-07-10 13:33:45.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/export_tools -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -150,6 +178,23 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(extensionini_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -182,9 +227,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -198,13 +241,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -233,7 +275,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -249,11 +294,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -270,7 +319,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -300,7 +348,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -407,6 +458,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -441,6 +493,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libexport_tools.la: $(libexport_tools_la_OBJECTS) $(libexport_tools_la_DEPENDENCIES) $(EXTRA_libexport_tools_la_DEPENDENCIES) $(AM_V_CCLD)$(libexport_tools_la_LINK) -rpath $(extensiondir) $(libexport_tools_la_OBJECTS) $(libexport_tools_la_LIBADD) $(LIBS) @@ -458,14 +511,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -515,26 +568,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(extensioninidir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -546,15 +588,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -563,9 +601,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -723,21 +762,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ clean-extensionLTLIBRARIES clean-generic clean-libtool \ - cscopelist ctags distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-extensionLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-extensionLTLIBRARIES \ install-extensioniniDATA install-html install-html-am \ install-info install-info-am install-man install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-extensionLTLIBRARIES \ - uninstall-extensioniniDATA + tags tags-am uninstall uninstall-am \ + uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA @GTHUMB_EXTENSION_IN_RULE@ diff -Nru gthumb-3.0.2/extensions/facebook/Makefile.am gthumb-3.2.3/extensions/facebook/Makefile.am --- gthumb-3.0.2/extensions/facebook/Makefile.am 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/Makefile.am 2013-04-30 16:56:12.000000000 +0000 @@ -12,33 +12,23 @@ callbacks.h \ dlg-export-to-facebook.c \ dlg-export-to-facebook.h \ - facebook-account.c \ - facebook-account.h \ - facebook-account-chooser-dialog.c \ - facebook-account-chooser-dialog.h \ - facebook-account-manager-dialog.c \ - facebook-account-manager-dialog.h \ + dlg-import-from-facebook.c \ + dlg-import-from-facebook.h \ facebook-album.c \ facebook-album.h \ facebook-album-properties-dialog.c \ facebook-album-properties-dialog.h \ - facebook-authentication.c \ - facebook-authentication.h \ - facebook-connection.c \ - facebook-connection.h \ facebook-photo.c \ facebook-photo.h \ facebook-service.c \ facebook-service.h \ facebook-types.h \ - facebook-user.c \ - facebook-user.h \ main.c \ preferences.h -libfacebook_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(GNOME_KEYRING_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb +libfacebook_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(LIBSECRET_CFLAGS) $(WEBKIT2_CFLAGS) $(JSON_GLIB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb libfacebook_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -libfacebook_la_LIBADD = $(GTHUMB_LIBS) $(LIBSOUP_LIBS) $(GNOME_KEYRING_LIBS) ../export_tools/libexport_tools.la +libfacebook_la_LIBADD = $(GTHUMB_LIBS) $(LIBSOUP_LIBS) $(LIBSECRET_LIBS) $(WEBKIT2_LIBS) $(JSON_GLIB_LIBS) ../export_tools/libexport_tools.la ../oauth/liboauth.la ../importer/libimporter.la libfacebook_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) extensioninidir = $(extensiondir) diff -Nru gthumb-3.0.2/extensions/facebook/Makefile.in gthumb-3.2.3/extensions/facebook/Makefile.in --- gthumb-3.0.2/extensions/facebook/Makefile.in 2012-08-20 19:54:12.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/Makefile.in 2013-07-10 13:33:45.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/facebook -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -99,31 +127,21 @@ am__DEPENDENCIES_1 = am__libfacebook_la_SOURCES_DIST = actions.c actions.h callbacks.c \ callbacks.h dlg-export-to-facebook.c dlg-export-to-facebook.h \ - facebook-account.c facebook-account.h \ - facebook-account-chooser-dialog.c \ - facebook-account-chooser-dialog.h \ - facebook-account-manager-dialog.c \ - facebook-account-manager-dialog.h facebook-album.c \ - facebook-album.h facebook-album-properties-dialog.c \ - facebook-album-properties-dialog.h facebook-authentication.c \ - facebook-authentication.h facebook-connection.c \ - facebook-connection.h facebook-photo.c facebook-photo.h \ - facebook-service.c facebook-service.h facebook-types.h \ - facebook-user.c facebook-user.h main.c preferences.h + dlg-import-from-facebook.c dlg-import-from-facebook.h \ + facebook-album.c facebook-album.h \ + facebook-album-properties-dialog.c \ + facebook-album-properties-dialog.h facebook-photo.c \ + facebook-photo.h facebook-service.c facebook-service.h \ + facebook-types.h main.c preferences.h @ENABLE_WEB_SERVICES_TRUE@am_libfacebook_la_OBJECTS = \ @ENABLE_WEB_SERVICES_TRUE@ libfacebook_la-actions.lo \ @ENABLE_WEB_SERVICES_TRUE@ libfacebook_la-callbacks.lo \ @ENABLE_WEB_SERVICES_TRUE@ libfacebook_la-dlg-export-to-facebook.lo \ -@ENABLE_WEB_SERVICES_TRUE@ libfacebook_la-facebook-account.lo \ -@ENABLE_WEB_SERVICES_TRUE@ libfacebook_la-facebook-account-chooser-dialog.lo \ -@ENABLE_WEB_SERVICES_TRUE@ libfacebook_la-facebook-account-manager-dialog.lo \ +@ENABLE_WEB_SERVICES_TRUE@ libfacebook_la-dlg-import-from-facebook.lo \ @ENABLE_WEB_SERVICES_TRUE@ libfacebook_la-facebook-album.lo \ @ENABLE_WEB_SERVICES_TRUE@ libfacebook_la-facebook-album-properties-dialog.lo \ -@ENABLE_WEB_SERVICES_TRUE@ libfacebook_la-facebook-authentication.lo \ -@ENABLE_WEB_SERVICES_TRUE@ libfacebook_la-facebook-connection.lo \ @ENABLE_WEB_SERVICES_TRUE@ libfacebook_la-facebook-photo.lo \ @ENABLE_WEB_SERVICES_TRUE@ libfacebook_la-facebook-service.lo \ -@ENABLE_WEB_SERVICES_TRUE@ libfacebook_la-facebook-user.lo \ @ENABLE_WEB_SERVICES_TRUE@ libfacebook_la-main.lo libfacebook_la_OBJECTS = $(am_libfacebook_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) @@ -172,13 +190,14 @@ am__v_CCLD_1 = SOURCES = $(libfacebook_la_SOURCES) DIST_SOURCES = $(am__libfacebook_la_SOURCES_DIST) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -187,9 +206,29 @@ DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = data @@ -248,9 +287,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -264,13 +301,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -299,7 +335,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -315,11 +354,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -336,7 +379,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -366,7 +408,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -433,33 +478,23 @@ @ENABLE_WEB_SERVICES_TRUE@ callbacks.h \ @ENABLE_WEB_SERVICES_TRUE@ dlg-export-to-facebook.c \ @ENABLE_WEB_SERVICES_TRUE@ dlg-export-to-facebook.h \ -@ENABLE_WEB_SERVICES_TRUE@ facebook-account.c \ -@ENABLE_WEB_SERVICES_TRUE@ facebook-account.h \ -@ENABLE_WEB_SERVICES_TRUE@ facebook-account-chooser-dialog.c \ -@ENABLE_WEB_SERVICES_TRUE@ facebook-account-chooser-dialog.h \ -@ENABLE_WEB_SERVICES_TRUE@ facebook-account-manager-dialog.c \ -@ENABLE_WEB_SERVICES_TRUE@ facebook-account-manager-dialog.h \ +@ENABLE_WEB_SERVICES_TRUE@ dlg-import-from-facebook.c \ +@ENABLE_WEB_SERVICES_TRUE@ dlg-import-from-facebook.h \ @ENABLE_WEB_SERVICES_TRUE@ facebook-album.c \ @ENABLE_WEB_SERVICES_TRUE@ facebook-album.h \ @ENABLE_WEB_SERVICES_TRUE@ facebook-album-properties-dialog.c \ @ENABLE_WEB_SERVICES_TRUE@ facebook-album-properties-dialog.h \ -@ENABLE_WEB_SERVICES_TRUE@ facebook-authentication.c \ -@ENABLE_WEB_SERVICES_TRUE@ facebook-authentication.h \ -@ENABLE_WEB_SERVICES_TRUE@ facebook-connection.c \ -@ENABLE_WEB_SERVICES_TRUE@ facebook-connection.h \ @ENABLE_WEB_SERVICES_TRUE@ facebook-photo.c \ @ENABLE_WEB_SERVICES_TRUE@ facebook-photo.h \ @ENABLE_WEB_SERVICES_TRUE@ facebook-service.c \ @ENABLE_WEB_SERVICES_TRUE@ facebook-service.h \ @ENABLE_WEB_SERVICES_TRUE@ facebook-types.h \ -@ENABLE_WEB_SERVICES_TRUE@ facebook-user.c \ -@ENABLE_WEB_SERVICES_TRUE@ facebook-user.h \ @ENABLE_WEB_SERVICES_TRUE@ main.c \ @ENABLE_WEB_SERVICES_TRUE@ preferences.h -@ENABLE_WEB_SERVICES_TRUE@libfacebook_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(GNOME_KEYRING_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb +@ENABLE_WEB_SERVICES_TRUE@libfacebook_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(LIBSECRET_CFLAGS) $(WEBKIT2_CFLAGS) $(JSON_GLIB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb @ENABLE_WEB_SERVICES_TRUE@libfacebook_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -@ENABLE_WEB_SERVICES_TRUE@libfacebook_la_LIBADD = $(GTHUMB_LIBS) $(LIBSOUP_LIBS) $(GNOME_KEYRING_LIBS) ../export_tools/libexport_tools.la +@ENABLE_WEB_SERVICES_TRUE@libfacebook_la_LIBADD = $(GTHUMB_LIBS) $(LIBSOUP_LIBS) $(LIBSECRET_LIBS) $(WEBKIT2_LIBS) $(JSON_GLIB_LIBS) ../export_tools/libexport_tools.la ../oauth/liboauth.la ../importer/libimporter.la @ENABLE_WEB_SERVICES_TRUE@libfacebook_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) @ENABLE_WEB_SERVICES_TRUE@extensioninidir = $(extensiondir) @ENABLE_WEB_SERVICES_TRUE@extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension) @@ -500,6 +535,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -534,6 +570,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libfacebook.la: $(libfacebook_la_OBJECTS) $(libfacebook_la_DEPENDENCIES) $(EXTRA_libfacebook_la_DEPENDENCIES) $(AM_V_CCLD)$(libfacebook_la_LINK) $(am_libfacebook_la_rpath) $(libfacebook_la_OBJECTS) $(libfacebook_la_LIBADD) $(LIBS) @@ -546,16 +583,11 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfacebook_la-actions.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfacebook_la-callbacks.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfacebook_la-dlg-export-to-facebook.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfacebook_la-facebook-account-chooser-dialog.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfacebook_la-facebook-account-manager-dialog.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfacebook_la-facebook-account.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfacebook_la-dlg-import-from-facebook.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfacebook_la-facebook-album-properties-dialog.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfacebook_la-facebook-album.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfacebook_la-facebook-authentication.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfacebook_la-facebook-connection.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfacebook_la-facebook-photo.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfacebook_la-facebook-service.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfacebook_la-facebook-user.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfacebook_la-main.Plo@am__quote@ .c.o: @@ -563,14 +595,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -600,26 +632,12 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfacebook_la_CFLAGS) $(CFLAGS) -c -o libfacebook_la-dlg-export-to-facebook.lo `test -f 'dlg-export-to-facebook.c' || echo '$(srcdir)/'`dlg-export-to-facebook.c -libfacebook_la-facebook-account.lo: facebook-account.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfacebook_la_CFLAGS) $(CFLAGS) -MT libfacebook_la-facebook-account.lo -MD -MP -MF $(DEPDIR)/libfacebook_la-facebook-account.Tpo -c -o libfacebook_la-facebook-account.lo `test -f 'facebook-account.c' || echo '$(srcdir)/'`facebook-account.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfacebook_la-facebook-account.Tpo $(DEPDIR)/libfacebook_la-facebook-account.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='facebook-account.c' object='libfacebook_la-facebook-account.lo' libtool=yes @AMDEPBACKSLASH@ +libfacebook_la-dlg-import-from-facebook.lo: dlg-import-from-facebook.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfacebook_la_CFLAGS) $(CFLAGS) -MT libfacebook_la-dlg-import-from-facebook.lo -MD -MP -MF $(DEPDIR)/libfacebook_la-dlg-import-from-facebook.Tpo -c -o libfacebook_la-dlg-import-from-facebook.lo `test -f 'dlg-import-from-facebook.c' || echo '$(srcdir)/'`dlg-import-from-facebook.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfacebook_la-dlg-import-from-facebook.Tpo $(DEPDIR)/libfacebook_la-dlg-import-from-facebook.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dlg-import-from-facebook.c' object='libfacebook_la-dlg-import-from-facebook.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfacebook_la_CFLAGS) $(CFLAGS) -c -o libfacebook_la-facebook-account.lo `test -f 'facebook-account.c' || echo '$(srcdir)/'`facebook-account.c - -libfacebook_la-facebook-account-chooser-dialog.lo: facebook-account-chooser-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfacebook_la_CFLAGS) $(CFLAGS) -MT libfacebook_la-facebook-account-chooser-dialog.lo -MD -MP -MF $(DEPDIR)/libfacebook_la-facebook-account-chooser-dialog.Tpo -c -o libfacebook_la-facebook-account-chooser-dialog.lo `test -f 'facebook-account-chooser-dialog.c' || echo '$(srcdir)/'`facebook-account-chooser-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfacebook_la-facebook-account-chooser-dialog.Tpo $(DEPDIR)/libfacebook_la-facebook-account-chooser-dialog.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='facebook-account-chooser-dialog.c' object='libfacebook_la-facebook-account-chooser-dialog.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfacebook_la_CFLAGS) $(CFLAGS) -c -o libfacebook_la-facebook-account-chooser-dialog.lo `test -f 'facebook-account-chooser-dialog.c' || echo '$(srcdir)/'`facebook-account-chooser-dialog.c - -libfacebook_la-facebook-account-manager-dialog.lo: facebook-account-manager-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfacebook_la_CFLAGS) $(CFLAGS) -MT libfacebook_la-facebook-account-manager-dialog.lo -MD -MP -MF $(DEPDIR)/libfacebook_la-facebook-account-manager-dialog.Tpo -c -o libfacebook_la-facebook-account-manager-dialog.lo `test -f 'facebook-account-manager-dialog.c' || echo '$(srcdir)/'`facebook-account-manager-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfacebook_la-facebook-account-manager-dialog.Tpo $(DEPDIR)/libfacebook_la-facebook-account-manager-dialog.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='facebook-account-manager-dialog.c' object='libfacebook_la-facebook-account-manager-dialog.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfacebook_la_CFLAGS) $(CFLAGS) -c -o libfacebook_la-facebook-account-manager-dialog.lo `test -f 'facebook-account-manager-dialog.c' || echo '$(srcdir)/'`facebook-account-manager-dialog.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfacebook_la_CFLAGS) $(CFLAGS) -c -o libfacebook_la-dlg-import-from-facebook.lo `test -f 'dlg-import-from-facebook.c' || echo '$(srcdir)/'`dlg-import-from-facebook.c libfacebook_la-facebook-album.lo: facebook-album.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfacebook_la_CFLAGS) $(CFLAGS) -MT libfacebook_la-facebook-album.lo -MD -MP -MF $(DEPDIR)/libfacebook_la-facebook-album.Tpo -c -o libfacebook_la-facebook-album.lo `test -f 'facebook-album.c' || echo '$(srcdir)/'`facebook-album.c @@ -635,20 +653,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfacebook_la_CFLAGS) $(CFLAGS) -c -o libfacebook_la-facebook-album-properties-dialog.lo `test -f 'facebook-album-properties-dialog.c' || echo '$(srcdir)/'`facebook-album-properties-dialog.c -libfacebook_la-facebook-authentication.lo: facebook-authentication.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfacebook_la_CFLAGS) $(CFLAGS) -MT libfacebook_la-facebook-authentication.lo -MD -MP -MF $(DEPDIR)/libfacebook_la-facebook-authentication.Tpo -c -o libfacebook_la-facebook-authentication.lo `test -f 'facebook-authentication.c' || echo '$(srcdir)/'`facebook-authentication.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfacebook_la-facebook-authentication.Tpo $(DEPDIR)/libfacebook_la-facebook-authentication.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='facebook-authentication.c' object='libfacebook_la-facebook-authentication.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfacebook_la_CFLAGS) $(CFLAGS) -c -o libfacebook_la-facebook-authentication.lo `test -f 'facebook-authentication.c' || echo '$(srcdir)/'`facebook-authentication.c - -libfacebook_la-facebook-connection.lo: facebook-connection.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfacebook_la_CFLAGS) $(CFLAGS) -MT libfacebook_la-facebook-connection.lo -MD -MP -MF $(DEPDIR)/libfacebook_la-facebook-connection.Tpo -c -o libfacebook_la-facebook-connection.lo `test -f 'facebook-connection.c' || echo '$(srcdir)/'`facebook-connection.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfacebook_la-facebook-connection.Tpo $(DEPDIR)/libfacebook_la-facebook-connection.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='facebook-connection.c' object='libfacebook_la-facebook-connection.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfacebook_la_CFLAGS) $(CFLAGS) -c -o libfacebook_la-facebook-connection.lo `test -f 'facebook-connection.c' || echo '$(srcdir)/'`facebook-connection.c - libfacebook_la-facebook-photo.lo: facebook-photo.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfacebook_la_CFLAGS) $(CFLAGS) -MT libfacebook_la-facebook-photo.lo -MD -MP -MF $(DEPDIR)/libfacebook_la-facebook-photo.Tpo -c -o libfacebook_la-facebook-photo.lo `test -f 'facebook-photo.c' || echo '$(srcdir)/'`facebook-photo.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfacebook_la-facebook-photo.Tpo $(DEPDIR)/libfacebook_la-facebook-photo.Plo @@ -663,13 +667,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfacebook_la_CFLAGS) $(CFLAGS) -c -o libfacebook_la-facebook-service.lo `test -f 'facebook-service.c' || echo '$(srcdir)/'`facebook-service.c -libfacebook_la-facebook-user.lo: facebook-user.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfacebook_la_CFLAGS) $(CFLAGS) -MT libfacebook_la-facebook-user.lo -MD -MP -MF $(DEPDIR)/libfacebook_la-facebook-user.Tpo -c -o libfacebook_la-facebook-user.lo `test -f 'facebook-user.c' || echo '$(srcdir)/'`facebook-user.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfacebook_la-facebook-user.Tpo $(DEPDIR)/libfacebook_la-facebook-user.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='facebook-user.c' object='libfacebook_la-facebook-user.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfacebook_la_CFLAGS) $(CFLAGS) -c -o libfacebook_la-facebook-user.lo `test -f 'facebook-user.c' || echo '$(srcdir)/'`facebook-user.c - libfacebook_la-main.lo: main.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfacebook_la_CFLAGS) $(CFLAGS) -MT libfacebook_la-main.lo -MD -MP -MF $(DEPDIR)/libfacebook_la-main.Tpo -c -o libfacebook_la-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfacebook_la-main.Tpo $(DEPDIR)/libfacebook_la-main.Plo @@ -710,14 +707,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -738,31 +734,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -778,12 +756,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -795,15 +768,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -812,9 +781,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -996,25 +966,23 @@ uninstall-am: uninstall-extensionLTLIBRARIES \ uninstall-extensioniniDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-extensionLTLIBRARIES \ - clean-generic clean-libtool cscopelist cscopelist-recursive \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extensionLTLIBRARIES \ - install-extensioniniDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-extensionLTLIBRARIES clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-extensionLTLIBRARIES install-extensioniniDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA diff -Nru gthumb-3.0.2/extensions/facebook/actions.c gthumb-3.2.3/extensions/facebook/actions.c --- gthumb-3.0.2/extensions/facebook/actions.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/actions.c 2013-04-30 16:56:12.000000000 +0000 @@ -24,6 +24,7 @@ #include #include #include "dlg-export-to-facebook.h" +#include "dlg-import-from-facebook.h" void @@ -42,3 +43,11 @@ _g_object_list_unref (file_list); _gtk_tree_path_list_free (items); } + + +void +gth_browser_activate_action_import_facebook (GtkAction *action, + GthBrowser *browser) +{ + dlg_import_from_facebook (browser); +} diff -Nru gthumb-3.0.2/extensions/facebook/actions.h gthumb-3.2.3/extensions/facebook/actions.h --- gthumb-3.0.2/extensions/facebook/actions.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/actions.h 2013-04-30 16:56:12.000000000 +0000 @@ -27,5 +27,6 @@ #define DEFINE_ACTION(x) void x (GtkAction *action, gpointer data); DEFINE_ACTION(gth_browser_activate_action_export_facebook) +DEFINE_ACTION(gth_browser_activate_action_import_facebook) #endif /* ACTIONS_H */ diff -Nru gthumb-3.0.2/extensions/facebook/callbacks.c gthumb-3.2.3/extensions/facebook/callbacks.c --- gthumb-3.0.2/extensions/facebook/callbacks.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/callbacks.c 2013-04-30 16:56:12.000000000 +0000 @@ -34,6 +34,11 @@ "" " " " " +" " +" " +" " +" " +" " " " " " " " @@ -50,6 +55,11 @@ static GthActionEntryExt action_entries[] = { + { "File_Import_Facebook", "site-facebook", + N_("Face_book..."), NULL, + N_("Download photos from Facebook"), + GTH_ACTION_FLAG_ALWAYS_SHOW_IMAGE, + G_CALLBACK (gth_browser_activate_action_import_facebook) }, { "File_Export_Facebook", "site-facebook", N_("Face_book..."), NULL, N_("Upload photos to Facebook"), diff -Nru gthumb-3.0.2/extensions/facebook/data/Makefile.in gthumb-3.2.3/extensions/facebook/data/Makefile.in --- gthumb-3.0.2/extensions/facebook/data/Makefile.in 2012-08-20 19:54:13.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/data/Makefile.in 2013-07-10 13:33:45.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/facebook/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/facebook/data/ui/Makefile.am gthumb-3.2.3/extensions/facebook/data/ui/Makefile.am --- gthumb-3.0.2/extensions/facebook/data/ui/Makefile.am 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/data/ui/Makefile.am 2013-04-30 16:56:12.000000000 +0000 @@ -1,12 +1,9 @@ uidir = $(pkgdatadir)/ui ui_DATA = \ export-to-facebook.ui \ - facebook-account-chooser.ui \ - facebook-account-manager.ui \ facebook-album-properties.ui \ - facebook-ask-authorization.ui \ - facebook-complete-authorization.ui \ - facebook-export-completed.ui + facebook-export-completed.ui \ + import-from-facebook.ui EXTRA_DIST = $(ui_DATA) diff -Nru gthumb-3.0.2/extensions/facebook/data/ui/Makefile.in gthumb-3.2.3/extensions/facebook/data/ui/Makefile.in --- gthumb-3.0.2/extensions/facebook/data/ui/Makefile.in 2012-08-20 19:54:13.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/data/ui/Makefile.in 2013-07-10 13:33:45.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/facebook/data/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -321,12 +355,9 @@ uidir = $(pkgdatadir)/ui ui_DATA = \ export-to-facebook.ui \ - facebook-account-chooser.ui \ - facebook-account-manager.ui \ facebook-album-properties.ui \ - facebook-ask-authorization.ui \ - facebook-complete-authorization.ui \ - facebook-export-completed.ui + facebook-export-completed.ui \ + import-from-facebook.ui EXTRA_DIST = $(ui_DATA) all: all-am @@ -389,11 +420,9 @@ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -534,16 +563,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-uiDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-uiDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/facebook/data/ui/export-to-facebook.ui gthumb-3.2.3/extensions/facebook/data/ui/export-to-facebook.ui --- gthumb-3.0.2/extensions/facebook/data/ui/export-to-facebook.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/data/ui/export-to-facebook.ui 2013-04-30 16:56:12.000000000 +0000 @@ -1,6 +1,6 @@ - + @@ -40,11 +40,9 @@ gtk-cancel - False True True True - False True @@ -56,11 +54,9 @@ _Upload - False True True True - False upload_image True @@ -70,23 +66,6 @@ 1 - - - gtk-help - False - True - True - True - False - True - - - False - False - 2 - True - - False @@ -136,7 +115,7 @@ True False - 3 + 2 2 6 5 @@ -144,7 +123,6 @@ True False - 6 True @@ -159,7 +137,7 @@ GTK_FILL - GTK_FILL + @@ -193,17 +171,15 @@ - False True True True Edit accounts - False True False - gtk-edit + view-list-symbolic @@ -224,7 +200,7 @@ 1 2 - GTK_FILL + @@ -239,7 +215,7 @@ 1 2 GTK_FILL - GTK_FILL + @@ -261,17 +237,15 @@ - False True True True Add a new album - False True False - gtk-add + list-add-symbolic @@ -287,23 +261,36 @@ 2 1 2 - GTK_FILL + + + + False + False + 0 + + + + + True + False + 6 True False + True + Resize the images if larger than this size Resize the images if larger than this size - _Resize to: + _Resize if larger than: True resize_combobox - 2 - 3 - GTK_FILL - GTK_FILL + False + True + 0 @@ -320,18 +307,16 @@ - 1 - 2 - 2 - 3 - GTK_FILL + False + True + 1 False - False - 0 + True + 1 @@ -353,7 +338,6 @@ close_button upload_button - button1 diff -Nru gthumb-3.0.2/extensions/facebook/data/ui/facebook-account-chooser.ui gthumb-3.2.3/extensions/facebook/data/ui/facebook-account-chooser.ui --- gthumb-3.0.2/extensions/facebook/data/ui/facebook-account-chooser.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/data/ui/facebook-account-chooser.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - True - False - 5 - 6 - - - True - False - 6 - - - True - False - 0 - A_ccount: - True - - - False - True - 0 - - - - - 300 - True - False - account_liststore - - - True - True - 1 - - - - - False - True - 0 - - - - diff -Nru gthumb-3.0.2/extensions/facebook/data/ui/facebook-account-manager.ui gthumb-3.2.3/extensions/facebook/data/ui/facebook-account-manager.ui --- gthumb-3.0.2/extensions/facebook/data/ui/facebook-account-manager.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/data/ui/facebook-account-manager.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,115 +0,0 @@ - - - - - - - - - - - - - True - False - 5 - - - True - False - 0 - A_ccounts: - True - account_treeview - - - False - True - 0 - - - - - True - False - 6 - - - 300 - 150 - True - True - in - - - True - True - accounts_liststore - False - False - True - 1 - - - - - - - - - 1 - - - - - - - - - True - True - 0 - - - - - True - False - 6 - - - False - True - True - True - False - - - True - False - gtk-delete - - - - - False - True - 0 - - - - - False - True - 1 - - - - - True - True - 1 - - - - diff -Nru gthumb-3.0.2/extensions/facebook/data/ui/facebook-album-properties.ui gthumb-3.2.3/extensions/facebook/data/ui/facebook-album-properties.ui --- gthumb-3.0.2/extensions/facebook/data/ui/facebook-album-properties.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/data/ui/facebook-album-properties.ui 2013-04-30 16:56:12.000000000 +0000 @@ -1,6 +1,6 @@ - + @@ -30,7 +30,7 @@ True False - 4 + 3 2 6 6 @@ -70,8 +70,8 @@ True - 3 - 4 + 2 + 3 GTK_FILL GTK_FILL @@ -94,7 +94,7 @@ - False + True True 0 @@ -103,47 +103,16 @@ 1 2 - 3 - 4 - GTK_FILL - - - - - True - True - ● - - - 1 - 2 2 3 GTK_FILL - - True - False - 0 - D_escription: - True - description_entry - - - 2 - 3 - GTK_FILL - - - - - 300 + True True ● - True 1 @@ -154,18 +123,17 @@ - + True False 0 - _Location: + D_escription: True - location_entry + description_entry 1 2 - GTK_FILL GTK_FILL diff -Nru gthumb-3.0.2/extensions/facebook/data/ui/facebook-ask-authorization.ui gthumb-3.2.3/extensions/facebook/data/ui/facebook-ask-authorization.ui --- gthumb-3.0.2/extensions/facebook/data/ui/facebook-ask-authorization.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/data/ui/facebook-ask-authorization.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,84 +0,0 @@ - - - - - True - False - gtk-dialog-authentication - - - False - 5 - False - True - normal - True - other - icon_image - - - True - False - vertical - 2 - - - True - False - end - - - gtk-cancel - False - True - True - True - False - True - - - False - False - 0 - - - - - _Authorize... - False - True - True - True - False - button_image - True - - - False - False - 1 - - - - - False - True - end - 0 - - - - - - cancel_button - authorize_button - - - - True - False - 0 - gtk-dialog-authentication - 6 - - diff -Nru gthumb-3.0.2/extensions/facebook/data/ui/facebook-complete-authorization.ui gthumb-3.2.3/extensions/facebook/data/ui/facebook-complete-authorization.ui --- gthumb-3.0.2/extensions/facebook/data/ui/facebook-complete-authorization.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/data/ui/facebook-complete-authorization.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,86 +0,0 @@ - - - - - True - False - gtk-dialog-authentication - - - False - 5 - False - True - normal - True - other - Once you're done, click the 'Continue' button below. - icon_image1 - - - True - False - vertical - 2 - - - True - False - end - - - gtk-cancel - False - True - True - True - False - True - 0.50999999046325684 - - - False - False - 0 - - - - - C_ontinue - False - True - True - True - False - button_image1 - True - - - False - False - 1 - - - - - False - True - end - 0 - - - - - - cancel_button1 - complete_button - - - - True - False - 0 - gtk-dialog-authentication - 6 - - diff -Nru gthumb-3.0.2/extensions/facebook/data/ui/import-from-facebook.ui gthumb-3.2.3/extensions/facebook/data/ui/import-from-facebook.ui --- gthumb-3.0.2/extensions/facebook/data/ui/import-from-facebook.ui 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/data/ui/import-from-facebook.ui 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,300 @@ + + + + + + + + + + + + + + + + + + + + + + + + + True + False + gtk-goto-bottom + + + False + 5 + Import from Picasa Web Album + dialog + + + True + False + vertical + 5 + + + True + False + end + + + gtk-cancel + True + True + True + True + + + False + False + 1 + + + + + _Import + True + True + True + download_image + True + + + False + False + 2 + + + + + False + True + end + 0 + + + + + True + False + 5 + 12 + + + True + False + 6 + + + True + False + 2 + 2 + 6 + 5 + + + True + False + 3 + + + True + False + 6 + + + 300 + True + False + account_liststore + + + + 1 + + + + + True + True + 0 + + + + + True + True + True + Edit accounts + + + True + False + view-list-symbolic + + + + + False + True + 1 + + + + + False + True + 0 + + + + + 1 + 2 + GTK_FILL + + + + + True + False + 0 + A_ccount: + True + + + GTK_FILL + GTK_FILL + + + + + True + False + 0 + _Album: + True + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + False + album_liststore + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + False + True + 0 + + + + + False + True + 0 + + + + + 460 + 250 + True + False + 3 + + + True + False + 0 + + + False + True + 0 + + + + + True + True + 1 + + + + + True + False + 6 + + + True + False + 0 + _Destination: + True + + + False + True + 0 + + + + + True + False + + + + + + True + True + 1 + + + + + False + True + 2 + + + + + True + True + 1 + + + + + + close_button + download_button + + + diff -Nru gthumb-3.0.2/extensions/facebook/dlg-export-to-facebook.c gthumb-3.2.3/extensions/facebook/dlg-export-to-facebook.c --- gthumb-3.0.2/extensions/facebook/dlg-export-to-facebook.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/dlg-export-to-facebook.c 2013-04-30 16:56:12.000000000 +0000 @@ -22,12 +22,11 @@ #include #include #include +#include #include "dlg-export-to-facebook.h" -#include "facebook-authentication.h" #include "facebook-album.h" #include "facebook-album-properties-dialog.h" #include "facebook-service.h" -#include "facebook-user.h" #include "preferences.h" @@ -64,10 +63,7 @@ GtkWidget *dialog; GtkWidget *list_view; GtkWidget *progress_dialog; - FacebookConnection *conn; - FacebookAuthentication *auth; FacebookService *service; - FacebookUser *user; GList *albums; FacebookAlbum *album; GList *photos_ids; @@ -80,17 +76,15 @@ { if (data->dialog != NULL) gtk_widget_destroy (data->dialog); - if (data->conn != NULL) - gth_task_completed (GTH_TASK (data->conn), NULL); + if (data->service != NULL) + gth_task_completed (GTH_TASK (data->service), NULL); _g_object_unref (data->cancellable); _g_string_list_free (data->photos_ids); _g_object_unref (data->album); _g_object_list_unref (data->albums); - _g_object_unref (data->user); _g_object_unref (data->service); - _g_object_unref (data->auth); - _g_object_unref (data->conn); _g_object_unref (data->settings); + gtk_widget_destroy (data->progress_dialog); _g_object_unref (data->builder); _g_object_list_unref (data->file_list); _g_object_unref (data->location); @@ -125,8 +119,7 @@ url = g_strdup (data->album->link); if ((url != NULL) && ! gtk_show_uri (screen, url, 0, &error)) { - if (data->conn != NULL) - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); _gtk_error_dialog_from_gerror_run (GTK_WINDOW (data->browser), _("Could not connect to the server"), error); g_clear_error (&error); } @@ -149,7 +142,7 @@ GtkBuilder *builder; GtkWidget *dialog; - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); builder = _gtk_builder_new_from_file ("facebook-export-completed.ui", "facebook"); dialog = _gtk_builder_get_widget (builder, "completed_messagedialog"); @@ -177,7 +170,7 @@ DialogData *data = user_data; GError *error = NULL; - data->photos_ids = facebook_service_upload_photos_finish (FACEBOOK_SERVICE (source_object), result, &error); + data->photos_ids = facebook_service_upload_photos_finish (data->service, result, &error); if (error != NULL) { _gtk_error_dialog_from_gerror_show (GTK_WINDOW (data->browser), _("Could not upload the files"), error); g_clear_error (&error); @@ -197,10 +190,6 @@ DialogData *data = user_data; switch (response_id) { - case GTK_RESPONSE_HELP: - show_help_dialog (GTK_WINDOW (data->browser), "gthumb-export-social"); - break; - case GTK_RESPONSE_DELETE_EVENT: case GTK_RESPONSE_CANCEL: gth_file_list_cancel (GTH_FILE_LIST (data->list_view), (DataFunc) destroy_dialog, data); @@ -212,9 +201,6 @@ GList *file_list; int max_resolution; - gtk_widget_hide (data->dialog); - gth_task_dialog (GTH_TASK (data->conn), FALSE, NULL); - data->album = NULL; if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (GET_WIDGET ("album_combobox")), &iter)) { gtk_tree_model_get (gtk_combo_box_get_model (GTK_COMBO_BOX (GET_WIDGET ("album_combobox"))), @@ -223,6 +209,12 @@ -1); } + if (data->album == NULL) + return; + + gtk_widget_hide (data->dialog); + gth_task_dialog (GTH_TASK (data->service), FALSE, NULL); + max_resolution = 0; if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (GET_WIDGET ("resize_combobox")), &iter)) { gtk_tree_model_get (gtk_combo_box_get_model (GTK_COMBO_BOX (GET_WIDGET ("resize_combobox"))), @@ -255,18 +247,18 @@ static void update_account_list (DialogData *data) { - int current_account_idx; - FacebookAccount *current_account; - int idx; - GList *scan; - GtkTreeIter iter; + int current_account_idx; + OAuthAccount *current_account; + int idx; + GList *scan; + GtkTreeIter iter; gtk_list_store_clear (GTK_LIST_STORE (GET_WIDGET ("account_liststore"))); current_account_idx = 0; - current_account = facebook_authentication_get_account (data->auth); - for (scan = facebook_authentication_get_accounts (data->auth), idx = 0; scan; scan = scan->next, idx++) { - FacebookAccount *account = scan->data; + current_account = web_service_get_current_account (WEB_SERVICE (data->service)); + for (scan = web_service_get_accounts (WEB_SERVICE (data->service)), idx = 0; scan; scan = scan->next, idx++) { + OAuthAccount *account = scan->data; if ((current_account != NULL) && (g_strcmp0 (current_account->username, account->username) == 0)) current_account_idx = idx; @@ -274,7 +266,7 @@ gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter); gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter, ACCOUNT_DATA_COLUMN, account, - ACCOUNT_NAME_COLUMN, account->username, + ACCOUNT_NAME_COLUMN, account->name, -1); } gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("account_combobox")), current_account_idx); @@ -282,8 +274,8 @@ static void -authentication_accounts_changed_cb (FacebookAuthentication *auth, - gpointer user_data) +service_accounts_changed_cb (FacebookService *service, + gpointer user_data) { update_account_list ((DialogData *) user_data); } @@ -301,7 +293,7 @@ char *size; GtkTreeIter iter; - size = g_strdup_printf ("(%d)", album->size); + size = g_strdup_printf ("(%d)", album->count); gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("album_liststore")), &iter); gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("album_liststore")), &iter, @@ -328,20 +320,18 @@ GError *error = NULL; _g_object_list_unref (data->albums); - data->albums = facebook_service_get_albums_finish (FACEBOOK_SERVICE (source_object), res, &error); + data->albums = facebook_service_get_albums_finish (data->service, res, &error); if (error != NULL) { - if (data->conn != NULL) - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); _gtk_error_dialog_from_gerror_run (GTK_WINDOW (data->browser), _("Could not connect to the server"), error); g_clear_error (&error); gtk_dialog_response (GTK_DIALOG (data->dialog), GTK_RESPONSE_DELETE_EVENT); return; } - gtk_widget_set_sensitive (GET_WIDGET ("upload_button"), TRUE); update_album_list (data, NULL); - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); gtk_window_set_transient_for (GTK_WINDOW (data->dialog), GTK_WINDOW (data->browser)); gtk_window_set_modal (GTK_WINDOW (data->dialog), FALSE); gtk_window_present (GTK_WINDOW (data->dialog)); @@ -349,16 +339,11 @@ static void -authentication_ready_cb (FacebookAuthentication *auth, - FacebookUser *user, - DialogData *data) +service_account_ready_cb (FacebookService *service, + DialogData *data) { - _g_object_unref (data->user); - data->user = g_object_ref (user); update_account_list (data); - facebook_service_get_albums (data->service, - data->user->id, data->cancellable, get_albums_ready_cb, data); @@ -369,7 +354,7 @@ edit_accounts_button_clicked_cb (GtkButton *button, DialogData *data) { - facebook_authentication_edit_accounts (data->auth, GTK_WINDOW (data->dialog)); + web_service_edit_accounts (WEB_SERVICE (data->service), GTK_WINDOW (data->dialog)); } @@ -377,9 +362,9 @@ account_combobox_changed_cb (GtkComboBox *widget, gpointer user_data) { - DialogData *data = user_data; - GtkTreeIter iter; - FacebookAccount *account; + DialogData *data = user_data; + GtkTreeIter iter; + OAuthAccount *account; if (! gtk_combo_box_get_active_iter (widget, &iter)) return; @@ -389,8 +374,8 @@ ACCOUNT_DATA_COLUMN, &account, -1); - if (facebook_account_cmp (account, facebook_authentication_get_account (data->auth)) != 0) - facebook_authentication_connect (data->auth, account); + if (oauth_account_cmp (account, web_service_get_current_account (WEB_SERVICE (data->service))) != 0) + web_service_connect (WEB_SERVICE (data->service), account); g_object_unref (account); } @@ -407,8 +392,8 @@ album = facebook_service_create_album_finish (data->service, result, &error); if (error != NULL) { - if (data->conn != NULL) - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); + if (data->service != NULL) + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); _gtk_error_dialog_from_gerror_show (GTK_WINDOW (data->browser), _("Could not create the album"), error); g_clear_error (&error); return; @@ -436,11 +421,11 @@ { FacebookAlbum *album; - album = facebook_album_new (); - facebook_album_set_name (album, facebook_album_properties_dialog_get_name (FACEBOOK_ALBUM_PROPERTIES_DIALOG (dialog))); - facebook_album_set_location (album, facebook_album_properties_dialog_get_location (FACEBOOK_ALBUM_PROPERTIES_DIALOG (dialog))); - facebook_album_set_description (album, facebook_album_properties_dialog_get_description (FACEBOOK_ALBUM_PROPERTIES_DIALOG (dialog))); - album->visibility = facebook_album_properties_dialog_get_visibility (FACEBOOK_ALBUM_PROPERTIES_DIALOG (dialog)); + album = g_object_new (FACEBOOK_TYPE_ALBUM, + "name", facebook_album_properties_dialog_get_name (FACEBOOK_ALBUM_PROPERTIES_DIALOG (dialog)), + "description", facebook_album_properties_dialog_get_description (FACEBOOK_ALBUM_PROPERTIES_DIALOG (dialog)), + "privacy", facebook_album_properties_dialog_get_visibility (FACEBOOK_ALBUM_PROPERTIES_DIALOG (dialog)), + NULL); facebook_service_create_album (data->service, album, data->cancellable, @@ -467,7 +452,6 @@ dialog = facebook_album_properties_dialog_new (g_file_info_get_edit_name (data->location->info), NULL, - NULL, FACEBOOK_VISIBILITY_SELF); g_signal_connect (dialog, "delete-event", @@ -485,6 +469,18 @@ } +static void +album_combobox_changed_cb (GtkComboBox *combo_box, + gpointer user_data) +{ + DialogData *data = user_data; + + gtk_dialog_set_response_sensitive (GTK_DIALOG (data->dialog), + GTK_RESPONSE_OK, + gtk_combo_box_get_active (combo_box) >= 0); +} + + void dlg_export_to_facebook (GthBrowser *browser, GList *file_list) @@ -576,7 +572,7 @@ /* Set the widget data */ - data->list_view = gth_file_list_new (gth_grid_view_new (), GTH_FILE_LIST_TYPE_NO_SELECTION, FALSE); + data->list_view = gth_file_list_new (gth_grid_view_new (), GTH_FILE_LIST_MODE_NO_SELECTION, FALSE); gth_file_list_set_thumb_size (GTH_FILE_LIST (data->list_view), 112); gth_file_list_enable_thumbs (GTH_FILE_LIST (data->list_view), TRUE); gth_file_list_set_ignore_hidden (GTH_FILE_LIST (data->list_view), TRUE); @@ -586,7 +582,7 @@ gtk_box_pack_start (GTK_BOX (GET_WIDGET ("images_box")), data->list_view, TRUE, TRUE, 0); gth_file_list_set_files (GTH_FILE_LIST (data->list_view), data->file_list); - gtk_widget_set_sensitive (GET_WIDGET ("upload_button"), FALSE); + gtk_dialog_set_response_sensitive (GTK_DIALOG (data->dialog), GTK_RESPONSE_OK, FALSE); title = g_strdup_printf (_("Export to %s"), "Facebook"); gtk_window_set_title (GTK_WINDOW (data->dialog), title); @@ -642,25 +638,25 @@ "clicked", G_CALLBACK (add_album_button_clicked_cb), data); + g_signal_connect (GET_WIDGET ("album_combobox"), + "changed", + G_CALLBACK (album_combobox_changed_cb), + data); - data->conn = facebook_connection_new (); - data->service = facebook_service_new (data->conn); - data->auth = facebook_authentication_new (data->conn, - data->service, - data->cancellable, - GTK_WIDGET (data->browser), - data->dialog); - g_signal_connect (data->auth, - "ready", - G_CALLBACK (authentication_ready_cb), + data->service = facebook_service_new (data->cancellable, + GTK_WIDGET (data->browser), + data->dialog); + g_signal_connect (data->service, + "account-ready", + G_CALLBACK (service_account_ready_cb), data); - g_signal_connect (data->auth, - "accounts_changed", - G_CALLBACK (authentication_accounts_changed_cb), + g_signal_connect (data->service, + "accounts-changed", + G_CALLBACK (service_accounts_changed_cb), data); data->progress_dialog = gth_progress_dialog_new (GTK_WINDOW (data->browser)); - gth_progress_dialog_add_task (GTH_PROGRESS_DIALOG (data->progress_dialog), GTH_TASK (data->conn)); + gth_progress_dialog_add_task (GTH_PROGRESS_DIALOG (data->progress_dialog), GTH_TASK (data->service)); - facebook_authentication_auto_connect (data->auth); + web_service_autoconnect (WEB_SERVICE (data->service)); } diff -Nru gthumb-3.0.2/extensions/facebook/dlg-import-from-facebook.c gthumb-3.2.3/extensions/facebook/dlg-import-from-facebook.c --- gthumb-3.0.2/extensions/facebook/dlg-import-from-facebook.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/dlg-import-from-facebook.c 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,607 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2010 The Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#define GDK_PIXBUF_ENABLE_BACKEND +#include +#include +#include +#include +#include "dlg-import-from-facebook.h" +#include "facebook-album.h" +#include "facebook-photo.h" +#include "facebook-service.h" + + +#define GET_WIDGET(x) (_gtk_builder_get_widget (data->builder, (x))) +#define FAKE_SIZE 100000 +#define THUMBNAIL_SIZE 110 + + +enum { + ACCOUNT_DATA_COLUMN, + ACCOUNT_NAME_COLUMN +}; + + +enum { + ALBUM_DATA_COLUMN, + ALBUM_NAME_COLUMN, + ALBUM_ICON_COLUMN, + ALBUM_SIZE_COLUMN +}; + + +typedef struct { + GthBrowser *browser; + GthFileData *location; + GtkBuilder *builder; + GtkWidget *dialog; + GtkWidget *preferences_dialog; + GtkWidget *progress_dialog; + FacebookService *service; + GtkWidget *file_list; + GList *albums; + FacebookAlbum *album; + GList *photos; + GCancellable *cancellable; +} DialogData; + + +static void +import_dialog_destroy_cb (GtkWidget *widget, + DialogData *data) +{ + if (data->service != NULL) + gth_task_completed (GTH_TASK (data->service), NULL); + _g_object_unref (data->cancellable); + _g_object_unref (data->service); + _g_object_list_unref (data->albums); + _g_object_unref (data->album); + _g_object_list_unref (data->photos); + gtk_widget_destroy (data->progress_dialog); + _g_object_unref (data->builder); + _g_object_unref (data->location); + g_free (data); +} + + +static GList * +get_files_to_download (DialogData *data) +{ + GthFileView *file_view; + GList *selected; + GList *file_list; + + file_view = (GthFileView *) gth_file_list_get_view (GTH_FILE_LIST (data->file_list)); + selected = gth_file_selection_get_selected (GTH_FILE_SELECTION (file_view)); + if (selected != NULL) + file_list = gth_file_list_get_files (GTH_FILE_LIST (data->file_list), selected); + else + file_list = gth_file_store_get_visibles (GTH_FILE_STORE (gth_file_view_get_model (file_view))); + + _gtk_tree_path_list_free (selected); + + return file_list; +} + + +static void +import_dialog_response_cb (GtkDialog *dialog, + int response_id, + gpointer user_data) +{ + DialogData *data = user_data; + + switch (response_id) { + case GTK_RESPONSE_DELETE_EVENT: + case GTK_RESPONSE_CANCEL: + gth_file_list_cancel (GTH_FILE_LIST (data->file_list), (DataFunc) gtk_widget_destroy, data->dialog); + break; + + case GTK_RESPONSE_OK: + { + GtkTreeIter iter; + FacebookAlbum *album; + GList *file_list; + + if (! gtk_combo_box_get_active_iter (GTK_COMBO_BOX (GET_WIDGET ("album_combobox")), &iter)) { + gtk_widget_set_sensitive (GET_WIDGET ("download_button"), FALSE); + return; + } + + gtk_tree_model_get (GTK_TREE_MODEL (GET_WIDGET ("album_liststore")), &iter, + ALBUM_DATA_COLUMN, &album, + -1); + + file_list = get_files_to_download (data); + if (file_list != NULL) { + GSettings *settings; + GFile *destination; + gboolean single_subfolder; + GthSubfolderType subfolder_type; + GthSubfolderFormat subfolder_format; + char *custom_format; + GthTask *task; + + settings = g_settings_new (GTHUMB_IMPORTER_SCHEMA); + destination = gth_import_preferences_get_destination (); + subfolder_type = g_settings_get_enum (settings, PREF_IMPORTER_SUBFOLDER_TYPE); + subfolder_format = g_settings_get_enum (settings, PREF_IMPORTER_SUBFOLDER_FORMAT); + single_subfolder = g_settings_get_boolean (settings, PREF_IMPORTER_SUBFOLDER_SINGLE); + custom_format = g_settings_get_string (settings, PREF_IMPORTER_SUBFOLDER_CUSTOM_FORMAT); + + task = gth_import_task_new (data->browser, + file_list, + destination, + subfolder_type, + subfolder_format, + single_subfolder, + custom_format, + (album->name != NULL ? album->name : ""), + NULL, + FALSE, + FALSE, + FALSE); + gth_browser_exec_task (data->browser, task, FALSE); + gtk_widget_destroy (data->dialog); + + g_object_unref (task); + _g_object_unref (destination); + g_object_unref (settings); + } + + _g_object_list_unref (file_list); + g_object_unref (album); + } + break; + + default: + break; + } +} + + +static void +update_account_list (DialogData *data) +{ + int current_account_idx; + OAuthAccount *current_account; + int idx; + GList *scan; + GtkTreeIter iter; + + gtk_list_store_clear (GTK_LIST_STORE (GET_WIDGET ("account_liststore"))); + + current_account_idx = 0; + current_account = web_service_get_current_account (WEB_SERVICE (data->service)); + for (scan = web_service_get_accounts (WEB_SERVICE (data->service)), idx = 0; scan; scan = scan->next, idx++) { + OAuthAccount *account = scan->data; + + if (oauth_account_cmp (current_account, account) == 0) + current_account_idx = idx; + + gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter); + gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter, + ACCOUNT_DATA_COLUMN, account, + ACCOUNT_NAME_COLUMN, account->name, + -1); + } + gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("account_combobox")), current_account_idx); +} + + +static void +get_albums_ready_cb (GObject *source_object, + GAsyncResult *res, + gpointer user_data) +{ + DialogData *data = user_data; + GError *error = NULL; + GList *scan; + + _g_object_list_unref (data->albums); + data->albums = facebook_service_get_albums_finish (data->service, res, &error); + if (error != NULL) { + if (data->service != NULL) + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); + _gtk_error_dialog_from_gerror_run (GTK_WINDOW (data->browser), _("Could not connect to the server"), error); + g_clear_error (&error); + gtk_widget_destroy (data->dialog); + return; + } + + gtk_list_store_clear (GTK_LIST_STORE (GET_WIDGET ("album_liststore"))); + for (scan = data->albums; scan; scan = scan->next) { + FacebookAlbum *album = scan->data; + char *n_photos; + GtkTreeIter iter; + + n_photos = g_strdup_printf ("(%d)", album->count); + + gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("album_liststore")), &iter); + gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("album_liststore")), &iter, + ALBUM_DATA_COLUMN, album, + ALBUM_ICON_COLUMN, "file-catalog", + ALBUM_NAME_COLUMN, album->name, + ALBUM_SIZE_COLUMN, n_photos, + -1); + + g_free (n_photos); + } + + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); + + gtk_window_set_transient_for (GTK_WINDOW (data->dialog), GTK_WINDOW (data->browser)); + gtk_window_set_modal (GTK_WINDOW (data->dialog), FALSE); + gtk_window_present (GTK_WINDOW (data->dialog)); +} + + +static void +authentication_ready_cb (WebService *service, + DialogData *data) +{ + update_account_list (data); + facebook_service_get_albums (data->service, + data->cancellable, + get_albums_ready_cb, + data); +} + + +static void +authentication_accounts_changed_cb (WebService *service, + DialogData *data) +{ + update_account_list (data); +} + + +static void +edit_accounts_button_clicked_cb (GtkButton *button, + DialogData *data) +{ + web_service_edit_accounts (WEB_SERVICE (data->service), GTK_WINDOW (data->dialog)); +} + + +static void +account_combobox_changed_cb (GtkComboBox *widget, + gpointer user_data) +{ + DialogData *data = user_data; + GtkTreeIter iter; + OAuthAccount *account; + + if (! gtk_combo_box_get_active_iter (widget, &iter)) + return; + + gtk_tree_model_get (gtk_combo_box_get_model (widget), + &iter, + ACCOUNT_DATA_COLUMN, &account, + -1); + + if (oauth_account_cmp (account, web_service_get_current_account (WEB_SERVICE (data->service))) != 0) + web_service_connect (WEB_SERVICE (data->service), account); + + g_object_unref (account); +} + + +static void +update_selection_status (DialogData *data) +{ + GList *file_list; + int n_selected; + char *text_selected; + + file_list = get_files_to_download (data); + n_selected = g_list_length (file_list); + text_selected = g_strdup_printf (g_dngettext (NULL, "%d file", "%d files", n_selected), n_selected); + gtk_label_set_text (GTK_LABEL (GET_WIDGET ("images_info_label")), text_selected); + + g_free (text_selected); + _g_object_list_unref (file_list); +} + + +static void +list_photos_ready_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) +{ + DialogData *data = user_data; + GError *error = NULL; + GList *list; + GList *scan; + + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); + + _g_object_list_unref (data->photos); + data->photos = facebook_service_list_photos_finish (data->service, result, &error); + if (error != NULL) { + if (data->service != NULL) + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); + _gtk_error_dialog_from_gerror_show (GTK_WINDOW (data->browser), _("Could not get the photo list"), error); + g_clear_error (&error); + gtk_widget_destroy (data->dialog); + return; + } + + list = NULL; + for (scan = data->photos; scan; scan = scan->next) { + FacebookPhoto *photo = scan->data; + GthFileData *file_data; + + file_data = gth_file_data_new_for_uri (facebook_photo_get_original_url (photo), "image/jpeg"); + g_file_info_set_file_type (file_data->info, G_FILE_TYPE_REGULAR); + g_file_info_set_size (file_data->info, FAKE_SIZE); /* set a fake size to make the progress dialog work correctly */ + g_file_info_set_attribute_object (file_data->info, "facebook::object", G_OBJECT (photo)); + + list = g_list_prepend (list, file_data); + } + gth_file_list_set_files (GTH_FILE_LIST (data->file_list), list); + update_selection_status (data); + gtk_widget_set_sensitive (GET_WIDGET ("download_button"), list != NULL); + + _g_object_list_unref (list); +} + + +static void +album_combobox_changed_cb (GtkComboBox *widget, + gpointer user_data) +{ + DialogData *data = user_data; + GtkTreeIter iter; + + if (! gtk_combo_box_get_active_iter (widget, &iter)) { + gth_file_list_clear (GTH_FILE_LIST (data->file_list), _("No album selected")); + return; + } + + _g_object_unref (data->album); + gtk_tree_model_get (gtk_combo_box_get_model (widget), + &iter, + ALBUM_DATA_COLUMN, &data->album, + -1); + + gth_import_preferences_dialog_set_event (GTH_IMPORT_PREFERENCES_DIALOG (data->preferences_dialog), data->album->name); + + gth_task_dialog (GTH_TASK (data->service), FALSE, NULL); + facebook_service_list_photos (data->service, + data->album, + -1, + NULL, + data->cancellable, + list_photos_ready_cb, + data); +} + + +static GthImage * +facebook_thumbnail_loader (GInputStream *istream, + GthFileData *file_data, + int requested_size, + int *original_width, + int *original_height, + gpointer user_data, + GCancellable *cancellable, + GError **error) +{ + GthImage *image = NULL; + FacebookPhoto *photo; + const char *uri; + + photo = (FacebookPhoto *) g_file_info_get_attribute_object (file_data->info, "facebook::object"); + + uri = facebook_photo_get_thumbnail_url (photo, requested_size); + if (uri == NULL) + uri = facebook_photo_get_original_url (photo); + + if (uri != NULL) { + GFile *file; + void *buffer; + gsize size; + + file = g_file_new_for_uri (uri); + if (_g_file_load_in_buffer (file, &buffer, &size, cancellable, error)) { + GInputStream *stream; + GdkPixbuf *pixbuf; + + stream = g_memory_input_stream_new_from_data (buffer, size, g_free); + pixbuf = gdk_pixbuf_new_from_stream (stream, cancellable, error); + if (pixbuf != NULL) { + GdkPixbuf *rotated; + + rotated = gdk_pixbuf_apply_embedded_orientation (pixbuf); + g_object_unref (pixbuf); + pixbuf = rotated; + + image = gth_image_new_for_pixbuf (pixbuf); + } + + g_object_unref (pixbuf); + g_object_unref (stream); + } + + g_object_unref (file); + } + else + *error = g_error_new_literal (GTH_ERROR, 0, "cannot generate the thumbnail"); + + return image; +} + + +static int +facebook_photo_position_func (GthFileData *a, + GthFileData *b) +{ + FacebookPhoto *photo_a; + FacebookPhoto *photo_b; + + photo_a = (FacebookPhoto *) g_file_info_get_attribute_object (a->info, "facebook::object"); + photo_b = (FacebookPhoto *) g_file_info_get_attribute_object (b->info, "facebook::object"); + + if (photo_a->position == photo_b->position) + return strcmp (photo_a->id, photo_b->id); + else if (photo_a->position > photo_b->position) + return 1; + else + return -1; +} + + +static void +file_list_selection_changed_cb (GthFileView *file_view, + gpointer user_data) +{ + update_selection_status ((DialogData *) user_data); +} + + +void +dlg_import_from_facebook (GthBrowser *browser) +{ + DialogData *data; + GthThumbLoader *thumb_loader; + char *title; + + data = g_new0 (DialogData, 1); + data->browser = browser; + data->location = gth_file_data_dup (gth_browser_get_location_data (browser)); + data->builder = _gtk_builder_new_from_file ("import-from-facebook.ui", "facebook"); + data->dialog = _gtk_builder_get_widget (data->builder, "import_dialog"); + data->cancellable = g_cancellable_new (); + + { + GtkCellLayout *cell_layout; + GtkCellRenderer *renderer; + + cell_layout = GTK_CELL_LAYOUT (GET_WIDGET ("album_combobox")); + + renderer = gtk_cell_renderer_pixbuf_new (); + gtk_cell_layout_pack_start (cell_layout, renderer, FALSE); + gtk_cell_layout_set_attributes (cell_layout, renderer, + "icon-name", ALBUM_ICON_COLUMN, + NULL); + + renderer = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (cell_layout, renderer, TRUE); + gtk_cell_layout_set_attributes (cell_layout, renderer, + "text", ALBUM_NAME_COLUMN, + NULL); + + renderer = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (cell_layout, renderer, FALSE); + gtk_cell_layout_set_attributes (cell_layout, renderer, + "text", ALBUM_SIZE_COLUMN, + NULL); + } + + /* Set the widget data */ + + data->file_list = gth_file_list_new (gth_grid_view_new (), GTH_FILE_LIST_MODE_NORMAL, FALSE); + thumb_loader = gth_file_list_get_thumb_loader (GTH_FILE_LIST (data->file_list)); + gth_thumb_loader_set_use_cache (thumb_loader, FALSE); + gth_thumb_loader_set_loader_func (thumb_loader, facebook_thumbnail_loader); + gth_file_list_set_thumb_size (GTH_FILE_LIST (data->file_list), THUMBNAIL_SIZE); + gth_file_list_enable_thumbs (GTH_FILE_LIST (data->file_list), TRUE); + gth_file_list_set_ignore_hidden (GTH_FILE_LIST (data->file_list), TRUE); + gth_file_list_set_caption (GTH_FILE_LIST (data->file_list), "none"); + gth_file_list_set_sort_func (GTH_FILE_LIST (data->file_list), facebook_photo_position_func, FALSE); + gth_file_list_clear (GTH_FILE_LIST (data->file_list), _("No album selected")); + gtk_widget_show (data->file_list); + gtk_box_pack_start (GTK_BOX (GET_WIDGET ("images_box")), data->file_list, TRUE, TRUE, 0); + + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (GET_WIDGET ("album_liststore")), ALBUM_NAME_COLUMN, GTK_SORT_ASCENDING); + + gtk_widget_set_sensitive (GET_WIDGET ("download_button"), FALSE); + + data->preferences_dialog = gth_import_preferences_dialog_new (); + gtk_window_set_transient_for (GTK_WINDOW (data->preferences_dialog), GTK_WINDOW (data->dialog)); + + gtk_box_pack_start (GTK_BOX (GET_WIDGET ("destination_button_box")), + gth_import_destination_button_new (GTH_IMPORT_PREFERENCES_DIALOG (data->preferences_dialog)), + TRUE, + TRUE, + 0); + gtk_widget_show_all (GET_WIDGET ("destination_button_box")); + + title = g_strdup_printf (_("Import from %s"), _("Facebook")); + gtk_window_set_title (GTK_WINDOW (data->dialog), title); + g_free (title); + + _gtk_window_resize_to_fit_screen_height (data->dialog, 500); + + /* Set the signals handlers. */ + + g_signal_connect (data->dialog, + "destroy", + G_CALLBACK (import_dialog_destroy_cb), + data); + g_signal_connect (data->dialog, + "delete-event", + G_CALLBACK (gtk_true), + NULL); + g_signal_connect (data->dialog, + "response", + G_CALLBACK (import_dialog_response_cb), + data); + g_signal_connect (GET_WIDGET ("edit_accounts_button"), + "clicked", + G_CALLBACK (edit_accounts_button_clicked_cb), + data); + g_signal_connect (GET_WIDGET ("account_combobox"), + "changed", + G_CALLBACK (account_combobox_changed_cb), + data); + g_signal_connect (GET_WIDGET ("album_combobox"), + "changed", + G_CALLBACK (album_combobox_changed_cb), + data); + g_signal_connect (gth_file_list_get_view (GTH_FILE_LIST (data->file_list)), + "file-selection-changed", + G_CALLBACK (file_list_selection_changed_cb), + data); + + update_selection_status (data); + gth_import_preferences_dialog_set_event (GTH_IMPORT_PREFERENCES_DIALOG (data->preferences_dialog), ""); + + data->service = facebook_service_new (data->cancellable, + GTK_WIDGET (data->browser), + data->dialog); + g_signal_connect (data->service, + "account-ready", + G_CALLBACK (authentication_ready_cb), + data); + g_signal_connect (data->service, + "accounts-changed", + G_CALLBACK (authentication_accounts_changed_cb), + data); + + data->progress_dialog = gth_progress_dialog_new (GTK_WINDOW (data->browser)); + gth_progress_dialog_add_task (GTH_PROGRESS_DIALOG (data->progress_dialog), GTH_TASK (data->service)); + + web_service_autoconnect (WEB_SERVICE (data->service)); +} diff -Nru gthumb-3.0.2/extensions/facebook/dlg-import-from-facebook.h gthumb-3.2.3/extensions/facebook/dlg-import-from-facebook.h --- gthumb-3.0.2/extensions/facebook/dlg-import-from-facebook.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/dlg-import-from-facebook.h 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,29 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2010 The Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef DLG_IMPORT_FROM_FACEBOOK_H +#define DLG_IMPORT_FROM_FACEBOOK_H + +#include + +void dlg_import_from_facebook (GthBrowser *browser); + +#endif /* DLG_IMPORT_FROM_FACEBOOK_H */ diff -Nru gthumb-3.0.2/extensions/facebook/facebook-account-chooser-dialog.c gthumb-3.2.3/extensions/facebook/facebook-account-chooser-dialog.c --- gthumb-3.0.2/extensions/facebook/facebook-account-chooser-dialog.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/facebook-account-chooser-dialog.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,236 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include "facebook-account-chooser-dialog.h" - -#define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x))) - - -enum { - ACCOUNT_DATA_COLUMN, - ACCOUNT_NAME_COLUMN, - ACCOUNT_SEPARATOR_COLUMN, - ACCOUNT_ICON_COLUMN -}; - - -struct _FacebookAccountChooserDialogPrivate { - GtkBuilder *builder; -}; - - -G_DEFINE_TYPE (FacebookAccountChooserDialog, facebook_account_chooser_dialog, GTK_TYPE_DIALOG) - - -static void -facebook_account_chooser_dialog_finalize (GObject *object) -{ - FacebookAccountChooserDialog *self; - - self = FACEBOOK_ACCOUNT_CHOOSER_DIALOG (object); - - _g_object_unref (self->priv->builder); - - G_OBJECT_CLASS (facebook_account_chooser_dialog_parent_class)->finalize (object); -} - - -static void -facebook_account_chooser_dialog_class_init (FacebookAccountChooserDialogClass *klass) -{ - GObjectClass *object_class; - - g_type_class_add_private (klass, sizeof (FacebookAccountChooserDialogPrivate)); - - object_class = (GObjectClass*) klass; - object_class->finalize = facebook_account_chooser_dialog_finalize; -} - - -static void -account_combobox_changed_cb (GtkComboBox *combobox, - gpointer user_data) -{ - FacebookAccountChooserDialog *self = user_data; - GtkTreeIter iter; - FacebookAccount *account; - - if (! gtk_combo_box_get_active_iter (combobox, &iter)) - return; - - gtk_tree_model_get (GTK_TREE_MODEL (GET_WIDGET ("account_liststore")), &iter, - ACCOUNT_DATA_COLUMN, &account, - -1); - - if (account == NULL) - gtk_dialog_response (GTK_DIALOG (self), FACEBOOK_ACCOUNT_CHOOSER_RESPONSE_NEW); - - _g_object_unref (account); -} - - -static gboolean -row_separator_func (GtkTreeModel *model, - GtkTreeIter *iter, - gpointer user_data) -{ - FacebookAccountChooserDialog *self = user_data; - gboolean is_separator; - - gtk_tree_model_get (GTK_TREE_MODEL (GET_WIDGET ("account_liststore")), - iter, - ACCOUNT_SEPARATOR_COLUMN, &is_separator, - -1); - - return is_separator; -} - - -static void -facebook_account_chooser_dialog_init (FacebookAccountChooserDialog *self) -{ - GtkWidget *content; - - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, FACEBOOK_TYPE_ACCOUNT_CHOOSER_DIALOG, FacebookAccountChooserDialogPrivate); - self->priv->builder = _gtk_builder_new_from_file ("facebook-account-chooser.ui", "facebook"); - - gtk_window_set_resizable (GTK_WINDOW (self), FALSE); - gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), 5); - gtk_container_set_border_width (GTK_CONTAINER (self), 5); - - content = _gtk_builder_get_widget (self->priv->builder, "account_chooser"); - gtk_container_set_border_width (GTK_CONTAINER (content), 5); - gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), content, TRUE, TRUE, 0); - - { - GtkCellLayout *cell_layout; - GtkCellRenderer *renderer; - - cell_layout = GTK_CELL_LAYOUT (GET_WIDGET ("account_combobox")); - - renderer = gtk_cell_renderer_pixbuf_new (); - gtk_cell_layout_pack_start (cell_layout, renderer, FALSE); - gtk_cell_layout_set_attributes (cell_layout, renderer, - "icon-name", ACCOUNT_ICON_COLUMN, - NULL); - - renderer = gtk_cell_renderer_text_new (); - gtk_cell_layout_pack_start (cell_layout, renderer, TRUE); - gtk_cell_layout_set_attributes (cell_layout, renderer, - "text", ACCOUNT_NAME_COLUMN, - NULL); - } - gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (GET_WIDGET ("account_combobox")), - row_separator_func, - self, - NULL); - g_signal_connect (GET_WIDGET ("account_combobox"), - "changed", - G_CALLBACK (account_combobox_changed_cb), - self); - - gtk_dialog_add_button (GTK_DIALOG (self), - GTK_STOCK_NEW, - FACEBOOK_ACCOUNT_CHOOSER_RESPONSE_NEW); - gtk_dialog_add_button (GTK_DIALOG (self), - GTK_STOCK_CANCEL, - GTK_RESPONSE_CANCEL); - gtk_dialog_add_button (GTK_DIALOG (self), - GTK_STOCK_OK, - GTK_RESPONSE_OK); - gtk_dialog_set_default_response (GTK_DIALOG (self), GTK_RESPONSE_OK); -} - - -static void -facebook_account_chooser_dialog_construct (FacebookAccountChooserDialog *self, - GList *accounts, - FacebookAccount *default_account) -{ - GtkTreeIter iter; - GList *scan; - int active = 0; - int idx; - - gtk_list_store_clear (GTK_LIST_STORE (GET_WIDGET ("account_liststore"))); - - for (scan = accounts, idx = 0; scan; scan = scan->next, idx++) { - FacebookAccount *account = scan->data; - - if ((default_account != NULL) && (g_strcmp0 (account->username, default_account->username) == 0)) - active = idx; - - gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter); - gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter, - ACCOUNT_DATA_COLUMN, account, - ACCOUNT_NAME_COLUMN, account->username, - ACCOUNT_SEPARATOR_COLUMN, FALSE, - ACCOUNT_ICON_COLUMN, "dialog-password", - -1); - } - - gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter); - gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter, - ACCOUNT_SEPARATOR_COLUMN, TRUE, - -1); - - gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter); - gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter, - ACCOUNT_DATA_COLUMN, NULL, - ACCOUNT_NAME_COLUMN, _("New authentication..."), - ACCOUNT_SEPARATOR_COLUMN, FALSE, - ACCOUNT_ICON_COLUMN, GTK_STOCK_NEW, - -1); - - gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("account_combobox")), active); -} - - -GtkWidget * -facebook_account_chooser_dialog_new (GList *accounts, - FacebookAccount *default_account) -{ - FacebookAccountChooserDialog *self; - - self = g_object_new (FACEBOOK_TYPE_ACCOUNT_CHOOSER_DIALOG, NULL); - facebook_account_chooser_dialog_construct (self, accounts, default_account); - - return (GtkWidget *) self; -} - - -FacebookAccount * -facebook_account_chooser_dialog_get_active (FacebookAccountChooserDialog *self) -{ - GtkTreeIter iter; - FacebookAccount *account; - - if (! gtk_combo_box_get_active_iter (GTK_COMBO_BOX (GET_WIDGET ("account_combobox")), &iter)) - return NULL; - - gtk_tree_model_get (GTK_TREE_MODEL (GET_WIDGET ("account_liststore")), &iter, - ACCOUNT_DATA_COLUMN, &account, - -1); - - return account; -} diff -Nru gthumb-3.0.2/extensions/facebook/facebook-account-chooser-dialog.h gthumb-3.2.3/extensions/facebook/facebook-account-chooser-dialog.h --- gthumb-3.0.2/extensions/facebook/facebook-account-chooser-dialog.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/facebook-account-chooser-dialog.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef FACEBOOK_ACCOUNT_CHOOSER_DIALOG_H -#define FACEBOOK_ACCOUNT_CHOOSER_DIALOG_H - -#include -#include -#include "facebook-account.h" - -G_BEGIN_DECLS - -#define FACEBOOK_ACCOUNT_CHOOSER_RESPONSE_NEW 1 - -#define FACEBOOK_TYPE_ACCOUNT_CHOOSER_DIALOG (facebook_account_chooser_dialog_get_type ()) -#define FACEBOOK_ACCOUNT_CHOOSER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FACEBOOK_TYPE_ACCOUNT_CHOOSER_DIALOG, FacebookAccountChooserDialog)) -#define FACEBOOK_ACCOUNT_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FACEBOOK_TYPE_ACCOUNT_CHOOSER_DIALOG, FacebookAccountChooserDialogClass)) -#define FACEBOOK_IS_ACCOUNT_CHOOSER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FACEBOOK_TYPE_ACCOUNT_CHOOSER_DIALOG)) -#define FACEBOOK_IS_ACCOUNT_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FACEBOOK_TYPE_ACCOUNT_CHOOSER_DIALOG)) -#define FACEBOOK_ACCOUNT_CHOOSER_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), FACEBOOK_TYPE_ACCOUNT_CHOOSER_DIALOG, FacebookAccountChooserDialogClass)) - -typedef struct _FacebookAccountChooserDialog FacebookAccountChooserDialog; -typedef struct _FacebookAccountChooserDialogClass FacebookAccountChooserDialogClass; -typedef struct _FacebookAccountChooserDialogPrivate FacebookAccountChooserDialogPrivate; - -struct _FacebookAccountChooserDialog { - GtkDialog parent_instance; - FacebookAccountChooserDialogPrivate *priv; -}; - -struct _FacebookAccountChooserDialogClass { - GtkDialogClass parent_class; -}; - -GType facebook_account_chooser_dialog_get_type (void); -GtkWidget * facebook_account_chooser_dialog_new (GList *accounts, - FacebookAccount *default_account); -FacebookAccount * facebook_account_chooser_dialog_get_active (FacebookAccountChooserDialog *self); - -G_END_DECLS - -#endif /* FACEBOOK_ACCOUNT_CHOOSER_DIALOG_H */ diff -Nru gthumb-3.0.2/extensions/facebook/facebook-account-manager-dialog.c gthumb-3.2.3/extensions/facebook/facebook-account-manager-dialog.c --- gthumb-3.0.2/extensions/facebook/facebook-account-manager-dialog.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/facebook-account-manager-dialog.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,219 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include "facebook-account.h" -#include "facebook-account-manager-dialog.h" - - -#define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x))) - - -enum { - ACCOUNT_DATA_COLUMN, - ACCOUNT_NAME_COLUMN, -}; - - -struct _FacebookAccountManagerDialogPrivate { - GtkBuilder *builder; -}; - - -G_DEFINE_TYPE (FacebookAccountManagerDialog, facebook_account_manager_dialog, GTK_TYPE_DIALOG) - - -static void -facebook_account_manager_dialog_finalize (GObject *object) -{ - FacebookAccountManagerDialog *self; - - self = FACEBOOK_ACCOUNT_MANAGER_DIALOG (object); - - _g_object_unref (self->priv->builder); - - G_OBJECT_CLASS (facebook_account_manager_dialog_parent_class)->finalize (object); -} - - -static void -facebook_account_manager_dialog_class_init (FacebookAccountManagerDialogClass *klass) -{ - GObjectClass *object_class; - - g_type_class_add_private (klass, sizeof (FacebookAccountManagerDialogPrivate)); - - object_class = (GObjectClass*) klass; - object_class->finalize = facebook_account_manager_dialog_finalize; -} - - -static void -delete_button_clicked_cb (GtkWidget *button, - gpointer user_data) -{ - FacebookAccountManagerDialog *self = user_data; - GtkTreeModel *tree_model; - GtkTreeIter iter; - - if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (GET_WIDGET ("account_treeview"))), - &tree_model, - &iter)) - { - gtk_list_store_remove (GTK_LIST_STORE (tree_model), &iter); - } -} - - -static void -text_renderer_edited_cb (GtkCellRendererText *renderer, - char *path, - char *new_text, - gpointer user_data) -{ - FacebookAccountManagerDialog *self = user_data; - GtkTreePath *tree_path; - GtkTreeIter iter; - FacebookAccount *account; - - tree_path = gtk_tree_path_new_from_string (path); - tree_path = gtk_tree_path_new_from_string (path); - if (! gtk_tree_model_get_iter (GTK_TREE_MODEL (GET_WIDGET ("accounts_liststore")), - &iter, - tree_path)) - { - gtk_tree_path_free (tree_path); - return; - } - gtk_tree_path_free (tree_path); - - gtk_tree_model_get (GTK_TREE_MODEL (GET_WIDGET ("accounts_liststore")), &iter, - ACCOUNT_DATA_COLUMN, &account, - -1); - facebook_account_set_username (account, new_text); - - gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("accounts_liststore")), &iter, - ACCOUNT_DATA_COLUMN, account, - ACCOUNT_NAME_COLUMN, new_text, - -1); - - g_object_unref (account); -} - - -static void -facebook_account_manager_dialog_init (FacebookAccountManagerDialog *self) -{ - GtkWidget *content; - - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, FACEBOOK_TYPE_ACCOUNT_MANAGER_DIALOG, FacebookAccountManagerDialogPrivate); - self->priv->builder = _gtk_builder_new_from_file ("facebook-account-manager.ui", "facebook"); - - gtk_window_set_resizable (GTK_WINDOW (self), FALSE); - gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), 5); - gtk_container_set_border_width (GTK_CONTAINER (self), 5); - - content = _gtk_builder_get_widget (self->priv->builder, "account_manager"); - gtk_container_set_border_width (GTK_CONTAINER (content), 5); - gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), content, TRUE, TRUE, 0); - - gtk_dialog_add_button (GTK_DIALOG (self), - GTK_STOCK_NEW, - FACEBOOK_ACCOUNT_MANAGER_RESPONSE_NEW); - gtk_dialog_add_button (GTK_DIALOG (self), - GTK_STOCK_CANCEL, - GTK_RESPONSE_CANCEL); - gtk_dialog_add_button (GTK_DIALOG (self), - GTK_STOCK_OK, - GTK_RESPONSE_OK); - - g_object_set (GET_WIDGET ("account_cellrenderertext"), "editable", TRUE, NULL); - g_signal_connect (GET_WIDGET ("account_cellrenderertext"), - "edited", - G_CALLBACK (text_renderer_edited_cb), - self); - - g_signal_connect (GET_WIDGET ("delete_button"), - "clicked", - G_CALLBACK (delete_button_clicked_cb), - self); -} - - -static void -facebook_account_manager_dialog_construct (FacebookAccountManagerDialog *self, - GList *accounts) -{ - GtkListStore *list_store; - GtkTreeIter iter; - GList *scan; - - list_store = GTK_LIST_STORE (GET_WIDGET ("accounts_liststore")); - gtk_list_store_clear (list_store); - for (scan = accounts; scan; scan = scan->next) { - FacebookAccount *account = scan->data; - - gtk_list_store_append (list_store, &iter); - gtk_list_store_set (list_store, &iter, - ACCOUNT_DATA_COLUMN, account, - ACCOUNT_NAME_COLUMN, account->username, - -1); - } -} - - -GtkWidget * -facebook_account_manager_dialog_new (GList *accounts) -{ - FacebookAccountManagerDialog *self; - - self = g_object_new (FACEBOOK_TYPE_ACCOUNT_MANAGER_DIALOG, NULL); - facebook_account_manager_dialog_construct (self, accounts); - - return (GtkWidget *) self; -} - - -GList * -facebook_account_manager_dialog_get_accounts (FacebookAccountManagerDialog *self) -{ - GList *accounts; - GtkTreeModel *tree_model; - GtkTreeIter iter; - - tree_model = (GtkTreeModel *) GET_WIDGET ("accounts_liststore"); - if (! gtk_tree_model_get_iter_first (tree_model, &iter)) - return NULL; - - accounts = NULL; - do { - FacebookAccount *account; - - gtk_tree_model_get (tree_model, &iter, - ACCOUNT_DATA_COLUMN, &account, - -1); - accounts = g_list_prepend (accounts, account); - } - while (gtk_tree_model_iter_next (tree_model, &iter)); - - return g_list_reverse (accounts); -} diff -Nru gthumb-3.0.2/extensions/facebook/facebook-account-manager-dialog.h gthumb-3.2.3/extensions/facebook/facebook-account-manager-dialog.h --- gthumb-3.0.2/extensions/facebook/facebook-account-manager-dialog.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/facebook-account-manager-dialog.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef FACEBOOK_ACCOUNT_MANAGER_DIALOG_H -#define FACEBOOK_ACCOUNT_MANAGER_DIALOG_H - -#include -#include - -G_BEGIN_DECLS - -#define FACEBOOK_ACCOUNT_MANAGER_RESPONSE_NEW 1 - -#define FACEBOOK_TYPE_ACCOUNT_MANAGER_DIALOG (facebook_account_manager_dialog_get_type ()) -#define FACEBOOK_ACCOUNT_MANAGER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FACEBOOK_TYPE_ACCOUNT_MANAGER_DIALOG, FacebookAccountManagerDialog)) -#define FACEBOOK_ACCOUNT_MANAGER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FACEBOOK_TYPE_ACCOUNT_MANAGER_DIALOG, FacebookAccountManagerDialogClass)) -#define FACEBOOK_IS_ACCOUNT_MANAGER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FACEBOOK_TYPE_ACCOUNT_MANAGER_DIALOG)) -#define FACEBOOK_IS_ACCOUNT_MANAGER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FACEBOOK_TYPE_ACCOUNT_MANAGER_DIALOG)) -#define FACEBOOK_ACCOUNT_MANAGER_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), FACEBOOK_TYPE_ACCOUNT_MANAGER_DIALOG, FacebookAccountManagerDialogClass)) - -typedef struct _FacebookAccountManagerDialog FacebookAccountManagerDialog; -typedef struct _FacebookAccountManagerDialogClass FacebookAccountManagerDialogClass; -typedef struct _FacebookAccountManagerDialogPrivate FacebookAccountManagerDialogPrivate; - -struct _FacebookAccountManagerDialog { - GtkDialog parent_instance; - FacebookAccountManagerDialogPrivate *priv; -}; - -struct _FacebookAccountManagerDialogClass { - GtkDialogClass parent_class; -}; - -GType facebook_account_manager_dialog_get_type (void); -GtkWidget * facebook_account_manager_dialog_new (GList *accounts); -GList * facebook_account_manager_dialog_get_accounts (FacebookAccountManagerDialog *dialog); - -G_END_DECLS - -#endif /* FACEBOOK_ACCOUNT_MANAGER_DIALOG_H */ diff -Nru gthumb-3.0.2/extensions/facebook/facebook-account.c gthumb-3.2.3/extensions/facebook/facebook-account.c --- gthumb-3.0.2/extensions/facebook/facebook-account.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/facebook-account.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,188 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#ifdef HAVE_GNOME_KEYRING -#include -#endif /* HAVE_GNOME_KEYRING */ -#include -#include "facebook-account.h" - - -static void facebook_account_dom_domizable_interface_init (DomDomizableInterface *iface); - - -G_DEFINE_TYPE_WITH_CODE (FacebookAccount, - facebook_account, - G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (DOM_TYPE_DOMIZABLE, - facebook_account_dom_domizable_interface_init)) - - -static void -facebook_account_finalize (GObject *obj) -{ - FacebookAccount *self; - - self = FACEBOOK_ACCOUNT (obj); - - g_free (self->user_id); - g_free (self->username); - g_free (self->session_key); - g_free (self->secret); - - G_OBJECT_CLASS (facebook_account_parent_class)->finalize (obj); -} - - -static void -facebook_account_class_init (FacebookAccountClass *klass) -{ - G_OBJECT_CLASS (klass)->finalize = facebook_account_finalize; -} - - -static DomElement* -facebook_account_create_element (DomDomizable *base, - DomDocument *doc) -{ - FacebookAccount *self; - DomElement *element; - gboolean set_secret; - - self = FACEBOOK_ACCOUNT (base); - - element = dom_document_create_element (doc, "account", NULL); - if (self->user_id != NULL) - dom_element_set_attribute (element, "uid", self->user_id); - if (self->username != NULL) - dom_element_set_attribute (element, "username", self->username); - - /* Don't save the secret in the configuration file if gnome-keyring is - * available. */ - - set_secret = TRUE; -#ifdef HAVE_GNOME_KEYRING - if (gnome_keyring_is_available ()) - set_secret = FALSE; -#endif - if (set_secret) { - if (self->session_key != NULL) - dom_element_set_attribute (element, "session_key", self->session_key); - if (self->secret != NULL) - dom_element_set_attribute (element, "secret", self->secret); - } - if (self->is_default) - dom_element_set_attribute (element, "default", "1"); - - return element; -} - - -static void -facebook_account_load_from_element (DomDomizable *base, - DomElement *element) -{ - FacebookAccount *self; - - self = FACEBOOK_ACCOUNT (base); - - _g_strset (&self->user_id, dom_element_get_attribute (element, "uid")); - _g_strset (&self->username, dom_element_get_attribute (element, "username")); - _g_strset (&self->session_key, dom_element_get_attribute (element, "session_key")); - _g_strset (&self->secret, dom_element_get_attribute (element, "secret")); - self->is_default = (g_strcmp0 (dom_element_get_attribute (element, "default"), "1") == 0); -} - - -static void -facebook_account_dom_domizable_interface_init (DomDomizableInterface *iface) -{ - iface->create_element = facebook_account_create_element; - iface->load_from_element = facebook_account_load_from_element; -} - - -static void -facebook_account_init (FacebookAccount *self) -{ - self->user_id = NULL; - self->username = NULL; - self->session_key = NULL; - self->secret = NULL; - self->is_default = FALSE; -} - - -FacebookAccount * -facebook_account_new (void) -{ - return g_object_new (FACEBOOK_TYPE_ACCOUNT, NULL); -} - - -void -facebook_account_set_session_key (FacebookAccount *self, - const char *value) -{ - _g_strset (&self->session_key, value); -} - - -void -facebook_account_set_secret (FacebookAccount *self, - const char *value) -{ - _g_strset (&self->secret, value); -} - - -void -facebook_account_set_user_id (FacebookAccount *self, - const char *value) -{ - _g_strset (&self->user_id, value); -} - - -void -facebook_account_set_username (FacebookAccount *self, - const char *value) -{ - _g_strset (&self->username, value); -} - - -int -facebook_account_cmp (FacebookAccount *a, - FacebookAccount *b) -{ - if ((a == NULL) && (b == NULL)) - return 0; - else if (a == NULL) - return 1; - else if (b == NULL) - return -1; - else - return g_strcmp0 (a->user_id, b->user_id); -} diff -Nru gthumb-3.0.2/extensions/facebook/facebook-account.h gthumb-3.2.3/extensions/facebook/facebook-account.h --- gthumb-3.0.2/extensions/facebook/facebook-account.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/facebook-account.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,71 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef FACEBOOK_ACCOUNT_H -#define FACEBOOK_ACCOUNT_H - -#include -#include - -G_BEGIN_DECLS - -#define FACEBOOK_TYPE_ACCOUNT (facebook_account_get_type ()) -#define FACEBOOK_ACCOUNT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FACEBOOK_TYPE_ACCOUNT, FacebookAccount)) -#define FACEBOOK_ACCOUNT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FACEBOOK_TYPE_ACCOUNT, FacebookAccountClass)) -#define FACEBOOK_IS_ACCOUNT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FACEBOOK_TYPE_ACCOUNT)) -#define FACEBOOK_IS_ACCOUNT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FACEBOOK_TYPE_ACCOUNT)) -#define FACEBOOK_ACCOUNT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), FACEBOOK_TYPE_ACCOUNT, FacebookAccountClass)) - -typedef struct _FacebookAccount FacebookAccount; -typedef struct _FacebookAccountClass FacebookAccountClass; -typedef struct _FacebookAccountPrivate FacebookAccountPrivate; - -struct _FacebookAccount { - GObject parent_instance; - FacebookAccountPrivate *priv; - - char *user_id; - char *username; - char *session_key; - char *secret; - gboolean is_default; -}; - -struct _FacebookAccountClass { - GObjectClass parent_class; -}; - -GType facebook_account_get_type (void); -FacebookAccount * facebook_account_new (void); -void facebook_account_set_session_key (FacebookAccount *self, - const char *value); -void facebook_account_set_secret (FacebookAccount *self, - const char *value); -void facebook_account_set_user_id (FacebookAccount *self, - const char *value); -void facebook_account_set_username (FacebookAccount *self, - const char *value); -int facebook_account_cmp (FacebookAccount *a, - FacebookAccount *b); - -G_END_DECLS - -#endif /* FACEBOOK_ACCOUNT_H */ diff -Nru gthumb-3.0.2/extensions/facebook/facebook-album-properties-dialog.c gthumb-3.2.3/extensions/facebook/facebook-album-properties-dialog.c --- gthumb-3.0.2/extensions/facebook/facebook-album-properties-dialog.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/facebook-album-properties-dialog.c 2013-04-30 16:56:12.000000000 +0000 @@ -86,7 +86,6 @@ static void facebook_album_properties_dialog_construct (FacebookAlbumPropertiesDialog *self, const char *name, - const char *location, const char *description, FacebookVisibility visibility) { @@ -94,8 +93,6 @@ if (name != NULL) gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("name_entry")), name); - if (location != NULL) - gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("location_entry")), location); if (description != NULL) gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("description_entry")), description); @@ -119,14 +116,13 @@ GtkWidget * facebook_album_properties_dialog_new (const char *name, - const char *location, const char *description, FacebookVisibility visibility) { FacebookAlbumPropertiesDialog *self; self = g_object_new (FACEBOOK_TYPE_ALBUM_PROPERTIES_DIALOG, NULL); - facebook_album_properties_dialog_construct (self, name, location, description, visibility); + facebook_album_properties_dialog_construct (self, name, description, visibility); return (GtkWidget *) self; } @@ -140,32 +136,51 @@ const char * -facebook_album_properties_dialog_get_location (FacebookAlbumPropertiesDialog *self) +facebook_album_properties_dialog_get_description (FacebookAlbumPropertiesDialog *self) { - return gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("location_entry"))); + return gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("description_entry"))); } -const char * -facebook_album_properties_dialog_get_description (FacebookAlbumPropertiesDialog *self) +static const char * +get_privacy_from_visibility (FacebookVisibility visibility) { - return gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("description_entry"))); + char *value = NULL; + + switch (visibility) { + case FACEBOOK_VISIBILITY_EVERYONE: + value = "{ 'value': 'EVERYONE' }"; + break; + + case FACEBOOK_VISIBILITY_ALL_FRIENDS: + value = "{ 'value': 'ALL_FRIENDS' }"; + break; + + case FACEBOOK_VISIBILITY_SELF: + value = "{ 'value': 'SELF' }"; + break; + + default: + break; + } + + return value; } -FacebookVisibility +const char * facebook_album_properties_dialog_get_visibility (FacebookAlbumPropertiesDialog *self) { GtkTreeIter iter; FacebookVisibility value; - if (! gtk_combo_box_get_active_iter (GTK_COMBO_BOX (GET_WIDGET ("visibility_combobox")), &iter)) - return FACEBOOK_VISIBILITY_SELF; - - gtk_tree_model_get (gtk_combo_box_get_model (GTK_COMBO_BOX (GET_WIDGET ("visibility_combobox"))), - &iter, - 1, &value, - -1); + if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (GET_WIDGET ("visibility_combobox")), &iter)) + gtk_tree_model_get (gtk_combo_box_get_model (GTK_COMBO_BOX (GET_WIDGET ("visibility_combobox"))), + &iter, + 1, &value, + -1); + else + value = FACEBOOK_VISIBILITY_SELF; - return value; + return get_privacy_from_visibility (value); } diff -Nru gthumb-3.0.2/extensions/facebook/facebook-album-properties-dialog.h gthumb-3.2.3/extensions/facebook/facebook-album-properties-dialog.h --- gthumb-3.0.2/extensions/facebook/facebook-album-properties-dialog.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/facebook-album-properties-dialog.h 2013-04-30 16:56:12.000000000 +0000 @@ -50,13 +50,11 @@ GType facebook_album_properties_dialog_get_type (void); GtkWidget * facebook_album_properties_dialog_new (const char *name, - const char *location, const char *description, FacebookVisibility visibility); const char * facebook_album_properties_dialog_get_name (FacebookAlbumPropertiesDialog *self); -const char * facebook_album_properties_dialog_get_location (FacebookAlbumPropertiesDialog *self); const char * facebook_album_properties_dialog_get_description (FacebookAlbumPropertiesDialog *self); -FacebookVisibility facebook_album_properties_dialog_get_visibility (FacebookAlbumPropertiesDialog *self); +const char * facebook_album_properties_dialog_get_visibility (FacebookAlbumPropertiesDialog *self); G_END_DECLS diff -Nru gthumb-3.0.2/extensions/facebook/facebook-album.c gthumb-3.2.3/extensions/facebook/facebook-album.c --- gthumb-3.0.2/extensions/facebook/facebook-album.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/facebook-album.c 2013-04-30 16:56:12.000000000 +0000 @@ -26,14 +26,19 @@ #include "facebook-album.h" -static void facebook_album_dom_domizable_interface_init (DomDomizableInterface *iface); +G_DEFINE_TYPE (FacebookAlbum, facebook_album, G_TYPE_OBJECT) -G_DEFINE_TYPE_WITH_CODE (FacebookAlbum, - facebook_album, - G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (DOM_TYPE_DOMIZABLE, - facebook_album_dom_domizable_interface_init)) +enum { + PROP_0, + PROP_ID, + PROP_NAME, + PROP_DESCRIPTION, + PROP_LINK, + PROP_PRIVACY, + PROP_COUNT, + PROP_CAN_UPLOAD +}; static void @@ -46,111 +51,153 @@ g_free (self->id); g_free (self->name); g_free (self->description); - g_free (self->location); g_free (self->link); + g_free (self->privacy); G_OBJECT_CLASS (facebook_album_parent_class)->finalize (obj); } static void -facebook_album_class_init (FacebookAlbumClass *klass) -{ - G_OBJECT_CLASS (klass)->finalize = facebook_album_finalize; -} - - -static DomElement* -facebook_album_create_element (DomDomizable *base, - DomDocument *doc) +facebook_album_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) { FacebookAlbum *self; - DomElement *element; - - self = FACEBOOK_ALBUM (base); - element = dom_document_create_element (doc, "photoset", NULL); - if (self->id != NULL) - dom_element_set_attribute (element, "aid", self->id); - if (self->name != NULL) - dom_element_append_child (element, dom_document_create_element_with_text (doc, self->name, "name", NULL)); - if (self->description != NULL) - dom_element_append_child (element, dom_document_create_element_with_text (doc, self->description, "description", NULL)); - - return element; -} - - -static FacebookVisibility -get_visibility_by_name (const char *name) -{ - if (name == NULL) - return FACEBOOK_VISIBILITY_EVERYONE; - if (g_strcmp0 (name, "everyone") == 0) - return FACEBOOK_VISIBILITY_EVERYONE; - if (g_strcmp0 (name, "networks_friends") == 0) - return FACEBOOK_VISIBILITY_NETWORKS_FRIENDS; - if (g_strcmp0 (name, "friends_of_friends") == 0) - return FACEBOOK_VISIBILITY_FRIENDS_OF_FRIENDS; - if (g_strcmp0 (name, "all_friends") == 0) - return FACEBOOK_VISIBILITY_ALL_FRIENDS; - if (g_strcmp0 (name, "self") == 0) - return FACEBOOK_VISIBILITY_SELF; - if (g_strcmp0 (name, "custom") == 0) - return FACEBOOK_VISIBILITY_CUSTOM; + self = FACEBOOK_ALBUM (object); - return FACEBOOK_VISIBILITY_EVERYONE; + switch (property_id) { + case PROP_ID: + _g_strset (&self->id, g_value_get_string (value)); + break; + case PROP_NAME: + _g_strset (&self->name, g_value_get_string (value)); + break; + case PROP_DESCRIPTION: + _g_strset (&self->description, g_value_get_string (value)); + break; + case PROP_LINK: + _g_strset (&self->link, g_value_get_string (value)); + break; + case PROP_PRIVACY: + _g_strset (&self->privacy, g_value_get_string (value)); + break; + case PROP_COUNT: + self->count = g_value_get_int (value); + break; + case PROP_CAN_UPLOAD: + self->can_upload = g_value_get_boolean (value); + break; + default: + break; + } } static void -facebook_album_load_from_element (DomDomizable *base, - DomElement *element) +facebook_album_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) { FacebookAlbum *self; - DomElement *node; - self = FACEBOOK_ALBUM (base); + self = FACEBOOK_ALBUM (object); - _g_strset (&self->id, NULL); - _g_strset (&self->name, NULL); - _g_strset (&self->description, NULL); - _g_strset (&self->location, NULL); - _g_strset (&self->link, NULL); - self->size = 0; - self->visibility = FACEBOOK_VISIBILITY_SELF; - - for (node = element->first_child; node; node = node->next_sibling) { - if (g_strcmp0 (node->tag_name, "aid") == 0) { - _g_strset (&self->id, dom_element_get_inner_text (node)); - } - else if (g_strcmp0 (node->tag_name, "name") == 0) { - _g_strset (&self->name, dom_element_get_inner_text (node)); - } - else if (g_strcmp0 (node->tag_name, "description") == 0) { - _g_strset (&self->description, dom_element_get_inner_text (node)); - } - else if (g_strcmp0 (node->tag_name, "location") == 0) { - _g_strset (&self->location, dom_element_get_inner_text (node)); - } - else if (g_strcmp0 (node->tag_name, "link") == 0) { - _g_strset (&self->link, dom_element_get_inner_text (node)); - } - else if (g_strcmp0 (node->tag_name, "size") == 0) { - self->size = atoi (dom_element_get_inner_text (node)); - } - else if (g_strcmp0 (node->tag_name, "visible") == 0) { - self->visibility = get_visibility_by_name (dom_element_get_inner_text (node)); - } + switch (property_id) { + case PROP_ID: + g_value_set_string (value, self->id); + break; + case PROP_NAME: + g_value_set_string (value, self->name); + break; + case PROP_DESCRIPTION: + g_value_set_string (value, self->description); + break; + case PROP_LINK: + g_value_set_string (value, self->link); + break; + case PROP_PRIVACY: + g_value_set_string (value, self->privacy); + break; + case PROP_COUNT: + g_value_set_int (value, self->count); + break; + case PROP_CAN_UPLOAD: + g_value_set_boolean (value, self->can_upload); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; } } static void -facebook_album_dom_domizable_interface_init (DomDomizableInterface *iface) +facebook_album_class_init (FacebookAlbumClass *klass) { - iface->create_element = facebook_album_create_element; - iface->load_from_element = facebook_album_load_from_element; + GObjectClass *object_class; + + object_class = G_OBJECT_CLASS (klass); + object_class->finalize = facebook_album_finalize; + object_class->set_property = facebook_album_set_property; + object_class->get_property = facebook_album_get_property; + + /* properties */ + + g_object_class_install_property (object_class, + PROP_ID, + g_param_spec_string ("id", + "ID", + "", + NULL, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_NAME, + g_param_spec_string ("name", + "Name", + "", + NULL, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_DESCRIPTION, + g_param_spec_string ("description", + "Description", + "", + NULL, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_LINK, + g_param_spec_string ("link", + "Link", + "", + NULL, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_PRIVACY, + g_param_spec_string ("privacy", + "Privacy", + "", + NULL, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_COUNT, + g_param_spec_int ("count", + "Count", + "", + 0, + G_MAXINT, + 0, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_CAN_UPLOAD, + g_param_spec_boolean ("can_upload", + "Can upload", + "", + FALSE, + G_PARAM_READWRITE)); } @@ -160,10 +207,10 @@ self->id = NULL; self->name = NULL; self->description = NULL; - self->location = NULL; self->link = NULL; - self->size = 0; - self->visibility = FACEBOOK_VISIBILITY_SELF; + self->privacy = NULL; + self->count = 0; + self->can_upload = FALSE; } @@ -172,27 +219,3 @@ { return g_object_new (FACEBOOK_TYPE_ALBUM, NULL); } - - -void -facebook_album_set_name (FacebookAlbum *self, - const char *value) -{ - _g_strset (&self->name, value); -} - - -void -facebook_album_set_location (FacebookAlbum *self, - const char *value) -{ - _g_strset (&self->location, value); -} - - -void -facebook_album_set_description (FacebookAlbum *self, - const char *value) -{ - _g_strset (&self->description, value); -} diff -Nru gthumb-3.0.2/extensions/facebook/facebook-album.h gthumb-3.2.3/extensions/facebook/facebook-album.h --- gthumb-3.0.2/extensions/facebook/facebook-album.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/facebook-album.h 2013-04-30 16:56:12.000000000 +0000 @@ -41,27 +41,21 @@ struct _FacebookAlbum { GObject parent_instance; - char *id; - char *name; - char *location; - char *description; - char *link; - int size; - FacebookVisibility visibility; + char *id; + char *name; + char *description; + char *link; + char *privacy; + int count; + gboolean can_upload; }; struct _FacebookAlbumClass { GObjectClass parent_class; }; -GType facebook_album_get_type (void); -FacebookAlbum * facebook_album_new (void); -void facebook_album_set_name (FacebookAlbum *self, - const char *value); -void facebook_album_set_location (FacebookAlbum *self, - const char *value); -void facebook_album_set_description (FacebookAlbum *self, - const char *value); +GType facebook_album_get_type (void); +FacebookAlbum * facebook_album_new (void); G_END_DECLS diff -Nru gthumb-3.0.2/extensions/facebook/facebook-authentication.c gthumb-3.2.3/extensions/facebook/facebook-authentication.c --- gthumb-3.0.2/extensions/facebook/facebook-authentication.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/facebook-authentication.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,765 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#ifdef HAVE_GNOME_KEYRING -#include -#endif /* HAVE_GNOME_KEYRING */ -#include "facebook-account-chooser-dialog.h" -#include "facebook-account-manager-dialog.h" -#include "facebook-authentication.h" -#include "facebook-user.h" -#include "facebook-service.h" - - -#define SECRET_SEPARATOR ("::") -#define FACEBOOK_AUTHENTICATION_RESPONSE_CHOOSE_ACCOUNT 2 - - -/* Signals */ -enum { - READY, - ACCOUNTS_CHANGED, - LAST_SIGNAL -}; - -struct _FacebookAuthenticationPrivate -{ - FacebookConnection *conn; - FacebookService *service; - GCancellable *cancellable; - GList *accounts; - FacebookAccount *account; - GtkWidget *browser; - GtkWidget *dialog; -}; - - -static guint facebook_authentication_signals[LAST_SIGNAL] = { 0 }; - - -G_DEFINE_TYPE (FacebookAuthentication, facebook_authentication, G_TYPE_OBJECT) - - -static void -facebook_authentication_finalize (GObject *object) -{ - FacebookAuthentication *self; - - self = FACEBOOK_AUTHENTICATION (object); - _g_object_unref (self->priv->conn); - _g_object_unref (self->priv->service); - _g_object_unref (self->priv->cancellable); - _g_object_list_unref (self->priv->accounts); - _g_object_unref (self->priv->account); - - G_OBJECT_CLASS (facebook_authentication_parent_class)->finalize (object); -} - - -static void -facebook_authentication_class_init (FacebookAuthenticationClass *class) -{ - GObjectClass *object_class; - - g_type_class_add_private (class, sizeof (FacebookAuthenticationPrivate)); - - object_class = (GObjectClass*) class; - object_class->finalize = facebook_authentication_finalize; - - /* signals */ - - facebook_authentication_signals[READY] = - g_signal_new ("ready", - G_TYPE_FROM_CLASS (class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (FacebookAuthenticationClass, ready), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, - 1, - G_TYPE_OBJECT); - facebook_authentication_signals[ACCOUNTS_CHANGED] = - g_signal_new ("accounts_changed", - G_TYPE_FROM_CLASS (class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (FacebookAuthenticationClass, accounts_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); -} - - -static void -facebook_authentication_init (FacebookAuthentication *self) -{ - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, FACEBOOK_TYPE_AUTHENTICATION, FacebookAuthenticationPrivate); - self->priv->conn = NULL; - self->priv->accounts = NULL; - self->priv->account = NULL; -} - - -FacebookAuthentication * -facebook_authentication_new (FacebookConnection *conn, - FacebookService *service, - GCancellable *cancellable, - GtkWidget *browser, - GtkWidget *dialog) -{ - FacebookAuthentication *self; - - g_return_val_if_fail (conn != NULL, NULL); - - self = (FacebookAuthentication *) g_object_new (FACEBOOK_TYPE_AUTHENTICATION, NULL); - self->priv->conn = g_object_ref (conn); - self->priv->service = g_object_ref (service); - self->priv->cancellable = _g_object_ref (cancellable); - self->priv->accounts = facebook_accounts_load_from_file (); - self->priv->account = facebook_accounts_find_default (self->priv->accounts); - self->priv->browser = browser; - self->priv->dialog = dialog; - - return self; -} - - -static void show_choose_account_dialog (FacebookAuthentication *self); - - -static void -authentication_error_dialog_response_cb (GtkDialog *dialog, - int response_id, - gpointer user_data) -{ - FacebookAuthentication *self = user_data; - - switch (response_id) { - case GTK_RESPONSE_DELETE_EVENT: - case GTK_RESPONSE_CANCEL: - gtk_widget_destroy (GTK_WIDGET (dialog)); - gtk_dialog_response (GTK_DIALOG (self->priv->dialog), GTK_RESPONSE_DELETE_EVENT); - break; - - case FACEBOOK_AUTHENTICATION_RESPONSE_CHOOSE_ACCOUNT: - gtk_widget_destroy (GTK_WIDGET (dialog)); - show_choose_account_dialog (self); - break; - - default: - break; - } -} - - -static void start_authorization_process (FacebookAuthentication *self); - - -static void -show_authentication_error_dialog (FacebookAuthentication *self, - GError **error) -{ - GtkWidget *dialog; - - if (g_error_matches (*error, FACEBOOK_CONNECTION_ERROR, FACEBOOK_CONNECTION_ERROR_SESSION_KEY_INVALID)) { - start_authorization_process (self); - return; - } - - dialog = _gtk_message_dialog_new (GTK_WINDOW (self->priv->browser), - GTK_DIALOG_MODAL, - GTK_STOCK_DIALOG_ERROR, - _("Could not connect to the server"), - (*error)->message, - _("Choose _Account..."), FACEBOOK_AUTHENTICATION_RESPONSE_CHOOSE_ACCOUNT, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - NULL); - if (self->priv->conn != NULL) - gth_task_dialog (GTH_TASK (self->priv->conn), TRUE, dialog); - - g_signal_connect (dialog, - "delete-event", - G_CALLBACK (gtk_true), - NULL); - g_signal_connect (dialog, - "response", - G_CALLBACK (authentication_error_dialog_response_cb), - self); - gtk_widget_show (dialog); - - g_clear_error (error); -} - - -/* -- facebook_authentication_auto_connect -- */ - - -static void -get_user_info_ready_cb (GObject *source_object, - GAsyncResult *res, - gpointer user_data) -{ - FacebookAuthentication *self = user_data; - FacebookUser *user; - GError *error = NULL; - - user = facebook_service_get_user_info_finish (FACEBOOK_SERVICE (source_object), res, &error); - if (error != NULL) { - show_authentication_error_dialog (self, &error); - return; - } - - facebook_account_set_username (self->priv->account, user->username); - facebook_accounts_save_to_file (self->priv->accounts, self->priv->account); - - g_signal_emit (self, facebook_authentication_signals[READY], 0, user); - - g_object_unref (user); -} - - -static void -get_logged_in_user_ready_cb (GObject *source_object, - GAsyncResult *res, - gpointer user_data) -{ - FacebookAuthentication *self = user_data; - char *uid; - GError *error = NULL; - - uid = facebook_service_get_logged_in_user_finish (FACEBOOK_SERVICE (source_object), res, &error); - if (error != NULL) { - show_authentication_error_dialog (self, &error); - return; - } - - if (g_strcmp0 (uid, self->priv->account->user_id) == 0) { - FacebookUser *user; - - user = facebook_user_new (); - facebook_user_set_id (user, uid); - facebook_user_set_username (user, self->priv->account->username); - g_signal_emit (self, facebook_authentication_signals[READY], 0, user); - - g_object_unref (user); - } - else { - /* Authorization required */ - start_authorization_process (self); - } - - g_free (uid); -} - - -static void -connect_to_server_step2 (FacebookAuthentication *self) -{ - if ((self->priv->account->session_key == NULL) || (self->priv->account->secret == NULL)) { - start_authorization_process (self); - return; - } - facebook_connection_set_session (self->priv->conn, - self->priv->account->session_key, - self->priv->account->secret); - if (self->priv->account->username == NULL) - facebook_service_get_user_info (self->priv->service, - "first_name,middle_name,last_name,name", - self->priv->cancellable, - get_user_info_ready_cb, - self); - else - facebook_service_get_logged_in_user (self->priv->service, - self->priv->cancellable, - get_logged_in_user_ready_cb, - self); -} - - -#ifdef HAVE_GNOME_KEYRING -static void -find_password_cb (GnomeKeyringResult result, - const char *string, - gpointer user_data) -{ - FacebookAuthentication *self = user_data; - - if (string != NULL) { - char **values; - - values = g_strsplit (string, SECRET_SEPARATOR, 2); - if ((values[0] != NULL) && (values[1] != NULL)) { - self->priv->account->session_key = g_strdup (values[0]); - self->priv->account->secret = g_strdup (values[1]); - } - - g_strfreev (values); - } - - connect_to_server_step2 (self); -} -#endif - - -static void -connect_to_server (FacebookAuthentication *self) -{ - g_return_if_fail (self->priv->account != NULL); - -#ifdef HAVE_GNOME_KEYRING - if (((self->priv->account->session_key == NULL) || (self->priv->account->secret == NULL)) && gnome_keyring_is_available ()) { - gnome_keyring_find_password (GNOME_KEYRING_NETWORK_PASSWORD, - find_password_cb, - self, - NULL, - "user", self->priv->account->user_id, - "server", FACEBOOK_HTTPS_REST_SERVER, - "protocol", "https", - NULL); - return; - } -#endif - - connect_to_server_step2 (self); -} - - -static void -set_account (FacebookAuthentication *self, - FacebookAccount *account) -{ - GList *link; - - link = g_list_find_custom (self->priv->accounts, self->priv->account, (GCompareFunc) facebook_account_cmp); - if (link != NULL) { - self->priv->accounts = g_list_remove_link (self->priv->accounts, link); - _g_object_list_unref (link); - } - - _g_object_unref (self->priv->account); - self->priv->account = NULL; - - if (account != NULL) { - self->priv->account = g_object_ref (account); - self->priv->accounts = g_list_prepend (self->priv->accounts, g_object_ref (self->priv->account)); - } -} - - -#ifdef HAVE_GNOME_KEYRING -static void -store_password_done_cb (GnomeKeyringResult result, - gpointer user_data) -{ - FacebookAuthentication *self = user_data; - connect_to_server (self); -} -#endif - - -static void -get_session_ready_cb (GObject *source_object, - GAsyncResult *res, - gpointer user_data) -{ - FacebookAuthentication *self = user_data; - GError *error = NULL; - FacebookAccount *account; - - if (! facebook_connection_get_session_finish (FACEBOOK_CONNECTION (source_object), res, &error)) { - show_authentication_error_dialog (self, &error); - return; - } - - account = facebook_account_new (); - facebook_account_set_session_key (account, facebook_connection_get_session_key (self->priv->conn)); - facebook_account_set_secret (account, facebook_connection_get_secret (self->priv->conn)); - facebook_account_set_user_id (account, facebook_connection_get_user_id (self->priv->conn)); - set_account (self, account); - -#ifdef HAVE_GNOME_KEYRING - if (gnome_keyring_is_available ()) { - char *secret; - - secret = g_strconcat (account->session_key, SECRET_SEPARATOR, account->secret, NULL); - gnome_keyring_store_password (GNOME_KEYRING_NETWORK_PASSWORD, - NULL, - "Facebook", - secret, - store_password_done_cb, - self, - NULL, - "user", account->user_id, - "server", FACEBOOK_HTTPS_REST_SERVER, - "protocol", "https", - NULL); - g_free (secret); - return; - } -#endif - - g_object_unref (account); - connect_to_server (self); -} - - -static void -complete_authorization_messagedialog_response_cb (GtkDialog *dialog, - int response_id, - gpointer user_data) -{ - FacebookAuthentication *self = user_data; - - switch (response_id) { - case GTK_RESPONSE_HELP: - show_help_dialog (GTK_WINDOW (dialog), "facebook-complete-authorization"); - break; - - case GTK_RESPONSE_DELETE_EVENT: - case GTK_RESPONSE_CANCEL: - gtk_widget_destroy (GTK_WIDGET (dialog)); - gtk_dialog_response (GTK_DIALOG (self->priv->dialog), GTK_RESPONSE_DELETE_EVENT); - break; - - case GTK_RESPONSE_OK: - gtk_widget_destroy (GTK_WIDGET (dialog)); - gth_task_dialog (GTH_TASK (self->priv->conn), FALSE, NULL); - facebook_connection_get_session (self->priv->conn, - self->priv->cancellable, - get_session_ready_cb, - self); - break; - - default: - break; - } -} - - -static void -complete_authorization (FacebookAuthentication *self) -{ - GtkBuilder *builder; - GtkWidget *dialog; - char *text; - char *secondary_text; - - gth_task_dialog (GTH_TASK (self->priv->conn), TRUE, NULL); - - builder = _gtk_builder_new_from_file ("facebook-complete-authorization.ui", "facebook"); - dialog = _gtk_builder_get_widget (builder, "complete_authorization_messagedialog"); - text = g_strdup_printf (_("Return to this window when you have finished the authorization process on %s"), "Facebook"); - secondary_text = g_strdup (_("Once you're done, click the 'Continue' button below.")); - g_object_set (dialog, "text", text, "secondary-text", secondary_text, NULL); - g_object_set_data_full (G_OBJECT (dialog), "builder", builder, g_object_unref); - g_signal_connect (dialog, - "delete-event", - G_CALLBACK (gtk_true), - NULL); - g_signal_connect (dialog, - "response", - G_CALLBACK (complete_authorization_messagedialog_response_cb), - self); - - if (gtk_widget_get_visible (self->priv->dialog)) - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self->priv->dialog)); - else - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self->priv->browser)); - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - gtk_window_present (GTK_WINDOW (dialog)); - - g_free (secondary_text); - g_free (text); -} - - -static void -ask_authorization_messagedialog_response_cb (GtkDialog *dialog, - int response_id, - gpointer user_data) -{ - FacebookAuthentication *self = user_data; - - switch (response_id) { - case GTK_RESPONSE_HELP: - show_help_dialog (GTK_WINDOW (dialog), "facebook-ask-authorization"); - break; - - case GTK_RESPONSE_DELETE_EVENT: - case GTK_RESPONSE_CANCEL: - gtk_widget_destroy (GTK_WIDGET (dialog)); - gtk_dialog_response (GTK_DIALOG (self->priv->dialog), GTK_RESPONSE_DELETE_EVENT); - break; - - case GTK_RESPONSE_OK: - { - GdkScreen *screen; - char *url; - GError *error = NULL; - - screen = gtk_widget_get_screen (GTK_WIDGET (dialog)); - gtk_widget_destroy (GTK_WIDGET (dialog)); - - url = facebook_connection_get_login_link (self->priv->conn, FACEBOOK_ACCESS_WRITE); - if (gtk_show_uri (screen, url, 0, &error)) - complete_authorization (self); - else - show_authentication_error_dialog (self, &error); - - g_free (url); - } - break; - - default: - break; - } -} - - -static void -ask_authorization (FacebookAuthentication *self) -{ - GtkBuilder *builder; - GtkWidget *dialog; - char *text; - char *secondary_text; - - gth_task_dialog (GTH_TASK (self->priv->conn), TRUE, NULL); - - builder = _gtk_builder_new_from_file ("facebook-ask-authorization.ui", "facebook"); - dialog = _gtk_builder_get_widget (builder, "ask_authorization_messagedialog"); - if (gtk_widget_get_visible (self->priv->dialog)) - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self->priv->dialog)); - else - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self->priv->browser)); - - text = g_strdup_printf (_("gthumb requires your authorization to upload the photos to %s"), "Facebook"); - secondary_text = g_strdup_printf (_("Click 'Authorize' to open your web browser and authorize gthumb to upload photos to %s. When you're finished, return to this window to complete the authorization."), "Facebook"); - g_object_set (dialog, "text", text, "secondary-text", secondary_text, NULL); - g_object_set_data_full (G_OBJECT (dialog), "builder", builder, g_object_unref); - g_signal_connect (dialog, - "delete-event", - G_CALLBACK (gtk_true), - NULL); - g_signal_connect (dialog, - "response", - G_CALLBACK (ask_authorization_messagedialog_response_cb), - self); - - gtk_widget_show (dialog); - - g_free (secondary_text); - g_free (text); -} - - -static void -create_token_ready_cb (GObject *source_object, - GAsyncResult *res, - gpointer user_data) -{ - FacebookAuthentication *self = user_data; - GError *error = NULL; - - if (! facebook_connection_create_token_finish (FACEBOOK_CONNECTION (source_object), res, &error)) - show_authentication_error_dialog (self, &error); - else - ask_authorization (self); -} - - -static void -start_authorization_process (FacebookAuthentication *self) -{ - facebook_connection_create_token (self->priv->conn, - self->priv->cancellable, - create_token_ready_cb, - self); -} - - -static void -account_chooser_dialog_response_cb (GtkDialog *dialog, - int response_id, - gpointer user_data) -{ - FacebookAuthentication *self = user_data; - - switch (response_id) { - case GTK_RESPONSE_DELETE_EVENT: - case GTK_RESPONSE_CANCEL: - gtk_widget_destroy (GTK_WIDGET (dialog)); - gtk_dialog_response (GTK_DIALOG (self->priv->dialog), GTK_RESPONSE_DELETE_EVENT); - break; - - case GTK_RESPONSE_OK: - _g_object_unref (self->priv->account); - self->priv->account = facebook_account_chooser_dialog_get_active (FACEBOOK_ACCOUNT_CHOOSER_DIALOG (dialog)); - if (self->priv->account != NULL) { - gtk_widget_destroy (GTK_WIDGET (dialog)); - connect_to_server (self); - } - - break; - - case FACEBOOK_ACCOUNT_CHOOSER_RESPONSE_NEW: - gtk_widget_destroy (GTK_WIDGET (dialog)); - start_authorization_process (self); - break; - - default: - break; - } -} - - -static void -show_choose_account_dialog (FacebookAuthentication *self) -{ - GtkWidget *dialog; - - gth_task_dialog (GTH_TASK (self->priv->conn), TRUE, NULL); - dialog = facebook_account_chooser_dialog_new (self->priv->accounts, self->priv->account); - g_signal_connect (dialog, - "delete-event", - G_CALLBACK (gtk_true), - NULL); - g_signal_connect (dialog, - "response", - G_CALLBACK (account_chooser_dialog_response_cb), - self); - - gtk_window_set_title (GTK_WINDOW (dialog), _("Choose Account")); - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self->priv->browser)); - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - gtk_window_present (GTK_WINDOW (dialog)); -} - - -void -facebook_authentication_auto_connect (FacebookAuthentication *self) -{ - gtk_widget_hide (self->priv->dialog); - gth_task_dialog (GTH_TASK (self->priv->conn), FALSE, NULL); - - if (self->priv->accounts != NULL) { - if (self->priv->account != NULL) { - connect_to_server (self); - } - else if (self->priv->accounts->next == NULL) { - self->priv->account = g_object_ref (self->priv->accounts->data); - connect_to_server (self); - } - else - show_choose_account_dialog (self); - } - else - start_authorization_process (self); -} - - -void -facebook_authentication_connect (FacebookAuthentication *self, - FacebookAccount *account) -{ - set_account (self, account); - facebook_authentication_auto_connect (self); -} - - -FacebookAccount * -facebook_authentication_get_account (FacebookAuthentication *self) -{ - return self->priv->account; -} - - -GList * -facebook_authentication_get_accounts (FacebookAuthentication *self) -{ - return self->priv->accounts; -} - - -/* -- facebook_authentication_edit_accounts -- */ - - -static void -account_manager_dialog_response_cb (GtkDialog *dialog, - int response_id, - gpointer user_data) -{ - FacebookAuthentication *self = user_data; - - switch (response_id) { - case GTK_RESPONSE_DELETE_EVENT: - case GTK_RESPONSE_CANCEL: - gtk_widget_destroy (GTK_WIDGET (dialog)); - break; - - case GTK_RESPONSE_OK: - _g_object_list_unref (self->priv->accounts); - self->priv->accounts = facebook_account_manager_dialog_get_accounts (FACEBOOK_ACCOUNT_MANAGER_DIALOG (dialog)); - if (! g_list_find_custom (self->priv->accounts, self->priv->account, (GCompareFunc) facebook_account_cmp)) { - _g_object_unref (self->priv->account); - self->priv->account = NULL; - facebook_authentication_auto_connect (self); - } - else - g_signal_emit (self, facebook_authentication_signals[ACCOUNTS_CHANGED], 0); - facebook_accounts_save_to_file (self->priv->accounts, self->priv->account); - gtk_widget_destroy (GTK_WIDGET (dialog)); - break; - - case FACEBOOK_ACCOUNT_MANAGER_RESPONSE_NEW: - gtk_widget_destroy (GTK_WIDGET (dialog)); - start_authorization_process (self); - break; - - default: - break; - } -} - - -void -facebook_authentication_edit_accounts (FacebookAuthentication *self, - GtkWindow *parent) -{ - GtkWidget *dialog; - - dialog = facebook_account_manager_dialog_new (self->priv->accounts); - g_signal_connect (dialog, - "delete-event", - G_CALLBACK (gtk_true), - NULL); - g_signal_connect (dialog, - "response", - G_CALLBACK (account_manager_dialog_response_cb), - self); - - gtk_window_set_title (GTK_WINDOW (dialog), _("Edit Accounts")); - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self->priv->dialog)); - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - gtk_window_present (GTK_WINDOW (dialog)); -} diff -Nru gthumb-3.0.2/extensions/facebook/facebook-authentication.h gthumb-3.2.3/extensions/facebook/facebook-authentication.h --- gthumb-3.0.2/extensions/facebook/facebook-authentication.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/facebook-authentication.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef FACEBOOK_AUTHENTICATION_H -#define FACEBOOK_AUTHENTICATION_H - -#include -#include -#include "facebook-account.h" -#include "facebook-connection.h" -#include "facebook-service.h" -#include "facebook-user.h" - -G_BEGIN_DECLS - -#define FACEBOOK_AUTHENTICATION_ERROR facebook_authentication_error_quark() - -#define FACEBOOK_TYPE_AUTHENTICATION (facebook_authentication_get_type ()) -#define FACEBOOK_AUTHENTICATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FACEBOOK_TYPE_AUTHENTICATION, FacebookAuthentication)) -#define FACEBOOK_AUTHENTICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FACEBOOK_TYPE_AUTHENTICATION, FacebookAuthenticationClass)) -#define FACEBOOK_IS_AUTHENTICATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FACEBOOK_TYPE_AUTHENTICATION)) -#define FACEBOOK_IS_AUTHENTICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FACEBOOK_TYPE_AUTHENTICATION)) -#define FACEBOOK_AUTHENTICATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), FACEBOOK_TYPE_AUTHENTICATION, FacebookAuthenticationClass)) - -typedef struct _FacebookAuthentication FacebookAuthentication; -typedef struct _FacebookAuthenticationClass FacebookAuthenticationClass; -typedef struct _FacebookAuthenticationPrivate FacebookAuthenticationPrivate; - -struct _FacebookAuthentication { - GObject parent_instance; - FacebookAuthenticationPrivate *priv; -}; - -struct _FacebookAuthenticationClass { - GObjectClass parent_class; - - /*< signals >*/ - - void (*ready) (FacebookAuthentication *auth, - FacebookUser *user); - void (*accounts_changed) (FacebookAuthentication *auth); -}; - - -GType facebook_authentication_get_type (void); -FacebookAuthentication * facebook_authentication_new (FacebookConnection *conn, - FacebookService *service, - GCancellable *cancellable, - GtkWidget *browser, - GtkWidget *dialog); -void facebook_authentication_auto_connect (FacebookAuthentication *auth); -void facebook_authentication_connect (FacebookAuthentication *auth, - FacebookAccount *account); -FacebookAccount * facebook_authentication_get_account (FacebookAuthentication *auth); -GList * facebook_authentication_get_accounts (FacebookAuthentication *auth); -void facebook_authentication_edit_accounts (FacebookAuthentication *auth, - GtkWindow *parent); - -G_END_DECLS - -#endif /* FACEBOOK_AUTHENTICATION_H */ diff -Nru gthumb-3.0.2/extensions/facebook/facebook-connection.c gthumb-3.2.3/extensions/facebook/facebook-connection.c --- gthumb-3.0.2/extensions/facebook/facebook-connection.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/facebook-connection.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,575 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include -#include "facebook-connection.h" -#include "facebook-user.h" - - -#undef DEBUG_FACEBOOK_CONNECTION -#define GTHUMB_FACEBOOK_API_KEY "1536ca726857c69843423d0312b9b356" -#define GTHUMB_FACEBOOK_SHARED_SECRET "8c0b99672a9bbc159ebec3c9a8240679" -#define FACEBOOK_API_VERSION "1.0" - - -GQuark -facebook_connection_error_quark (void) -{ - static GQuark quark; - - if (!quark) - quark = g_quark_from_static_string ("facebook-connection-error"); - - return quark; -} - - -/* -- FacebookConnection -- */ - - -struct _FacebookConnectionPrivate -{ - SoupSession *session; - SoupMessage *msg; - char *token; - char *secret; - char *session_key; - char *user_id; - GCancellable *cancellable; - GSimpleAsyncResult *result; - GChecksum *checksum; - char *call_id; -}; - - -G_DEFINE_TYPE (FacebookConnection, facebook_connection, GTH_TYPE_TASK) - - -static void -facebook_connection_finalize (GObject *object) -{ - FacebookConnection *self; - - self = FACEBOOK_CONNECTION (object); - - g_free (self->priv->call_id); - g_checksum_free (self->priv->checksum); - _g_object_unref (self->priv->result); - _g_object_unref (self->priv->cancellable); - g_free (self->priv->user_id); - g_free (self->priv->session_key); - g_free (self->priv->secret); - g_free (self->priv->token); - _g_object_unref (self->priv->session); - - G_OBJECT_CLASS (facebook_connection_parent_class)->finalize (object); -} - - -static void -facebook_connection_exec (GthTask *base) -{ - /* void */ -} - - -static void -facebook_connection_cancelled (GthTask *base) -{ - FacebookConnection *self = FACEBOOK_CONNECTION (base); - - if ((self->priv->session == NULL) || (self->priv->msg == NULL)) - return; - - soup_session_cancel_message (self->priv->session, self->priv->msg, SOUP_STATUS_CANCELLED); -} - - -static void -facebook_connection_class_init (FacebookConnectionClass *klass) -{ - GObjectClass *object_class; - GthTaskClass *task_class; - - g_type_class_add_private (klass, sizeof (FacebookConnectionPrivate)); - - object_class = (GObjectClass*) klass; - object_class->finalize = facebook_connection_finalize; - - task_class = (GthTaskClass*) klass; - task_class->exec = facebook_connection_exec; - task_class->cancelled = facebook_connection_cancelled; -} - - -static void -facebook_connection_init (FacebookConnection *self) -{ - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, FACEBOOK_TYPE_CONNECTION, FacebookConnectionPrivate); - self->priv->session = NULL; - self->priv->msg = NULL; - self->priv->token = NULL; - self->priv->secret = NULL; - self->priv->session_key = NULL; - self->priv->user_id = NULL; - self->priv->cancellable = NULL; - self->priv->result = NULL; - self->priv->checksum = g_checksum_new (G_CHECKSUM_MD5); - self->priv->call_id = NULL; -} - - -FacebookConnection * -facebook_connection_new (void) -{ - return (FacebookConnection *) g_object_new (FACEBOOK_TYPE_CONNECTION, NULL); -} - - -void -facebook_connection_send_message (FacebookConnection *self, - SoupMessage *msg, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data, - gpointer source_tag, - SoupSessionCallback soup_session_cb, - gpointer soup_session_cb_data) -{ - if (self->priv->session == NULL) { - self->priv->session = soup_session_async_new_with_options ( -#ifdef HAVE_LIBSOUP_GNOME - SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_PROXY_RESOLVER_GNOME, -#endif - NULL); - -#ifdef DEBUG_FACEBOOK_CONNECTION - { - SoupLogger *logger; - - logger = soup_logger_new (SOUP_LOGGER_LOG_BODY, -1); - soup_session_add_feature (self->priv->session, SOUP_SESSION_FEATURE (logger)); - - g_object_unref (logger); - } -#endif - } - - _g_object_unref (self->priv->cancellable); - self->priv->cancellable = _g_object_ref (cancellable); - - _g_object_unref (self->priv->result); - self->priv->result = g_simple_async_result_new (G_OBJECT (soup_session_cb_data), - callback, - user_data, - source_tag); - - self->priv->msg = msg; - g_object_add_weak_pointer (G_OBJECT (msg), (gpointer *) &self->priv->msg); - - soup_session_queue_message (self->priv->session, - msg, - soup_session_cb, - soup_session_cb_data); -} - - -GSimpleAsyncResult * -facebook_connection_get_result (FacebookConnection *self) -{ - return self->priv->result; -} - - -void -facebook_connection_reset_result (FacebookConnection *self) -{ - _g_object_unref (self->priv->result); - self->priv->result = NULL; -} - - -void -facebook_connection_add_api_sig (FacebookConnection *self, - GHashTable *data_set) -{ - GList *keys; - GList *scan; - - g_hash_table_insert (data_set, "api_key", GTHUMB_FACEBOOK_API_KEY); - g_hash_table_insert (data_set, "v", FACEBOOK_API_VERSION); - g_hash_table_insert (data_set, "format", "XML"); - - if (self->priv->session_key != NULL) { - GTimeVal current_time; - - g_hash_table_insert (data_set, "session_key", self->priv->session_key); - g_hash_table_insert (data_set, "ss", "true"); - - g_free (self->priv->call_id); - g_get_current_time (¤t_time); - self->priv->call_id = g_strdup_printf ("%ld.%ld", current_time.tv_sec, current_time.tv_usec); - g_hash_table_insert (data_set, "call_id", self->priv->call_id); - } - - g_checksum_reset (self->priv->checksum); - keys = g_hash_table_get_keys (data_set); - keys = g_list_sort (keys, (GCompareFunc) strcmp); - for (scan = keys; scan; scan = scan->next) { - char *key = scan->data; - - g_checksum_update (self->priv->checksum, (guchar *) key, -1); - g_checksum_update (self->priv->checksum, (guchar *) "=", -1); - g_checksum_update (self->priv->checksum, g_hash_table_lookup (data_set, key), -1); - } - if (self->priv->session_key != NULL) - g_checksum_update (self->priv->checksum, (guchar *) self->priv->secret, -1); - else - g_checksum_update (self->priv->checksum, (guchar *) GTHUMB_FACEBOOK_SHARED_SECRET, -1); - g_hash_table_insert (data_set, "sig", (gpointer) g_checksum_get_string (self->priv->checksum)); - - g_list_free (keys); -} - - -static void -create_token_ready_cb (SoupSession *session, - SoupMessage *msg, - gpointer user_data) -{ - FacebookConnection *self = user_data; - SoupBuffer *body; - DomDocument *doc = NULL; - GError *error = NULL; - - body = soup_message_body_flatten (msg->response_body); - if (facebook_utils_parse_response (body, &doc, &error)) { - DomElement *root; - - root = DOM_ELEMENT (doc)->first_child; - if (g_strcmp0 (root->tag_name, "auth_createToken_response") == 0) - self->priv->token = g_strdup (dom_element_get_inner_text (root)); - - if (self->priv->token == NULL) { - error = g_error_new_literal (FACEBOOK_CONNECTION_ERROR, 0, _("Unknown error")); - g_simple_async_result_set_from_error (self->priv->result, error); - } - else - g_simple_async_result_set_op_res_gboolean (self->priv->result, TRUE); - - g_object_unref (doc); - } - else - g_simple_async_result_set_from_error (self->priv->result, error); - - g_simple_async_result_complete_in_idle (self->priv->result); - - soup_buffer_free (body); -} - - -void -facebook_connection_create_token (FacebookConnection *self, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - GHashTable *data_set; - SoupMessage *msg; - - g_free (self->priv->token); - g_free (self->priv->session_key); - g_free (self->priv->secret); - g_free (self->priv->user_id); - self->priv->token = NULL; - self->priv->session_key = NULL; - self->priv->secret = NULL; - self->priv->user_id = NULL; - - gth_task_progress (GTH_TASK (self), _("Connecting to the server"), NULL, TRUE, 0.0); - - data_set = g_hash_table_new (g_str_hash, g_str_equal); - g_hash_table_insert (data_set, "method", "facebook.auth.createToken"); - facebook_connection_add_api_sig (self, data_set); - msg = soup_form_request_new_from_hash ("POST", FACEBOOK_HTTPS_REST_SERVER, data_set); - facebook_connection_send_message (self, - msg, - cancellable, - callback, - user_data, - facebook_connection_create_token, - create_token_ready_cb, - self); - - g_hash_table_destroy (data_set); -} - - -gboolean -facebook_connection_create_token_finish (FacebookConnection *self, - GAsyncResult *result, - GError **error) -{ - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return FALSE; - else - return TRUE; -} - - -static char * -get_access_type_name (FacebookAccessType access_type) -{ - char *name = NULL; - - switch (access_type) { - case FACEBOOK_ACCESS_READ: - /*name = "read_stream,offline_access";*/ - name = "user_photos,offline_access"; - break; - - case FACEBOOK_ACCESS_WRITE: - /*name = "photo_upload,offline_access";*/ - name = "user_photos,offline_access,publish_stream"; - break; - } - - return name; -} - - -char * -facebook_connection_get_login_link (FacebookConnection *self, - FacebookAccessType access_type) -{ - GHashTable *data_set; - GString *link; - GList *keys; - GList *scan; - - g_return_val_if_fail (self->priv->token != NULL, NULL); - - data_set = g_hash_table_new (g_str_hash, g_str_equal); - g_hash_table_insert (data_set, "api_key", GTHUMB_FACEBOOK_API_KEY); - g_hash_table_insert (data_set, "auth_token", self->priv->token); - g_hash_table_insert (data_set, "req_perms", get_access_type_name (access_type)); - g_hash_table_insert (data_set, "connect_display", "page"); - g_hash_table_insert (data_set, "fbconnect", "true"); - - link = g_string_new ("http://www.facebook.com/login.php?"); - keys = g_hash_table_get_keys (data_set); - for (scan = keys; scan; scan = scan->next) { - char *key = scan->data; - char *encoded; - - if (scan != keys) - g_string_append (link, "&"); - g_string_append (link, key); - g_string_append (link, "="); - encoded = soup_uri_encode (g_hash_table_lookup (data_set, key), NULL); - g_string_append (link, encoded); - - g_free (encoded); - } - - g_list_free (keys); - g_hash_table_destroy (data_set); - - return g_string_free (link, FALSE); -} - - -static void -get_session_ready_cb (SoupSession *session, - SoupMessage *msg, - gpointer user_data) -{ - FacebookConnection *self = user_data; - SoupBuffer *body; - DomDocument *doc = NULL; - GError *error = NULL; - - body = soup_message_body_flatten (msg->response_body); - if (facebook_utils_parse_response (body, &doc, &error)) { - DomElement *root; - - root = DOM_ELEMENT (doc)->first_child; - if (g_strcmp0 (root->tag_name, "auth_getSession_response") == 0) { - DomElement *node; - - for (node = root->first_child; node; node = node->next_sibling) { - if (g_strcmp0 (node->tag_name, "session_key") == 0) { - self->priv->session_key = g_strdup (dom_element_get_inner_text (node)); - } - else if (g_strcmp0 (node->tag_name, "secret") == 0) { - self->priv->secret = g_strdup (dom_element_get_inner_text (node)); - } - else if (g_strcmp0 (node->tag_name, "uid") == 0) { - self->priv->user_id = g_strdup (dom_element_get_inner_text (node)); - } - } - } - - if ((self->priv->session_key == NULL) || (self->priv->secret == NULL)) { - error = g_error_new_literal (FACEBOOK_CONNECTION_ERROR, 0, _("Unknown error")); - g_simple_async_result_set_from_error (self->priv->result, error); - } - else - g_simple_async_result_set_op_res_gboolean (self->priv->result, TRUE); - - g_object_unref (doc); - } - else - g_simple_async_result_set_from_error (self->priv->result, error); - - g_simple_async_result_complete_in_idle (self->priv->result); - - soup_buffer_free (body); -} - - -void -facebook_connection_get_session (FacebookConnection *self, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - GHashTable *data_set; - SoupMessage *msg; - - gth_task_progress (GTH_TASK (self), _("Connecting to the server"), NULL, TRUE, 0.0); - - g_free (self->priv->session_key); - g_free (self->priv->secret); - g_free (self->priv->user_id); - self->priv->session_key = NULL; - self->priv->secret = NULL; - self->priv->user_id = NULL; - - data_set = g_hash_table_new (g_str_hash, g_str_equal); - g_hash_table_insert (data_set, "method", "facebook.auth.getSession"); - g_hash_table_insert (data_set, "auth_token", self->priv->token); - facebook_connection_add_api_sig (self, data_set); - msg = soup_form_request_new_from_hash ("POST", FACEBOOK_HTTPS_REST_SERVER, data_set); - facebook_connection_send_message (self, - msg, - cancellable, - callback, - user_data, - facebook_connection_get_session, - get_session_ready_cb, - self); - - g_hash_table_destroy (data_set); -} - - -gboolean -facebook_connection_get_session_finish (FacebookConnection *self, - GAsyncResult *result, - GError **error) -{ - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return FALSE; - else - return TRUE; -} - - -void -facebook_connection_set_session (FacebookConnection *self, - const char *session_key, - const char *secret) -{ - _g_strset (&self->priv->session_key, session_key); - _g_strset (&self->priv->secret, secret); -} - - -const char * -facebook_connection_get_session_key (FacebookConnection *self) -{ - return self->priv->session_key; -} - - -const char * -facebook_connection_get_secret (FacebookConnection *self) -{ - return self->priv->secret; -} - - -const char * -facebook_connection_get_user_id (FacebookConnection *self) -{ - return self->priv->user_id; -} - - -/* utilities */ - - -gboolean -facebook_utils_parse_response (SoupBuffer *body, - DomDocument **doc_p, - GError **error) -{ - DomDocument *doc; - DomElement *node; - - doc = dom_document_new (); - if (! dom_document_load (doc, body->data, body->length, error)) { - g_object_unref (doc); - return FALSE; - } - - for (node = DOM_ELEMENT (doc)->first_child; node; node = node->next_sibling) { - if (g_strcmp0 (node->tag_name, "error_response") == 0) { - DomElement *child; - int code = 0; - const char *message = NULL; - - for (child = node->first_child; child; child = child->next_sibling) { - if (g_strcmp0 (child->tag_name, "error_code") == 0) { - code = atoi (dom_element_get_inner_text (child)); - } - else if (g_strcmp0 (child->tag_name, "error_msg") == 0) { - message = dom_element_get_inner_text (child); - } - } - - *error = g_error_new_literal (FACEBOOK_CONNECTION_ERROR, - code, - message); - - g_object_unref (doc); - return FALSE; - } - } - - *doc_p = doc; - - return TRUE; -} diff -Nru gthumb-3.0.2/extensions/facebook/facebook-connection.h gthumb-3.2.3/extensions/facebook/facebook-connection.h --- gthumb-3.0.2/extensions/facebook/facebook-connection.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/facebook-connection.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,112 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef FACEBOOK_CONNECTION_H -#define FACEBOOK_CONNECTION_H - -#include -#ifdef HAVE_LIBSOUP_GNOME -#include -#else -#include -#endif /* HAVE_LIBSOUP_GNOME */ -#include - -typedef enum { - FACEBOOK_ACCESS_READ, - FACEBOOK_ACCESS_WRITE -} FacebookAccessType; - -#define FACEBOOK_REST_SERVER "api.facebook.com/restserver.php" -#define FACEBOOK_HTTP_REST_SERVER "http://" FACEBOOK_REST_SERVER -#define FACEBOOK_HTTPS_REST_SERVER "https://" FACEBOOK_REST_SERVER - -#define FACEBOOK_CONNECTION_ERROR facebook_connection_error_quark () -GQuark facebook_connection_error_quark (void); - -#define FACEBOOK_CONNECTION_ERROR_SESSION_KEY_INVALID 102 - -#define FACEBOOK_TYPE_CONNECTION (facebook_connection_get_type ()) -#define FACEBOOK_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), FACEBOOK_TYPE_CONNECTION, FacebookConnection)) -#define FACEBOOK_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), FACEBOOK_TYPE_CONNECTION, FacebookConnectionClass)) -#define FACEBOOK_IS_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), FACEBOOK_TYPE_CONNECTION)) -#define FACEBOOK_IS_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), FACEBOOK_TYPE_CONNECTION)) -#define FACEBOOK_CONNECTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), FACEBOOK_TYPE_CONNECTION, FacebookConnectionClass)) - -typedef struct _FacebookConnection FacebookConnection; -typedef struct _FacebookConnectionPrivate FacebookConnectionPrivate; -typedef struct _FacebookConnectionClass FacebookConnectionClass; - -struct _FacebookConnection -{ - GthTask __parent; - FacebookConnectionPrivate *priv; -}; - -struct _FacebookConnectionClass -{ - GthTaskClass __parent_class; -}; - -GType facebook_connection_get_type (void) G_GNUC_CONST; -FacebookConnection * facebook_connection_new (void); -void facebook_connection_send_message (FacebookConnection *self, - SoupMessage *msg, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data, - gpointer source_tag, - SoupSessionCallback soup_session_cb, - gpointer soup_session_cb_data); -GSimpleAsyncResult * facebook_connection_get_result (FacebookConnection *self); -void facebook_connection_reset_result (FacebookConnection *self); -void facebook_connection_add_api_sig (FacebookConnection *self, - GHashTable *data_set); -void facebook_connection_create_token (FacebookConnection *self, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -gboolean facebook_connection_create_token_finish (FacebookConnection *self, - GAsyncResult *result, - GError **error); -char * facebook_connection_get_login_link (FacebookConnection *self, - FacebookAccessType access_type); -void facebook_connection_get_session (FacebookConnection *self, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -gboolean facebook_connection_get_session_finish (FacebookConnection *self, - GAsyncResult *result, - GError **error); -void facebook_connection_set_session (FacebookConnection *self, - const char *session_key, - const char *secret); -const char * facebook_connection_get_session_key (FacebookConnection *self); -const char * facebook_connection_get_secret (FacebookConnection *self); -const char * facebook_connection_get_user_id (FacebookConnection *self); - -/* utilities */ - -gboolean facebook_utils_parse_response (SoupBuffer *body, - DomDocument **doc_p, - GError **error); - -#endif /* FACEBOOK_CONNECTION_H */ diff -Nru gthumb-3.0.2/extensions/facebook/facebook-photo.c gthumb-3.2.3/extensions/facebook/facebook-photo.c --- gthumb-3.0.2/extensions/facebook/facebook-photo.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/facebook-photo.c 2013-04-30 16:56:12.000000000 +0000 @@ -3,7 +3,7 @@ /* * GThumb * - * Copyright (C) 2010 Free Software Foundation, Inc. + * Copyright (C) 2010-2012 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,202 +22,435 @@ #include #include #include +#include #include #include "facebook-photo.h" -static void facebook_photo_dom_domizable_interface_init (DomDomizableInterface *iface); +static void facebook_photo_json_serializable_interface_init (JsonSerializableIface *iface); G_DEFINE_TYPE_WITH_CODE (FacebookPhoto, facebook_photo, G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (DOM_TYPE_DOMIZABLE, - facebook_photo_dom_domizable_interface_init)) + G_IMPLEMENT_INTERFACE (JSON_TYPE_SERIALIZABLE, + facebook_photo_json_serializable_interface_init)) -static void -facebook_photo_finalize (GObject *obj) +enum { + PROP_0, + PROP_ID, + PROP_PICTURE, + PROP_SOURCE, + PROP_WIDTH, + PROP_HEIGHT, + PROP_LINK, + PROP_CREATED_TIME, + PROP_UPDATED_TIME, + PROP_IMAGES +}; + + +/* -- facebook_image -- */ + + +static FacebookImage * +facebook_image_new (void) { - FacebookPhoto *self; + FacebookImage *image; - self = FACEBOOK_PHOTO (obj); + image = g_new (FacebookImage, 1); + image->source = NULL; + image->width = 0; + image->height = 0; - g_free (self->id); - g_free (self->secret); - g_free (self->server); - g_free (self->title); + return image; +} - G_OBJECT_CLASS (facebook_photo_parent_class)->finalize (obj); + +static FacebookImage * +facebook_image_copy (FacebookImage *source) +{ + FacebookImage *dest; + + dest = facebook_image_new (); + _g_strset (&dest->source, source->source); + dest->width = source->width; + dest->height = source->height; + + return dest; } static void -facebook_photo_class_init (FacebookPhotoClass *klass) +facebook_image_free (FacebookImage *image) { - G_OBJECT_CLASS (klass)->finalize = facebook_photo_finalize; + g_free (image->source); + g_free (image); } -static DomElement* -facebook_photo_create_element (DomDomizable *base, - DomDocument *doc) -{ - FacebookPhoto *self; - DomElement *element; +/* -- facebook_image_list -- */ + - self = FACEBOOK_PHOTO (base); +#define FACEBOOK_TYPE_IMAGE_LIST (facebook_image_list_get_type ()) - element = dom_document_create_element (doc, "photo", NULL); - if (self->id != NULL) - dom_element_set_attribute (element, "id", self->id); - if (self->secret != NULL) - dom_element_set_attribute (element, "secret", self->secret); - if (self->server != NULL) - dom_element_set_attribute (element, "server", self->server); - if (self->title != NULL) - dom_element_set_attribute (element, "title", self->title); - if (self->is_primary) - dom_element_set_attribute (element, "isprimary", "1"); - return element; +static GList * +facebook_image_list_copy (GList *source) +{ + return g_list_copy_deep (source, (GCopyFunc) facebook_image_copy, NULL); } static void -facebook_photo_load_from_element (DomDomizable *base, - DomElement *element) +facebook_image_list_free (GList *images) { - FacebookPhoto *self; + g_list_foreach (images, (GFunc) facebook_image_free, NULL); + g_list_free (images); +} - if ((element == NULL) || (g_strcmp0 (element->tag_name, "photo") != 0)) - return; - self = FACEBOOK_PHOTO (base); +G_DEFINE_BOXED_TYPE (GList, facebook_image_list, facebook_image_list_copy, facebook_image_list_free) - facebook_photo_set_id (self, dom_element_get_attribute (element, "id")); - facebook_photo_set_secret (self, dom_element_get_attribute (element, "secret")); - facebook_photo_set_server (self, dom_element_get_attribute (element, "server")); - facebook_photo_set_title (self, dom_element_get_attribute (element, "title")); - facebook_photo_set_is_primary (self, dom_element_get_attribute (element, "isprimary")); - facebook_photo_set_url_sq (self, dom_element_get_attribute (element, "url_sq")); - facebook_photo_set_url_t (self, dom_element_get_attribute (element, "url_t")); - facebook_photo_set_url_s (self, dom_element_get_attribute (element, "url_s")); - facebook_photo_set_url_m (self, dom_element_get_attribute (element, "url_m")); - facebook_photo_set_url_o (self, dom_element_get_attribute (element, "url_o")); -} + +/* -- facebook_photo -- */ static void -facebook_photo_dom_domizable_interface_init (DomDomizableInterface *iface) +facebook_photo_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) { - iface->create_element = facebook_photo_create_element; - iface->load_from_element = facebook_photo_load_from_element; + FacebookPhoto *self; + + self = FACEBOOK_PHOTO (object); + + switch (property_id) { + case PROP_ID: + _g_strset (&self->id, g_value_get_string (value)); + break; + case PROP_PICTURE: + _g_strset (&self->picture, g_value_get_string (value)); + break; + case PROP_SOURCE: + _g_strset (&self->source, g_value_get_string (value)); + break; + case PROP_WIDTH: + self->width = g_value_get_int (value); + break; + case PROP_HEIGHT: + self->height = g_value_get_int (value); + break; + case PROP_LINK: + _g_strset (&self->link, g_value_get_string (value)); + break; + case PROP_CREATED_TIME: + gth_datetime_free (self->created_time); + self->created_time = g_value_dup_boxed (value); + break; + case PROP_UPDATED_TIME: + gth_datetime_free (self->updated_time); + self->updated_time = g_value_dup_boxed (value); + break; + case PROP_IMAGES: + facebook_image_list_free (self->images); + self->images = g_value_dup_boxed (value); + break; + default: + break; + } } static void -facebook_photo_init (FacebookPhoto *self) +facebook_photo_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) { - /* void */ -} + FacebookPhoto *self; + self = FACEBOOK_PHOTO (object); -FacebookPhoto * -facebook_photo_new (void) -{ - return g_object_new (FACEBOOK_TYPE_PHOTO, NULL); + switch (property_id) { + case PROP_ID: + g_value_set_string (value, self->id); + break; + case PROP_PICTURE: + g_value_set_string (value, self->picture); + break; + case PROP_SOURCE: + g_value_set_string (value, self->source); + break; + case PROP_WIDTH: + g_value_set_int (value, self->width); + break; + case PROP_HEIGHT: + g_value_set_int (value, self->height); + break; + case PROP_LINK: + g_value_set_string (value, self->link); + break; + case PROP_CREATED_TIME: + g_value_set_boxed (value, self->created_time); + break; + case PROP_UPDATED_TIME: + g_value_set_boxed (value, self->updated_time); + break; + case PROP_IMAGES: + g_value_set_boxed (value, self->images); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } } -void -facebook_photo_set_id (FacebookPhoto *self, - const char *value) +static void +facebook_photo_finalize (GObject *obj) { - _g_strset (&self->id, value); -} + FacebookPhoto *self; + self = FACEBOOK_PHOTO (obj); -void -facebook_photo_set_secret (FacebookPhoto *self, - const char *value) -{ - _g_strset (&self->secret, value); + g_free (self->id); + g_free (self->picture); + g_free (self->source); + g_free (self->link); + gth_datetime_free (self->created_time); + gth_datetime_free (self->updated_time); + facebook_image_list_free (self->images); + + G_OBJECT_CLASS (facebook_photo_parent_class)->finalize (obj); } -void -facebook_photo_set_server (FacebookPhoto *self, - const char *value) +static void +facebook_photo_class_init (FacebookPhotoClass *klass) { - _g_strset (&self->server, value); + GObjectClass *object_class; + + object_class = G_OBJECT_CLASS (klass); + object_class->finalize = facebook_photo_finalize; + object_class->set_property = facebook_photo_set_property; + object_class->get_property = facebook_photo_get_property; + + /* properties */ + + g_object_class_install_property (object_class, + PROP_ID, + g_param_spec_string ("id", + "ID", + "", + NULL, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_PICTURE, + g_param_spec_string ("picture", + "Picture", + "", + NULL, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_SOURCE, + g_param_spec_string ("source", + "Source", + "", + NULL, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_WIDTH, + g_param_spec_int ("width", + "Width", + "", + 0, + G_MAXINT, + 0, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_HEIGHT, + g_param_spec_int ("height", + "Height", + "", + 0, + G_MAXINT, + 0, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_LINK, + g_param_spec_string ("link", + "Link", + "", + NULL, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_CREATED_TIME, + g_param_spec_boxed ("created-time", + "Created time", + "", + GTH_TYPE_DATETIME, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_UPDATED_TIME, + g_param_spec_boxed ("updated-time", + "Updated time", + "", + GTH_TYPE_DATETIME, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_IMAGES, + g_param_spec_boxed ("images", + "Images", + "", + FACEBOOK_TYPE_IMAGE_LIST, + G_PARAM_READWRITE)); +} + + +static gboolean +facebook_photo_deserialize_property (JsonSerializable *serializable, + const gchar *property_name, + GValue *value, + GParamSpec *pspec, + JsonNode *property_node) +{ + FacebookPhoto *self = FACEBOOK_PHOTO (serializable); + + if (pspec->value_type == GTH_TYPE_DATETIME) { + GTimeVal timeval; + + if (g_time_val_from_iso8601 (json_node_get_string (property_node), &timeval)) { + GthDateTime *datetime; + + datetime = gth_datetime_new (); + gth_datetime_from_timeval (datetime, &timeval); + g_object_set (self, property_name, datetime, NULL); + + gth_datetime_free (datetime); + + return TRUE; + } + + return FALSE; + } + + if (pspec->value_type == FACEBOOK_TYPE_IMAGE_LIST) { + GList *images = NULL; + JsonArray *array; + int i; + + array = json_node_get_array (property_node); + for (i = 0; i < json_array_get_length (array); i++) { + JsonObject *image_obj; + + image_obj = json_array_get_object_element (array, i); + if (image_obj != NULL) { + FacebookImage *image; + + image = facebook_image_new (); + _g_strset (&image->source, json_object_get_string_member (image_obj, "source")); + image->width = json_object_get_int_member (image_obj, "width"); + image->height = json_object_get_int_member (image_obj, "height"); + + images = g_list_prepend (images, image); + } + } + + images = g_list_reverse (images); + g_object_set (self, property_name, images, NULL); + + facebook_image_list_free (images); + + return TRUE; + } + + return json_serializable_default_deserialize_property (serializable, + property_name, + value, + pspec, + property_node); } -void -facebook_photo_set_title (FacebookPhoto *self, - const char *value) +static void +facebook_photo_json_serializable_interface_init (JsonSerializableIface *iface) { - _g_strset (&self->title, value); + iface->deserialize_property = facebook_photo_deserialize_property; } -void -facebook_photo_set_is_primary (FacebookPhoto *self, - const char *value) +static void +facebook_photo_init (FacebookPhoto *self) { - self->is_primary = (g_strcmp0 (value, "1") == 0); + self->id = NULL; + self->picture = NULL; + self->source = NULL; + self->width = 0; + self->height = 0; + self->link = NULL; + self->created_time = NULL; + self->updated_time = NULL; + self->images = NULL; } -void -facebook_photo_set_url_sq (FacebookPhoto *self, - const char *value) +FacebookPhoto * +facebook_photo_new (void) { - _g_strset (&self->url_sq, value); + return g_object_new (FACEBOOK_TYPE_PHOTO, NULL); } -void -facebook_photo_set_url_t (FacebookPhoto *self, - const char *value) +const char * +facebook_photo_get_original_url (FacebookPhoto *photo) { - _g_strset (&self->url_t, value); -} + char *url; + GList *scan; + glong max_size; + url = photo->source; + max_size = photo->width * photo->height; -void -facebook_photo_set_url_s (FacebookPhoto *self, - const char *value) -{ - _g_strset (&self->url_s, value); -} + for (scan = photo->images; scan; scan = scan->next) { + FacebookImage *image = scan->data; + glong image_size; + image_size = image->width * image->height; + if (image_size > max_size) { + max_size = image_size; + url = image->source; + } + } -void -facebook_photo_set_url_m (FacebookPhoto *self, - const char *value) -{ - _g_strset (&self->url_m, value); + return url; } -void -facebook_photo_set_url_o (FacebookPhoto *self, - const char *value) +const char * +facebook_photo_get_thumbnail_url (FacebookPhoto *photo, + int requested_size) { - _g_strset (&self->url_o, value); -} + char *url; + GList *scan; + glong min_delta; + url = photo->picture; + requested_size = requested_size * requested_size; + min_delta = 0; -void -facebook_photo_set_original_format (FacebookPhoto *self, - const char *value) -{ - _g_strset (&self->original_format, value); + for (scan = photo->images; scan; scan = scan->next) { + FacebookImage *image = scan->data; + glong image_delta; + + image_delta = labs ((image->width * image->height) - requested_size); + if ((scan == photo->images) || (image_delta < min_delta)) { + min_delta = image_delta; + url = image->source; + } + } - g_free (self->mime_type); - self->mime_type = NULL; - if (self->original_format != NULL) - self->mime_type = g_strconcat ("image/", self->original_format, NULL); + return url; } diff -Nru gthumb-3.0.2/extensions/facebook/facebook-photo.h gthumb-3.2.3/extensions/facebook/facebook-photo.h --- gthumb-3.0.2/extensions/facebook/facebook-photo.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/facebook-photo.h 2013-04-30 16:56:12.000000000 +0000 @@ -38,53 +38,37 @@ typedef struct _FacebookPhotoClass FacebookPhotoClass; typedef struct _FacebookPhotoPrivate FacebookPhotoPrivate; +typedef struct { + char *source; + int width; + int height; +} FacebookImage; + struct _FacebookPhoto { GObject parent_instance; FacebookPhotoPrivate *priv; - char *id; - char *secret; - char *server; - char *title; - gboolean is_primary; - char *url_sq; - char *url_t; - char *url_s; - char *url_m; - char *url_o; - char *original_format; - char *mime_type; - int position; + char *id; + char *picture; + char *source; + int width; + int height; + char *link; + GthDateTime *created_time; + GthDateTime *updated_time; + GList *images; /* FacebookImage list */ + int position; }; struct _FacebookPhotoClass { GObjectClass parent_class; }; -GType facebook_photo_get_type (void); -FacebookPhoto * facebook_photo_new (void); -void facebook_photo_set_id (FacebookPhoto *self, - const char *value); -void facebook_photo_set_secret (FacebookPhoto *self, - const char *value); -void facebook_photo_set_server (FacebookPhoto *self, - const char *value); -void facebook_photo_set_title (FacebookPhoto *self, - const char *value); -void facebook_photo_set_is_primary (FacebookPhoto *self, - const char *value); -void facebook_photo_set_url_sq (FacebookPhoto *self, - const char *value); -void facebook_photo_set_url_t (FacebookPhoto *self, - const char *value); -void facebook_photo_set_url_s (FacebookPhoto *self, - const char *value); -void facebook_photo_set_url_m (FacebookPhoto *self, - const char *value); -void facebook_photo_set_url_o (FacebookPhoto *self, - const char *value); -void facebook_photo_set_original_format (FacebookPhoto *self, - const char *value); +GType facebook_photo_get_type (void); +FacebookPhoto * facebook_photo_new (void); +const char * facebook_photo_get_original_url (FacebookPhoto *photo); +const char * facebook_photo_get_thumbnail_url (FacebookPhoto *photo, + int requested_size); G_END_DECLS diff -Nru gthumb-3.0.2/extensions/facebook/facebook-service.c gthumb-3.2.3/extensions/facebook/facebook-service.c --- gthumb-3.0.2/extensions/facebook/facebook-service.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/facebook-service.c 2013-04-30 16:56:12.000000000 +0000 @@ -22,16 +22,28 @@ #include #include #include +#include #include -#include "facebook-account.h" +#include #include "facebook-album.h" -#include "facebook-connection.h" #include "facebook-photo.h" #include "facebook-service.h" -#include "facebook-user.h" -#define FACEBOOK_MIN_IMAGE_SIZE 720 + +#define GTHUMB_FACEBOOK_NAMESPACE "gthumbviewer" +#define GTHUMB_FACEBOOK_APP_ID "110609985627460" +#define GTHUMB_FACEBOOK_APP_SECRET "8c0b99672a9bbc159ebec3c9a8240679" +#define FACEBOOK_API_VERSION "1.0" +#define FACEBOOK_AUTHENTICATION_RESPONSE_CHOOSE_ACCOUNT 2 +#define FACEBOOK_HTTP_SERVER "https://www.facebook.com" #define FACEBOOK_MAX_IMAGE_SIZE 2048 +#define FACEBOOK_MIN_IMAGE_SIZE 720 +#define FACEBOOK_REDIRECT_URI "https://apps.facebook.com/" GTHUMB_FACEBOOK_NAMESPACE +#define FACEBOOK_SERVICE_ERROR_TOKEN_EXPIRED 190 + + +/* -- post_photos_data -- */ + typedef struct { FacebookAlbum *album; @@ -63,156 +75,249 @@ } -struct _FacebookServicePrivate -{ - FacebookConnection *conn; - FacebookUser *user; - PostPhotosData *post_photos; -}; +/* -- facebook_service -- */ -G_DEFINE_TYPE (FacebookService, facebook_service, G_TYPE_OBJECT) +G_DEFINE_TYPE (FacebookService, facebook_service, WEB_TYPE_SERVICE) + + +struct _FacebookServicePrivate { + char *state; + char *token; + PostPhotosData *post_photos; +}; static void facebook_service_finalize (GObject *object) { - FacebookService *self; - - self = FACEBOOK_SERVICE (object); + FacebookService *self = FACEBOOK_SERVICE (object); - _g_object_unref (self->priv->conn); - _g_object_unref (self->priv->user); post_photos_data_free (self->priv->post_photos); + g_free (self->priv->token); + g_free (self->priv->state); G_OBJECT_CLASS (facebook_service_parent_class)->finalize (object); } +/* -- connection utilities -- */ + + static void -facebook_service_class_init (FacebookServiceClass *klass) +_facebook_service_set_access_token (FacebookService *self, + const char *token) { - GObjectClass *object_class; + _g_strset (&self->priv->token, token); +} - g_type_class_add_private (klass, sizeof (FacebookServicePrivate)); - object_class = (GObjectClass*) klass; - object_class->finalize = facebook_service_finalize; +static const char * +_facebook_service_get_access_token (FacebookService *self) +{ + return self->priv->token; } static void -facebook_service_init (FacebookService *self) +_facebook_service_add_access_token (FacebookService *self, + GHashTable *data_set) { - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, FACEBOOK_TYPE_SERVICE, FacebookServicePrivate); - self->priv->conn = NULL; - self->priv->user = NULL; - self->priv->post_photos = NULL; + g_return_if_fail (self->priv->token != NULL); + + g_hash_table_insert (data_set, "access_token", self->priv->token); } -FacebookService * -facebook_service_new (FacebookConnection *conn) +static char * +get_access_type_name (WebAuthorization access_type) { - FacebookService *self; + char *name = NULL; + + switch (access_type) { + case WEB_AUTHORIZATION_READ: + name = ""; + break; - self = (FacebookService *) g_object_new (FACEBOOK_TYPE_SERVICE, NULL); - self->priv->conn = g_object_ref (conn); + case WEB_AUTHORIZATION_WRITE: + name = "publish_actions"; + break; + } - return self; + return name; } -/* -- facebook_service_get_user_info -- */ +static char * +facebook_utils_get_authorization_url (WebAuthorization access_type, + const char *state) +{ + GHashTable *data_set; + GString *link; + GList *keys; + GList *scan; + data_set = g_hash_table_new (g_str_hash, g_str_equal); + g_hash_table_insert (data_set, "client_id", GTHUMB_FACEBOOK_APP_ID); + g_hash_table_insert (data_set, "redirect_uri", FACEBOOK_REDIRECT_URI); + g_hash_table_insert (data_set, "scope", get_access_type_name (access_type)); + g_hash_table_insert (data_set, "response_type", "token"); + g_hash_table_insert (data_set, "state", (char *) state); + + link = g_string_new ("https://www.facebook.com/dialog/oauth?"); + keys = g_hash_table_get_keys (data_set); + for (scan = keys; scan; scan = scan->next) { + char *key = scan->data; + char *encoded; + + if (scan != keys) + g_string_append (link, "&"); + g_string_append (link, key); + g_string_append (link, "="); + encoded = soup_uri_encode (g_hash_table_lookup (data_set, key), NULL); + g_string_append (link, encoded); -static void -get_logged_in_user_ready_cb (SoupSession *session, - SoupMessage *msg, - gpointer user_data) + g_free (encoded); + } + + g_list_free (keys); + g_hash_table_destroy (data_set); + + return g_string_free (link, FALSE); +} + + +static gboolean +facebook_utils_parse_response (SoupMessage *msg, + JsonNode **node, + GError **error) { - FacebookService *self = user_data; - GSimpleAsyncResult *result; - SoupBuffer *body; - DomDocument *doc = NULL; - GError *error = NULL; + JsonParser *parser; + SoupBuffer *body; - result = facebook_connection_get_result (self->priv->conn); + g_return_val_if_fail (msg != NULL, FALSE); + g_return_val_if_fail (node != NULL, FALSE); - if (msg->status_code != 200) { - g_simple_async_result_set_error (result, - SOUP_HTTP_ERROR, - msg->status_code, - "%s", - soup_status_get_phrase (msg->status_code)); - g_simple_async_result_complete_in_idle (result); - return; + *node = NULL; + + if ((msg->status_code != 200) && (msg->status_code != 400)) { + *error = g_error_new (SOUP_HTTP_ERROR, + msg->status_code, + "%s", + soup_status_get_phrase (msg->status_code)); + return FALSE; } body = soup_message_body_flatten (msg->response_body); - if (facebook_utils_parse_response (body, &doc, &error)) { - DomElement *root; - char *uid = NULL; - - root = DOM_ELEMENT (doc)->first_child; - if (g_strcmp0 (root->tag_name, "users_getLoggedInUser_response") == 0) - uid = g_strdup (dom_element_get_inner_text (root)); - - if (uid == NULL) { - error = g_error_new_literal (FACEBOOK_CONNECTION_ERROR, 0, _("Unknown error")); - g_simple_async_result_set_from_error (result, error); - } - else - g_simple_async_result_set_op_res_gpointer (result, uid, g_free); + parser = json_parser_new (); + if (json_parser_load_from_data (parser, body->data, body->length, error)) { + JsonObject *obj; + + *node = json_node_copy (json_parser_get_root (parser)); + + obj = json_node_get_object (*node); + if (json_object_has_member (obj, "error")) { + JsonObject *error_obj; + int error_code; + + error_obj = json_object_get_object_member (obj, "error"); + switch (json_object_get_int_member (error_obj, "code")) { + case FACEBOOK_SERVICE_ERROR_TOKEN_EXPIRED: + error_code = WEB_SERVICE_ERROR_TOKEN_EXPIRED; + break; + default: + error_code = WEB_SERVICE_ERROR_GENERIC; + break; + } - g_object_unref (doc); - } - else - g_simple_async_result_set_from_error (result, error); + *error = g_error_new (WEB_SERVICE_ERROR, + error_code, + "%s", + json_object_get_string_member (error_obj, "message")); - g_simple_async_result_complete_in_idle (result); + json_node_free (*node); + *node = NULL; + } + } + g_object_unref (parser); soup_buffer_free (body); + + return *node != NULL; } -void -facebook_service_get_logged_in_user (FacebookService *self, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) +/* -- facebook_service_ask_authorization -- */ + + +static void +ask_authorization_dialog_redirected_cb (OAuthAskAuthorizationDialog *dialog, + gpointer user_data) { - GHashTable *data_set; - SoupMessage *msg; + FacebookService *self = user_data; + const char *uri; - gth_task_progress (GTH_TASK (self->priv->conn), _("Connecting to the server"), _("Getting account information"), TRUE, 0.0); + uri = oauth_ask_authorization_dialog_get_uri (dialog); + if (g_str_has_prefix (uri, FACEBOOK_REDIRECT_URI)) { + const char *uri_data; + GHashTable *data; + const char *access_token; + const char *state; + + uri_data = uri + strlen (FACEBOOK_REDIRECT_URI "#"); + + data = soup_form_decode (uri_data); + access_token = NULL; + state = g_hash_table_lookup (data, "state"); + if (g_strcmp0 (state, self->priv->state) == 0) { + access_token = g_hash_table_lookup (data, "access_token"); + _facebook_service_set_access_token (self, access_token); + } - data_set = g_hash_table_new (g_str_hash, g_str_equal); - g_hash_table_insert (data_set, "method", "facebook.users.getLoggedInUser"); - facebook_connection_add_api_sig (self->priv->conn, data_set); - msg = soup_form_request_new_from_hash ("POST", FACEBOOK_HTTPS_REST_SERVER, data_set); - facebook_connection_send_message (self->priv->conn, - msg, - cancellable, - callback, - user_data, - facebook_service_get_logged_in_user, - get_logged_in_user_ready_cb, - self); + gtk_dialog_response (GTK_DIALOG (dialog), + (access_token != NULL) ? GTK_RESPONSE_OK : GTK_RESPONSE_CANCEL); - g_hash_table_destroy (data_set); + g_hash_table_destroy (data); + } } -char * -facebook_service_get_logged_in_user_finish (FacebookService *self, - GAsyncResult *result, - GError **error) +static char * +facebook_create_state_for_authorization (void) { - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return NULL; - else - return g_strdup (g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result))); + GTimeVal t; + char *s; + char *v; + + g_get_current_time (&t); + s = g_strdup_printf ("%ld%u", t.tv_usec, g_random_int ()); + v = g_compute_checksum_for_string (G_CHECKSUM_MD5, s, -1); + + g_free (s); + + return v; +} + + +static void +facebook_service_ask_authorization (WebService *base) +{ + FacebookService *self = FACEBOOK_SERVICE (base); + GtkWidget *dialog; + + g_free (self->priv->state); + self->priv->state = facebook_create_state_for_authorization (); + + dialog = oauth_ask_authorization_dialog_new (facebook_utils_get_authorization_url (WEB_AUTHORIZATION_WRITE, self->priv->state)); + _gtk_window_resize_to_fit_screen_height (dialog, 1024); + _web_service_set_auth_dialog (WEB_SERVICE (self), GTK_DIALOG (dialog)); + + g_signal_connect (OAUTH_ASK_AUTHORIZATION_DIALOG (dialog), + "redirected", + G_CALLBACK (ask_authorization_dialog_redirected_cb), + self); + + gtk_widget_show (dialog); } @@ -220,103 +325,110 @@ static void -get_user_info_ready_cb (SoupSession *session, - SoupMessage *msg, - gpointer user_data) +facebook_service_get_user_info_ready_cb (SoupSession *session, + SoupMessage *msg, + gpointer user_data) { - FacebookService *self = user_data; + FacebookService *self = user_data; GSimpleAsyncResult *result; - SoupBuffer *body; - DomDocument *doc = NULL; GError *error = NULL; + JsonNode *node; - result = facebook_connection_get_result (self->priv->conn); - - if (msg->status_code != 200) { - g_simple_async_result_set_error (result, - SOUP_HTTP_ERROR, - msg->status_code, - "%s", - soup_status_get_phrase (msg->status_code)); - g_simple_async_result_complete_in_idle (result); - return; - } + result = _web_service_get_result (WEB_SERVICE (self)); - body = soup_message_body_flatten (msg->response_body); - if (facebook_utils_parse_response (body, &doc, &error)) { - DomElement *node; - FacebookUser *user = NULL; - - for (node = DOM_ELEMENT (doc)->first_child; node; node = node->next_sibling) { - if (g_strcmp0 (node->tag_name, "users_getInfo_response") == 0) { - DomElement *child; - - for (child = node->first_child; child; child = child->next_sibling) { - if (g_strcmp0 (child->tag_name, "user") == 0) { - user = facebook_user_new (); - dom_domizable_load_from_element (DOM_DOMIZABLE (user), child); - g_simple_async_result_set_op_res_gpointer (result, user, (GDestroyNotify) g_object_unref); - } - } - } - } + if (facebook_utils_parse_response (msg, &node, &error)) { + OAuthAccount *account; - if (user == NULL) { - error = g_error_new_literal (FACEBOOK_CONNECTION_ERROR, 0, _("Unknown error")); - g_simple_async_result_set_from_error (result, error); - } + account = (OAuthAccount *) json_gobject_deserialize (OAUTH_TYPE_ACCOUNT, node); + g_object_set (account, + "token", _facebook_service_get_access_token (self), + "token-secret", _facebook_service_get_access_token (self), + NULL); + g_simple_async_result_set_op_res_gpointer (result, + g_object_ref (account), + (GDestroyNotify) g_object_unref); - g_object_unref (doc); + _g_object_unref (account); + json_node_free (node); } else g_simple_async_result_set_from_error (result, error); g_simple_async_result_complete_in_idle (result); - - soup_buffer_free (body); } -void -facebook_service_get_user_info (FacebookService *self, - const char *fields, +static void +facebook_service_get_user_info (WebService *base, GCancellable *cancellable, GAsyncReadyCallback callback, - gpointer user_data) + gpointer user_data) { - GHashTable *data_set; - SoupMessage *msg; + FacebookService *self = FACEBOOK_SERVICE (base); + OAuthAccount *account; + GHashTable *data_set; + SoupMessage *msg; - gth_task_progress (GTH_TASK (self->priv->conn), _("Connecting to the server"), _("Getting account information"), TRUE, 0.0); + account = web_service_get_current_account (WEB_SERVICE (self)); + if (account != NULL) + _facebook_service_set_access_token (self, account->token_secret); data_set = g_hash_table_new (g_str_hash, g_str_equal); - g_hash_table_insert (data_set, "method", "facebook.users.getInfo"); - g_hash_table_insert (data_set, "uids", (char *) facebook_connection_get_user_id (self->priv->conn)); - g_hash_table_insert (data_set, "fields", (char *) fields); - facebook_connection_add_api_sig (self->priv->conn, data_set); - msg = soup_form_request_new_from_hash ("POST", FACEBOOK_HTTPS_REST_SERVER, data_set); - facebook_connection_send_message (self->priv->conn, - msg, - cancellable, - callback, - user_data, - facebook_service_get_user_info, - get_user_info_ready_cb, - self); + _facebook_service_add_access_token (self, data_set); + msg = soup_form_request_new_from_hash ("GET", "https://graph.facebook.com/me", data_set); + _web_service_send_message (WEB_SERVICE (self), + msg, + cancellable, + callback, + user_data, + facebook_service_get_user_info, + facebook_service_get_user_info_ready_cb, + self); g_hash_table_destroy (data_set); } -FacebookUser * -facebook_service_get_user_info_finish (FacebookService *self, - GAsyncResult *result, - GError **error) +static void +facebook_service_class_init (FacebookServiceClass *klass) { - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return NULL; - else - return g_object_ref (g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result))); + GObjectClass *object_class; + WebServiceClass *service_class; + + g_type_class_add_private (klass, sizeof (FacebookServicePrivate)); + + object_class = (GObjectClass*) klass; + object_class->finalize = facebook_service_finalize; + + service_class = (WebServiceClass*) klass; + service_class->ask_authorization = facebook_service_ask_authorization; + service_class->get_user_info = facebook_service_get_user_info; +} + + +static void +facebook_service_init (FacebookService *self) +{ + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, FACEBOOK_TYPE_SERVICE, FacebookServicePrivate); + self->priv->state = NULL; + self->priv->token = NULL; + self->priv->post_photos = NULL; +} + + +FacebookService * +facebook_service_new (GCancellable *cancellable, + GtkWidget *browser, + GtkWidget *dialog) +{ + return g_object_new (FACEBOOK_TYPE_SERVICE, + "service-name", "facebook", + "service-address", "https://www.facebook.com", + "service-protocol", "https", + "cancellable", cancellable, + "browser", browser, + "dialog", dialog, + NULL); } @@ -324,91 +436,80 @@ static void -get_albums_ready_cb (SoupSession *session, - SoupMessage *msg, - gpointer user_data) +facebook_service_get_albums_ready_cb (SoupSession *session, + SoupMessage *msg, + gpointer user_data) { FacebookService *self = user_data; GSimpleAsyncResult *result; - SoupBuffer *body; - DomDocument *doc = NULL; + JsonNode *node; GError *error = NULL; - result = facebook_connection_get_result (self->priv->conn); + result = _web_service_get_result (WEB_SERVICE (self)); - if (msg->status_code != 200) { - g_simple_async_result_set_error (result, - SOUP_HTTP_ERROR, - msg->status_code, - "%s", - soup_status_get_phrase (msg->status_code)); - g_simple_async_result_complete_in_idle (result); - return; - } - - body = soup_message_body_flatten (msg->response_body); - if (facebook_utils_parse_response (body, &doc, &error)) { - DomElement *node; + if (facebook_utils_parse_response (msg, &node, &error)) { GList *albums = NULL; - - for (node = DOM_ELEMENT (doc)->first_child; node; node = node->next_sibling) { - if (g_strcmp0 (node->tag_name, "photos_getAlbums_response") == 0) { - DomElement *child; - - for (child = node->first_child; child; child = child->next_sibling) { - if (g_strcmp0 (child->tag_name, "album") == 0) { - FacebookAlbum *album; - - album = facebook_album_new (); - dom_domizable_load_from_element (DOM_DOMIZABLE (album), child); - albums = g_list_prepend (albums, album); - } - } - } + JsonObject *obj; + JsonArray *data; + int i; + + obj = json_node_get_object (node); + data = json_object_get_array_member (obj, "data"); + for (i = 0; i < json_array_get_length (data); i++) { + JsonNode *album_node; + FacebookAlbum *album; + + album_node = json_array_get_element (data, i); + album = (FacebookAlbum *) json_gobject_deserialize (FACEBOOK_TYPE_ALBUM, album_node); + albums = g_list_prepend (albums, album); } albums = g_list_reverse (albums); g_simple_async_result_set_op_res_gpointer (result, albums, (GDestroyNotify) _g_object_list_unref); - g_object_unref (doc); + json_node_free (node); } else g_simple_async_result_set_from_error (result, error); g_simple_async_result_complete_in_idle (result); - - soup_buffer_free (body); } void facebook_service_get_albums (FacebookService *self, - const char *user_id, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data) { - GHashTable *data_set; - SoupMessage *msg; + OAuthAccount *account; + GHashTable *data_set; + char *uri; + SoupMessage *msg; - g_return_if_fail (user_id != NULL); + account = web_service_get_current_account (WEB_SERVICE (self)); + g_return_if_fail (account != NULL); - gth_task_progress (GTH_TASK (self->priv->conn), _("Getting the album list"), NULL, TRUE, 0.0); + gth_task_progress (GTH_TASK (self), + _("Getting the album list"), + NULL, + TRUE, + 0.0); + uri = g_strdup_printf ("https://graph.facebook.com/%s/albums", account->id); data_set = g_hash_table_new (g_str_hash, g_str_equal); - g_hash_table_insert (data_set, "method", "facebook.photos.getAlbums"); - g_hash_table_insert (data_set, "uid", (char *) user_id); - facebook_connection_add_api_sig (self->priv->conn, data_set); - msg = soup_form_request_new_from_hash ("GET", FACEBOOK_HTTPS_REST_SERVER, data_set); - facebook_connection_send_message (self->priv->conn, - msg, - cancellable, - callback, - user_data, - facebook_service_get_albums, - get_albums_ready_cb, - self); + _facebook_service_add_access_token (self, data_set); + msg = soup_form_request_new_from_hash ("GET", uri, data_set); + _web_service_send_message (WEB_SERVICE (self), + msg, + cancellable, + callback, + user_data, + facebook_service_get_albums, + facebook_service_get_albums_ready_cb, + self); + g_free (uri); g_hash_table_destroy (data_set); } @@ -428,83 +529,67 @@ /* -- facebook_service_create_album -- */ -static void -create_album_ready_cb (SoupSession *session, - SoupMessage *msg, - gpointer user_data) -{ - FacebookService *self = user_data; - GSimpleAsyncResult *result; - SoupBuffer *body; - DomDocument *doc = NULL; - GError *error = NULL; +typedef struct { + FacebookService *service; + FacebookAlbum *album; +} CreateAlbumData; - result = facebook_connection_get_result (self->priv->conn); - if (msg->status_code != 200) { - g_simple_async_result_set_error (result, - SOUP_HTTP_ERROR, - msg->status_code, - "%s", - soup_status_get_phrase (msg->status_code)); - g_simple_async_result_complete_in_idle (result); - return; - } +static CreateAlbumData * +create_album_data_new (FacebookService *service, + FacebookAlbum *album) +{ + CreateAlbumData *ca_data; - body = soup_message_body_flatten (msg->response_body); - if (facebook_utils_parse_response (body, &doc, &error)) { - DomElement *node; - FacebookAlbum *album = NULL; - - for (node = DOM_ELEMENT (doc)->first_child; node; node = node->next_sibling) { - if (g_strcmp0 (node->tag_name, "photos_createAlbum_response") == 0) { - album = facebook_album_new (); - dom_domizable_load_from_element (DOM_DOMIZABLE (album), node); - break; - } - } + ca_data = g_new0 (CreateAlbumData, 1); + ca_data->service = g_object_ref (service); + ca_data->album = g_object_ref (album); - if (album == NULL) { - error = g_error_new_literal (FACEBOOK_CONNECTION_ERROR, 0, _("Unknown error")); - g_simple_async_result_set_from_error (result, error); - } - else - g_simple_async_result_set_op_res_gpointer (result, album, (GDestroyNotify) _g_object_unref); + return ca_data; +} - g_object_unref (doc); - } - else - g_simple_async_result_set_from_error (result, error); - g_simple_async_result_complete_in_idle (result); - - soup_buffer_free (body); +static void +create_album_data_free (CreateAlbumData *ca_data) +{ + _g_object_unref (ca_data->service); + _g_object_unref (ca_data->album); + g_free (ca_data); } -static const char * -get_privacy_from_visibility (FacebookVisibility visibility) +static void +facebook_service_create_album_ready_cb (SoupSession *session, + SoupMessage *msg, + gpointer user_data) { - char *value = NULL; - - switch (visibility) { - case FACEBOOK_VISIBILITY_EVERYONE: - value = "{ value: \"EVERYONE\" }"; - break; + CreateAlbumData *ca_data = user_data; + FacebookService *self = ca_data->service; + GSimpleAsyncResult *result; + JsonNode *node; + GError *error = NULL; - case FACEBOOK_VISIBILITY_ALL_FRIENDS: - value = "{ value: \"ALL_FRIENDS\" }"; - break; + result = _web_service_get_result (WEB_SERVICE (self)); - case FACEBOOK_VISIBILITY_SELF: - value = "{ value: \"SELF\" }"; - break; + if (facebook_utils_parse_response (msg, &node, &error)) { + FacebookAlbum *album; + JsonObject *obj; + const char *id; + + album = g_object_ref (ca_data->album); + obj = json_node_get_object (node); + id = json_object_get_string_member (obj, "id"); + g_object_set (album, "id", id, NULL); + g_simple_async_result_set_op_res_gpointer (result, album, (GDestroyNotify) _g_object_unref); - default: - break; + json_node_free (node); } + else + g_simple_async_result_set_from_error (result, error); - return value; + g_simple_async_result_complete_in_idle (result); + + create_album_data_free (ca_data); } @@ -515,35 +600,43 @@ GAsyncReadyCallback callback, gpointer user_data) { - GHashTable *data_set; - const char *privacy; - SoupMessage *msg; + OAuthAccount *account; + CreateAlbumData *ca_data; + char *uri; + GHashTable *data_set; + SoupMessage *msg; + + account = web_service_get_current_account (WEB_SERVICE (self)); + g_return_if_fail (account != NULL); g_return_if_fail (album != NULL); g_return_if_fail (album->name != NULL); - gth_task_progress (GTH_TASK (self->priv->conn), _("Creating the new album"), NULL, TRUE, 0.0); + gth_task_progress (GTH_TASK (self), + _("Creating the new album"), + NULL, + TRUE, + 0.0); + + ca_data = create_album_data_new (self, album); + uri = g_strdup_printf ("https://graph.facebook.com/%s/albums", account->id); data_set = g_hash_table_new (g_str_hash, g_str_equal); - g_hash_table_insert (data_set, "method", "facebook.photos.createAlbum"); g_hash_table_insert (data_set, "name", album->name); if (album->description != NULL) - g_hash_table_insert (data_set, "description", album->description); - if (album->location != NULL) - g_hash_table_insert (data_set, "location", album->location); - privacy = get_privacy_from_visibility (album->visibility); - if (privacy != NULL) - g_hash_table_insert (data_set, "privacy", (char *) privacy); - facebook_connection_add_api_sig (self->priv->conn, data_set); - msg = soup_form_request_new_from_hash ("POST", FACEBOOK_HTTPS_REST_SERVER, data_set); - facebook_connection_send_message (self->priv->conn, - msg, - cancellable, - callback, - user_data, - facebook_service_create_album, - create_album_ready_cb, - self); + g_hash_table_insert (data_set, "message", album->description); + if (album->privacy != NULL) + g_hash_table_insert (data_set, "privacy", album->privacy); + _facebook_service_add_access_token (self, data_set); + msg = soup_form_request_new_from_hash ("POST", uri, data_set); + _web_service_send_message (WEB_SERVICE (self), + msg, + cancellable, + callback, + user_data, + facebook_service_create_album, + facebook_service_create_album_ready_cb, + ca_data); g_hash_table_destroy (data_set); } @@ -570,7 +663,7 @@ { GSimpleAsyncResult *result; - result = facebook_connection_get_result (self->priv->conn); + result = _web_service_get_result (WEB_SERVICE (self)); if (error == NULL) { self->priv->post_photos->ids = g_list_reverse (self->priv->post_photos->ids); g_simple_async_result_set_op_res_gpointer (result, self->priv->post_photos->ids, (GDestroyNotify) _g_string_list_free); @@ -601,46 +694,25 @@ gpointer user_data) { FacebookService *self = user_data; - SoupBuffer *body; - DomDocument *doc = NULL; - GError *error = NULL; - GthFileData *file_data; - - if (msg->status_code != 200) { - GError *error; - - error = g_error_new_literal (SOUP_HTTP_ERROR, msg->status_code, soup_status_get_phrase (msg->status_code)); - upload_photos_done (self, error); - g_error_free (error); - - return; - } - - body = soup_message_body_flatten (msg->response_body); - if (facebook_utils_parse_response (body, &doc, &error)) { - DomElement *node; - - /* save the photo id */ - - for (node = DOM_ELEMENT (doc)->first_child; node; node = node->next_sibling) { - if (g_strcmp0 (node->tag_name, "pid") == 0) { - const char *id; + JsonNode *node; + GError *error = NULL; + GthFileData *file_data; - id = dom_element_get_inner_text (node); - self->priv->post_photos->ids = g_list_prepend (self->priv->post_photos->ids, g_strdup (id)); - } - } + if (facebook_utils_parse_response (msg, &node, &error)) { + JsonObject *obj; + const char *id; + + obj = json_node_get_object (node); + id = json_object_get_string_member (obj, "id"); + self->priv->post_photos->ids = g_list_prepend (self->priv->post_photos->ids, g_strdup (id)); - g_object_unref (doc); + json_node_free (node); } else { - soup_buffer_free (body); upload_photos_done (self, error); return; } - soup_buffer_free (body); - file_data = self->priv->post_photos->current->data; self->priv->post_photos->uploaded_size += g_file_info_get_size (file_data->info); self->priv->post_photos->current = self->priv->post_photos->current->next; @@ -669,7 +741,7 @@ /* Translators: %s is a filename */ details = g_strdup_printf (_("Uploading '%s'"), g_file_info_get_display_name (file_data->info)); current_file_fraction = (double) self->priv->post_photos->wrote_body_data_size / msg->request_body->length; - gth_task_progress (GTH_TASK (self->priv->conn), + gth_task_progress (GTH_TASK (self), NULL, details, FALSE, @@ -688,7 +760,6 @@ FacebookService *self = user_data; GthFileData *file_data; SoupMultipart *multipart; - GthPixbufSaver *saver; char *uri; SoupBuffer *body; SoupMessage *msg; @@ -712,19 +783,14 @@ data_set = g_hash_table_new (g_str_hash, g_str_equal); - g_hash_table_insert (data_set, "method", "facebook.photos.upload"); - title = gth_file_data_get_attribute_as_string (file_data, "general::title"); description = gth_file_data_get_attribute_as_string (file_data, "general::description"); if (description != NULL) - g_hash_table_insert (data_set, "caption", description); + g_hash_table_insert (data_set, "message", description); else if (title != NULL) - g_hash_table_insert (data_set, "caption", title); - - if (self->priv->post_photos->album != NULL) - g_hash_table_insert (data_set, "aid", self->priv->post_photos->album->id); + g_hash_table_insert (data_set, "message", title); - facebook_connection_add_api_sig (self->priv->conn, data_set); + _facebook_service_add_access_token (self, data_set); keys = g_hash_table_get_keys (data_set); for (scan = keys; scan; scan = scan->next) { @@ -740,17 +806,16 @@ /* the file part: rotate and scale the image if required */ - saver = gth_main_get_pixbuf_saver (gth_file_data_get_mime_type (file_data)); - if (saver != NULL) { - GInputStream *stream; - GdkPixbuf *pixbuf; - GdkPixbuf *tmp_pixbuf; - int width; - int height; + { + GInputStream *stream; + GthImage *image; + cairo_surface_t *surface; + int width; + int height; stream = g_memory_input_stream_new_from_data (*buffer, count, NULL); - pixbuf = gdk_pixbuf_new_from_stream (stream, NULL, &error); - if (pixbuf == NULL) { + image = gth_image_new_from_stream (stream, -1, NULL, NULL, NULL, &error); + if (image == NULL) { g_object_unref (stream); soup_multipart_free (multipart); upload_photos_done (self, error); @@ -759,48 +824,49 @@ g_object_unref (stream); - tmp_pixbuf = gdk_pixbuf_apply_embedded_orientation (pixbuf); - g_object_unref (pixbuf); - pixbuf = tmp_pixbuf; - - width = gdk_pixbuf_get_width (pixbuf); - height = gdk_pixbuf_get_height (pixbuf); + surface = gth_image_get_cairo_surface (image); + width = cairo_image_surface_get_width (surface); + height = cairo_image_surface_get_height (surface); if (scale_keeping_ratio (&width, &height, self->priv->post_photos->max_resolution, self->priv->post_photos->max_resolution, FALSE)) { - tmp_pixbuf = _gdk_pixbuf_scale_simple_safe (pixbuf, width, height, GDK_INTERP_BILINEAR); - g_object_unref (pixbuf); - pixbuf = tmp_pixbuf; + cairo_surface_t *scaled; + + scaled = _cairo_image_surface_scale (surface, width, height, SCALE_FILTER_BEST, NULL); + cairo_surface_destroy (surface); + surface = scaled; } g_free (*buffer); *buffer = NULL; - if (! gth_pixbuf_saver_save_pixbuf (saver, - pixbuf, - (char **)buffer, - &count, - gth_file_data_get_mime_type (file_data), - &error)) + gth_image_set_cairo_surface (image, surface); + if (! gth_image_save_to_buffer (image, + gth_file_data_get_mime_type (file_data), + file_data, + (char **) buffer, + &count, + self->priv->post_photos->cancellable, + &error)) { - g_object_unref (pixbuf); - g_object_unref (saver); + cairo_surface_destroy (surface); + g_object_unref (image); soup_multipart_free (multipart); upload_photos_done (self, error); return; } - g_object_unref (pixbuf); - g_object_unref (saver); + cairo_surface_destroy (surface); + g_object_unref (image); } uri = g_file_get_uri (file_data->file); body = soup_buffer_new (SOUP_MEMORY_TEMPORARY, *buffer, count); soup_multipart_append_form_file (multipart, - "filename", + "source", _g_uri_get_basename (uri), gth_file_data_get_mime_type (file_data), body); @@ -811,20 +877,22 @@ /* send the file */ self->priv->post_photos->wrote_body_data_size = 0; - msg = soup_form_request_new_from_multipart (FACEBOOK_HTTPS_REST_SERVER, multipart); + uri = g_strdup_printf ("https://graph.facebook.com/%s/photos", self->priv->post_photos->album->id); + msg = soup_form_request_new_from_multipart (uri, multipart); g_signal_connect (msg, "wrote-body-data", (GCallback) upload_photo_wrote_body_data_cb, self); - facebook_connection_send_message (self->priv->conn, - msg, - self->priv->post_photos->cancellable, - self->priv->post_photos->callback, - self->priv->post_photos->user_data, - facebook_service_upload_photos, - upload_photo_ready_cb, - self); + _web_service_send_message (WEB_SERVICE (self), + msg, + self->priv->post_photos->cancellable, + self->priv->post_photos->callback, + self->priv->post_photos->user_data, + facebook_service_upload_photos, + upload_photo_ready_cb, + self); + g_free (uri); soup_multipart_free (multipart); } @@ -840,11 +908,11 @@ } file_data = self->priv->post_photos->current->data; - g_load_file_async (file_data->file, - G_PRIORITY_DEFAULT, - self->priv->post_photos->cancellable, - upload_photo_file_buffer_ready_cb, - self); + _g_file_load_async (file_data->file, + G_PRIORITY_DEFAULT, + self->priv->post_photos->cancellable, + upload_photo_file_buffer_ready_cb, + self); } @@ -883,7 +951,11 @@ GAsyncReadyCallback callback, gpointer user_data) { - gth_task_progress (GTH_TASK (self->priv->conn), _("Uploading the files to the server"), NULL, TRUE, 0.0); + gth_task_progress (GTH_TASK (self), + _("Uploading the files to the server"), + "", + TRUE, + 0.0); post_photos_data_free (self->priv->post_photos); self->priv->post_photos = g_new0 (PostPhotosData, 1); @@ -916,119 +988,97 @@ } -#if 0 - /* -- facebook_service_list_photos -- */ static void -list_photos_ready_cb (SoupSession *session, - SoupMessage *msg, - gpointer user_data) +facebook_service_list_photos_ready_cb (SoupSession *session, + SoupMessage *msg, + gpointer user_data) { - FacebookService *self = user_data; + FacebookService *self = user_data; GSimpleAsyncResult *result; - SoupBuffer *body; - DomDocument *doc = NULL; + JsonNode *node; GError *error = NULL; - result = facebook_connection_get_result (self->priv->conn); + result = _web_service_get_result (WEB_SERVICE (self)); - if (msg->status_code != 200) { - g_simple_async_result_set_error (result, - SOUP_HTTP_ERROR, - msg->status_code, - "%s", - soup_status_get_phrase (msg->status_code)); - g_simple_async_result_complete_in_idle (result); - return; - } - - body = soup_message_body_flatten (msg->response_body); - if (facebook_utils_parse_response (body, &doc, &error)) { - DomElement *response; - DomElement *node; + if (facebook_utils_parse_response (msg, &node, &error)) { GList *photos = NULL; - - response = DOM_ELEMENT (doc)->first_child; - for (node = response->first_child; node; node = node->next_sibling) { - if (g_strcmp0 (node->tag_name, "photoset") == 0) { - DomElement *child; - int position; - - position = 0; - for (child = node->first_child; child; child = child->next_sibling) { - if (g_strcmp0 (child->tag_name, "photo") == 0) { - FacebookPhoto *photo; - - photo = facebook_photo_new (); - dom_domizable_load_from_element (DOM_DOMIZABLE (photo), child); - photo->position = position++; - photos = g_list_prepend (photos, photo); - } - } - } + JsonObject *obj; + JsonObject *obj_photos; + JsonArray *data; + int i; + + obj = json_node_get_object (node); + obj_photos = json_object_get_object_member (obj, "photos"); + data = json_object_get_array_member (obj_photos, "data"); + for (i = 0; i < json_array_get_length (data); i++) { + JsonNode *photo_node; + FacebookPhoto *photo; + + photo_node = json_array_get_element (data, i); + photo = (FacebookPhoto *) json_gobject_deserialize (FACEBOOK_TYPE_PHOTO, photo_node); + photo->position = i; + photos = g_list_prepend (photos, photo); } photos = g_list_reverse (photos); g_simple_async_result_set_op_res_gpointer (result, photos, (GDestroyNotify) _g_object_list_unref); - g_object_unref (doc); + json_node_free (node); } else g_simple_async_result_set_from_error (result, error); g_simple_async_result_complete_in_idle (result); - - soup_buffer_free (body); } void -facebook_service_list_photos (FacebookService *self, - FacebookPhotoset *photoset, - const char *extras, - int per_page, - int page, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) +facebook_service_list_photos (FacebookService *self, + FacebookAlbum *album, + int limit, + const char *after, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) { + char *uri; GHashTable *data_set; - char *s; SoupMessage *msg; - g_return_if_fail (photoset != NULL); + g_return_if_fail (album != NULL); - gth_task_progress (GTH_TASK (self->priv->conn), _("Getting the photo list"), NULL, TRUE, 0.0); + gth_task_progress (GTH_TASK (self), + _("Getting the photo list"), + NULL, + TRUE, + 0.0); + uri = g_strdup_printf ("https://graph.facebook.com/%s", album->id); data_set = g_hash_table_new (g_str_hash, g_str_equal); - g_hash_table_insert (data_set, "method", "facebook.photosets.getPhotos"); - g_hash_table_insert (data_set, "photoset_id", photoset->id); - if (extras != NULL) - g_hash_table_insert (data_set, "extras", (char *) extras); - if (per_page > 0) { - s = g_strdup_printf ("%d", per_page); - g_hash_table_insert (data_set, "per_page", s); - g_free (s); - } - if (page > 0) { - s = g_strdup_printf ("%d", page); - g_hash_table_insert (data_set, "page", s); - g_free (s); - } - facebook_connection_add_api_sig (self->priv->conn, data_set); - msg = soup_form_request_new_from_hash ("GET", "http://api.facebook.com/services/rest", data_set); - facebook_connection_send_message (self->priv->conn, - msg, - cancellable, - callback, - user_data, - facebook_service_list_photos, - list_photos_ready_cb, - self); + g_hash_table_insert (data_set, "fields", "photos"); + if (limit > 0) { + char *s_limit = g_strdup_printf ("%d", limit); + g_hash_table_insert (data_set, "limit", s_limit); + g_free (s_limit); + } + if (after != NULL) + g_hash_table_insert (data_set, "after", (gpointer) after); + _facebook_service_add_access_token (self, data_set); + msg = soup_form_request_new_from_hash ("GET", uri, data_set); + _web_service_send_message (WEB_SERVICE (self), + msg, + cancellable, + callback, + user_data, + facebook_service_list_photos, + facebook_service_list_photos_ready_cb, + self); g_hash_table_destroy (data_set); + g_free (uri); } @@ -1042,113 +1092,3 @@ else return _g_object_list_ref (g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result))); } - -#endif - - -/* utilities */ - - -GList * -facebook_accounts_load_from_file (void) -{ - GList *accounts = NULL; - char *filename; - char *buffer; - gsize len; - DomDocument *doc; - - filename = gth_user_dir_get_file (GTH_DIR_CONFIG, GTHUMB_DIR, "accounts", "facebook.xml", NULL); - if (! g_file_get_contents (filename, &buffer, &len, NULL)) { - g_free (filename); - return NULL; - } - - doc = dom_document_new (); - if (dom_document_load (doc, buffer, len, NULL)) { - DomElement *node; - - node = DOM_ELEMENT (doc)->first_child; - if ((node != NULL) && (g_strcmp0 (node->tag_name, "accounts") == 0)) { - DomElement *child; - - for (child = node->first_child; - child != NULL; - child = child->next_sibling) - { - if (strcmp (child->tag_name, "account") == 0) { - FacebookAccount *account; - - account = facebook_account_new (); - dom_domizable_load_from_element (DOM_DOMIZABLE (account), child); - - accounts = g_list_prepend (accounts, account); - } - } - - accounts = g_list_reverse (accounts); - } - } - - g_object_unref (doc); - g_free (buffer); - g_free (filename); - - return accounts; -} - - -FacebookAccount * -facebook_accounts_find_default (GList *accounts) -{ - GList *scan; - - for (scan = accounts; scan; scan = scan->next) { - FacebookAccount *account = scan->data; - - if (account->is_default) - return g_object_ref (account); - } - - return NULL; -} - - -void -facebook_accounts_save_to_file (GList *accounts, - FacebookAccount *default_account) -{ - DomDocument *doc; - DomElement *root; - GList *scan; - char *buffer; - gsize len; - char *filename; - GFile *file; - - doc = dom_document_new (); - root = dom_document_create_element (doc, "accounts", NULL); - dom_element_append_child (DOM_ELEMENT (doc), root); - for (scan = accounts; scan; scan = scan->next) { - FacebookAccount *account = scan->data; - DomElement *node; - - if ((default_account != NULL) && g_strcmp0 (account->username, default_account->username) == 0) - account->is_default = TRUE; - else - account->is_default = FALSE; - node = dom_domizable_create_element (DOM_DOMIZABLE (account), doc); - dom_element_append_child (root, node); - } - - gth_user_dir_make_dir_for_file (GTH_DIR_CONFIG, GTHUMB_DIR, "accounts", "facebook.xml", NULL); - filename = gth_user_dir_get_file (GTH_DIR_CONFIG, GTHUMB_DIR, "accounts", "facebook.xml", NULL); - file = g_file_new_for_path (filename); - buffer = dom_document_dump (doc, &len); - g_write_file (file, FALSE, G_FILE_CREATE_PRIVATE | G_FILE_CREATE_REPLACE_DESTINATION, buffer, len, NULL, NULL); - - g_free (buffer); - g_object_unref (file); - g_free (filename); - g_object_unref (doc); -} diff -Nru gthumb-3.0.2/extensions/facebook/facebook-service.h gthumb-3.2.3/extensions/facebook/facebook-service.h --- gthumb-3.0.2/extensions/facebook/facebook-service.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/facebook-service.h 2013-04-30 16:56:12.000000000 +0000 @@ -22,12 +22,11 @@ #ifndef FACEBOOK_SERVICE_H #define FACEBOOK_SERVICE_H -#include -#include "facebook-account.h" -#include "facebook-connection.h" +#include +#include +#include #include "facebook-album.h" #include "facebook-types.h" -#include "facebook-user.h" #define FACEBOOK_TYPE_SERVICE (facebook_service_get_type ()) #define FACEBOOK_SERVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), FACEBOOK_TYPE_SERVICE, FacebookService)) @@ -42,34 +41,20 @@ struct _FacebookService { - GObject __parent; + WebService __parent; FacebookServicePrivate *priv; }; struct _FacebookServiceClass { - GObjectClass __parent_class; + WebServiceClass __parent_class; }; GType facebook_service_get_type (void) G_GNUC_CONST; -FacebookService * facebook_service_new (FacebookConnection *conn); -void facebook_service_get_logged_in_user (FacebookService *self, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -char * facebook_service_get_logged_in_user_finish (FacebookService *self, - GAsyncResult *result, - GError **error); -void facebook_service_get_user_info (FacebookService *self, - const char *fields, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -FacebookUser * facebook_service_get_user_info_finish (FacebookService *self, - GAsyncResult *result, - GError **error); +FacebookService * facebook_service_new (GCancellable *cancellable, + GtkWidget *browser, + GtkWidget *dialog); void facebook_service_get_albums (FacebookService *self, - const char *user_id, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); @@ -94,21 +79,15 @@ GList * facebook_service_upload_photos_finish (FacebookService *self, GAsyncResult *result, GError **error); -#if 0 void facebook_service_list_photos (FacebookService *self, FacebookAlbum *album, + int limit, + const char *after, + GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); GList * facebook_service_list_photos_finish (FacebookService *self, GAsyncResult *result, GError **error); -#endif - -/* utilities */ - -GList * facebook_accounts_load_from_file (void); -FacebookAccount * facebook_accounts_find_default (GList *accounts); -void facebook_accounts_save_to_file (GList *accounts, - FacebookAccount *default_account); #endif /* FACEBOOK_SERVICE_H */ diff -Nru gthumb-3.0.2/extensions/facebook/facebook-user.c gthumb-3.2.3/extensions/facebook/facebook-user.c --- gthumb-3.0.2/extensions/facebook/facebook-user.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/facebook-user.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,135 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include -#include "facebook-user.h" - - -static void facebook_user_dom_domizable_interface_init (DomDomizableInterface *iface); - - -G_DEFINE_TYPE_WITH_CODE (FacebookUser, - facebook_user, - G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (DOM_TYPE_DOMIZABLE, - facebook_user_dom_domizable_interface_init)) - - -static void -facebook_user_finalize (GObject *obj) -{ - FacebookUser *self; - - self = FACEBOOK_USER (obj); - - g_free (self->id); - g_free (self->username); - - G_OBJECT_CLASS (facebook_user_parent_class)->finalize (obj); -} - - -static void -facebook_user_class_init (FacebookUserClass *klass) -{ - G_OBJECT_CLASS (klass)->finalize = facebook_user_finalize; -} - - -static DomElement* -facebook_user_create_element (DomDomizable *base, - DomDocument *doc) -{ - FacebookUser *self; - DomElement *element; - - self = FACEBOOK_USER (base); - - element = dom_document_create_element (doc, "user", NULL); - if (self->id != NULL) - dom_element_set_attribute (element, "id", self->id); - if (self->username != NULL) - dom_element_set_attribute (element, "name", self->username); - - return element; -} - - -static void -facebook_user_load_from_element (DomDomizable *base, - DomElement *element) -{ - FacebookUser *self; - DomElement *node; - - self = FACEBOOK_USER (base); - - for (node = element->first_child; node; node = node->next_sibling) { - if (g_strcmp0 (node->tag_name, "uid") == 0) { - _g_strset (&self->id, dom_element_get_inner_text (node)); - } - else if (g_strcmp0 (node->tag_name, "name") == 0) { - _g_strset (&self->username, dom_element_get_inner_text (node)); - } - } -} - - -static void -facebook_user_dom_domizable_interface_init (DomDomizableInterface *iface) -{ - iface->create_element = facebook_user_create_element; - iface->load_from_element = facebook_user_load_from_element; -} - - -static void -facebook_user_init (FacebookUser *self) -{ - self->id = NULL; - self->username = NULL; -} - - -FacebookUser * -facebook_user_new (void) -{ - return g_object_new (FACEBOOK_TYPE_USER, NULL); -} - - -void -facebook_user_set_id (FacebookUser *self, - const char *value) -{ - _g_strset (&self->id, value); -} - - -void -facebook_user_set_username (FacebookUser *self, - const char *value) -{ - _g_strset (&self->username, value); -} diff -Nru gthumb-3.0.2/extensions/facebook/facebook-user.h gthumb-3.2.3/extensions/facebook/facebook-user.h --- gthumb-3.0.2/extensions/facebook/facebook-user.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/facebook-user.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef FACEBOOK_USER_H -#define FACEBOOK_USER_H - -#include -#include - -G_BEGIN_DECLS - -#define FACEBOOK_TYPE_USER (facebook_user_get_type ()) -#define FACEBOOK_USER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FACEBOOK_TYPE_USER, FacebookUser)) -#define FACEBOOK_USER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FACEBOOK_TYPE_USER, FacebookUserClass)) -#define FACEBOOK_IS_USER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FACEBOOK_TYPE_USER)) -#define FACEBOOK_IS_USER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FACEBOOK_TYPE_USER)) -#define FACEBOOK_USER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), FACEBOOK_TYPE_USER, FacebookUserClass)) - -typedef struct _FacebookUser FacebookUser; -typedef struct _FacebookUserClass FacebookUserClass; - -struct _FacebookUser { - GObject parent_instance; - - char *id; - char *username; -}; - -struct _FacebookUserClass { - GObjectClass parent_class; -}; - -GType facebook_user_get_type (void); -FacebookUser * facebook_user_new (void); -void facebook_user_set_id (FacebookUser *self, - const char *value); -void facebook_user_set_username (FacebookUser *self, - const char *value); - -G_END_DECLS - -#endif /* FACEBOOK_USER_H */ diff -Nru gthumb-3.0.2/extensions/facebook/facebook.extension.in.in gthumb-3.2.3/extensions/facebook/facebook.extension.in.in --- gthumb-3.0.2/extensions/facebook/facebook.extension.in.in 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/facebook/facebook.extension.in.in 2013-04-30 16:56:12.000000000 +0000 @@ -11,4 +11,4 @@ Type=module File=%LIBRARY% API=%GTHUMB_API_VERSION% -Requires=export_tools +Requires=importer;export_tools;oauth diff -Nru gthumb-3.0.2/extensions/file_manager/Makefile.in gthumb-3.2.3/extensions/file_manager/Makefile.in --- gthumb-3.0.2/extensions/file_manager/Makefile.in 2012-08-20 19:54:13.000000000 +0000 +++ gthumb-3.2.3/extensions/file_manager/Makefile.in 2013-07-10 13:33:45.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/file_manager -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -155,6 +183,23 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(extensionini_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -187,9 +232,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -203,13 +246,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -238,7 +280,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -254,11 +299,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -275,7 +324,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -305,7 +353,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -423,6 +474,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -457,6 +509,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libfile_manager.la: $(libfile_manager_la_OBJECTS) $(libfile_manager_la_DEPENDENCIES) $(EXTRA_libfile_manager_la_DEPENDENCIES) $(AM_V_CCLD)$(libfile_manager_la_LINK) -rpath $(extensiondir) $(libfile_manager_la_OBJECTS) $(libfile_manager_la_LIBADD) $(LIBS) @@ -479,14 +532,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -571,26 +624,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(extensioninidir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -602,15 +644,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -619,9 +657,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -779,21 +818,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ clean-extensionLTLIBRARIES clean-generic clean-libtool \ - cscopelist ctags distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-extensionLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-extensionLTLIBRARIES \ install-extensioniniDATA install-html install-html-am \ install-info install-info-am install-man install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-extensionLTLIBRARIES \ - uninstall-extensioniniDATA + tags tags-am uninstall uninstall-am \ + uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA @GTHUMB_EXTENSION_IN_RULE@ diff -Nru gthumb-3.0.2/extensions/file_manager/actions.c gthumb-3.2.3/extensions/file_manager/actions.c --- gthumb-3.0.2/extensions/file_manager/actions.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/file_manager/actions.c 2013-07-03 09:34:13.000000000 +0000 @@ -897,7 +897,7 @@ data); gth_browser_exec_task (browser, task, FALSE); - + g_object_unref (task); g_object_unref (file_source); } @@ -929,7 +929,7 @@ g_free (start_uri); start_uri = g_strdup (get_home_uri ()); } - gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog), start_uri); + gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (dialog), start_uri); g_free(start_uri); history = _g_settings_get_string_list (settings, PREF_FILE_MANAGER_COPY_HISTORY); diff -Nru gthumb-3.0.2/extensions/file_manager/callbacks.c gthumb-3.2.3/extensions/file_manager/callbacks.c --- gthumb-3.0.2/extensions/file_manager/callbacks.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/file_manager/callbacks.c 2013-04-30 16:56:12.000000000 +0000 @@ -486,8 +486,6 @@ double max_value; double value; - GDK_THREADS_ENTER (); - data = g_object_get_data (G_OBJECT (browser), BROWSER_DATA_KEY); adj = gth_file_list_get_vadjustment (GTH_FILE_LIST (gth_browser_get_file_list (browser))); @@ -497,8 +495,6 @@ value = max_value; gtk_adjustment_set_value (adj, value); - GDK_THREADS_LEAVE(); - return TRUE; } @@ -549,7 +545,7 @@ if (data->scroll_diff != 0) { if (data->scroll_event == 0) - data->scroll_event = g_timeout_add (SCROLL_TIMEOUT, drag_motion_autoscroll_cb, browser); + data->scroll_event = gdk_threads_add_timeout (SCROLL_TIMEOUT, drag_motion_autoscroll_cb, browser); } else if (data->scroll_event != 0) { g_source_remove (data->scroll_event); @@ -1184,20 +1180,46 @@ break; case GDK_KEY_Delete: - if (((event->state & modifiers) == 0) || ((event->state & modifiers) == GDK_SHIFT_MASK)) { - if (gth_browser_get_location_source (browser) != NULL) { - items = gth_file_selection_get_selected (GTH_FILE_SELECTION (gth_browser_get_file_list_view (browser))); - file_data_list = gth_file_list_get_files (GTH_FILE_LIST (gth_browser_get_file_list (browser)), items); - gth_file_source_remove (gth_browser_get_location_source (browser), - gth_browser_get_location_data (browser), - file_data_list, - (event->state & modifiers) == GDK_SHIFT_MASK, - GTK_WINDOW (browser)); - - _g_object_list_unref (file_data_list); - _gtk_tree_path_list_free (items); - result = GINT_TO_POINTER (1); + if (((event->state & modifiers) == 0) + || ((event->state & modifiers) == GDK_SHIFT_MASK) + || ((event->state & modifiers) == GDK_CONTROL_MASK)) + { + GthFileSource *source; + GthFileData *location; + + if ((event->state & modifiers) == 0) { + /* Removes the files from the current location, + * for example: when viewing a catalog removes + * the files from the catalog; when viewing a + * folder removes the files from the folder. */ + source = gth_browser_get_location_source (browser); + location = gth_browser_get_location_data (browser); + } + else { + /* When a key modifier is active, use the VFS + * file source to delete the files from the + * disk. */ + source = gth_main_get_file_source_for_uri ("file:///"); + location = NULL; } + + if (source == NULL) + return result; + + items = gth_file_selection_get_selected (GTH_FILE_SELECTION (gth_browser_get_file_list_view (browser))); + if (items == NULL) + return result; + + file_data_list = gth_file_list_get_files (GTH_FILE_LIST (gth_browser_get_file_list (browser)), items); + gth_file_source_remove (source, + location, + file_data_list, + (event->state & modifiers) == GDK_SHIFT_MASK, + GTK_WINDOW (browser)); + result = GINT_TO_POINTER (1); + + _g_object_list_unref (file_data_list); + _gtk_tree_path_list_free (items); } break; } diff -Nru gthumb-3.0.2/extensions/file_tools/Makefile.am gthumb-3.2.3/extensions/file_tools/Makefile.am --- gthumb-3.0.2/extensions/file_tools/Makefile.am 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/Makefile.am 2013-04-30 16:56:12.000000000 +0000 @@ -11,11 +11,11 @@ cairo-blur.h \ cairo-rotate.h \ gth-file-tool-adjust-colors.h \ + gth-file-tool-adjust-contrast.h \ gth-file-tool-crop.h \ - gth-file-tool-desaturate.h \ - gth-file-tool-enhance.h \ gth-file-tool-equalize.h \ gth-file-tool-flip.h \ + gth-file-tool-grayscale.h \ gth-file-tool-mirror.h \ gth-file-tool-negative.h \ gth-file-tool-redo.h \ @@ -30,6 +30,7 @@ gth-file-tool-undo.h \ gth-image-line-tool.h \ gth-image-rotator.h \ + gth-preview-tool.h \ preferences.h enum-types.h: $(HEADER_FILES) @@ -59,11 +60,11 @@ cairo-blur.c \ cairo-rotate.c \ gth-file-tool-adjust-colors.c \ + gth-file-tool-adjust-contrast.c \ gth-file-tool-crop.c \ - gth-file-tool-desaturate.c \ - gth-file-tool-enhance.c \ gth-file-tool-equalize.c \ gth-file-tool-flip.c \ + gth-file-tool-grayscale.c \ gth-file-tool-mirror.c \ gth-file-tool-negative.c \ gth-file-tool-redo.c \ @@ -77,6 +78,7 @@ gth-file-tool-undo.c \ gth-image-line-tool.c \ gth-image-rotator.c \ + gth-preview-tool.c \ main.c libfile_tools_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb diff -Nru gthumb-3.0.2/extensions/file_tools/Makefile.in gthumb-3.2.3/extensions/file_tools/Makefile.in --- gthumb-3.0.2/extensions/file_tools/Makefile.in 2012-08-20 19:54:13.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/Makefile.in 2013-07-10 13:33:46.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/file_tools -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -103,11 +131,11 @@ libfile_tools_la-callbacks.lo libfile_tools_la-cairo-blur.lo \ libfile_tools_la-cairo-rotate.lo \ libfile_tools_la-gth-file-tool-adjust-colors.lo \ + libfile_tools_la-gth-file-tool-adjust-contrast.lo \ libfile_tools_la-gth-file-tool-crop.lo \ - libfile_tools_la-gth-file-tool-desaturate.lo \ - libfile_tools_la-gth-file-tool-enhance.lo \ libfile_tools_la-gth-file-tool-equalize.lo \ libfile_tools_la-gth-file-tool-flip.lo \ + libfile_tools_la-gth-file-tool-grayscale.lo \ libfile_tools_la-gth-file-tool-mirror.lo \ libfile_tools_la-gth-file-tool-negative.lo \ libfile_tools_la-gth-file-tool-redo.lo \ @@ -120,7 +148,8 @@ libfile_tools_la-gth-file-tool-sharpen.lo \ libfile_tools_la-gth-file-tool-undo.lo \ libfile_tools_la-gth-image-line-tool.lo \ - libfile_tools_la-gth-image-rotator.lo libfile_tools_la-main.lo + libfile_tools_la-gth-image-rotator.lo \ + libfile_tools_la-gth-preview-tool.lo libfile_tools_la-main.lo libfile_tools_la_OBJECTS = $(am_libfile_tools_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -166,13 +195,14 @@ am__v_CCLD_1 = SOURCES = $(libfile_tools_la_SOURCES) DIST_SOURCES = $(libfile_tools_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -181,9 +211,29 @@ DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -242,9 +292,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -258,13 +306,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -293,7 +340,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -309,11 +359,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -330,7 +384,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -360,7 +413,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -428,11 +484,11 @@ cairo-blur.h \ cairo-rotate.h \ gth-file-tool-adjust-colors.h \ + gth-file-tool-adjust-contrast.h \ gth-file-tool-crop.h \ - gth-file-tool-desaturate.h \ - gth-file-tool-enhance.h \ gth-file-tool-equalize.h \ gth-file-tool-flip.h \ + gth-file-tool-grayscale.h \ gth-file-tool-mirror.h \ gth-file-tool-negative.h \ gth-file-tool-redo.h \ @@ -447,6 +503,7 @@ gth-file-tool-undo.h \ gth-image-line-tool.h \ gth-image-rotator.h \ + gth-preview-tool.h \ preferences.h libfile_tools_la_SOURCES = \ @@ -457,11 +514,11 @@ cairo-blur.c \ cairo-rotate.c \ gth-file-tool-adjust-colors.c \ + gth-file-tool-adjust-contrast.c \ gth-file-tool-crop.c \ - gth-file-tool-desaturate.c \ - gth-file-tool-enhance.c \ gth-file-tool-equalize.c \ gth-file-tool-flip.c \ + gth-file-tool-grayscale.c \ gth-file-tool-mirror.c \ gth-file-tool-negative.c \ gth-file-tool-redo.c \ @@ -475,6 +532,7 @@ gth-file-tool-undo.c \ gth-image-line-tool.c \ gth-image-rotator.c \ + gth-preview-tool.c \ main.c libfile_tools_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb @@ -523,6 +581,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -557,6 +616,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libfile_tools.la: $(libfile_tools_la_OBJECTS) $(libfile_tools_la_DEPENDENCIES) $(EXTRA_libfile_tools_la_DEPENDENCIES) $(AM_V_CCLD)$(libfile_tools_la_LINK) -rpath $(extensiondir) $(libfile_tools_la_OBJECTS) $(libfile_tools_la_LIBADD) $(LIBS) @@ -571,11 +631,11 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfile_tools_la-callbacks.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfile_tools_la-enum-types.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfile_tools_la-gth-file-tool-adjust-colors.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfile_tools_la-gth-file-tool-adjust-contrast.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfile_tools_la-gth-file-tool-crop.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfile_tools_la-gth-file-tool-desaturate.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfile_tools_la-gth-file-tool-enhance.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfile_tools_la-gth-file-tool-equalize.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfile_tools_la-gth-file-tool-flip.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfile_tools_la-gth-file-tool-grayscale.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfile_tools_la-gth-file-tool-mirror.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfile_tools_la-gth-file-tool-negative.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfile_tools_la-gth-file-tool-redo.Plo@am__quote@ @@ -589,6 +649,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfile_tools_la-gth-file-tool-undo.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfile_tools_la-gth-image-line-tool.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfile_tools_la-gth-image-rotator.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfile_tools_la-gth-preview-tool.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfile_tools_la-main.Plo@am__quote@ .c.o: @@ -596,14 +657,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -647,6 +708,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfile_tools_la_CFLAGS) $(CFLAGS) -c -o libfile_tools_la-gth-file-tool-adjust-colors.lo `test -f 'gth-file-tool-adjust-colors.c' || echo '$(srcdir)/'`gth-file-tool-adjust-colors.c +libfile_tools_la-gth-file-tool-adjust-contrast.lo: gth-file-tool-adjust-contrast.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfile_tools_la_CFLAGS) $(CFLAGS) -MT libfile_tools_la-gth-file-tool-adjust-contrast.lo -MD -MP -MF $(DEPDIR)/libfile_tools_la-gth-file-tool-adjust-contrast.Tpo -c -o libfile_tools_la-gth-file-tool-adjust-contrast.lo `test -f 'gth-file-tool-adjust-contrast.c' || echo '$(srcdir)/'`gth-file-tool-adjust-contrast.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfile_tools_la-gth-file-tool-adjust-contrast.Tpo $(DEPDIR)/libfile_tools_la-gth-file-tool-adjust-contrast.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-file-tool-adjust-contrast.c' object='libfile_tools_la-gth-file-tool-adjust-contrast.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfile_tools_la_CFLAGS) $(CFLAGS) -c -o libfile_tools_la-gth-file-tool-adjust-contrast.lo `test -f 'gth-file-tool-adjust-contrast.c' || echo '$(srcdir)/'`gth-file-tool-adjust-contrast.c + libfile_tools_la-gth-file-tool-crop.lo: gth-file-tool-crop.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfile_tools_la_CFLAGS) $(CFLAGS) -MT libfile_tools_la-gth-file-tool-crop.lo -MD -MP -MF $(DEPDIR)/libfile_tools_la-gth-file-tool-crop.Tpo -c -o libfile_tools_la-gth-file-tool-crop.lo `test -f 'gth-file-tool-crop.c' || echo '$(srcdir)/'`gth-file-tool-crop.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfile_tools_la-gth-file-tool-crop.Tpo $(DEPDIR)/libfile_tools_la-gth-file-tool-crop.Plo @@ -654,20 +722,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfile_tools_la_CFLAGS) $(CFLAGS) -c -o libfile_tools_la-gth-file-tool-crop.lo `test -f 'gth-file-tool-crop.c' || echo '$(srcdir)/'`gth-file-tool-crop.c -libfile_tools_la-gth-file-tool-desaturate.lo: gth-file-tool-desaturate.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfile_tools_la_CFLAGS) $(CFLAGS) -MT libfile_tools_la-gth-file-tool-desaturate.lo -MD -MP -MF $(DEPDIR)/libfile_tools_la-gth-file-tool-desaturate.Tpo -c -o libfile_tools_la-gth-file-tool-desaturate.lo `test -f 'gth-file-tool-desaturate.c' || echo '$(srcdir)/'`gth-file-tool-desaturate.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfile_tools_la-gth-file-tool-desaturate.Tpo $(DEPDIR)/libfile_tools_la-gth-file-tool-desaturate.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-file-tool-desaturate.c' object='libfile_tools_la-gth-file-tool-desaturate.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfile_tools_la_CFLAGS) $(CFLAGS) -c -o libfile_tools_la-gth-file-tool-desaturate.lo `test -f 'gth-file-tool-desaturate.c' || echo '$(srcdir)/'`gth-file-tool-desaturate.c - -libfile_tools_la-gth-file-tool-enhance.lo: gth-file-tool-enhance.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfile_tools_la_CFLAGS) $(CFLAGS) -MT libfile_tools_la-gth-file-tool-enhance.lo -MD -MP -MF $(DEPDIR)/libfile_tools_la-gth-file-tool-enhance.Tpo -c -o libfile_tools_la-gth-file-tool-enhance.lo `test -f 'gth-file-tool-enhance.c' || echo '$(srcdir)/'`gth-file-tool-enhance.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfile_tools_la-gth-file-tool-enhance.Tpo $(DEPDIR)/libfile_tools_la-gth-file-tool-enhance.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-file-tool-enhance.c' object='libfile_tools_la-gth-file-tool-enhance.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfile_tools_la_CFLAGS) $(CFLAGS) -c -o libfile_tools_la-gth-file-tool-enhance.lo `test -f 'gth-file-tool-enhance.c' || echo '$(srcdir)/'`gth-file-tool-enhance.c - libfile_tools_la-gth-file-tool-equalize.lo: gth-file-tool-equalize.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfile_tools_la_CFLAGS) $(CFLAGS) -MT libfile_tools_la-gth-file-tool-equalize.lo -MD -MP -MF $(DEPDIR)/libfile_tools_la-gth-file-tool-equalize.Tpo -c -o libfile_tools_la-gth-file-tool-equalize.lo `test -f 'gth-file-tool-equalize.c' || echo '$(srcdir)/'`gth-file-tool-equalize.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfile_tools_la-gth-file-tool-equalize.Tpo $(DEPDIR)/libfile_tools_la-gth-file-tool-equalize.Plo @@ -682,6 +736,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfile_tools_la_CFLAGS) $(CFLAGS) -c -o libfile_tools_la-gth-file-tool-flip.lo `test -f 'gth-file-tool-flip.c' || echo '$(srcdir)/'`gth-file-tool-flip.c +libfile_tools_la-gth-file-tool-grayscale.lo: gth-file-tool-grayscale.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfile_tools_la_CFLAGS) $(CFLAGS) -MT libfile_tools_la-gth-file-tool-grayscale.lo -MD -MP -MF $(DEPDIR)/libfile_tools_la-gth-file-tool-grayscale.Tpo -c -o libfile_tools_la-gth-file-tool-grayscale.lo `test -f 'gth-file-tool-grayscale.c' || echo '$(srcdir)/'`gth-file-tool-grayscale.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfile_tools_la-gth-file-tool-grayscale.Tpo $(DEPDIR)/libfile_tools_la-gth-file-tool-grayscale.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-file-tool-grayscale.c' object='libfile_tools_la-gth-file-tool-grayscale.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfile_tools_la_CFLAGS) $(CFLAGS) -c -o libfile_tools_la-gth-file-tool-grayscale.lo `test -f 'gth-file-tool-grayscale.c' || echo '$(srcdir)/'`gth-file-tool-grayscale.c + libfile_tools_la-gth-file-tool-mirror.lo: gth-file-tool-mirror.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfile_tools_la_CFLAGS) $(CFLAGS) -MT libfile_tools_la-gth-file-tool-mirror.lo -MD -MP -MF $(DEPDIR)/libfile_tools_la-gth-file-tool-mirror.Tpo -c -o libfile_tools_la-gth-file-tool-mirror.lo `test -f 'gth-file-tool-mirror.c' || echo '$(srcdir)/'`gth-file-tool-mirror.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfile_tools_la-gth-file-tool-mirror.Tpo $(DEPDIR)/libfile_tools_la-gth-file-tool-mirror.Plo @@ -773,6 +834,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfile_tools_la_CFLAGS) $(CFLAGS) -c -o libfile_tools_la-gth-image-rotator.lo `test -f 'gth-image-rotator.c' || echo '$(srcdir)/'`gth-image-rotator.c +libfile_tools_la-gth-preview-tool.lo: gth-preview-tool.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfile_tools_la_CFLAGS) $(CFLAGS) -MT libfile_tools_la-gth-preview-tool.lo -MD -MP -MF $(DEPDIR)/libfile_tools_la-gth-preview-tool.Tpo -c -o libfile_tools_la-gth-preview-tool.lo `test -f 'gth-preview-tool.c' || echo '$(srcdir)/'`gth-preview-tool.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfile_tools_la-gth-preview-tool.Tpo $(DEPDIR)/libfile_tools_la-gth-preview-tool.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-preview-tool.c' object='libfile_tools_la-gth-preview-tool.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfile_tools_la_CFLAGS) $(CFLAGS) -c -o libfile_tools_la-gth-preview-tool.lo `test -f 'gth-preview-tool.c' || echo '$(srcdir)/'`gth-preview-tool.c + libfile_tools_la-main.lo: main.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfile_tools_la_CFLAGS) $(CFLAGS) -MT libfile_tools_la-main.lo -MD -MP -MF $(DEPDIR)/libfile_tools_la-main.Tpo -c -o libfile_tools_la-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfile_tools_la-main.Tpo $(DEPDIR)/libfile_tools_la-main.Plo @@ -813,14 +881,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -841,31 +908,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -881,12 +930,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -898,15 +942,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -915,9 +955,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -1106,25 +1147,24 @@ uninstall-am: uninstall-extensionLTLIBRARIES \ uninstall-extensioniniDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ - cscopelist-recursive ctags-recursive install install-am \ - install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-extensionLTLIBRARIES \ - clean-generic clean-libtool cscopelist cscopelist-recursive \ - ctags ctags-recursive dist-hook distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extensionLTLIBRARIES \ - install-extensioniniDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +.MAKE: $(am__recursive_targets) all check install install-am \ + install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-extensionLTLIBRARIES clean-generic \ + clean-libtool cscopelist-am ctags ctags-am dist-hook distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-extensionLTLIBRARIES install-extensioniniDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA diff -Nru gthumb-3.0.2/extensions/file_tools/cairo-rotate.c gthumb-3.2.3/extensions/file_tools/cairo-rotate.c --- gthumb-3.0.2/extensions/file_tools/cairo-rotate.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/cairo-rotate.c 2013-04-30 16:56:12.000000000 +0000 @@ -35,7 +35,10 @@ double src_width, src_height; double t1, t2; - angle = CLAMP (angle, -90.0, 90.0); + if (angle < -90) + angle += 180; + else if (angle > 90) + angle -= 180; angle_rad = fabs (angle) / 180.0 * G_PI; @@ -77,7 +80,11 @@ double new_width; double xx1, yy1, xx2, yy2; - angle = CLAMP (angle, -90.0, 90.0); + if (angle < -90) + angle += 180; + else if (angle > 90) + angle -= 180; + p1 = CLAMP (p1, 0.0, 1.0); p2 = CLAMP (p2, 0.0, 1.0); @@ -355,7 +362,7 @@ _cairo_image_surface_rotate (cairo_surface_t *image, double angle, gboolean high_quality, - cairo_color_t *background_color) + GdkRGBA *background_color) { cairo_surface_t *rotated; cairo_surface_t *tmp = NULL; @@ -373,10 +380,10 @@ rotated = rotate (image, -angle, high_quality, - background_color->r * 255.0, - background_color->g * 255.0, - background_color->b * 255.0, - background_color->a * 255.0); + background_color->red * 255.0, + background_color->green * 255.0, + background_color->blue * 255.0, + background_color->alpha * 255.0); else rotated = cairo_surface_reference (image); diff -Nru gthumb-3.0.2/extensions/file_tools/cairo-rotate.h gthumb-3.2.3/extensions/file_tools/cairo-rotate.h --- gthumb-3.0.2/extensions/file_tools/cairo-rotate.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/cairo-rotate.h 2013-04-30 16:56:12.000000000 +0000 @@ -43,7 +43,7 @@ cairo_surface_t * _cairo_image_surface_rotate (cairo_surface_t *image, double angle, gboolean high_quality, - cairo_color_t *background_color); + GdkRGBA *background_color); G_END_DECLS diff -Nru gthumb-3.0.2/extensions/file_tools/callbacks.c gthumb-3.2.3/extensions/file_tools/callbacks.c --- gthumb-3.0.2/extensions/file_tools/callbacks.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/callbacks.c 2013-04-30 16:56:12.000000000 +0000 @@ -26,8 +26,8 @@ #include #include #include +#include "gth-file-tool-adjust-contrast.h" #include "gth-file-tool-crop.h" -#include "gth-file-tool-enhance.h" #include "gth-file-tool-flip.h" #include "gth-file-tool-mirror.h" #include "gth-file-tool-resize.h" @@ -67,7 +67,7 @@ switch (event->keyval) { case GDK_KEY_h: - tool = (GthFileTool *) gth_toolbox_get_tool (GTH_TOOLBOX (toolbox), GTH_TYPE_FILE_TOOL_ENHANCE); + tool = (GthFileTool *) gth_toolbox_get_tool (GTH_TOOLBOX (toolbox), GTH_TYPE_FILE_TOOL_ADJUST_CONTRAST); break; case GDK_KEY_l: tool = (GthFileTool *) gth_toolbox_get_tool (GTH_TOOLBOX (toolbox), GTH_TYPE_FILE_TOOL_FLIP); @@ -82,11 +82,11 @@ tool = (GthFileTool *) gth_toolbox_get_tool (GTH_TOOLBOX (toolbox), GTH_TYPE_FILE_TOOL_ROTATE_LEFT); break; case GDK_KEY_C: - gth_browser_show_viewer_tools (browser, TRUE); + gth_browser_show_viewer_tools (browser); tool = (GthFileTool *) gth_toolbox_get_tool (GTH_TOOLBOX (toolbox), GTH_TYPE_FILE_TOOL_CROP); break; case GDK_KEY_S: - gth_browser_show_viewer_tools (browser, TRUE); + gth_browser_show_viewer_tools (browser); tool = (GthFileTool *) gth_toolbox_get_tool (GTH_TOOLBOX (toolbox), GTH_TYPE_FILE_TOOL_RESIZE); break; } diff -Nru gthumb-3.0.2/extensions/file_tools/data/Makefile.in gthumb-3.2.3/extensions/file_tools/data/Makefile.in --- gthumb-3.0.2/extensions/file_tools/data/Makefile.in 2012-08-20 19:54:13.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/data/Makefile.in 2013-07-10 13:33:46.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/file_tools/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/file_tools/data/ui/Makefile.am gthumb-3.2.3/extensions/file_tools/data/ui/Makefile.am --- gthumb-3.0.2/extensions/file_tools/data/ui/Makefile.am 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/data/ui/Makefile.am 2013-04-30 16:56:12.000000000 +0000 @@ -2,6 +2,7 @@ ui_DATA = \ adjust-colors-options.ui \ crop-options.ui \ + grayscale-options.ui \ resize-options.ui \ rotate-options.ui \ sharpen-options.ui diff -Nru gthumb-3.0.2/extensions/file_tools/data/ui/Makefile.in gthumb-3.2.3/extensions/file_tools/data/ui/Makefile.in --- gthumb-3.0.2/extensions/file_tools/data/ui/Makefile.in 2012-08-20 19:54:13.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/data/ui/Makefile.in 2013-07-10 13:33:46.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/file_tools/data/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -322,6 +356,7 @@ ui_DATA = \ adjust-colors-options.ui \ crop-options.ui \ + grayscale-options.ui \ resize-options.ui \ rotate-options.ui \ sharpen-options.ui @@ -387,11 +422,9 @@ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -532,16 +565,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-uiDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-uiDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/file_tools/data/ui/adjust-colors-options.ui gthumb-3.2.3/extensions/file_tools/data/ui/adjust-colors-options.ui --- gthumb-3.0.2/extensions/file_tools/data/ui/adjust-colors-options.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/data/ui/adjust-colors-options.ui 2013-04-30 16:56:12.000000000 +0000 @@ -1,6 +1,6 @@ - + 100 1 @@ -89,7 +89,7 @@ True False - 0 + 1 B_rightness: True @@ -107,7 +107,7 @@ True False - 0 + 1 Con_trast: True @@ -125,7 +125,7 @@ True False - 0 + 1 _Saturation: True @@ -205,7 +205,7 @@ True False - 0 + 1 G_amma: True @@ -221,7 +221,7 @@ True False - 0 + 1 Cyan-_Red: True @@ -239,7 +239,7 @@ True False - 0 + 1 _Magenta-Green: True @@ -257,7 +257,7 @@ True False - 0 + 1 _Yellow-Blue: True @@ -358,13 +358,24 @@ False - _Reset False True True True False True + + + True + False + _Reset + True + reset_button + + + + + False diff -Nru gthumb-3.0.2/extensions/file_tools/data/ui/crop-options.ui gthumb-3.2.3/extensions/file_tools/data/ui/crop-options.ui --- gthumb-3.0.2/extensions/file_tools/data/ui/crop-options.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/data/ui/crop-options.ui 2013-04-30 16:56:12.000000000 +0000 @@ -1,6 +1,6 @@ - + 1 100000 @@ -23,10 +23,6 @@ 999999 1 - - 999999 - 1 - True False @@ -39,286 +35,283 @@ True False + 12 12 - + True False - 0 - none + vertical + 12 - + True False - 6 - 12 + 0 + Selection + + + + + + False + False + 0 + + + + + True + False + 6 - + True False - 6 + 4 + 2 + 6 + 6 + + + - + True False - 3 - 2 - 6 - 6 - - - True - False - 0 - _Position: - True - crop_x_spinbutton - - - GTK_FILL - - - + 6 - + True - False - 0 - Size: - True - crop_width_spinbutton + True + ● + 5 + True + crop_width_adjustment + 1 - 1 - 2 - GTK_FILL - + False + False + 0 + + + 1 + 2 + GTK_FILL + + + + + + True + False + 1 + _Width: + True + + + GTK_FILL + + + + + + True + False - + True - False - 6 - - - True - True - ● - 5 - crop_x_adjustment - 1 - - - False - True - 0 - - - - - True - False - × - - - False - True - 1 - - - - - True - True - ● - 5 - crop_y_adjustment - 1 - - - False - True - 2 - - + True + ● + 5 + True + crop_height_adjustment + 1 - 1 - 2 - GTK_FILL - GTK_FILL + False + False + 0 + + + 1 + 2 + 1 + 2 + + + + + + True + False + 1 + Heigh_t: + True + + + 1 + 2 + GTK_FILL + + + + + + True + False + 1 + _Position: + True + crop_x_spinbutton + + + 2 + 3 + GTK_FILL + + + + + + True + False + 6 - + True - False - 6 - - - True - True - ● - 5 - crop_width_adjustment - 1 - - - False - False - 0 - - - - - True - False - × - - - False - True - 1 - - - - - True - True - ● - 5 - crop_height_adjustment - 1 - - - False - False - 2 - - + True + ● + 5 + True + crop_x_adjustment + 1 - 1 - 2 - 1 - 2 - GTK_FILL - GTK_FILL + False + False + 0 + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + + True + False - + True - False - - - + True + ● + 5 + True + crop_y_adjustment + 1 - 1 - 2 - 2 - 3 - GTK_FILL + False + True + 0 + + + 1 + 2 + 3 + 4 + + + + + + False + False + 0 + + + + + True + False + 6 + 6 + spread + + + False + True + True + True + False - + True False - 0 - _Grid: - True + Maximize + + + - - 2 - 3 - GTK_FILL - GTK_FILL - False - True + False 0 - + + False True - False - 6 - spread - - - False - True - True - True - False - - - True - False - Maximize - - - - - - - - False - False - 0 - - + True + True + False - - False + True - True - True - False - - - True - False - Center - - - - - + False + Center + + + - - False - False - 1 - False - True + False 1 + + False + False + 1 + - - - - True - False - Selection - - - - + + False + False + 1 + @@ -328,82 +321,71 @@ - + True False - 0 - none + vertical + 12 - + True False - 6 - 12 + 0 + Aspect ratio + + + + + + False + True + 0 + + + + + True + False + 6 + + + True + False + + + + + + False + False + 0 + + - + True False 6 - + True - False - - - + True + ● + True + ratio_w_adjustment + 1 False - False + True 0 - + True False - 6 - - - True - True - ● - ratio_w_adjustment - 1 - - - False - True - 0 - - - - - True - False - : - - - False - False - 1 - - - - - True - True - ● - ratio_h_adjustment - 1 - if-valid - - - False - True - 2 - - + : False @@ -412,97 +394,201 @@ - - I_nvert aspect ratio + + True + True + ● + True + ratio_h_adjustment + 1 + if-valid + + + False + True + 2 + + + + + False + False + 1 + + + + + I_nvert aspect ratio + False + True + True + False + False + True + 0 + True + + + False + False + 2 + + + + + True + False + 6 + + + M_ultiple of: False True True False False True + 0 True False - False - 2 + True + 0 + + + + + True + True + ● + 5 + True + bind_factor_adjustment + + + False + True + 1 - + True False - 6 - - - M_ultiple of: - False - True - True - False - False - True - True - - - False - True - 0 - - - - - True - True - ● - 5 - bind_factor_adjustment - - - False - True - 1 - - - - - True - False - 0 - px - - - False - True - 2 - - + 0 + px False True - 3 + 2 + + False + True + 3 + + + False + True + 1 + - - + + + False + False + 1 + + + + + True + False + vertical + 12 + + True False - Aspect ratio + 0 + Options + + False + True + 0 + + + + + True + False + 6 + + + True + False + 6 + 6 + + + True + False + 0 + _Grid: + True + + + 0 + 0 + 1 + 1 + + + + + True + False + True + + + + + + 1 + 0 + 1 + 1 + + + + + True + True + 0 + + + + + False + True + 1 + False False - 1 + 2 @@ -577,4 +663,8 @@ 999999 1 + + 999999 + 1 + diff -Nru gthumb-3.0.2/extensions/file_tools/data/ui/grayscale-options.ui gthumb-3.2.3/extensions/file_tools/data/ui/grayscale-options.ui --- gthumb-3.0.2/extensions/file_tools/data/ui/grayscale-options.ui 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/data/ui/grayscale-options.ui 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,204 @@ + + + + + True + False + 6 + + + True + False + + + True + False + 12 + 12 + + + True + False + vertical + 12 + + + True + False + 0 + Method + + + + + + False + True + 0 + + + + + True + False + vertical + 6 + + + _Brightness + False + True + True + False + False + True + 0 + True + True + + + False + True + 0 + + + + + _Saturation + False + True + True + False + False + True + 0 + True + brightness_radiobutton + + + False + True + 1 + + + + + _Average + False + True + True + False + False + True + 0 + True + brightness_radiobutton + + + False + True + 2 + + + + + False + True + 1 + + + + + False + True + 0 + + + + + _Preview + False + True + True + False + False + True + 0 + True + True + + + False + True + 1 + + + + + False + True + 0 + + + + + True + False + + + False + True + 6 + 1 + + + + + True + False + 12 + center + + + gtk-ok + False + True + True + True + False + True + + + False + False + 0 + + + + + gtk-cancel + False + True + True + True + False + True + + + False + False + 1 + + + + + False + False + 6 + 2 + + + + + + diff -Nru gthumb-3.0.2/extensions/file_tools/data/ui/resize-options.ui gthumb-3.2.3/extensions/file_tools/data/ui/resize-options.ui --- gthumb-3.0.2/extensions/file_tools/data/ui/resize-options.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/data/ui/resize-options.ui 2013-04-30 16:56:12.000000000 +0000 @@ -1,24 +1,6 @@ - - - 999999 - 1 - - - 999999 - 1 - - - 1 - 999999 - 1 - - - 1 - 999999 - 1 - + True False @@ -31,231 +13,241 @@ True False + 12 12 - + True False - 0 - none + vertical + 12 + + + True + False + 0 + Dimensions + + + + + + False + True + 0 + + - + True False - 6 - 12 + 12 - + True False - 12 + 2 + 3 + 6 + 6 + + + - + + True + False + 1 + _Width: + True + resize_width_spinbutton + + + GTK_FILL + + + + + + True + False + 1 + Heigh_t: + True + resize_height_spinbutton + + + 1 + 2 + GTK_FILL + + + + + True False - 2 - 3 - 6 - 6 - - - True - False - 0 - _Width: - True - resize_width_spinbutton - - - GTK_FILL - - - - + True - False - 0 - Heigh_t: - True - resize_height_spinbutton + True + ● + 6 + True + resize_width_adjustment + 1 + True + if-valid - 1 - 2 - GTK_FILL - + False + False + 0 + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + False - + True - False - - - True - True - ● - 6 - resize_width_adjustment - 1 - True - if-valid - - - False - False - 0 - - + True + ● + 6 + True + resize_height_adjustment + 1 + True + if-valid - 1 - 2 - GTK_FILL - GTK_FILL + False + False + 0 + + + 1 + 2 + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + False + unit_liststore + 0 - - True - False - - - True - True - ● - 6 - resize_height_adjustment - 1 - True - if-valid - - - False - False - 0 - - - - - 1 - 2 - 1 - 2 - GTK_FILL - GTK_FILL - + + + 1 + + + + 2 + 3 + GTK_FILL + GTK_FILL + + + + + False + True + 0 + + + + + True + False + 6 + spread + + + False + True + True + True + True + Set the image size to this value + Set the image size to this value + False + True - + True False - unit_liststore - 0 - - - - 1 - - + Image + + + - - 2 - 3 - GTK_FILL - GTK_FILL - - - - False - True + False 0 - + + False True - False - 6 - spread - - - False - True - True - True - Set the image size to this value - False - True - - - True - False - Image - - - - - - - - False - False - 0 - - + True + True + True + Set the image size to this value + Set the image size to this value + False + True - - False + True - True - True - Set the image size to this value - False - True - - - True - False - 1 - Screen - - - - - + False + 1 + Screen + + + - - False - False - 1 - False - True + False 1 + + False + True + 1 + - - - - True - False - Dimensions - - - - + + False + True + 1 + @@ -265,82 +257,71 @@ - + True False - 0 - none + vertical + 12 - + True False - 6 - 12 + 0 + Aspect ratio + + + + + + False + True + 0 + + + + + True + False + 6 + + + True + False + + + + + + False + False + 0 + + - + True False 6 - + True - False - - - + True + ● + True + ratio_w_adjustment + 1 False - False + True 0 - + True False - 6 - - - True - True - ● - ratio_w_adjustment - 1 - - - False - True - 0 - - - - - True - False - : - - - False - False - 1 - - - - - True - True - ● - ratio_h_adjustment - 1 - if-valid - - - False - True - 2 - - + : False @@ -349,35 +330,52 @@ - - I_nvert aspect ratio - False + True True - False - False - True - True + ● + True + ratio_h_adjustment + 1 + if-valid False - False + True 2 + + False + False + 1 + + + + + I_nvert aspect ratio + False + True + True + False + False + True + 0 + True + + + False + False + 2 + - - - - True - False - Aspect ratio - - - - + + False + True + 1 + @@ -387,205 +385,63 @@ - + True False - 0 - none + vertical + 12 - - True - False - 6 - 12 - - - True - False - 6 - - - High _quality - False - True - True - False - False - True - 0 - True - True - - - False - False - 0 - - - - - - - True False + 0 Options + + False + True + 0 + - - - False - False - 2 - - - - - True - False - - - False - True - 3 - - - - - True - False - 6 - + True False + 6 - + + High _quality + False True - False - 3 - 2 - 6 - 6 - - - True - False - 0 - Original dimensions: - - - - - - GTK_FILL - GTK_FILL - - - - - True - False - 0 - Scale factor: - - - - - - 2 - 3 - GTK_FILL - GTK_FILL - - - - - True - False - 0 - label - - - - - - 1 - 2 - GTK_FILL - - - - - True - False - 0 - label - - - - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - True - False - 0 - New dimensions: - - - - - - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - False - 0 - label - - - - - - 1 - 2 - 1 - 2 - GTK_FILL - - + True + False + False + True + 0 + True + True - True + False False 0 + + False + True + 1 + False - True - 4 + False + 2 @@ -596,7 +452,7 @@ - + True False @@ -608,6 +464,147 @@ + + True + False + + + True + False + 6 + 6 + 3 + 2 + 6 + 6 + + + True + False + 0 + Original dimensions: + + + + + + GTK_FILL + GTK_FILL + + + + + True + False + 0 + Scale factor: + + + + + + 2 + 3 + GTK_FILL + GTK_FILL + + + + + True + False + 0 + label + + + + + + 1 + 2 + GTK_FILL + + + + + True + False + 0 + label + + + + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + True + False + 0 + New dimensions: + + + + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + False + 0 + label + + + + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + False + 0 + + + + + False + False + 2 + + + + + True + False + + + False + True + 6 + 3 + + + True False @@ -651,12 +648,30 @@ False False 6 - 2 + 4 + + 999999 + 1 + + + 999999 + 1 + + + 1 + 999999 + 1 + + + 1 + 999999 + 1 + diff -Nru gthumb-3.0.2/extensions/file_tools/data/ui/rotate-options.ui gthumb-3.2.3/extensions/file_tools/data/ui/rotate-options.ui --- gthumb-3.0.2/extensions/file_tools/data/ui/rotate-options.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/data/ui/rotate-options.ui 2013-04-30 16:56:12.000000000 +0000 @@ -1,6 +1,6 @@ - + True True @@ -19,126 +19,144 @@ True False + 12 12 - + True False - 0 - none + vertical + 12 - + True False - 6 - 12 + 0 + Angle + + + + + + False + True + 0 + + + + + True + False + 12 - + True False 6 - + True False - 6 - - True - False - - - - - - True - True - 0 - + - False + True True 0 + + + False + True + 0 + + + + + True + False + 6 + spread - + + False True - False - 6 - spread + True + True + False + True - - False + True - True - True - False - True - - - True - False - Align - - - - - + False + Align + + + - - False - False - 0 - False - True - 1 + False + 0 + + False + True + 1 + - - - - True - False - Angle - - - - + + False + True + 1 + False - False + True 0 - + True False - 0 - none + vertical + 12 - + True False - 6 - 12 + 0 + Image size + + + + + + False + True + 0 + + + + + True + False + 6 - + True False - 6 True @@ -152,175 +170,212 @@ - False + True True 0 + + + False + False + 0 + + + + + True + False + 3 + 2 + 6 + 6 - + True False - 3 - 2 - 6 - 6 - - True - False - - - - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - False - - - - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - True - False - 0 - Point 1: - - - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - False - 0 - Point 2: - - - 2 - 3 - GTK_FILL - GTK_FILL - + + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + False - - Keep aspect ratio - False - True - True - False - False - 0 - True - True - - - 2 - GTK_FILL - + - False - True - 1 + 1 + 2 + 2 + 3 + GTK_FILL + + + + + True + False + 1 + Point 1: + + + + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + False + 1 + Point 2: + + + + + + 2 + 3 + GTK_FILL + GTK_FILL + + + + + Keep aspect ratio + False + True + True + False + False + 0 + True + True + + + 2 + GTK_FILL + + False + False + 1 + - - - - True - False - Image size - - - - + + False + True + 1 + False - False + True 1 - + True False - 0 - none + vertical + 12 - + True False - 6 - 12 + 0 + Options + + + + + + False + True + 0 + + + + + True + False + 2 + 2 + 6 + 6 - + True False - 2 - 2 - 6 - 6 - - - True - False - - - - - - 1 - 2 - GTK_FILL - - - - True - False - 0 - Grid: - - - GTK_FILL - GTK_FILL - + + + + 1 + 2 + GTK_FILL + + + + + True + False + 0 + Grid: + + + GTK_FILL + GTK_FILL + + + + + True + False + 0 + 0.10999999940395355 + _Background: + True + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + False + vertical + 2 - + True False - 6 False @@ -337,61 +392,46 @@ 0 - - - _Transparent - False - True - True - False - False - True - 0 - True - - - True - True - 1 - - - 1 - 2 - 1 - 2 - GTK_FILL + False + True + 0 - + + _Transparent + False True - False - 0 - _Background: + True + False + False True + 0 + True - 1 - 2 - GTK_FILL - GTK_FILL + False + True + 1 + + 1 + 2 + 1 + 2 + + - - - - True - False - Options - - - - + + False + True + 1 + @@ -404,7 +444,6 @@ True False - 6 False @@ -417,6 +456,9 @@ True False Reset + + + @@ -527,6 +569,7 @@ True False + 12 12 @@ -567,12 +610,10 @@ True False 6 - 12 True False - 6 Parallel @@ -703,15 +744,7 @@ - - True - False - page 3 - - - 2 - False - + diff -Nru gthumb-3.0.2/extensions/file_tools/data/ui/sharpen-options.ui gthumb-3.2.3/extensions/file_tools/data/ui/sharpen-options.ui --- gthumb-3.0.2/extensions/file_tools/data/ui/sharpen-options.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/data/ui/sharpen-options.ui 2013-04-30 16:56:12.000000000 +0000 @@ -1,6 +1,6 @@ - + True False @@ -80,9 +80,12 @@ True False - 0 + 1 Threshold: True + + + 2 @@ -127,9 +130,12 @@ True False - 0 + 1 Radius: True + + + 1 @@ -142,9 +148,12 @@ True False - 0 + 1 Amount: True + + + GTK_FILL @@ -178,13 +187,24 @@ False - _Reset False True True True False True + + + True + False + _Reset + True + reset_button + + + + + False diff -Nru gthumb-3.0.2/extensions/file_tools/gth-file-tool-adjust-colors.c gthumb-3.2.3/extensions/file_tools/gth-file-tool-adjust-colors.c --- gthumb-3.0.2/extensions/file_tools/gth-file-tool-adjust-colors.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/gth-file-tool-adjust-colors.c 2013-04-30 16:56:12.000000000 +0000 @@ -24,37 +24,41 @@ #include #include #include "gth-file-tool-adjust-colors.h" +#include "gth-preview-tool.h" #define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x))) #define APPLY_DELAY 150 - +#define PREVIEW_SIZE 0.9 G_DEFINE_TYPE (GthFileToolAdjustColors, gth_file_tool_adjust_colors, GTH_TYPE_FILE_TOOL) struct _GthFileToolAdjustColorsPrivate { - cairo_surface_t *source; - cairo_surface_t *destination; - GtkBuilder *builder; - GtkAdjustment *gamma_adj; - GtkAdjustment *brightness_adj; - GtkAdjustment *contrast_adj; - GtkAdjustment *saturation_adj; - GtkAdjustment *cyan_red_adj; - GtkAdjustment *magenta_green_adj; - GtkAdjustment *yellow_blue_adj; - GtkWidget *histogram_view; - GthHistogram *histogram; - GthTask *image_task; - guint apply_event; + cairo_surface_t *source; + cairo_surface_t *destination; + cairo_surface_t *preview; + GtkBuilder *builder; + GtkAdjustment *gamma_adj; + GtkAdjustment *brightness_adj; + GtkAdjustment *contrast_adj; + GtkAdjustment *saturation_adj; + GtkAdjustment *cyan_red_adj; + GtkAdjustment *magenta_green_adj; + GtkAdjustment *yellow_blue_adj; + GtkWidget *histogram_view; + GthHistogram *histogram; + GthTask *image_task; + guint apply_event; + GthImageViewerTool *preview_tool; + gboolean apply_to_original; + gboolean closing; }; typedef struct { GthFileToolAdjustColors *self; cairo_surface_t *source; - cairo_surface_t *destination; GtkWidget *viewer_page; double gamma; double brightness; @@ -114,22 +118,23 @@ unsigned char *p_destination; gboolean cancelled; double progress; - gboolean terminated; int x, y; unsigned char values[4]; int channel; unsigned char value; + cairo_surface_t *destination; + GthImage *destination_image; format = cairo_image_surface_get_format (adjust_data->source); width = cairo_image_surface_get_width (adjust_data->source); height = cairo_image_surface_get_height (adjust_data->source); source_stride = cairo_image_surface_get_stride (adjust_data->source); - adjust_data->destination = cairo_image_surface_create (format, width, height); - cairo_surface_flush (adjust_data->destination); - destination_stride = cairo_image_surface_get_stride (adjust_data->destination); + destination = cairo_image_surface_create (format, width, height); + cairo_surface_flush (destination); + destination_stride = cairo_image_surface_get_stride (destination); p_source_line = cairo_image_surface_get_data (adjust_data->source); - p_destination_line = cairo_image_surface_get_data (adjust_data->destination); + p_destination_line = cairo_image_surface_get_data (destination); for (y = 0; y < height; y++) { gth_async_task_get_data (task, NULL, &cancelled, NULL); if (cancelled) @@ -209,36 +214,15 @@ p_destination_line += destination_stride; } - cairo_surface_mark_dirty (adjust_data->destination); - terminated = TRUE; - gth_async_task_set_data (task, &terminated, NULL, NULL); - - return NULL; -} + cairo_surface_mark_dirty (destination); + destination_image = gth_image_new_for_surface (destination); + gth_image_task_set_destination (GTH_IMAGE_TASK (task), destination_image); -static void -adjust_colors_after (GthAsyncTask *task, - GError *error, - gpointer user_data) -{ - AdjustData *adjust_data = user_data; - GthFileToolAdjustColors *self = adjust_data->self; - - if (error == NULL) { - cairo_surface_destroy (self->priv->destination); - self->priv->destination = cairo_surface_reference (adjust_data->destination); + _g_object_unref (destination_image); + cairo_surface_destroy (destination); - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("preview_checkbutton")))) - gth_image_viewer_page_set_image (GTH_IMAGE_VIEWER_PAGE (adjust_data->viewer_page), self->priv->destination, FALSE); - gth_histogram_calculate_for_image (self->priv->histogram, self->priv->destination); - } - - pixbuf_cache_free (adjust_data->cache); - - if (self->priv->image_task == GTH_TASK (task)) - self->priv->image_task = NULL; - g_object_unref (task); + return NULL; } @@ -247,13 +231,71 @@ { AdjustData *adjust_data = user_data; - cairo_surface_destroy (adjust_data->destination); + pixbuf_cache_free (adjust_data->cache); cairo_surface_destroy (adjust_data->source); g_object_unref (adjust_data->viewer_page); g_free (adjust_data); } +static void apply_changes (GthFileToolAdjustColors *self); +static void gth_file_tool_adjust_colors_cancel (GthFileTool *file_tool); + + +static void +image_task_completed_cb (GthTask *task, + GError *error, + gpointer user_data) +{ + GthFileToolAdjustColors *self = user_data; + GthImage *destination_image; + + self->priv->image_task = NULL; + + if (self->priv->closing) { + g_object_unref (task); + gth_file_tool_adjust_colors_cancel (GTH_FILE_TOOL (self)); + return; + } + + if (error != NULL) { + if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) + apply_changes (self); + g_object_unref (task); + return; + } + + destination_image = gth_image_task_get_destination (GTH_IMAGE_TASK (task)); + if (destination_image == NULL) { + g_object_unref (task); + return; + } + + cairo_surface_destroy (self->priv->destination); + self->priv->destination = gth_image_get_cairo_surface (destination_image); + + if (self->priv->apply_to_original) { + if (self->priv->destination != NULL) { + GtkWidget *window; + GtkWidget *viewer_page; + + window = gth_file_tool_get_window (GTH_FILE_TOOL (self)); + viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); + gth_image_viewer_page_set_image (GTH_IMAGE_VIEWER_PAGE (viewer_page), self->priv->destination, TRUE); + } + + gth_file_tool_hide_options (GTH_FILE_TOOL (self)); + } + else { + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("preview_checkbutton")))) + gth_preview_tool_set_image (GTH_PREVIEW_TOOL (self->priv->preview_tool), self->priv->destination); + gth_histogram_calculate_for_image (self->priv->histogram, self->priv->destination); + } + + g_object_unref (task); +} + + static void gth_file_tool_adjust_colors_update_sensitivity (GthFileTool *base) { @@ -275,37 +317,8 @@ { GthFileToolAdjustColors *self = user_data; - if (self->priv->destination != NULL) { - GtkWidget *window; - GtkWidget *viewer_page; - - window = gth_file_tool_get_window (GTH_FILE_TOOL (self)); - viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); - gth_image_viewer_page_set_image (GTH_IMAGE_VIEWER_PAGE (viewer_page), self->priv->destination, TRUE); - } - - gth_file_tool_hide_options (GTH_FILE_TOOL (self)); -} - - -static void -cancel_button_clicked_cb (GtkButton *button, - gpointer user_data) -{ - GthFileToolAdjustColors *self = user_data; - GtkWidget *window; - GtkWidget *viewer_page; - - if (self->priv->apply_event != 0) { - g_source_remove (self->priv->apply_event); - self->priv->apply_event = 0; - } - - window = gth_file_tool_get_window (GTH_FILE_TOOL (self)); - viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); - gth_image_viewer_page_reset (GTH_IMAGE_VIEWER_PAGE (viewer_page)); - - gth_file_tool_hide_options (GTH_FILE_TOOL (self)); + self->priv->apply_to_original = TRUE; + apply_changes (self); } @@ -337,15 +350,17 @@ self->priv->apply_event = 0; } - if (self->priv->image_task != NULL) + if (self->priv->image_task != NULL) { gth_task_cancel (self->priv->image_task); + return FALSE; + } window = gth_file_tool_get_window (GTH_FILE_TOOL (self)); adjust_data = g_new0 (AdjustData, 1); adjust_data->self = self; adjust_data->viewer_page = g_object_ref (gth_browser_get_viewer_page (GTH_BROWSER (window))); - adjust_data->source = cairo_surface_reference (self->priv->source); + adjust_data->source = cairo_surface_reference (self->priv->apply_to_original ? self->priv->source : self->priv->preview); adjust_data->gamma = pow (10, - (gtk_adjustment_get_value (self->priv->gamma_adj) / 100.0)); adjust_data->brightness = gtk_adjustment_get_value (self->priv->brightness_adj) / 100.0 * -1.0; adjust_data->contrast = gtk_adjustment_get_value (self->priv->contrast_adj) / 100.0 * -1.0; @@ -354,11 +369,16 @@ adjust_data->color_level[1] = gtk_adjustment_get_value (self->priv->magenta_green_adj); adjust_data->color_level[2] = gtk_adjustment_get_value (self->priv->yellow_blue_adj); - self->priv->image_task = gth_async_task_new (adjust_colors_before, + self->priv->image_task = gth_image_task_new (_("Applying changes"), + adjust_colors_before, adjust_colors_exec, - adjust_colors_after, + NULL, adjust_data, adjust_data_free); + g_signal_connect (self->priv->image_task, + "completed", + G_CALLBACK (image_task_completed_cb), + self); gth_browser_exec_task (GTH_BROWSER (window), self->priv->image_task, FALSE); return FALSE; @@ -366,8 +386,7 @@ static void -value_changed_cb (GtkAdjustment *adj, - GthFileToolAdjustColors *self) +apply_changes (GthFileToolAdjustColors *self) { if (self->priv->apply_event != 0) { g_source_remove (self->priv->apply_event); @@ -378,19 +397,23 @@ static void +value_changed_cb (GtkAdjustment *adj, + gpointer user_data) +{ + apply_changes (GTH_FILE_TOOL_ADJUST_COLORS (user_data)); +} + + +static void preview_checkbutton_toggled_cb (GtkToggleButton *togglebutton, gpointer user_data) { GthFileToolAdjustColors *self = user_data; - GtkWidget *window; - GtkWidget *viewer_page; - window = gth_file_tool_get_window (GTH_FILE_TOOL (self)); - viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); if (gtk_toggle_button_get_active (togglebutton)) - gth_image_viewer_page_set_image (GTH_IMAGE_VIEWER_PAGE (viewer_page), self->priv->destination, FALSE); + gth_preview_tool_set_image (GTH_PREVIEW_TOOL (self->priv->preview_tool), self->priv->destination); else - gth_image_viewer_page_set_image (GTH_IMAGE_VIEWER_PAGE (viewer_page), self->priv->source, FALSE); + gth_preview_tool_set_image (GTH_PREVIEW_TOOL (self->priv->preview_tool), self->priv->preview); } @@ -402,6 +425,8 @@ GtkWidget *viewer_page; GtkWidget *viewer; GtkWidget *options; + int width, height; + GtkAllocation allocation; self = (GthFileToolAdjustColors *) base; @@ -412,13 +437,24 @@ cairo_surface_destroy (self->priv->source); cairo_surface_destroy (self->priv->destination); + cairo_surface_destroy (self->priv->preview); viewer = gth_image_viewer_page_get_image_viewer (GTH_IMAGE_VIEWER_PAGE (viewer_page)); self->priv->source = cairo_surface_reference (gth_image_viewer_get_current_image (GTH_IMAGE_VIEWER (viewer))); if (self->priv->source == NULL) return NULL; - self->priv->destination = NULL; + width = cairo_image_surface_get_width (self->priv->source); + height = cairo_image_surface_get_height (self->priv->source); + gtk_widget_get_allocation (GTK_WIDGET (viewer), &allocation); + if (scale_keeping_ratio (&width, &height, PREVIEW_SIZE * allocation.width, PREVIEW_SIZE * allocation.height, FALSE)) + self->priv->preview = _cairo_image_surface_scale_bilinear (self->priv->source, width, height); + else + self->priv->preview = cairo_surface_reference (self->priv->source); + + self->priv->destination = cairo_surface_reference (self->priv->preview); + self->priv->apply_to_original = FALSE; + self->priv->closing = FALSE; self->priv->builder = _gtk_builder_new_from_file ("adjust-colors-options.ui", "file_tools"); options = _gtk_builder_get_widget (self->priv->builder, "options"); @@ -428,36 +464,43 @@ gtk_widget_show (self->priv->histogram_view); gtk_box_pack_start (GTK_BOX (GET_WIDGET ("histogram_hbox")), self->priv->histogram_view, TRUE, TRUE, 0); - self->priv->brightness_adj = gimp_scale_entry_new (GET_WIDGET ("brightness_hbox"), - GTK_LABEL (GET_WIDGET ("brightness_label")), - 0.0, -100.0, 100.0, 1.0, 10.0, 0); - self->priv->contrast_adj = gimp_scale_entry_new (GET_WIDGET ("contrast_hbox"), - GTK_LABEL (GET_WIDGET ("contrast_label")), - 0.0, -100.0, 100.0, 1.0, 10.0, 0); - self->priv->gamma_adj = gimp_scale_entry_new (GET_WIDGET ("gamma_hbox"), - GTK_LABEL (GET_WIDGET ("gamma_label")), - 0.0, -100.0, 100.0, 1.0, 10.0, 0); - self->priv->saturation_adj = gimp_scale_entry_new (GET_WIDGET ("saturation_hbox"), - GTK_LABEL (GET_WIDGET ("saturation_label")), - 0.0, -100.0, 100.0, 1.0, 10.0, 0); - self->priv->cyan_red_adj = gimp_scale_entry_new (GET_WIDGET ("cyan_red_hbox"), - GTK_LABEL (GET_WIDGET ("cyan_red_label")), - 0.0, -100.0, 100.0, 1.0, 10.0, 0); - self->priv->magenta_green_adj = gimp_scale_entry_new (GET_WIDGET ("magenta_green_hbox"), - GTK_LABEL (GET_WIDGET ("magenta_green_label")), - 0.0, -100.0, 100.0, 1.0, 10.0, 0); - self->priv->yellow_blue_adj = gimp_scale_entry_new (GET_WIDGET ("yellow_blue_hbox"), - GTK_LABEL (GET_WIDGET ("yellow_blue_label")), - 0.0, -100.0, 100.0, 1.0, 10.0, 0); + self->priv->brightness_adj = gth_color_scale_label_new (GET_WIDGET ("brightness_hbox"), + GTK_LABEL (GET_WIDGET ("brightness_label")), + GTH_COLOR_SCALE_BLACK_WHITE, + 0.0, -100.0, 100.0, 1.0, 1.0, "%+.0f"); + self->priv->contrast_adj = gth_color_scale_label_new (GET_WIDGET ("contrast_hbox"), + GTK_LABEL (GET_WIDGET ("contrast_label")), + GTH_COLOR_SCALE_GRAY_BLACK, + 0.0, -100.0, 100.0, 1.0, 1.0, "%+.0f"); + self->priv->gamma_adj = gth_color_scale_label_new (GET_WIDGET ("gamma_hbox"), + GTK_LABEL (GET_WIDGET ("gamma_label")), + GTH_COLOR_SCALE_WHITE_BLACK, + 0.0, -100.0, 100.0, 1.0, 1.0, "%+.0f"); + self->priv->saturation_adj = gth_color_scale_label_new (GET_WIDGET ("saturation_hbox"), + GTK_LABEL (GET_WIDGET ("saturation_label")), + GTH_COLOR_SCALE_GRAY_WHITE, + 0.0, -100.0, 100.0, 1.0, 1.0, "%+.0f"); + self->priv->cyan_red_adj = gth_color_scale_label_new (GET_WIDGET ("cyan_red_hbox"), + GTK_LABEL (GET_WIDGET ("cyan_red_label")), + GTH_COLOR_SCALE_CYAN_RED, + 0.0, -100.0, 100.0, 1.0, 1.0, "%+.0f"); + self->priv->magenta_green_adj = gth_color_scale_label_new (GET_WIDGET ("magenta_green_hbox"), + GTK_LABEL (GET_WIDGET ("magenta_green_label")), + GTH_COLOR_SCALE_MAGENTA_GREEN, + 0.0, -100.0, 100.0, 1.0, 1.0, "%+.0f"); + self->priv->yellow_blue_adj = gth_color_scale_label_new (GET_WIDGET ("yellow_blue_hbox"), + GTK_LABEL (GET_WIDGET ("yellow_blue_label")), + GTH_COLOR_SCALE_YELLOW_BLUE, + 0.0, -100.0, 100.0, 1.0, 1.0, "%+.0f"); g_signal_connect (GET_WIDGET ("ok_button"), "clicked", G_CALLBACK (ok_button_clicked_cb), self); - g_signal_connect (GET_WIDGET ("cancel_button"), - "clicked", - G_CALLBACK (cancel_button_clicked_cb), - self); + g_signal_connect_swapped (GET_WIDGET ("cancel_button"), + "clicked", + G_CALLBACK (gth_file_tool_cancel), + self); g_signal_connect (GET_WIDGET ("reset_button"), "clicked", G_CALLBACK (reset_button_clicked_cb), @@ -495,7 +538,10 @@ G_CALLBACK (preview_checkbutton_toggled_cb), self); - gth_histogram_calculate_for_image (self->priv->histogram, self->priv->source); + self->priv->preview_tool = gth_preview_tool_new (); + gth_preview_tool_set_image (GTH_PREVIEW_TOOL (self->priv->preview_tool), self->priv->preview); + gth_image_viewer_set_tool (GTH_IMAGE_VIEWER (viewer), self->priv->preview_tool); + gth_histogram_calculate_for_image (self->priv->histogram, self->priv->preview); return options; } @@ -505,6 +551,9 @@ gth_file_tool_adjust_colors_destroy_options (GthFileTool *base) { GthFileToolAdjustColors *self; + GtkWidget *window; + GtkWidget *viewer_page; + GtkWidget *viewer; self = (GthFileToolAdjustColors *) base; @@ -513,12 +562,16 @@ self->priv->apply_event = 0; } - cairo_surface_destroy (self->priv->source); - cairo_surface_destroy (self->priv->destination); - _g_object_unref (self->priv->builder); - self->priv->source = NULL; - self->priv->destination = NULL; - self->priv->builder = NULL; + window = gth_file_tool_get_window (GTH_FILE_TOOL (self)); + viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); + viewer = gth_image_viewer_page_get_image_viewer (GTH_IMAGE_VIEWER_PAGE (viewer_page)); + gth_image_viewer_set_tool (GTH_IMAGE_VIEWER (viewer), NULL); + gth_viewer_page_update_sensitivity (GTH_VIEWER_PAGE (viewer_page)); + + _cairo_clear_surface (&self->priv->preview); + _cairo_clear_surface (&self->priv->source); + _cairo_clear_surface (&self->priv->destination); + _g_clear_object (&self->priv->builder); } @@ -530,10 +583,37 @@ static void +gth_file_tool_adjust_colors_cancel (GthFileTool *file_tool) +{ + GthFileToolAdjustColors *self = GTH_FILE_TOOL_ADJUST_COLORS (file_tool); + GtkWidget *window; + GtkWidget *viewer_page; + + if (self->priv->image_task != NULL) { + self->priv->closing = TRUE; + return; + } + + if (self->priv->apply_event != 0) { + g_source_remove (self->priv->apply_event); + self->priv->apply_event = 0; + } + + window = gth_file_tool_get_window (GTH_FILE_TOOL (self)); + viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); + gth_image_viewer_page_reset (GTH_IMAGE_VIEWER_PAGE (viewer_page)); +} + + +static void gth_file_tool_adjust_colors_init (GthFileToolAdjustColors *self) { self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_FILE_TOOL_ADJUST_COLORS, GthFileToolAdjustColorsPrivate); self->priv->histogram = gth_histogram_new (); + self->priv->preview = NULL; + self->priv->source = NULL; + self->priv->destination = NULL; + self->priv->builder = NULL; gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-adjust-colors", _("Adjust Colors..."), _("Adjust Colors"), FALSE); gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Change brightness, contrast, saturation and gamma level of the image")); @@ -550,6 +630,7 @@ self = (GthFileToolAdjustColors *) object; + cairo_surface_destroy (self->priv->preview); cairo_surface_destroy (self->priv->source); cairo_surface_destroy (self->priv->destination); _g_object_unref (self->priv->builder); @@ -573,6 +654,7 @@ file_tool_class = (GthFileToolClass *) class; file_tool_class->update_sensitivity = gth_file_tool_adjust_colors_update_sensitivity; file_tool_class->activate = gth_file_tool_adjust_colors_activate; + file_tool_class->cancel = gth_file_tool_adjust_colors_cancel; file_tool_class->get_options = gth_file_tool_adjust_colors_get_options; file_tool_class->destroy_options = gth_file_tool_adjust_colors_destroy_options; } diff -Nru gthumb-3.0.2/extensions/file_tools/gth-file-tool-adjust-contrast.c gthumb-3.2.3/extensions/file_tools/gth-file-tool-adjust-contrast.c --- gthumb-3.0.2/extensions/file_tools/gth-file-tool-adjust-contrast.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/gth-file-tool-adjust-contrast.c 2013-06-24 16:19:49.000000000 +0000 @@ -0,0 +1,317 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include +#include "gth-file-tool-adjust-contrast.h" + + +#define HISTOGRAM_CROP 0.005 + + +G_DEFINE_TYPE (GthFileToolAdjustContrast, gth_file_tool_adjust_contrast, GTH_TYPE_FILE_TOOL) + + +typedef struct { + GtkWidget *viewer_page; + cairo_surface_t *source; + int *lowest; + int *highest; + double *factor; +} AdjustContrastData; + + +static void +adjust_contrast_setup (AdjustContrastData *adjust_data) +{ + GthHistogram *histogram; + long **cumulative; + int c, v; + glong n_pixels; + double lower_threshold; + double higher_threshold; + + /* histogram */ + + histogram = gth_histogram_new (); + gth_histogram_calculate_for_image (histogram, adjust_data->source); + cumulative = gth_histogram_get_cumulative (histogram); + + /* lowest and highest values for each channel */ + + adjust_data->lowest = g_new (int, GTH_HISTOGRAM_N_CHANNELS); + adjust_data->highest = g_new (int, GTH_HISTOGRAM_N_CHANNELS); + + n_pixels = cairo_image_surface_get_width (adjust_data->source) * cairo_image_surface_get_height (adjust_data->source); + lower_threshold = HISTOGRAM_CROP * n_pixels; + higher_threshold = (1.0 - HISTOGRAM_CROP) * n_pixels; + + for (c = 0; c < GTH_HISTOGRAM_N_CHANNELS; c++) { + gboolean lowest_set = FALSE; + + for (v = 0; v < 256; v++) { + if (! lowest_set && (cumulative[c][v] >= lower_threshold)) { + adjust_data->lowest[c] = v; + lowest_set = TRUE; + } + + if (cumulative[c][v] <= higher_threshold) + adjust_data->highest[c] = v; + } + } + + /* stretch factor */ + + adjust_data->factor = g_new (double, GTH_HISTOGRAM_N_CHANNELS); + for (c = 0; c < GTH_HISTOGRAM_N_CHANNELS; c++) { + if (adjust_data->highest[c] != adjust_data->lowest[c]) + adjust_data->factor[c] = 255.0 / ((double) adjust_data->highest[c] - adjust_data->lowest[c]); + else + adjust_data->factor[c] = 0.0; + } + + /**/ + + gth_cumulative_histogram_free (cumulative); + g_object_unref (histogram); +} + + +static guchar +adjust_contrast_func (AdjustContrastData *adjust_data, + int n_channel, + guchar value) +{ + if (value <= adjust_data->lowest[n_channel]) + return 0; + else if (value >= adjust_data->highest[n_channel]) + return 255; + else + return (int) (adjust_data->factor[n_channel] * (value - adjust_data->lowest[n_channel])); +} + + +static gpointer +adjust_contrast_exec (GthAsyncTask *task, + gpointer user_data) +{ + AdjustContrastData *adjust_data = user_data; + cairo_format_t format; + int width; + int height; + int source_stride; + cairo_surface_t *destination; + int destination_stride; + unsigned char *p_source_line; + unsigned char *p_destination_line; + unsigned char *p_source; + unsigned char *p_destination; + gboolean cancelled; + double progress; + int x, y; + unsigned char red, green, blue, alpha; + GthImage *destination_image; + + /* initialize some extra data */ + + adjust_contrast_setup (adjust_data); + + /* convert the image */ + + format = cairo_image_surface_get_format (adjust_data->source); + width = cairo_image_surface_get_width (adjust_data->source); + height = cairo_image_surface_get_height (adjust_data->source); + source_stride = cairo_image_surface_get_stride (adjust_data->source); + + destination = cairo_image_surface_create (format, width, height); + cairo_surface_flush (destination); + destination_stride = cairo_image_surface_get_stride (destination); + p_source_line = cairo_image_surface_get_data (adjust_data->source); + p_destination_line = cairo_image_surface_get_data (destination); + for (y = 0; y < height; y++) { + gth_async_task_get_data (task, NULL, &cancelled, NULL); + if (cancelled) + return NULL; + + progress = (double) y / height; + gth_async_task_set_data (task, NULL, NULL, &progress); + + p_source = p_source_line; + p_destination = p_destination_line; + for (x = 0; x < width; x++) { + CAIRO_GET_RGBA (p_source, red, green, blue, alpha); + red = adjust_contrast_func (adjust_data, GTH_HISTOGRAM_CHANNEL_RED, red); + green = adjust_contrast_func (adjust_data, GTH_HISTOGRAM_CHANNEL_GREEN, green); + blue = adjust_contrast_func (adjust_data, GTH_HISTOGRAM_CHANNEL_BLUE, blue); + CAIRO_SET_RGBA (p_destination, red, green, blue, alpha); + + p_source += 4; + p_destination += 4; + } + p_source_line += source_stride; + p_destination_line += destination_stride; + } + + cairo_surface_mark_dirty (destination); + + destination_image = gth_image_new_for_surface (destination); + gth_image_task_set_destination (GTH_IMAGE_TASK (task), destination_image); + + _g_object_unref (destination_image); + cairo_surface_destroy (destination); + + return NULL; +} + + +static void +adjust_contrast_after (GthAsyncTask *task, + GError *error, + gpointer user_data) +{ + AdjustContrastData *adjust_data = user_data; + + g_free (adjust_data->lowest); + adjust_data->lowest = NULL; + + g_free (adjust_data->highest); + adjust_data->highest = NULL; +} + + +static void +adjust_contrast_data_free (gpointer user_data) +{ + AdjustContrastData *adjust_contrast_data = user_data; + + g_object_unref (adjust_contrast_data->viewer_page); + cairo_surface_destroy (adjust_contrast_data->source); + g_free (adjust_contrast_data); +} + + +static void +image_task_completed_cb (GthTask *task, + GError *error, + gpointer user_data) +{ + GthFileTool *base = user_data; + GthImage *destination_image; + cairo_surface_t *destination; + GtkWidget *window; + GtkWidget *viewer_page; + + if (error != NULL) { + g_object_unref (task); + return; + } + + destination_image = gth_image_task_get_destination (GTH_IMAGE_TASK (task)); + if (destination_image == NULL) { + g_object_unref (task); + return; + } + + destination = gth_image_get_cairo_surface (destination_image); + + window = gth_file_tool_get_window (base); + viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); + gth_image_viewer_page_set_image (GTH_IMAGE_VIEWER_PAGE (viewer_page), destination, TRUE); + + cairo_surface_destroy (destination); + g_object_unref (task); +} + + +static void +gth_file_tool_adjust_contrast_activate (GthFileTool *base) +{ + GtkWidget *window; + GtkWidget *viewer_page; + GtkWidget *viewer; + cairo_surface_t *image; + AdjustContrastData *adjust_contrast_data; + GthTask *task; + + window = gth_file_tool_get_window (base); + viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); + if (! GTH_IS_IMAGE_VIEWER_PAGE (viewer_page)) + return; + + viewer = gth_image_viewer_page_get_image_viewer (GTH_IMAGE_VIEWER_PAGE (viewer_page)); + image = gth_image_viewer_get_current_image (GTH_IMAGE_VIEWER (viewer)); + if (image == NULL) + return; + + adjust_contrast_data = g_new0 (AdjustContrastData, 1); + adjust_contrast_data->viewer_page = g_object_ref (viewer_page); + adjust_contrast_data->source = cairo_surface_reference (image); + adjust_contrast_data->lowest = NULL; + adjust_contrast_data->highest = NULL; + adjust_contrast_data->factor = NULL; + task = gth_image_task_new (_("Applying changes"), + NULL, + adjust_contrast_exec, + adjust_contrast_after, + adjust_contrast_data, + adjust_contrast_data_free); + g_signal_connect (task, + "completed", + G_CALLBACK (image_task_completed_cb), + base); + gth_browser_exec_task (GTH_BROWSER (window), task, FALSE); +} + + +static void +gth_file_tool_adjust_contrast_update_sensitivity (GthFileTool *base) +{ + GtkWidget *window; + GtkWidget *viewer_page; + + window = gth_file_tool_get_window (base); + viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); + if (! GTH_IS_IMAGE_VIEWER_PAGE (viewer_page)) + gtk_widget_set_sensitive (GTK_WIDGET (base), FALSE); + else + gtk_widget_set_sensitive (GTK_WIDGET (base), TRUE); +} + + +static void +gth_file_tool_adjust_contrast_init (GthFileToolAdjustContrast *self) +{ + gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-adjust-contrast", _("Adjust Contrast"), NULL, TRUE); + gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Automatic contrast adjustment")); +} + + +static void +gth_file_tool_adjust_contrast_class_init (GthFileToolAdjustContrastClass *klass) +{ + GthFileToolClass *file_tool_class; + + file_tool_class = GTH_FILE_TOOL_CLASS (klass); + file_tool_class->update_sensitivity = gth_file_tool_adjust_contrast_update_sensitivity; + file_tool_class->activate = gth_file_tool_adjust_contrast_activate; +} diff -Nru gthumb-3.0.2/extensions/file_tools/gth-file-tool-adjust-contrast.h gthumb-3.2.3/extensions/file_tools/gth-file-tool-adjust-contrast.h --- gthumb-3.0.2/extensions/file_tools/gth-file-tool-adjust-contrast.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/gth-file-tool-adjust-contrast.h 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,51 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef GTH_FILE_TOOL_ADJUST_CONTRAST_H +#define GTH_FILE_TOOL_ADJUST_CONTRAST_H + +#include + +G_BEGIN_DECLS + +#define GTH_TYPE_FILE_TOOL_ADJUST_CONTRAST (gth_file_tool_adjust_contrast_get_type ()) +#define GTH_FILE_TOOL_ADJUST_CONTRAST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_FILE_TOOL_ADJUST_CONTRAST, GthFileToolAdjustContrast)) +#define GTH_FILE_TOOL_ADJUST_CONTRAST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTH_TYPE_FILE_TOOL_ADJUST_CONTRAST, GthFileToolAdjustContrastClass)) +#define GTH_IS_FILE_TOOL_ADJUST_CONTRAST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_FILE_TOOL_ADJUST_CONTRAST)) +#define GTH_IS_FILE_TOOL_ADJUST_CONTRAST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTH_TYPE_FILE_TOOL_ADJUST_CONTRAST)) +#define GTH_FILE_TOOL_ADJUST_CONTRAST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTH_TYPE_FILE_TOOL_ADJUST_CONTRAST, GthFileToolAdjustContrastClass)) + +typedef struct _GthFileToolAdjustContrast GthFileToolAdjustContrast; +typedef struct _GthFileToolAdjustContrastClass GthFileToolAdjustContrastClass; + +struct _GthFileToolAdjustContrast { + GthFileTool parent_instance; +}; + +struct _GthFileToolAdjustContrastClass { + GthFileToolClass parent_class; +}; + +GType gth_file_tool_adjust_contrast_get_type (void); + +G_END_DECLS + +#endif /* GTH_FILE_TOOL_ADJUST_CONTRAST_H */ diff -Nru gthumb-3.0.2/extensions/file_tools/gth-file-tool-crop.c gthumb-3.2.3/extensions/file_tools/gth-file-tool-crop.c --- gthumb-3.0.2/extensions/file_tools/gth-file-tool-crop.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/gth-file-tool-crop.c 2013-04-30 16:56:12.000000000 +0000 @@ -67,14 +67,6 @@ static void -cancel_button_clicked_cb (GtkButton *button, - GthFileToolCrop *self) -{ - gth_file_tool_hide_options (GTH_FILE_TOOL (self)); -} - - -static void crop_button_clicked_cb (GtkButton *button, GthFileToolCrop *self) { @@ -440,7 +432,7 @@ _("Custom"), NULL); gtk_widget_show (self->priv->ratio_combobox); - gtk_box_pack_start (GTK_BOX (GET_WIDGET ("ratio_combobox_box")), self->priv->ratio_combobox, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (GET_WIDGET ("ratio_combobox_box")), self->priv->ratio_combobox, TRUE, TRUE, 0); gtk_combo_box_set_active (GTK_COMBO_BOX (self->priv->ratio_combobox), g_settings_get_enum (self->priv->settings, PREF_CROP_ASPECT_RATIO)); @@ -461,7 +453,7 @@ g_settings_get_enum (self->priv->settings, PREF_CROP_GRID_TYPE)); gtk_widget_show (self->priv->grid_type_combobox); gtk_box_pack_start (GTK_BOX (GET_WIDGET ("grid_type_combobox_box")), - self->priv->grid_type_combobox, FALSE, FALSE, 0); + self->priv->grid_type_combobox, TRUE, TRUE, 0); gtk_label_set_mnemonic_widget (GTK_LABEL (GET_WIDGET ("grid_label")), self->priv->grid_type_combobox); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("bind_dimensions_checkbutton")), @@ -469,14 +461,16 @@ gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("bind_factor_spinbutton")), g_settings_get_int (self->priv->settings, PREF_CROP_BIND_FACTOR)); + gtk_widget_set_vexpand (GET_WIDGET ("options_box"), FALSE); + g_signal_connect (GET_WIDGET ("crop_button"), "clicked", G_CALLBACK (crop_button_clicked_cb), self); - g_signal_connect (GET_WIDGET ("cancel_button"), - "clicked", - G_CALLBACK (cancel_button_clicked_cb), - self); + g_signal_connect_swapped (GET_WIDGET ("cancel_button"), + "clicked", + G_CALLBACK (gth_file_tool_cancel), + self); g_signal_connect (G_OBJECT (self->priv->crop_x_spinbutton), "value-changed", G_CALLBACK (selection_x_value_changed_cb), diff -Nru gthumb-3.0.2/extensions/file_tools/gth-file-tool-desaturate.c gthumb-3.2.3/extensions/file_tools/gth-file-tool-desaturate.c --- gthumb-3.0.2/extensions/file_tools/gth-file-tool-desaturate.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/gth-file-tool-desaturate.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,204 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2011 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include "gth-file-tool-desaturate.h" - - -G_DEFINE_TYPE (GthFileToolDesaturate, gth_file_tool_desaturate, GTH_TYPE_FILE_TOOL) - - -typedef struct { - GtkWidget *viewer_page; - cairo_surface_t *source; - cairo_surface_t *destination; -} DesaturateData; - - -static void -gth_file_tool_desaturate_update_sensitivity (GthFileTool *base) -{ - GtkWidget *window; - GtkWidget *viewer_page; - - window = gth_file_tool_get_window (base); - viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); - if (! GTH_IS_IMAGE_VIEWER_PAGE (viewer_page)) - gtk_widget_set_sensitive (GTK_WIDGET (base), FALSE); - else - gtk_widget_set_sensitive (GTK_WIDGET (base), TRUE); -} - - -static void -desaturate_data_free (gpointer user_data) -{ - DesaturateData *desaturate_data = user_data; - - cairo_surface_destroy (desaturate_data->destination); - cairo_surface_destroy (desaturate_data->source); - g_free (desaturate_data); -} - - -static void -desaturate_init (GthAsyncTask *task, - gpointer user_data) -{ - gth_task_progress (GTH_TASK (task), _("Applying changes"), NULL, TRUE, 0.0); -} - - -static gpointer -desaturate_exec (GthAsyncTask *task, - gpointer user_data) -{ - DesaturateData *desaturate_data = user_data; - cairo_format_t format; - int width; - int height; - int source_stride; - int destination_stride; - unsigned char *p_source_line; - unsigned char *p_destination_line; - unsigned char *p_source; - unsigned char *p_destination; - gboolean cancelled; - double progress; - gboolean terminated; - int x, y; - unsigned char red, green, blue, alpha; - unsigned char min, max, lightness; - - format = cairo_image_surface_get_format (desaturate_data->source); - width = cairo_image_surface_get_width (desaturate_data->source); - height = cairo_image_surface_get_height (desaturate_data->source); - source_stride = cairo_image_surface_get_stride (desaturate_data->source); - - desaturate_data->destination = cairo_image_surface_create (format, width, height); - cairo_surface_flush (desaturate_data->destination); - destination_stride = cairo_image_surface_get_stride (desaturate_data->destination); - p_source_line = cairo_image_surface_get_data (desaturate_data->source); - p_destination_line = cairo_image_surface_get_data (desaturate_data->destination); - for (y = 0; y < height; y++) { - gth_async_task_get_data (task, NULL, &cancelled, NULL); - if (cancelled) - return NULL; - - progress = (double) y / height; - gth_async_task_set_data (task, NULL, NULL, &progress); - - p_source = p_source_line; - p_destination = p_destination_line; - for (x = 0; x < width; x++) { - CAIRO_GET_RGBA (p_source, red, green, blue, alpha); - - max = MAX (MAX (red, green), blue); - min = MIN (MIN (red, green), blue); - lightness = (max + min) / 2; - - CAIRO_SET_RGBA (p_destination, - lightness, - lightness, - lightness, - alpha); - - p_source += 4; - p_destination += 4; - } - p_source_line += source_stride; - p_destination_line += destination_stride; - } - - cairo_surface_mark_dirty (desaturate_data->destination); - terminated = TRUE; - gth_async_task_set_data (task, &terminated, NULL, NULL); - - return NULL; -} - - -static void -desaturate_after (GthAsyncTask *task, - GError *error, - gpointer user_data) -{ - DesaturateData *desaturate_data = user_data; - - if (error == NULL) - gth_image_viewer_page_set_image (GTH_IMAGE_VIEWER_PAGE (desaturate_data->viewer_page), - desaturate_data->destination, - TRUE); -} - - -static void -gth_file_tool_desaturate_activate (GthFileTool *base) -{ - GtkWidget *window; - GtkWidget *viewer_page; - GtkWidget *viewer; - cairo_surface_t *image; - DesaturateData *desaturate_data; - GthTask *task; - - window = gth_file_tool_get_window (base); - viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); - if (! GTH_IS_IMAGE_VIEWER_PAGE (viewer_page)) - return; - - viewer = gth_image_viewer_page_get_image_viewer (GTH_IMAGE_VIEWER_PAGE (viewer_page)); - image = gth_image_viewer_get_current_image (GTH_IMAGE_VIEWER (viewer)); - if (image == NULL) - return; - - desaturate_data = g_new0 (DesaturateData, 1); - desaturate_data->viewer_page = viewer_page; - desaturate_data->source = cairo_surface_reference (image); - task = gth_async_task_new (desaturate_init, - desaturate_exec, - desaturate_after, - desaturate_data, - desaturate_data_free); - gth_browser_exec_task (GTH_BROWSER (window), task, FALSE); - - g_object_unref (task); -} - - -static void -gth_file_tool_desaturate_class_init (GthFileToolDesaturateClass *klass) -{ - GthFileToolClass *file_tool_class; - - file_tool_class = GTH_FILE_TOOL_CLASS (klass); - file_tool_class->update_sensitivity = gth_file_tool_desaturate_update_sensitivity; - file_tool_class->activate = gth_file_tool_desaturate_activate; -} - - -static void -gth_file_tool_desaturate_init (GthFileToolDesaturate *self) -{ - gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-desaturate", _("Desaturate"), _("Desaturate"), FALSE); -} diff -Nru gthumb-3.0.2/extensions/file_tools/gth-file-tool-desaturate.h gthumb-3.2.3/extensions/file_tools/gth-file-tool-desaturate.h --- gthumb-3.0.2/extensions/file_tools/gth-file-tool-desaturate.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/gth-file-tool-desaturate.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2009 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef GTH_FILE_TOOL_DESATURATE_H -#define GTH_FILE_TOOL_DESATURATE_H - -#include - -G_BEGIN_DECLS - -#define GTH_TYPE_FILE_TOOL_DESATURATE (gth_file_tool_desaturate_get_type ()) -#define GTH_FILE_TOOL_DESATURATE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_FILE_TOOL_DESATURATE, GthFileToolDesaturate)) -#define GTH_FILE_TOOL_DESATURATE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTH_TYPE_FILE_TOOL_DESATURATE, GthFileToolDesaturateClass)) -#define GTH_IS_FILE_TOOL_DESATURATE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_FILE_TOOL_DESATURATE)) -#define GTH_IS_FILE_TOOL_DESATURATE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTH_TYPE_FILE_TOOL_DESATURATE)) -#define GTH_FILE_TOOL_DESATURATE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTH_TYPE_FILE_TOOL_DESATURATE, GthFileToolDesaturateClass)) - -typedef struct _GthFileToolDesaturate GthFileToolDesaturate; -typedef struct _GthFileToolDesaturateClass GthFileToolDesaturateClass; - -struct _GthFileToolDesaturate { - GthFileTool parent_instance; -}; - -struct _GthFileToolDesaturateClass { - GthFileToolClass parent_class; -}; - -GType gth_file_tool_desaturate_get_type (void); - -G_END_DECLS - -#endif /* GTH_FILE_TOOL_DESATURATE_H */ diff -Nru gthumb-3.0.2/extensions/file_tools/gth-file-tool-enhance.c gthumb-3.2.3/extensions/file_tools/gth-file-tool-enhance.c --- gthumb-3.0.2/extensions/file_tools/gth-file-tool-enhance.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/gth-file-tool-enhance.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,355 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2009 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include -#include "gth-file-tool-enhance.h" - - -G_DEFINE_TYPE (GthFileToolEnhance, gth_file_tool_enhance, GTH_TYPE_FILE_TOOL) - - -typedef struct { - double gamma[GTH_HISTOGRAM_N_CHANNELS]; - double low_input[GTH_HISTOGRAM_N_CHANNELS]; - double high_input[GTH_HISTOGRAM_N_CHANNELS]; - double low_output[GTH_HISTOGRAM_N_CHANNELS]; - double high_output[GTH_HISTOGRAM_N_CHANNELS]; -} Levels; - - -typedef struct { - GtkWidget *viewer_page; - cairo_surface_t *source; - cairo_surface_t *destination; - GthHistogram *histogram; - Levels *levels; -} EnhanceData; - - -static void -levels_channel_auto (Levels *levels, - GthHistogram *hist, - int channel) -{ - int i; - double count, new_count, percentage, next_percentage; - - g_return_if_fail (levels != NULL); - g_return_if_fail (hist != NULL); - - levels->gamma[channel] = 1.0; - levels->low_output[channel] = 0; - levels->high_output[channel] = 255; - - count = gth_histogram_get_count (hist, 0, 255); - - if (count == 0.0) { - levels->low_input[channel] = 0; - levels->high_input[channel] = 0; - } - else { - /* Set the low input */ - - new_count = 0.0; - for (i = 0; i < 255; i++) { - double value; - double next_value; - - value = gth_histogram_get_value (hist, channel, i); - next_value = gth_histogram_get_value (hist, channel, i + 1); - - new_count += value; - percentage = new_count / count; - next_percentage = (new_count + next_value) / count; - - if (fabs (percentage - 0.006) < fabs (next_percentage - 0.006)) { - levels->low_input[channel] = i + 1; - break; - } - } - - /* Set the high input */ - - new_count = 0.0; - for (i = 255; i > 0; i--) { - double value; - double next_value; - - value = gth_histogram_get_value (hist, channel, i); - next_value = gth_histogram_get_value (hist, channel, i - 1); - - new_count += value; - percentage = new_count / count; - next_percentage = (new_count + next_value) / count; - - if (fabs (percentage - 0.006) < fabs (next_percentage - 0.006)) { - levels->high_input[channel] = i - 1; - break; - } - } - } -} - - -static void -enhance_before (GthAsyncTask *task, - gpointer user_data) -{ - gth_task_progress (GTH_TASK (task), _("White balance correction"), NULL, TRUE, 0.0); -} - - -static guchar -levels_func (guchar value, - Levels *levels, - int channel) -{ - double inten; - int j; - - inten = value; - - /* For color images this runs through the loop with j = channel + 1 - * the first time and j = 0 the second time - * - * For bw images this runs through the loop with j = 0 the first and - * only time - */ - for (j = channel + 1; j >= 0; j -= (channel + 1)) { - inten /= 255.0; - - /* determine input intensity */ - - if (levels->high_input[j] != levels->low_input[j]) - inten = (255.0 * inten - levels->low_input[j]) / - (levels->high_input[j] - levels->low_input[j]); - else - inten = 255.0 * inten - levels->low_input[j]; - - if (levels->gamma[j] != 0.0) { - if (inten >= 0.0) - inten = pow ( inten, (1.0 / levels->gamma[j])); - else - inten = -pow (-inten, (1.0 / levels->gamma[j])); - } - - /* determine the output intensity */ - - if (levels->high_output[j] >= levels->low_output[j]) - inten = inten * (levels->high_output[j] - levels->low_output[j]) + - levels->low_output[j]; - else if (levels->high_output[j] < levels->low_output[j]) - inten = levels->low_output[j] - inten * - (levels->low_output[j] - levels->high_output[j]); - } - - if (inten < 0.0) - inten = 0.0; - else if (inten > 255.0) - inten = 255.0; - - return (guchar) inten; -} - - -static gpointer -enhance_exec (GthAsyncTask *task, - gpointer user_data) -{ - EnhanceData *enhance_data = user_data; - int channel; - cairo_format_t format; - int width; - int height; - int source_stride; - int destination_stride; - unsigned char *p_source_line; - unsigned char *p_destination_line; - unsigned char *p_source; - unsigned char *p_destination; - gboolean cancelled; - double progress; - gboolean terminated; - int x, y; - unsigned char red, green, blue, alpha; - - /* initialize some extra data */ - - enhance_data->histogram = gth_histogram_new (); - gth_histogram_calculate_for_image (enhance_data->histogram, enhance_data->source); - - enhance_data->levels = g_new0 (Levels, 1); - for (channel = 0; channel < GTH_HISTOGRAM_N_CHANNELS; channel++) { - enhance_data->levels->gamma[channel] = 1.0; - enhance_data->levels->low_input[channel] = 0; - enhance_data->levels->high_input[channel] = 255; - enhance_data->levels->low_output[channel] = 0; - enhance_data->levels->high_output[channel] = 255; - } - - for (channel = 1; channel < GTH_HISTOGRAM_N_CHANNELS - 1; channel++) - levels_channel_auto (enhance_data->levels, enhance_data->histogram, channel); - - /* convert the image */ - - format = cairo_image_surface_get_format (enhance_data->source); - width = cairo_image_surface_get_width (enhance_data->source); - height = cairo_image_surface_get_height (enhance_data->source); - source_stride = cairo_image_surface_get_stride (enhance_data->source); - - enhance_data->destination = cairo_image_surface_create (format, width, height); - cairo_surface_flush (enhance_data->destination); - destination_stride = cairo_image_surface_get_stride (enhance_data->destination); - p_source_line = cairo_image_surface_get_data (enhance_data->source); - p_destination_line = cairo_image_surface_get_data (enhance_data->destination); - for (y = 0; y < height; y++) { - gth_async_task_get_data (task, NULL, &cancelled, NULL); - if (cancelled) - return NULL; - - progress = (double) y / height; - gth_async_task_set_data (task, NULL, NULL, &progress); - - p_source = p_source_line; - p_destination = p_destination_line; - for (x = 0; x < width; x++) { - CAIRO_GET_RGBA (p_source, red, green, blue, alpha); - red = levels_func (red, enhance_data->levels, RED_PIX); - green = levels_func (green, enhance_data->levels, GREEN_PIX); - blue = levels_func (blue, enhance_data->levels, BLUE_PIX); - CAIRO_SET_RGBA (p_destination, red, green, blue, alpha); - - p_source += 4; - p_destination += 4; - } - p_source_line += source_stride; - p_destination_line += destination_stride; - } - - cairo_surface_mark_dirty (enhance_data->destination); - terminated = TRUE; - gth_async_task_set_data (task, &terminated, NULL, NULL); - - return NULL; -} - - -static void -enhance_after (GthAsyncTask *task, - GError *error, - gpointer user_data) -{ - EnhanceData *enhance_data = user_data; - - if (error == NULL) - gth_image_viewer_page_set_image (GTH_IMAGE_VIEWER_PAGE (enhance_data->viewer_page), enhance_data->destination, TRUE); - - g_object_unref (enhance_data->histogram); - enhance_data->histogram = NULL; - - g_free (enhance_data->levels); - enhance_data->levels = NULL; -} - - -static void -enhance_data_free (gpointer user_data) -{ - EnhanceData *enhance_data = user_data; - - g_object_unref (enhance_data->viewer_page); - cairo_surface_destroy (enhance_data->destination); - cairo_surface_destroy (enhance_data->source); - g_free (enhance_data); -} - - -static void -gth_file_tool_enhance_activate (GthFileTool *base) -{ - GtkWidget *window; - GtkWidget *viewer_page; - GtkWidget *viewer; - cairo_surface_t *image; - EnhanceData *enhance_data; - GthTask *task; - - window = gth_file_tool_get_window (base); - viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); - if (! GTH_IS_IMAGE_VIEWER_PAGE (viewer_page)) - return; - - viewer = gth_image_viewer_page_get_image_viewer (GTH_IMAGE_VIEWER_PAGE (viewer_page)); - image = gth_image_viewer_get_current_image (GTH_IMAGE_VIEWER (viewer)); - if (image == NULL) - return; - - enhance_data = g_new0 (EnhanceData, 1); - enhance_data->viewer_page = g_object_ref (viewer_page); - enhance_data->source = cairo_surface_reference (image); - enhance_data->histogram = NULL; - enhance_data->levels = NULL; - task = gth_async_task_new (enhance_before, - enhance_exec, - enhance_after, - enhance_data, - enhance_data_free); - gth_browser_exec_task (GTH_BROWSER (window), task, FALSE); - - g_object_unref (task); -} - - -static void -gth_file_tool_enhance_update_sensitivity (GthFileTool *base) -{ - GtkWidget *window; - GtkWidget *viewer_page; - - window = gth_file_tool_get_window (base); - viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); - if (! GTH_IS_IMAGE_VIEWER_PAGE (viewer_page)) - gtk_widget_set_sensitive (GTK_WIDGET (base), FALSE); - else - gtk_widget_set_sensitive (GTK_WIDGET (base), TRUE); -} - - -static void -gth_file_tool_enhance_init (GthFileToolEnhance *self) -{ - gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-enhance", _("Enhance Colors"), NULL, TRUE); - gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Automatic white balance correction")); -} - - -static void -gth_file_tool_enhance_class_init (GthFileToolEnhanceClass *klass) -{ - GthFileToolClass *file_tool_class; - - file_tool_class = GTH_FILE_TOOL_CLASS (klass); - file_tool_class->update_sensitivity = gth_file_tool_enhance_update_sensitivity; - file_tool_class->activate = gth_file_tool_enhance_activate; -} diff -Nru gthumb-3.0.2/extensions/file_tools/gth-file-tool-enhance.h gthumb-3.2.3/extensions/file_tools/gth-file-tool-enhance.h --- gthumb-3.0.2/extensions/file_tools/gth-file-tool-enhance.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/gth-file-tool-enhance.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2009 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef GTH_FILE_TOOL_ENHANCE_H -#define GTH_FILE_TOOL_ENHANCE_H - -#include - -G_BEGIN_DECLS - -#define GTH_TYPE_FILE_TOOL_ENHANCE (gth_file_tool_enhance_get_type ()) -#define GTH_FILE_TOOL_ENHANCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_FILE_TOOL_ENHANCE, GthFileToolEnhance)) -#define GTH_FILE_TOOL_ENHANCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTH_TYPE_FILE_TOOL_ENHANCE, GthFileToolEnhanceClass)) -#define GTH_IS_FILE_TOOL_ENHANCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_FILE_TOOL_ENHANCE)) -#define GTH_IS_FILE_TOOL_ENHANCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTH_TYPE_FILE_TOOL_ENHANCE)) -#define GTH_FILE_TOOL_ENHANCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTH_TYPE_FILE_TOOL_ENHANCE, GthFileToolEnhanceClass)) - -typedef struct _GthFileToolEnhance GthFileToolEnhance; -typedef struct _GthFileToolEnhanceClass GthFileToolEnhanceClass; - -struct _GthFileToolEnhance { - GthFileTool parent_instance; -}; - -struct _GthFileToolEnhanceClass { - GthFileToolClass parent_class; -}; - -GType gth_file_tool_enhance_get_type (void); - -G_END_DECLS - -#endif /* GTH_FILE_TOOL_ENHANCE_H */ diff -Nru gthumb-3.0.2/extensions/file_tools/gth-file-tool-equalize.c gthumb-3.2.3/extensions/file_tools/gth-file-tool-equalize.c --- gthumb-3.0.2/extensions/file_tools/gth-file-tool-equalize.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/gth-file-tool-equalize.c 2013-04-30 16:56:12.000000000 +0000 @@ -33,69 +33,39 @@ GtkWidget *viewer_page; cairo_surface_t *source; cairo_surface_t *destination; - GthHistogram *histogram; - int **part; + long **cumulative; + double factor; } EqualizeData; static void -equalize_histogram_setup (GthHistogram *hist, - int **part) +equalize_before (GthAsyncTask *task, + gpointer user_data) { - int i, k, j; - int pixels_per_value; - int desired; - int sum, dif; - - pixels_per_value = gth_histogram_get_count (hist, 0, 255) / 256.0; - - for (k = 0; k < gth_histogram_get_nchannels (hist); k++) { - /* First and last points in partition */ - part[k][0] = 0; - part[k][256] = 256; - - /* Find intermediate points */ - j = 0; - sum = (gth_histogram_get_value (hist, k + 1, 0) + - gth_histogram_get_value (hist, k + 1, 1)); - - for (i = 1; i < 256; i++) { - desired = i * pixels_per_value; - - while (sum <= desired) { - j++; - sum += gth_histogram_get_value (hist, k + 1, j + 1); - } - - /* Nearest sum */ - dif = sum - gth_histogram_get_value (hist, k + 1, j); - - if ((sum - desired) > (dif / 2.0)) - part[k][i] = j; - else - part[k][i] = j + 1; - } - } + gth_task_progress (GTH_TASK (task), _("Equalizing image histogram"), NULL, TRUE, 0.0); } static void -equalize_before (GthAsyncTask *task, - gpointer user_data) +equalize_histogram_setup (EqualizeData *equalize_data) { - gth_task_progress (GTH_TASK (task), _("Equalizing image histogram"), NULL, TRUE, 0.0); + GthHistogram *histogram; + + histogram = gth_histogram_new (); + gth_histogram_calculate_for_image (histogram, equalize_data->source); + equalize_data->cumulative = gth_histogram_get_cumulative (histogram); + equalize_data->factor = 255.0 / (cairo_image_surface_get_width (equalize_data->source) * cairo_image_surface_get_height (equalize_data->source)); + + g_object_unref (histogram); } static guchar -equalize_func (guchar u_value, - int **part, - int channel) -{ - guchar i = 0; - while (part[channel][i + 1] <= u_value) - i++; - return i; +equalize_func (EqualizeData *equalize_data, + int n_channel, + guchar value) +{ + return (guchar) (equalize_data->factor * equalize_data->cumulative[n_channel][value]); } @@ -104,7 +74,6 @@ gpointer user_data) { EqualizeData *equalize_data = user_data; - int i; cairo_format_t format; int width; int height; @@ -122,13 +91,7 @@ /* initialize the extra data */ - equalize_data->histogram = gth_histogram_new (); - gth_histogram_calculate_for_image (equalize_data->histogram, equalize_data->source); - - equalize_data->part = g_new0 (int *, GTH_HISTOGRAM_N_CHANNELS); - for (i = 0; i < GTH_HISTOGRAM_N_CHANNELS; i++) - equalize_data->part[i] = g_new0 (int, 257); - equalize_histogram_setup (equalize_data->histogram, equalize_data->part); + equalize_histogram_setup (equalize_data); /* convert the image */ @@ -154,11 +117,9 @@ p_destination = p_destination_line; for (x = 0; x < width; x++) { CAIRO_GET_RGBA (p_source, red, green, blue, alpha); - red = equalize_func (red, equalize_data->part, RED_PIX); - green = equalize_func (green, equalize_data->part, GREEN_PIX); - blue = equalize_func (blue, equalize_data->part, BLUE_PIX); - if (alpha != 0xff) - alpha = equalize_func (alpha, equalize_data->part, ALPHA_PIX); + red = equalize_func (equalize_data, GTH_HISTOGRAM_CHANNEL_RED, red); + green = equalize_func (equalize_data, GTH_HISTOGRAM_CHANNEL_GREEN, green); + blue = equalize_func (equalize_data, GTH_HISTOGRAM_CHANNEL_BLUE, blue); CAIRO_SET_RGBA (p_destination, red, green, blue, alpha); p_source += 4; @@ -182,18 +143,12 @@ gpointer user_data) { EqualizeData *equalize_data = user_data; - int i; if (error == NULL) gth_image_viewer_page_set_image (GTH_IMAGE_VIEWER_PAGE (equalize_data->viewer_page), equalize_data->destination, TRUE); - for (i = 0; i < GTH_HISTOGRAM_N_CHANNELS; i++) - g_free (equalize_data->part[i]); - g_free (equalize_data->part); - equalize_data->part = NULL; - - g_object_unref (equalize_data->histogram); - equalize_data->histogram = NULL; + gth_cumulative_histogram_free (equalize_data->cumulative); + equalize_data->cumulative = NULL; } diff -Nru gthumb-3.0.2/extensions/file_tools/gth-file-tool-grayscale.c gthumb-3.2.3/extensions/file_tools/gth-file-tool-grayscale.c --- gthumb-3.0.2/extensions/file_tools/gth-file-tool-grayscale.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/gth-file-tool-grayscale.c 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,508 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2011 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include "gth-file-tool-grayscale.h" +#include "gth-preview-tool.h" + + +#define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x))) +#define APPLY_DELAY 150 +#define PREVIEW_SIZE 0.9 + + +G_DEFINE_TYPE (GthFileToolGrayscale, gth_file_tool_grayscale, GTH_TYPE_FILE_TOOL) + + +typedef enum { + METHOD_BRIGHTNESS, + METHOD_SATURATION, + METHOD_AVARAGE +} Method; + + +struct _GthFileToolGrayscalePrivate { + cairo_surface_t *source; + cairo_surface_t *destination; + cairo_surface_t *preview; + GtkBuilder *builder; + GthTask *image_task; + GthImageViewerTool *preview_tool; + guint apply_event; + gboolean apply_to_original; + gboolean closing; +}; + + +typedef struct { + GthFileToolGrayscale *self; + GtkWidget *viewer_page; + cairo_surface_t *source; + Method method; +} GrayscaleData; + + +static void +grayscale_data_free (gpointer user_data) +{ + GrayscaleData *grayscale_data = user_data; + + g_object_unref (grayscale_data->viewer_page); + cairo_surface_destroy (grayscale_data->source); + g_free (grayscale_data); +} + + +static gpointer +grayscale_exec (GthAsyncTask *task, + gpointer user_data) +{ + GrayscaleData *grayscale_data = user_data; + cairo_format_t format; + int width; + int height; + int source_stride; + int destination_stride; + unsigned char *p_source_line; + unsigned char *p_destination_line; + unsigned char *p_source; + unsigned char *p_destination; + gboolean cancelled; + double progress; + int x, y; + unsigned char red, green, blue, alpha; + unsigned char min, max, value; + cairo_surface_t *destination; + GthImage *destination_image; + + format = cairo_image_surface_get_format (grayscale_data->source); + width = cairo_image_surface_get_width (grayscale_data->source); + height = cairo_image_surface_get_height (grayscale_data->source); + source_stride = cairo_image_surface_get_stride (grayscale_data->source); + + destination = cairo_image_surface_create (format, width, height); + cairo_surface_flush (destination); + destination_stride = cairo_image_surface_get_stride (destination); + p_source_line = cairo_image_surface_get_data (grayscale_data->source); + p_destination_line = cairo_image_surface_get_data (destination); + for (y = 0; y < height; y++) { + gth_async_task_get_data (task, NULL, &cancelled, NULL); + if (cancelled) + return NULL; + + progress = (double) y / height; + gth_async_task_set_data (task, NULL, NULL, &progress); + + p_source = p_source_line; + p_destination = p_destination_line; + for (x = 0; x < width; x++) { + CAIRO_GET_RGBA (p_source, red, green, blue, alpha); + + switch (grayscale_data->method) { + case METHOD_BRIGHTNESS: + value = (0.2125 * red + 0.7154 * green + 0.072 * blue); + break; + + case METHOD_SATURATION: + max = MAX (MAX (red, green), blue); + min = MIN (MIN (red, green), blue); + value = (max + min) / 2; + break; + + case METHOD_AVARAGE: + value = (0.3333 * red + 0.3333 * green + 0.3333 * blue); + break; + } + + CAIRO_SET_RGBA (p_destination, + value, + value, + value, + alpha); + + p_source += 4; + p_destination += 4; + } + p_source_line += source_stride; + p_destination_line += destination_stride; + } + + cairo_surface_mark_dirty (destination); + + destination_image = gth_image_new_for_surface (destination); + gth_image_task_set_destination (GTH_IMAGE_TASK (task), destination_image); + + _g_object_unref (destination_image); + cairo_surface_destroy (destination); + + return NULL; +} + + +static void apply_changes (GthFileToolGrayscale *self); +static void gth_file_tool_grayscale_cancel (GthFileTool *file_tool); + + +static void +image_task_completed_cb (GthTask *task, + GError *error, + gpointer user_data) +{ + GthFileToolGrayscale *self = user_data; + GthImage *destination_image; + + self->priv->image_task = NULL; + + if (self->priv->closing) { + g_object_unref (task); + gth_file_tool_grayscale_cancel (GTH_FILE_TOOL (self)); + return; + } + + if (error != NULL) { + if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) + apply_changes (self); + g_object_unref (task); + return; + } + + destination_image = gth_image_task_get_destination (GTH_IMAGE_TASK (task)); + if (destination_image == NULL) { + g_object_unref (task); + return; + } + + cairo_surface_destroy (self->priv->destination); + self->priv->destination = gth_image_get_cairo_surface (destination_image); + + if (self->priv->apply_to_original) { + if (self->priv->destination != NULL) { + GtkWidget *window; + GtkWidget *viewer_page; + + window = gth_file_tool_get_window (GTH_FILE_TOOL (self)); + viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); + gth_image_viewer_page_set_image (GTH_IMAGE_VIEWER_PAGE (viewer_page), self->priv->destination, TRUE); + } + + gth_file_tool_hide_options (GTH_FILE_TOOL (self)); + } + else { + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("preview_checkbutton")))) + gth_preview_tool_set_image (GTH_PREVIEW_TOOL (self->priv->preview_tool), self->priv->destination); + } + + g_object_unref (task); +} + + +static gboolean +apply_cb (gpointer user_data) +{ + GthFileToolGrayscale *self = user_data; + GtkWidget *window; + GrayscaleData *grayscale_data; + + if (self->priv->apply_event != 0) { + g_source_remove (self->priv->apply_event); + self->priv->apply_event = 0; + } + + if (self->priv->image_task != NULL) { + gth_task_cancel (self->priv->image_task); + return FALSE; + } + + window = gth_file_tool_get_window (GTH_FILE_TOOL (self)); + + grayscale_data = g_new0 (GrayscaleData, 1); + grayscale_data->viewer_page = g_object_ref (gth_browser_get_viewer_page (GTH_BROWSER (window))); + grayscale_data->source = cairo_surface_reference (self->priv->apply_to_original ? self->priv->source : self->priv->preview); + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("brightness_radiobutton")))) + grayscale_data->method = METHOD_BRIGHTNESS; + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("saturation_radiobutton")))) + grayscale_data->method = METHOD_SATURATION; + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("average_radiobutton")))) + grayscale_data->method = METHOD_AVARAGE; + + self->priv->image_task = gth_image_task_new (_("Applying changes"), + NULL, + grayscale_exec, + NULL, + grayscale_data, + grayscale_data_free); + g_signal_connect (self->priv->image_task, + "completed", + G_CALLBACK (image_task_completed_cb), + self); + gth_browser_exec_task (GTH_BROWSER (window), self->priv->image_task, FALSE); + + return FALSE; +} + + +static void +apply_changes (GthFileToolGrayscale *self) +{ + if (self->priv->apply_event != 0) { + g_source_remove (self->priv->apply_event); + self->priv->apply_event = 0; + } + self->priv->apply_event = g_timeout_add (APPLY_DELAY, apply_cb, self); +} + + +static void +gth_file_tool_grayscale_update_sensitivity (GthFileTool *base) +{ + GtkWidget *window; + GtkWidget *viewer_page; + + window = gth_file_tool_get_window (base); + viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); + if (! GTH_IS_IMAGE_VIEWER_PAGE (viewer_page)) + gtk_widget_set_sensitive (GTK_WIDGET (base), FALSE); + else + gtk_widget_set_sensitive (GTK_WIDGET (base), TRUE); +} + + +static void +gth_file_tool_grayscale_activate (GthFileTool *base) +{ + gth_file_tool_show_options (base); +} + + +static void +gth_file_tool_grayscale_cancel (GthFileTool *file_tool) +{ + GthFileToolGrayscale *self = GTH_FILE_TOOL_GRAYSCALE (file_tool); + GtkWidget *window; + GtkWidget *viewer_page; + + if (self->priv->image_task != NULL) { + self->priv->closing = TRUE; + return; + } + + if (self->priv->apply_event != 0) { + g_source_remove (self->priv->apply_event); + self->priv->apply_event = 0; + } + + window = gth_file_tool_get_window (GTH_FILE_TOOL (self)); + viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); + gth_image_viewer_page_reset (GTH_IMAGE_VIEWER_PAGE (viewer_page)); +} + + +static void +ok_button_clicked_cb (GtkButton *button, + gpointer user_data) +{ + GthFileToolGrayscale *self = user_data; + + self->priv->apply_to_original = TRUE; + apply_changes (self); +} + + +static void +preview_checkbutton_toggled_cb (GtkToggleButton *togglebutton, + gpointer user_data) +{ + GthFileToolGrayscale *self = user_data; + + if (gtk_toggle_button_get_active (togglebutton)) + gth_preview_tool_set_image (GTH_PREVIEW_TOOL (self->priv->preview_tool), self->priv->destination); + else + gth_preview_tool_set_image (GTH_PREVIEW_TOOL (self->priv->preview_tool), self->priv->preview); +} + + +static void +method_changed_cb (GtkButton *button, + gpointer user_data) +{ + GthFileToolGrayscale *self = user_data; + + apply_changes (self); +} + + +static GtkWidget * +gth_file_tool_grayscale_get_options (GthFileTool *base) +{ + GthFileToolGrayscale *self; + GtkWidget *window; + GtkWidget *viewer_page; + GtkWidget *viewer; + GtkWidget *options; + int width, height; + GtkAllocation allocation; + + self = (GthFileToolGrayscale *) base; + + window = gth_file_tool_get_window (base); + viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); + if (! GTH_IS_IMAGE_VIEWER_PAGE (viewer_page)) + return NULL; + + cairo_surface_destroy (self->priv->source); + cairo_surface_destroy (self->priv->destination); + cairo_surface_destroy (self->priv->preview); + + viewer = gth_image_viewer_page_get_image_viewer (GTH_IMAGE_VIEWER_PAGE (viewer_page)); + self->priv->source = cairo_surface_reference (gth_image_viewer_get_current_image (GTH_IMAGE_VIEWER (viewer))); + if (self->priv->source == NULL) + return NULL; + + width = cairo_image_surface_get_width (self->priv->source); + height = cairo_image_surface_get_height (self->priv->source); + gtk_widget_get_allocation (GTK_WIDGET (viewer), &allocation); + if (scale_keeping_ratio (&width, &height, PREVIEW_SIZE * allocation.width, PREVIEW_SIZE * allocation.height, FALSE)) + self->priv->preview = _cairo_image_surface_scale_bilinear (self->priv->source, width, height); + else + self->priv->preview = cairo_surface_reference (self->priv->source); + + self->priv->destination = cairo_surface_reference (self->priv->preview); + self->priv->apply_to_original = FALSE; + self->priv->closing = FALSE; + + self->priv->builder = _gtk_builder_new_from_file ("grayscale-options.ui", "file_tools"); + options = _gtk_builder_get_widget (self->priv->builder, "options"); + gtk_widget_show (options); + + g_signal_connect (GET_WIDGET ("ok_button"), + "clicked", + G_CALLBACK (ok_button_clicked_cb), + self); + g_signal_connect_swapped (GET_WIDGET ("cancel_button"), + "clicked", + G_CALLBACK (gth_file_tool_cancel), + self); + g_signal_connect (GET_WIDGET ("brightness_radiobutton"), + "clicked", + G_CALLBACK (method_changed_cb), + self); + g_signal_connect (GET_WIDGET ("saturation_radiobutton"), + "clicked", + G_CALLBACK (method_changed_cb), + self); + g_signal_connect (GET_WIDGET ("average_radiobutton"), + "clicked", + G_CALLBACK (method_changed_cb), + self); + g_signal_connect (GET_WIDGET ("preview_checkbutton"), + "toggled", + G_CALLBACK (preview_checkbutton_toggled_cb), + self); + + self->priv->preview_tool = gth_preview_tool_new (); + gth_preview_tool_set_image (GTH_PREVIEW_TOOL (self->priv->preview_tool), self->priv->preview); + gth_image_viewer_set_tool (GTH_IMAGE_VIEWER (viewer), self->priv->preview_tool); + apply_changes (self); + + return options; +} + + +static void +gth_file_tool_grayscale_destroy_options (GthFileTool *base) +{ + GthFileToolGrayscale *self; + GtkWidget *window; + GtkWidget *viewer_page; + GtkWidget *viewer; + + self = (GthFileToolGrayscale *) base; + + if (self->priv->apply_event != 0) { + g_source_remove (self->priv->apply_event); + self->priv->apply_event = 0; + } + + window = gth_file_tool_get_window (GTH_FILE_TOOL (self)); + viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); + viewer = gth_image_viewer_page_get_image_viewer (GTH_IMAGE_VIEWER_PAGE (viewer_page)); + gth_image_viewer_set_tool (GTH_IMAGE_VIEWER (viewer), NULL); + gth_viewer_page_update_sensitivity (GTH_VIEWER_PAGE (viewer_page)); + + _cairo_clear_surface (&self->priv->preview); + _cairo_clear_surface (&self->priv->source); + _cairo_clear_surface (&self->priv->destination); + _g_clear_object (&self->priv->builder); +} + + +static void +gth_file_tool_grayscale_finalize (GObject *object) +{ + GthFileToolGrayscale *self; + + g_return_if_fail (object != NULL); + g_return_if_fail (GTH_IS_FILE_TOOL_GRAYSCALE (object)); + + self = (GthFileToolGrayscale *) object; + + cairo_surface_destroy (self->priv->preview); + cairo_surface_destroy (self->priv->source); + cairo_surface_destroy (self->priv->destination); + _g_object_unref (self->priv->builder); + + G_OBJECT_CLASS (gth_file_tool_grayscale_parent_class)->finalize (object); +} + + +static void +gth_file_tool_grayscale_class_init (GthFileToolGrayscaleClass *klass) +{ + GObjectClass *gobject_class; + GthFileToolClass *file_tool_class; + + g_type_class_add_private (klass, sizeof (GthFileToolGrayscalePrivate)); + + gobject_class = (GObjectClass*) klass; + gobject_class->finalize = gth_file_tool_grayscale_finalize; + + file_tool_class = GTH_FILE_TOOL_CLASS (klass); + file_tool_class->update_sensitivity = gth_file_tool_grayscale_update_sensitivity; + file_tool_class->activate = gth_file_tool_grayscale_activate; + file_tool_class->cancel = gth_file_tool_grayscale_cancel; + file_tool_class->get_options = gth_file_tool_grayscale_get_options; + file_tool_class->destroy_options = gth_file_tool_grayscale_destroy_options; +} + + +static void +gth_file_tool_grayscale_init (GthFileToolGrayscale *self) +{ + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_FILE_TOOL_GRAYSCALE, GthFileToolGrayscalePrivate); + self->priv->preview = NULL; + self->priv->source = NULL; + self->priv->destination = NULL; + self->priv->builder = NULL; + + gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-grayscale", _("Grayscale..."), _("Grayscale"), FALSE); +} diff -Nru gthumb-3.0.2/extensions/file_tools/gth-file-tool-grayscale.h gthumb-3.2.3/extensions/file_tools/gth-file-tool-grayscale.h --- gthumb-3.0.2/extensions/file_tools/gth-file-tool-grayscale.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/gth-file-tool-grayscale.h 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,53 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2009 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef GTH_FILE_TOOL_GRAYSCALE_H +#define GTH_FILE_TOOL_GRAYSCALE_H + +#include + +G_BEGIN_DECLS + +#define GTH_TYPE_FILE_TOOL_GRAYSCALE (gth_file_tool_grayscale_get_type ()) +#define GTH_FILE_TOOL_GRAYSCALE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_FILE_TOOL_GRAYSCALE, GthFileToolGrayscale)) +#define GTH_FILE_TOOL_GRAYSCALE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTH_TYPE_FILE_TOOL_GRAYSCALE, GthFileToolGrayscaleClass)) +#define GTH_IS_FILE_TOOL_GRAYSCALE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_FILE_TOOL_GRAYSCALE)) +#define GTH_IS_FILE_TOOL_GRAYSCALE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTH_TYPE_FILE_TOOL_GRAYSCALE)) +#define GTH_FILE_TOOL_GRAYSCALE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTH_TYPE_FILE_TOOL_GRAYSCALE, GthFileToolGrayscaleClass)) + +typedef struct _GthFileToolGrayscale GthFileToolGrayscale; +typedef struct _GthFileToolGrayscaleClass GthFileToolGrayscaleClass; +typedef struct _GthFileToolGrayscalePrivate GthFileToolGrayscalePrivate; + +struct _GthFileToolGrayscale { + GthFileTool parent_instance; + GthFileToolGrayscalePrivate *priv; +}; + +struct _GthFileToolGrayscaleClass { + GthFileToolClass parent_class; +}; + +GType gth_file_tool_grayscale_get_type (void); + +G_END_DECLS + +#endif /* GTH_FILE_TOOL_GRAYSCALE_H */ diff -Nru gthumb-3.0.2/extensions/file_tools/gth-file-tool-resize.c gthumb-3.2.3/extensions/file_tools/gth-file-tool-resize.c --- gthumb-3.0.2/extensions/file_tools/gth-file-tool-resize.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/gth-file-tool-resize.c 2013-04-30 16:56:12.000000000 +0000 @@ -23,6 +23,7 @@ #include #include #include +#include #include "gth-file-tool-resize.h" #include "preferences.h" @@ -50,8 +51,12 @@ double aspect_ratio; int new_width; int new_height; - cairo_filter_t filter; + gboolean high_quality; GthUnit unit; + GthTask *resize_task; + gboolean closing; + gboolean final_resize; + guint update_size_id; }; @@ -70,34 +75,15 @@ } -static void -cancel_button_clicked_cb (GtkButton *button, - GthFileToolResize *self) -{ - GtkWidget *window; - GtkWidget *viewer_page; - - window = gth_file_tool_get_window (GTH_FILE_TOOL (self)); - viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); - gth_image_viewer_page_reset (GTH_IMAGE_VIEWER_PAGE (viewer_page)); - gth_file_tool_hide_options (GTH_FILE_TOOL (self)); -} +static void update_pixbuf_size (GthFileToolResize *self); static void resize_button_clicked_cb (GtkButton *button, GthFileToolResize *self) { - GtkWidget *window; - GtkWidget *viewer_page; - - if (self->priv->new_image == NULL) - return; - - window = gth_file_tool_get_window (GTH_FILE_TOOL (self)); - viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); - gth_image_viewer_page_set_image (GTH_IMAGE_VIEWER_PAGE (viewer_page), self->priv->new_image, TRUE); - gth_file_tool_hide_options (GTH_FILE_TOOL (self)); + self->priv->final_resize = TRUE; + update_pixbuf_size (self); } @@ -120,31 +106,135 @@ } +static gpointer +resize_task_exec (GthAsyncTask *task, + gpointer user_data) +{ + GthFileToolResize *self = user_data; + cairo_surface_t *destination; + + destination = _cairo_image_surface_scale (self->priv->original_image, + self->priv->new_width, + self->priv->new_height, + (self->priv->high_quality ? SCALE_FILTER_BEST : SCALE_FILTER_FAST), + task); + + if (destination != NULL) { + GthImage *destination_image; + + destination_image = gth_image_new_for_surface (destination); + gth_image_task_set_destination (GTH_IMAGE_TASK (task), destination_image); + + _g_object_unref (destination_image); + cairo_surface_destroy (destination); + } + + return NULL; +} + + +static void gth_file_tool_resize_cancel (GthFileTool *base); + + static void -update_pixbuf_size (GthFileToolResize *self) +resize_task_completed_cb (GthTask *task, + GError *error, + gpointer user_data) { - GtkWidget *window; - GtkWidget *viewer_page; + GthFileToolResize *self = user_data; + GthImage *destination_image; + GtkWidget *window; + GtkWidget *viewer_page; + + self->priv->resize_task = NULL; + + if (self->priv->closing) { + g_object_unref (task); + gth_file_tool_resize_cancel (GTH_FILE_TOOL (self)); + return; + } + + if (error != NULL) { + if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) + update_pixbuf_size (self); + g_object_unref (task); + return; + } + + destination_image = gth_image_task_get_destination (GTH_IMAGE_TASK (task)); + if (destination_image == NULL) { + g_object_unref (task); + return; + } + + _cairo_clear_surface (&self->priv->new_image); + self->priv->new_image = gth_image_get_cairo_surface (destination_image); - cairo_surface_destroy (self->priv->new_image); - self->priv->new_image = _cairo_image_surface_scale_to (self->priv->original_image, - self->priv->new_width, - self->priv->new_height, - self->priv->filter); window = gth_file_tool_get_window (GTH_FILE_TOOL (self)); viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); + gth_image_viewer_page_set_image (GTH_IMAGE_VIEWER_PAGE (viewer_page), self->priv->new_image, FALSE); - update_dimensione_info_label (self, - "new_dimensions_label", - self->priv->new_width, - self->priv->new_height, - TRUE); - update_dimensione_info_label (self, - "scale_factor_label", - (double) self->priv->new_width / self->priv->original_width, - (double) self->priv->new_height / self->priv->original_height, - FALSE); + if (self->priv->final_resize) { + gth_image_history_add_image (gth_image_viewer_page_get_history (GTH_IMAGE_VIEWER_PAGE (viewer_page)), + self->priv->new_image, + TRUE); + gth_viewer_page_focus (GTH_VIEWER_PAGE (viewer_page)); + gth_file_tool_hide_options (GTH_FILE_TOOL (self)); + } + else { + update_dimensione_info_label (self, + "new_dimensions_label", + self->priv->new_width, + self->priv->new_height, + TRUE); + update_dimensione_info_label (self, + "scale_factor_label", + (double) self->priv->new_width / self->priv->original_width, + (double) self->priv->new_height / self->priv->original_height, + FALSE); + } + + g_object_unref (task); +} + + +static gboolean +update_pixbuf_size_cb (gpointer user_data) +{ + GthFileToolResize *self = user_data; + + self->priv->update_size_id = 0; + + if (self->priv->resize_task != NULL) { + gth_task_cancel (self->priv->resize_task); + return FALSE; + } + + self->priv->resize_task = gth_image_task_new (_("Resizing images"), + NULL, + resize_task_exec, + NULL, + self, + NULL); + g_signal_connect (self->priv->resize_task, + "completed", + G_CALLBACK (resize_task_completed_cb), + self); + gth_browser_exec_task (GTH_BROWSER (gth_file_tool_get_window (GTH_FILE_TOOL (self))), + self->priv->resize_task, + FALSE); + + return FALSE; +} + + +static void +update_pixbuf_size (GthFileToolResize *self) +{ + if (self->priv->update_size_id != 0) + g_source_remove (self->priv->update_size_id); + self->priv->update_size_id = g_timeout_add (100, update_pixbuf_size_cb, self); } @@ -198,7 +288,7 @@ high_quality_checkbutton_toggled_cb (GtkToggleButton *button, GthFileToolResize *self) { - self->priv->filter = gtk_toggle_button_get_active (button) ? CAIRO_FILTER_GAUSSIAN : CAIRO_FILTER_NEAREST; + self->priv->high_quality = gtk_toggle_button_get_active (button); update_pixbuf_size (self); } @@ -464,9 +554,10 @@ self->priv->new_image = NULL; self->priv->new_width = self->priv->original_width; self->priv->new_height = self->priv->original_height; - self->priv->filter = g_settings_get_boolean (self->priv->settings, PREF_RESIZE_HIGH_QUALITY) ? CAIRO_FILTER_GAUSSIAN : CAIRO_FILTER_NEAREST; + self->priv->high_quality = g_settings_get_boolean (self->priv->settings, PREF_RESIZE_HIGH_QUALITY); self->priv->unit = g_settings_get_enum (self->priv->settings, PREF_RESIZE_UNIT); self->priv->builder = _gtk_builder_new_from_file ("resize-options.ui", "file_tools"); + self->priv->final_resize = FALSE; update_dimensione_info_label (self, "original_dimensions_label", @@ -516,10 +607,10 @@ _("Custom"), NULL); gtk_widget_show (self->priv->ratio_combobox); - gtk_box_pack_start (GTK_BOX (GET_WIDGET ("ratio_combobox_box")), self->priv->ratio_combobox, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (GET_WIDGET ("ratio_combobox_box")), self->priv->ratio_combobox, TRUE, TRUE, 0); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("high_quality_checkbutton")), - self->priv->filter != CAIRO_FILTER_NEAREST); + self->priv->high_quality); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("invert_ratio_checkbutton")), g_settings_get_boolean (self->priv->settings, PREF_RESIZE_ASPECT_RATIO_INVERT)); @@ -532,10 +623,10 @@ "clicked", G_CALLBACK (resize_button_clicked_cb), self); - g_signal_connect (GET_WIDGET ("cancel_button"), - "clicked", - G_CALLBACK (cancel_button_clicked_cb), - self); + g_signal_connect_swapped (GET_WIDGET ("cancel_button"), + "clicked", + G_CALLBACK (gth_file_tool_cancel), + self); g_signal_connect (GET_WIDGET ("resize_width_spinbutton"), "value-changed", G_CALLBACK (selection_width_value_changed_cb), @@ -580,6 +671,8 @@ gtk_combo_box_set_active (GTK_COMBO_BOX (self->priv->ratio_combobox), g_settings_get_enum (self->priv->settings, PREF_RESIZE_ASPECT_RATIO)); + gth_image_viewer_set_zoom_quality (GTH_IMAGE_VIEWER (viewer), GTH_ZOOM_QUALITY_LOW); + return options; } @@ -591,9 +684,15 @@ GtkWidget *window; GtkWidget *viewer_page; GtkWidget *viewer; + GSettings *viewer_settings; self = (GthFileToolResize *) base; + if (self->priv->update_size_id != 0) { + g_source_remove (self->priv->update_size_id); + self->priv->update_size_id = 0; + } + if (self->priv->builder != NULL) { int unit; @@ -611,18 +710,23 @@ /* destroy the options data */ - cairo_surface_destroy (self->priv->new_image); - cairo_surface_destroy (self->priv->original_image); - _g_object_unref (self->priv->builder); - self->priv->new_image = NULL; - self->priv->original_image = NULL; - self->priv->builder = NULL; + _cairo_clear_surface (&self->priv->new_image); + _cairo_clear_surface (&self->priv->original_image); + _g_clear_object (&self->priv->builder); } window = gth_file_tool_get_window (GTH_FILE_TOOL (self)); viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); viewer = gth_image_viewer_page_get_image_viewer (GTH_IMAGE_VIEWER_PAGE (viewer_page)); gth_image_viewer_set_tool (GTH_IMAGE_VIEWER (viewer), NULL); + + /* restore the zoom quality */ + + viewer_settings = g_settings_new (GTHUMB_IMAGE_VIEWER_SCHEMA); + gth_image_viewer_set_zoom_quality (GTH_IMAGE_VIEWER (viewer), + g_settings_get_enum (viewer_settings, PREF_IMAGE_VIEWER_ZOOM_QUALITY)); + + g_object_unref (viewer_settings); } @@ -634,6 +738,29 @@ static void +gth_file_tool_resize_cancel (GthFileTool *base) +{ + GthFileToolResize *self = (GthFileToolResize *) base; + GtkWidget *window; + GtkWidget *viewer_page; + + if (self->priv->resize_task != NULL) { + self->priv->closing = TRUE; + return; + } + + if (self->priv->update_size_id != 0) { + g_source_remove (self->priv->update_size_id); + self->priv->update_size_id = 0; + } + + window = gth_file_tool_get_window (GTH_FILE_TOOL (self)); + viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); + gth_image_viewer_page_reset (GTH_IMAGE_VIEWER_PAGE (viewer_page)); +} + + +static void gth_file_tool_resize_finalize (GObject *object) { GthFileToolResize *self; @@ -667,6 +794,7 @@ file_tool_class = (GthFileToolClass *) klass; file_tool_class->update_sensitivity = gth_file_tool_resize_update_sensitivity; file_tool_class->activate = gth_file_tool_resize_activate; + file_tool_class->cancel = gth_file_tool_resize_cancel; file_tool_class->get_options = gth_file_tool_resize_get_options; file_tool_class->destroy_options = gth_file_tool_resize_destroy_options; } @@ -679,3 +807,5 @@ self->priv->settings = g_settings_new (GTHUMB_RESIZE_SCHEMA); gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-resize", _("Resize..."), _("Resize"), FALSE); } + + diff -Nru gthumb-3.0.2/extensions/file_tools/gth-file-tool-rotate.c gthumb-3.2.3/extensions/file_tools/gth-file-tool-rotate.c --- gthumb-3.0.2/extensions/file_tools/gth-file-tool-rotate.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/gth-file-tool-rotate.c 2013-04-30 16:56:12.000000000 +0000 @@ -240,7 +240,7 @@ GtkWidget *window; GtkWidget *viewer_page; - image = gth_image_rotator_get_result (GTH_IMAGE_ROTATOR (self->priv->rotator), TRUE); + image = gth_image_rotator_get_result (GTH_IMAGE_ROTATOR (self->priv->rotator), FALSE); window = gth_file_tool_get_window (GTH_FILE_TOOL (self)); viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); @@ -252,21 +252,6 @@ static void -cancel_button_clicked_cb (GtkButton *button, - GthFileToolRotate *self) -{ - GtkWidget *window; - GtkWidget *viewer_page; - - window = gth_file_tool_get_window (GTH_FILE_TOOL (self)); - viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); - gth_image_viewer_page_reset (GTH_IMAGE_VIEWER_PAGE (viewer_page)); - - gth_file_tool_hide_options (GTH_FILE_TOOL (self)); -} - - -static void crop_settings_changed_cb (GtkAdjustment *adj, GthFileToolRotate *self) { @@ -307,16 +292,11 @@ background_colorbutton_color_set_cb (GtkColorButton *color_button, GthFileToolRotate *self) { - GdkColor color; - cairo_color_t background_color; + GdkRGBA background_color; gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("background_transparent_checkbutton")), FALSE); - gtk_color_button_get_color (color_button, &color); - background_color.r = (double) color.red / 65535; - background_color.g = (double) color.green / 65535; - background_color.b = (double) color.blue / 65535; - background_color.a = 1.0; + gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (color_button), &background_color); gth_image_rotator_set_background (GTH_IMAGE_ROTATOR (self->priv->rotator), &background_color); apply_changes (self); @@ -328,12 +308,12 @@ GthFileToolRotate *self) { if (gtk_toggle_button_get_active (toggle_button)) { - cairo_color_t background_color; + GdkRGBA background_color; - background_color.r = 0.0; - background_color.g = 0.0; - background_color.b = 0.0; - background_color.a = 0.0; + background_color.red = 0.0; + background_color.green = 0.0; + background_color.blue = 0.0; + background_color.alpha = 0.0; gth_image_rotator_set_background (GTH_IMAGE_ROTATOR (self->priv->rotator), &background_color); } else @@ -379,8 +359,7 @@ GtkWidget *viewer_page; GtkWidget *viewer; char *color_spec; - GdkColor color; - cairo_color_t background_color; + GdkRGBA background_color; self = (GthFileToolRotate *) base; @@ -400,17 +379,20 @@ self->priv->builder = _gtk_builder_new_from_file ("rotate-options.ui", "file_tools"); - self->priv->rotation_angle_adj = gimp_scale_entry_new (GET_WIDGET ("rotation_angle_hbox"), - GTK_LABEL (GET_WIDGET ("rotation_angle_label")), - 0.0, -90.0, 90.0, 0.1, 1.0, 1); - - self->priv->crop_p1_adj = gimp_scale_entry_new (GET_WIDGET ("crop_p1_hbox"), - GTK_LABEL (GET_WIDGET ("crop_p1_label")), - 1.0, 0.0, 1.0, 0.001, 0.01, 3); - - self->priv->crop_p2_adj = gimp_scale_entry_new (GET_WIDGET ("crop_p2_hbox"), - GTK_LABEL (GET_WIDGET ("crop_p2_label")), - 1.0, 0.0, 1.0, 0.001, 0.01, 3); + self->priv->rotation_angle_adj = gth_color_scale_label_new (GET_WIDGET ("rotation_angle_hbox"), + GTK_LABEL (GET_WIDGET ("rotation_angle_label")), + GTH_COLOR_SCALE_DEFAULT, + 0.0, -180.0, 180.0, 0.1, 1.0, "%+.1f°"); + + self->priv->crop_p1_adj = gth_color_scale_label_new (GET_WIDGET ("crop_p1_hbox"), + GTK_LABEL (GET_WIDGET ("crop_p1_label")), + GTH_COLOR_SCALE_DEFAULT, + 1.0, 0.0, 1.0, 0.001, 0.01, "%.3f"); + + self->priv->crop_p2_adj = gth_color_scale_label_new (GET_WIDGET ("crop_p2_hbox"), + GTK_LABEL (GET_WIDGET ("crop_p2_label")), + GTH_COLOR_SCALE_DEFAULT, + 1.0, 0.0, 1.0, 0.001, 0.01, "%.3f"); self->priv->crop_grid = _gtk_combo_box_new_with_texts (_("None"), _("Rule of Thirds"), @@ -444,14 +426,14 @@ } color_spec = g_settings_get_string (self->priv->settings, PREF_ROTATE_BACKGROUND_COLOR); - if (! self->priv->has_alpha && gdk_color_parse (color_spec, &color)) { - _gdk_color_to_cairo_color (&color, &background_color); + if (! self->priv->has_alpha) { + gdk_rgba_parse (&background_color, color_spec); } else { - background_color.r = 0.0; - background_color.g = 0.0; - background_color.b = 0.0; - background_color.a = self->priv->has_alpha ? 0.0 : 1.0; + background_color.red = 0.0; + background_color.green = 0.0; + background_color.blue = 0.0; + background_color.alpha = 1.0; } gth_image_rotator_set_background (GTH_IMAGE_ROTATOR (self->priv->rotator), &background_color); @@ -468,10 +450,10 @@ "clicked", G_CALLBACK (apply_button_clicked_cb), self); - g_signal_connect (GET_WIDGET ("cancel_button"), - "clicked", - G_CALLBACK (cancel_button_clicked_cb), - self); + g_signal_connect_swapped (GET_WIDGET ("cancel_button"), + "clicked", + G_CALLBACK (gth_file_tool_cancel), + self); g_signal_connect (GET_WIDGET ("reset_button"), "clicked", G_CALLBACK (reset_button_clicked_cb), @@ -548,9 +530,8 @@ self = (GthFileToolRotate *) base; if (self->priv->builder != NULL) { - cairo_color_t background_color; - GdkColor color; - char *color_spec; + GdkRGBA background_color; + char *color_spec; /* save the dialog options */ @@ -559,11 +540,9 @@ g_settings_set_enum (self->priv->settings, PREF_ROTATE_GRID_TYPE, gth_image_rotator_get_grid_type (GTH_IMAGE_ROTATOR (self->priv->rotator))); gth_image_rotator_get_background (GTH_IMAGE_ROTATOR (self->priv->rotator), &background_color); - color.red = background_color.r * 255.0; - color.green = background_color.g * 255.0; - color.blue = background_color.b * 255.0; - color_spec = gdk_color_to_string (&color); + color_spec = gdk_rgba_to_string (&background_color); g_settings_set_string (self->priv->settings, PREF_ROTATE_BACKGROUND_COLOR, color_spec); + g_free (color_spec); } @@ -571,7 +550,6 @@ viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); viewer = gth_image_viewer_page_get_image_viewer (GTH_IMAGE_VIEWER_PAGE (viewer_page)); gth_image_viewer_set_tool (GTH_IMAGE_VIEWER (viewer), NULL); - gth_image_viewer_set_zoom_enabled (GTH_IMAGE_VIEWER (viewer), TRUE); gth_viewer_page_update_sensitivity (GTH_VIEWER_PAGE (viewer_page)); cairo_surface_destroy (self->priv->image); @@ -590,6 +568,19 @@ static void +gth_file_tool_rotate_cancel (GthFileTool *base) +{ + GthFileToolRotate *self = (GthFileToolRotate *) base; + GtkWidget *window; + GtkWidget *viewer_page; + + window = gth_file_tool_get_window (GTH_FILE_TOOL (self)); + viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); + gth_image_viewer_page_reset (GTH_IMAGE_VIEWER_PAGE (viewer_page)); +} + + +static void gth_file_tool_rotate_finalize (GObject *object) { GthFileToolRotate *self; @@ -622,6 +613,7 @@ file_tool_class = (GthFileToolClass *) klass; file_tool_class->update_sensitivity = gth_file_tool_rotate_update_sensitivity; file_tool_class->activate = gth_file_tool_rotate_activate; + file_tool_class->cancel = gth_file_tool_rotate_cancel; file_tool_class->get_options = gth_file_tool_rotate_get_options; file_tool_class->destroy_options = gth_file_tool_rotate_destroy_options; } diff -Nru gthumb-3.0.2/extensions/file_tools/gth-file-tool-sharpen.c gthumb-3.2.3/extensions/file_tools/gth-file-tool-sharpen.c --- gthumb-3.0.2/extensions/file_tools/gth-file-tool-sharpen.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/gth-file-tool-sharpen.c 2013-04-30 16:56:12.000000000 +0000 @@ -47,6 +47,7 @@ GthTask *pixbuf_task; guint apply_event; gboolean show_preview; + gboolean first_allocation; }; @@ -180,26 +181,6 @@ static void -cancel_button_clicked_cb (GtkButton *button, - GthFileToolSharpen *self) -{ - GtkWidget *window; - GtkWidget *viewer_page; - - if (self->priv->apply_event != 0) { - g_source_remove (self->priv->apply_event); - self->priv->apply_event = 0; - } - - window = gth_file_tool_get_window (GTH_FILE_TOOL (self)); - viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); - gth_image_viewer_page_reset (GTH_IMAGE_VIEWER_PAGE (viewer_page)); - - gth_file_tool_hide_options (GTH_FILE_TOOL (self)); -} - - -static void reset_button_clicked_cb (GtkButton *button, GthFileToolSharpen *self) { @@ -233,6 +214,9 @@ w = MIN (gtk_adjustment_get_page_size (preview->hadj), cairo_image_surface_get_width (self->priv->source)); h = MIN (gtk_adjustment_get_page_size (preview->vadj), cairo_image_surface_get_height (self->priv->source)); + if ((w < 0) || (h < 0)) + return FALSE; + cairo_surface_destroy (self->priv->destination); self->priv->destination = _cairo_image_surface_copy (self->priv->source); @@ -287,6 +271,21 @@ } +static void +preview_size_allocate_cb (GtkWidget *widget, + GdkRectangle *allocation, + gpointer user_data) +{ + GthFileToolSharpen *self = user_data; + + if (! self->priv->first_allocation) + return; + self->priv->first_allocation = FALSE; + + gth_image_viewer_scroll_to_center (GTH_IMAGE_VIEWER (self->priv->preview)); +} + + static GtkWidget * gth_file_tool_sharpen_get_options (GthFileTool *base) { @@ -313,6 +312,7 @@ return NULL; self->priv->destination = NULL; + self->priv->first_allocation = TRUE; self->priv->builder = _gtk_builder_new_from_file ("sharpen-options.ui", "file_tools"); options = _gtk_builder_get_widget (self->priv->builder, "options"); @@ -329,24 +329,27 @@ gtk_widget_show_all (image_navigator); gtk_box_pack_start (GTK_BOX (GET_WIDGET ("preview_hbox")), image_navigator, TRUE, TRUE, 0); - self->priv->amount_adj = gimp_scale_entry_new (GET_WIDGET ("amount_hbox"), - GTK_LABEL (GET_WIDGET ("amount_label")), - DEFAULT_AMOUNT, 0.0, 500.0, 1.0, 10.0, 0); - self->priv->radius_adj = gimp_scale_entry_new (GET_WIDGET ("radius_hbox"), - GTK_LABEL (GET_WIDGET ("radius_label")), - DEFAULT_RADIUS, 0.0, 10.0, 1.0, 1.0, 0); - self->priv->threshold_adj = gimp_scale_entry_new (GET_WIDGET ("threshold_hbox"), - GTK_LABEL (GET_WIDGET ("threshold_label")), - DEFAULT_THRESHOLD, 0.0, 255.0, 1.0, 10.0, 0); + self->priv->amount_adj = gth_color_scale_label_new (GET_WIDGET ("amount_hbox"), + GTK_LABEL (GET_WIDGET ("amount_label")), + GTH_COLOR_SCALE_DEFAULT, + DEFAULT_AMOUNT, 0.0, 500.0, 1.0, 1.0, "%.0f"); + self->priv->radius_adj = gth_color_scale_label_new (GET_WIDGET ("radius_hbox"), + GTK_LABEL (GET_WIDGET ("radius_label")), + GTH_COLOR_SCALE_DEFAULT, + DEFAULT_RADIUS, 0.0, 10.0, 1.0, 1.0, "%.0f"); + self->priv->threshold_adj = gth_color_scale_label_new (GET_WIDGET ("threshold_hbox"), + GTK_LABEL (GET_WIDGET ("threshold_label")), + GTH_COLOR_SCALE_DEFAULT, + DEFAULT_THRESHOLD, 0.0, 255.0, 1.0, 1.0, "%.0f"); g_signal_connect (GET_WIDGET ("ok_button"), "clicked", G_CALLBACK (ok_button_clicked_cb), self); - g_signal_connect (GET_WIDGET ("cancel_button"), - "clicked", - G_CALLBACK (cancel_button_clicked_cb), - self); + g_signal_connect_swapped (GET_WIDGET ("cancel_button"), + "clicked", + G_CALLBACK (gth_file_tool_cancel), + self); g_signal_connect (GET_WIDGET ("reset_button"), "clicked", G_CALLBACK (reset_button_clicked_cb), @@ -375,6 +378,10 @@ "clicked", G_CALLBACK (preview_checkbutton_toggled_cb), self); + g_signal_connect_after (self->priv->preview, + "size-allocate", + G_CALLBACK (preview_size_allocate_cb), + self); return options; } @@ -409,6 +416,24 @@ static void +gth_file_tool_sharpen_cancel (GthFileTool *base) +{ + GthFileToolSharpen *self = (GthFileToolSharpen *) base; + GtkWidget *window; + GtkWidget *viewer_page; + + if (self->priv->apply_event != 0) { + g_source_remove (self->priv->apply_event); + self->priv->apply_event = 0; + } + + window = gth_file_tool_get_window (GTH_FILE_TOOL (self)); + viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); + gth_image_viewer_page_reset (GTH_IMAGE_VIEWER_PAGE (viewer_page)); +} + + +static void gth_file_tool_sharpen_finalize (GObject *object) { GthFileToolSharpen *self; @@ -441,6 +466,7 @@ file_tool_class = (GthFileToolClass *) klass; file_tool_class->update_sensitivity = gth_file_tool_sharpen_update_sensitivity; file_tool_class->activate = gth_file_tool_sharpen_activate; + file_tool_class->cancel = gth_file_tool_sharpen_cancel; file_tool_class->get_options = gth_file_tool_sharpen_get_options; file_tool_class->destroy_options = gth_file_tool_sharpen_destroy_options; } diff -Nru gthumb-3.0.2/extensions/file_tools/gth-image-line-tool.c gthumb-3.2.3/extensions/file_tools/gth-image-line-tool.c --- gthumb-3.0.2/extensions/file_tools/gth-image-line-tool.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/gth-image-line-tool.c 2013-04-30 16:56:12.000000000 +0000 @@ -147,7 +147,7 @@ gtk_widget_get_allocation (GTK_WIDGET (self->priv->viewer), &allocation); max_size = MAX (allocation.width, allocation.height) / G_SQRT2 + 2; if (scale_keeping_ratio (&width, &height, max_size, max_size, FALSE)) - preview_image = _cairo_image_surface_scale_to (image, width, height, CAIRO_FILTER_BILINEAR); + preview_image = _cairo_image_surface_scale_bilinear (image, width, height); else preview_image = cairo_surface_reference (image); diff -Nru gthumb-3.0.2/extensions/file_tools/gth-image-rotator.c gthumb-3.2.3/extensions/file_tools/gth-image-rotator.c --- gthumb-3.0.2/extensions/file_tools/gth-image-rotator.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/gth-image-rotator.c 2013-04-30 16:56:12.000000000 +0000 @@ -63,7 +63,7 @@ GdkPoint center; double angle; - cairo_color_t background_color; + GdkRGBA background_color; gboolean enable_crop; cairo_rectangle_int_t crop_region; GthGridType grid_type; @@ -239,7 +239,7 @@ gtk_widget_get_allocation (GTK_WIDGET (self->priv->viewer), &allocation); max_size = MAX (allocation.width, allocation.height) / G_SQRT2 + 2; if (scale_keeping_ratio (&width, &height, max_size, max_size, FALSE)) - preview_image = _cairo_image_surface_scale_to (image, width, height, CAIRO_FILTER_BILINEAR); + preview_image = _cairo_image_surface_scale_bilinear (image, width, height); else preview_image = cairo_surface_reference (image); @@ -304,49 +304,61 @@ cairo_t *cr) { cairo_rectangle_int_t crop_region; + GtkAllocation allocation; cairo_save (cr); cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.5); - /* the crop_region is not zoomed the clip_area is already zoomed */ + gtk_widget_get_allocation (GTK_WIDGET (self->priv->viewer), &allocation); + + switch (self->priv->resize) { + case GTH_TRANSFORM_RESIZE_BOUNDING_BOX: + case GTH_TRANSFORM_RESIZE_CLIP: + crop_region = self->priv->clip_area; + break; - crop_region = self->priv->crop_region; - crop_region.x = crop_region.x * self->priv->preview_zoom; - crop_region.y = crop_region.y * self->priv->preview_zoom; - crop_region.width = crop_region.width * self->priv->preview_zoom; - crop_region.height = crop_region.height * self->priv->preview_zoom; + case GTH_TRANSFORM_RESIZE_CROP: + /* the crop_region is not zoomed the clip_area is already zoomed */ + cairo_scale (cr, self->priv->preview_zoom, self->priv->preview_zoom); + crop_region = self->priv->crop_region; + crop_region.x += self->priv->clip_area.x / self->priv->preview_zoom; + crop_region.y += self->priv->clip_area.y / self->priv->preview_zoom; + allocation.width /= self->priv->preview_zoom; + allocation.height /= self->priv->preview_zoom; + break; + } /* left side */ cairo_rectangle (cr, - self->priv->clip_area.x, - self->priv->clip_area.y, + 0, + 0, crop_region.x, - self->priv->clip_area.height); + allocation.height); /* right side */ cairo_rectangle (cr, - self->priv->clip_area.x + crop_region.x + crop_region.width, - self->priv->clip_area.y, - self->priv->clip_area.width - crop_region.x - crop_region.width, - self->priv->clip_area.height); + crop_region.x + crop_region.width, + 0, + allocation.width - crop_region.x - crop_region.width, + allocation.height); /* top */ cairo_rectangle (cr, - self->priv->clip_area.x, - self->priv->clip_area.y, - self->priv->clip_area.width, + crop_region.x, + 0, + crop_region.width, crop_region.y); /* bottom */ cairo_rectangle (cr, - self->priv->clip_area.x, - self->priv->clip_area.y + crop_region.y + crop_region.height, - self->priv->clip_area.width, - self->priv->clip_area.height - crop_region.y - crop_region.height); + crop_region.x, + crop_region.y + crop_region.height, + crop_region.width, + allocation.height - crop_region.y - crop_region.height); cairo_fill (cr); cairo_restore (cr); @@ -361,11 +373,20 @@ cairo_save (cr); - cairo_scale (cr, self->priv->preview_zoom, self->priv->preview_zoom); + switch (self->priv->resize) { + case GTH_TRANSFORM_RESIZE_BOUNDING_BOX: + case GTH_TRANSFORM_RESIZE_CLIP: + grid = self->priv->clip_area; + break; + + case GTH_TRANSFORM_RESIZE_CROP: + cairo_scale (cr, self->priv->preview_zoom, self->priv->preview_zoom); + grid = self->priv->crop_region; + grid.x += self->priv->clip_area.x / self->priv->preview_zoom; + grid.y += self->priv->clip_area.y / self->priv->preview_zoom; + break; + } - grid = self->priv->crop_region; - grid.x += self->priv->clip_area.x / self->priv->preview_zoom; - grid.y += self->priv->clip_area.y / self->priv->preview_zoom; _cairo_paint_grid (cr, &grid, self->priv->grid_type); cairo_restore (cr); @@ -379,11 +400,19 @@ { double radius = 10.0; + cairo_save (cr); + +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 9, 2) + cairo_set_operator (cr, CAIRO_OPERATOR_DIFFERENCE); +#endif + cairo_move_to (cr, p->x - radius, p->y - radius); cairo_line_to (cr, p->x + radius, p->y + radius); cairo_move_to (cr, p->x - radius, p->y + radius); cairo_line_to (cr, p->x + radius, p->y - radius); cairo_stroke (cr); + + cairo_restore (cr); } @@ -392,46 +421,38 @@ cairo_t *cr) { GthImageRotator *self = GTH_IMAGE_ROTATOR (base); - GtkStyleContext *style_context; - GdkRGBA color; GtkAllocation allocation; cairo_save (cr); /* background */ + /* + GtkStyleContext *style_context; + GdkRGBA color; style_context = gtk_widget_get_style_context (GTK_WIDGET (self->priv->viewer)); gtk_style_context_get_background_color (style_context, gtk_widget_get_state (GTK_WIDGET (self->priv->viewer)), &color); gdk_cairo_set_source_rgba (cr, &color); + */ + gtk_widget_get_allocation (GTK_WIDGET (self->priv->viewer), &allocation); cairo_rectangle (cr, 0, 0, allocation.width, allocation.height); + + cairo_set_source_rgba (cr, + self->priv->background_color.red, + self->priv->background_color.green, + self->priv->background_color.blue, + self->priv->background_color.alpha); cairo_fill (cr); if (self->priv->preview_image == NULL) return; - /* clip box */ - - cairo_rectangle (cr, - self->priv->clip_area.x, - self->priv->clip_area.y, - self->priv->clip_area.width, - self->priv->clip_area.height); - cairo_clip_preserve (cr); - cairo_set_source_rgba (cr, - self->priv->background_color.r, - self->priv->background_color.g, - self->priv->background_color.b, - self->priv->background_color.a); - cairo_fill (cr); - paint_image (self, cr); - if (self->priv->enable_crop) { - paint_darker_background (self, cr); - paint_grid (self, cr); - } + paint_darker_background (self, cr); + paint_grid (self, cr); if (self->priv->dragging) { GdkPoint center; @@ -564,13 +585,13 @@ angle1 = get_angle (¢er, &self->priv->drag_p1); angle2 = get_angle (¢er, &self->priv->drag_p2); - if (angle2 < angle1 - G_PI) - angle2 = G_2_PI + angle2; - if (angle2 > angle1 + G_PI) - angle2 = angle2 - G_2_PI; angle = self->priv->angle_before_dragging + (angle2 - angle1); + if (angle < - G_PI) + angle = G_2_PI + angle; + if (angle > + G_PI) + angle = angle - G_2_PI; - g_signal_emit (self, signals[ANGLE_CHANGED], 0, CLAMP (RAD_TO_DEG (angle), -90.0, 90)); + g_signal_emit (self, signals[ANGLE_CHANGED], 0, CLAMP (RAD_TO_DEG (angle), -180.0, 180)); } return FALSE; @@ -674,10 +695,10 @@ self->priv->preview_image = NULL; self->priv->grid_type = GTH_GRID_NONE; self->priv->resize = GTH_TRANSFORM_RESIZE_BOUNDING_BOX; - self->priv->background_color.r = 0.0; - self->priv->background_color.g = 0.0; - self->priv->background_color.b = 0.0; - self->priv->background_color.a = 1.0; + self->priv->background_color.red = 0.0; + self->priv->background_color.green = 0.0; + self->priv->background_color.blue = 0.0; + self->priv->background_color.alpha = 1.0; self->priv->enable_crop = FALSE; self->priv->crop_region.x = 0; self->priv->crop_region.y = 0; @@ -810,7 +831,7 @@ void gth_image_rotator_set_background (GthImageRotator *self, - cairo_color_t *color) + GdkRGBA *color) { self->priv->background_color = *color; @@ -823,7 +844,7 @@ void gth_image_rotator_get_background (GthImageRotator *self, - cairo_color_t *color) + GdkRGBA *color) { *color = self->priv->background_color; } @@ -865,7 +886,9 @@ self->priv->crop_region.height = clip_area.height; } - output = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, self->priv->crop_region.width, self->priv->crop_region.height); + output = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, + self->priv->crop_region.width, + self->priv->crop_region.height); /* set the device offset to make the clip area start from the top left * corner of the output image */ @@ -880,10 +903,10 @@ cairo_rectangle (cr, clip_area.x, clip_area.y, clip_area.width, clip_area.height); cairo_clip_preserve (cr); cairo_set_source_rgba (cr, - self->priv->background_color.r, - self->priv->background_color.g, - self->priv->background_color.b, - self->priv->background_color.a); + self->priv->background_color.red, + self->priv->background_color.green, + self->priv->background_color.blue, + self->priv->background_color.alpha); cairo_fill (cr); /* paint the rotated image */ diff -Nru gthumb-3.0.2/extensions/file_tools/gth-image-rotator.h gthumb-3.2.3/extensions/file_tools/gth-image-rotator.h --- gthumb-3.0.2/extensions/file_tools/gth-image-rotator.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/gth-image-rotator.h 2013-04-30 16:56:12.000000000 +0000 @@ -85,9 +85,9 @@ void gth_image_rotator_set_crop_region (GthImageRotator *self, cairo_rectangle_int_t *region); void gth_image_rotator_set_background (GthImageRotator *self, - cairo_color_t *color); + GdkRGBA *color); void gth_image_rotator_get_background (GthImageRotator *self, - cairo_color_t *color); + GdkRGBA *color); cairo_surface_t * gth_image_rotator_get_result (GthImageRotator *self, gboolean high_quality); diff -Nru gthumb-3.0.2/extensions/file_tools/gth-preview-tool.c gthumb-3.2.3/extensions/file_tools/gth-preview-tool.c --- gthumb-3.0.2/extensions/file_tools/gth-preview-tool.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/gth-preview-tool.c 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,354 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include +#include "gth-preview-tool.h" + + +static void gth_preview_tool_gth_image_tool_interface_init (GthImageViewerToolInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (GthPreviewTool, + gth_preview_tool, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (GTH_TYPE_IMAGE_VIEWER_TOOL, + gth_preview_tool_gth_image_tool_interface_init)) + + + +struct _GthPreviewToolPrivate { + GthImageViewer *viewer; + GthFit original_fit_mode; + gboolean original_zoom_enabled; + cairo_surface_t *preview_image; + cairo_rectangle_int_t preview_image_area; + GdkRGBA background_color; +}; + + +static void +gth_preview_tool_set_viewer (GthImageViewerTool *base, + GthImageViewer *viewer) +{ + GthPreviewTool *self = GTH_PREVIEW_TOOL (base); + GdkCursor *cursor; + + self->priv->viewer = viewer; + self->priv->original_fit_mode = gth_image_viewer_get_fit_mode (GTH_IMAGE_VIEWER (viewer)); + self->priv->original_zoom_enabled = gth_image_viewer_get_zoom_enabled (GTH_IMAGE_VIEWER (viewer)); + gth_image_viewer_set_fit_mode (GTH_IMAGE_VIEWER (viewer), GTH_FIT_SIZE_IF_LARGER); + gth_image_viewer_set_zoom_enabled (GTH_IMAGE_VIEWER (viewer), FALSE); + + cursor = gdk_cursor_new (GDK_LEFT_PTR); + gth_image_viewer_set_cursor (self->priv->viewer, cursor); + + g_object_unref (cursor); +} + + +static void +gth_preview_tool_unset_viewer (GthImageViewerTool *base, + GthImageViewer *viewer) +{ + GthPreviewTool *self = GTH_PREVIEW_TOOL (base); + + gth_image_viewer_set_fit_mode (GTH_IMAGE_VIEWER (viewer), self->priv->original_fit_mode); + gth_image_viewer_set_zoom_enabled (GTH_IMAGE_VIEWER (viewer), self->priv->original_zoom_enabled); + self->priv->viewer = NULL; +} + + +static void +gth_preview_tool_realize (GthImageViewerTool *base) +{ + /* void */ +} + + +static void +gth_preview_tool_unrealize (GthImageViewerTool *base) +{ + /* void */ +} + + +#if 0 + + +static void +update_preview_image (GthPreviewTool *self) +{ + cairo_surface_t *image; + int width; + int height; + GtkAllocation allocation; + int max_size; + + if (self->priv->preview_image != NULL) { + cairo_surface_destroy (self->priv->preview_image); + self->priv->preview_image = NULL; + } + + image = gth_image_viewer_get_current_image (GTH_IMAGE_VIEWER (self->priv->viewer)); + if (image == NULL) + return; + + width = cairo_image_surface_get_width (image); + height = cairo_image_surface_get_height (image); + gtk_widget_get_allocation (GTK_WIDGET (self->priv->viewer), &allocation); + max_size = MAX (allocation.width, allocation.height) / G_SQRT2 + 2; + if (scale_keeping_ratio (&width, &height, max_size, max_size, FALSE)) + self->priv->preview_image = _cairo_image_surface_scale_bilinear (image, width, height); + else + self->priv->preview_image = cairo_surface_reference (image); + + self->priv->preview_image_area.width = width; + self->priv->preview_image_area.height = height; + self->priv->preview_image_area.x = MAX ((allocation.width - self->priv->preview_image_area.width) / 2 - 0.5, 0); + self->priv->preview_image_area.y = MAX ((allocation.height - self->priv->preview_image_area.height) / 2 - 0.5, 0); +} + + +#endif + + +static void +update_preview_image_area (GthPreviewTool *self) +{ + int width; + int height; + GtkAllocation allocation; + + if ((self->priv->preview_image == NULL) || (self->priv->viewer == NULL)) + return; + + if (! gtk_widget_get_realized (GTK_WIDGET (self->priv->viewer))) + return; + + width = cairo_image_surface_get_width (self->priv->preview_image); + height = cairo_image_surface_get_height (self->priv->preview_image); + gtk_widget_get_allocation (GTK_WIDGET (self->priv->viewer), &allocation); + + self->priv->preview_image_area.width = width; + self->priv->preview_image_area.height = height; + self->priv->preview_image_area.x = MAX ((allocation.width - self->priv->preview_image_area.width) / 2 - 0.5, 0); + self->priv->preview_image_area.y = MAX ((allocation.height - self->priv->preview_image_area.height) / 2 - 0.5, 0); +} + + +static void +gth_preview_tool_size_allocate (GthImageViewerTool *base, + GtkAllocation *allocation) +{ + update_preview_image_area (GTH_PREVIEW_TOOL (base)); +} + + +static void +gth_preview_tool_map (GthImageViewerTool *base) +{ + /* void */ +} + + +static void +gth_preview_tool_unmap (GthImageViewerTool *base) +{ + /* void */ +} + + +static void +gth_preview_tool_draw (GthImageViewerTool *base, + cairo_t *cr) +{ + GthPreviewTool *self = GTH_PREVIEW_TOOL (base); + GtkAllocation allocation; + + /* background */ + + cairo_save (cr); + gtk_widget_get_allocation (GTK_WIDGET (self->priv->viewer), &allocation); + cairo_rectangle (cr, 0, 0, allocation.width, allocation.height); + + cairo_set_source_rgba (cr, + self->priv->background_color.red, + self->priv->background_color.green, + self->priv->background_color.blue, + self->priv->background_color.alpha); + cairo_fill (cr); + cairo_restore (cr); + + /* image */ + + cairo_save (cr); + + if (self->priv->preview_image != NULL) { + cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE); + cairo_set_source_surface (cr, self->priv->preview_image, + self->priv->preview_image_area.x, + self->priv->preview_image_area.y); + cairo_pattern_set_filter (cairo_get_source (cr), CAIRO_FILTER_FAST); + cairo_rectangle (cr, + self->priv->preview_image_area.x, + self->priv->preview_image_area.y, + self->priv->preview_image_area.width, + self->priv->preview_image_area.height); + cairo_fill (cr); + } + + cairo_restore (cr); +} + + +static gboolean +gth_preview_tool_button_release (GthImageViewerTool *base, + GdkEventButton *event) +{ + /* void */ + + return FALSE; +} + + +static gboolean +gth_preview_tool_button_press (GthImageViewerTool *base, + GdkEventButton *event) +{ + /* void */ + + return FALSE; +} + + +static gboolean +gth_preview_tool_motion_notify (GthImageViewerTool *base, + GdkEventMotion *event) +{ + /* void */ + + return FALSE; +} + + +static void +gth_preview_tool_image_changed (GthImageViewerTool *base) +{ + /* void */ +} + + +static void +gth_preview_tool_zoom_changed (GthImageViewerTool *base) +{ + /* void */ +} + + +static void +gth_preview_tool_finalize (GObject *object) +{ + GthPreviewTool *self; + + g_return_if_fail (object != NULL); + g_return_if_fail (GTH_IS_PREVIEW_TOOL (object)); + + self = (GthPreviewTool *) object; + cairo_surface_destroy (self->priv->preview_image); + + /* Chain up */ + G_OBJECT_CLASS (gth_preview_tool_parent_class)->finalize (object); +} + + +static void +gth_preview_tool_class_init (GthPreviewToolClass *class) +{ + GObjectClass *gobject_class; + + g_type_class_add_private (class, sizeof (GthPreviewToolPrivate)); + + gobject_class = (GObjectClass*) class; + gobject_class->finalize = gth_preview_tool_finalize; +} + + +static void +gth_preview_tool_gth_image_tool_interface_init (GthImageViewerToolInterface *iface) +{ + iface->set_viewer = gth_preview_tool_set_viewer; + iface->unset_viewer = gth_preview_tool_unset_viewer; + iface->realize = gth_preview_tool_realize; + iface->unrealize = gth_preview_tool_unrealize; + iface->size_allocate = gth_preview_tool_size_allocate; + iface->map = gth_preview_tool_map; + iface->unmap = gth_preview_tool_unmap; + iface->draw = gth_preview_tool_draw; + iface->button_press = gth_preview_tool_button_press; + iface->button_release = gth_preview_tool_button_release; + iface->motion_notify = gth_preview_tool_motion_notify; + iface->image_changed = gth_preview_tool_image_changed; + iface->zoom_changed = gth_preview_tool_zoom_changed; +} + + +static void +gth_preview_tool_init (GthPreviewTool *self) +{ + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_PREVIEW_TOOL, GthPreviewToolPrivate); + self->priv->preview_image = NULL; + self->priv->background_color.red = 0.2; + self->priv->background_color.green = 0.2; + self->priv->background_color.blue = 0.2; + self->priv->background_color.alpha = 1.0; +} + + +GthImageViewerTool * +gth_preview_tool_new (void) +{ + return GTH_IMAGE_VIEWER_TOOL ( g_object_new (GTH_TYPE_PREVIEW_TOOL, NULL)); +} + + +void +gth_preview_tool_set_image (GthPreviewTool *self, + cairo_surface_t *modified) +{ + _cairo_clear_surface (&self->priv->preview_image); + if (modified != NULL) { + self->priv->preview_image = cairo_surface_reference (modified); + update_preview_image_area (self); + } + + if (self->priv->viewer) + gtk_widget_queue_draw (GTK_WIDGET (self->priv->viewer)); +} + + +cairo_surface_t * +gth_preview_tool_get_image (GthPreviewTool *self) +{ + return self->priv->preview_image; +} diff -Nru gthumb-3.0.2/extensions/file_tools/gth-preview-tool.h gthumb-3.2.3/extensions/file_tools/gth-preview-tool.h --- gthumb-3.0.2/extensions/file_tools/gth-preview-tool.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/gth-preview-tool.h 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,61 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2011 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef GTH_PREVIEW_TOOL_H +#define GTH_PREVIEW_TOOL_H + +#include +#include +#include + +G_BEGIN_DECLS + +#define GTH_TYPE_PREVIEW_TOOL (gth_preview_tool_get_type ()) +#define GTH_PREVIEW_TOOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_PREVIEW_TOOL, GthPreviewTool)) +#define GTH_PREVIEW_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTH_TYPE_PREVIEW_TOOL, GthPreviewToolClass)) +#define GTH_IS_PREVIEW_TOOL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_PREVIEW_TOOL)) +#define GTH_IS_PREVIEW_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTH_TYPE_PREVIEW_TOOL)) +#define GTH_PREVIEW_TOOL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTH_TYPE_PREVIEW_TOOL, GthPreviewToolClass)) + +typedef struct _GthPreviewTool GthPreviewTool; +typedef struct _GthPreviewToolClass GthPreviewToolClass; +typedef struct _GthPreviewToolPrivate GthPreviewToolPrivate; + +struct _GthPreviewTool +{ + GObject __parent; + GthPreviewToolPrivate *priv; +}; + +struct _GthPreviewToolClass +{ + GObjectClass __parent_class; +}; + +GType gth_preview_tool_get_type (void); +GthImageViewerTool * gth_preview_tool_new (void); +void gth_preview_tool_set_image (GthPreviewTool *self, + cairo_surface_t *image); +cairo_surface_t * gth_preview_tool_get_image (GthPreviewTool *self); + +G_END_DECLS + +#endif /* GTH_PREVIEW_TOOL_H */ diff -Nru gthumb-3.0.2/extensions/file_tools/main.c gthumb-3.2.3/extensions/file_tools/main.c --- gthumb-3.0.2/extensions/file_tools/main.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/file_tools/main.c 2013-04-30 16:56:12.000000000 +0000 @@ -25,11 +25,11 @@ #include #include "callbacks.h" #include "gth-file-tool-adjust-colors.h" +#include "gth-file-tool-adjust-contrast.h" #include "gth-file-tool-crop.h" -#include "gth-file-tool-desaturate.h" -#include "gth-file-tool-enhance.h" #include "gth-file-tool-equalize.h" #include "gth-file-tool-flip.h" +#include "gth-file-tool-grayscale.h" #include "gth-file-tool-mirror.h" #include "gth-file-tool-negative.h" #include "gth-file-tool-redo.h" @@ -51,11 +51,11 @@ gth_main_register_type ("file-tools", GTH_TYPE_FILE_TOOL_UNDO); gth_main_register_type ("file-tools", GTH_TYPE_FILE_TOOL_REDO); - gth_main_register_type ("file-tools", GTH_TYPE_FILE_TOOL_ENHANCE); + gth_main_register_type ("file-tools", GTH_TYPE_FILE_TOOL_ADJUST_CONTRAST); gth_main_register_type ("file-tools", GTH_TYPE_FILE_TOOL_ADJUST_COLORS); gth_main_register_type ("file-tools", GTH_TYPE_FILE_TOOL_SHARPEN); gth_main_register_type ("file-tools", GTH_TYPE_FILE_TOOL_EQUALIZE); - gth_main_register_type ("file-tools", GTH_TYPE_FILE_TOOL_DESATURATE); + gth_main_register_type ("file-tools", GTH_TYPE_FILE_TOOL_GRAYSCALE); gth_main_register_type ("file-tools", GTH_TYPE_FILE_TOOL_NEGATIVE); gth_main_register_type ("file-tools", GTH_TYPE_FILE_TOOL_ROTATE_RIGHT); diff -Nru gthumb-3.0.2/extensions/file_viewer/Makefile.in gthumb-3.2.3/extensions/file_viewer/Makefile.in --- gthumb-3.0.2/extensions/file_viewer/Makefile.in 2012-08-20 19:54:13.000000000 +0000 +++ gthumb-3.2.3/extensions/file_viewer/Makefile.in 2013-07-10 13:33:46.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/file_viewer -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -151,6 +179,23 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(extensionini_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -183,9 +228,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -199,13 +242,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -234,7 +276,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -250,11 +295,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -271,7 +320,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -301,7 +349,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -408,6 +459,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -442,6 +494,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libfile_viewer.la: $(libfile_viewer_la_OBJECTS) $(libfile_viewer_la_DEPENDENCIES) $(EXTRA_libfile_viewer_la_DEPENDENCIES) $(AM_V_CCLD)$(libfile_viewer_la_LINK) -rpath $(extensiondir) $(libfile_viewer_la_OBJECTS) $(libfile_viewer_la_LIBADD) $(LIBS) @@ -459,14 +512,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -516,26 +569,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(extensioninidir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -547,15 +589,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -564,9 +602,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -724,21 +763,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ clean-extensionLTLIBRARIES clean-generic clean-libtool \ - cscopelist ctags distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-extensionLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-extensionLTLIBRARIES \ install-extensioniniDATA install-html install-html-am \ install-info install-info-am install-man install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-extensionLTLIBRARIES \ - uninstall-extensioniniDATA + tags tags-am uninstall uninstall-am \ + uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA @GTHUMB_EXTENSION_IN_RULE@ diff -Nru gthumb-3.0.2/extensions/find_duplicates/Makefile.in gthumb-3.2.3/extensions/find_duplicates/Makefile.in --- gthumb-3.0.2/extensions/find_duplicates/Makefile.in 2012-08-20 19:54:13.000000000 +0000 +++ gthumb-3.2.3/extensions/find_duplicates/Makefile.in 2013-07-10 13:33:46.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/find_duplicates -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -148,13 +176,14 @@ am__v_CCLD_1 = SOURCES = $(libfind_duplicates_la_SOURCES) DIST_SOURCES = $(libfind_duplicates_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -163,9 +192,29 @@ DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -224,9 +273,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -240,13 +287,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -275,7 +321,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -291,11 +340,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -312,7 +365,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -342,7 +394,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -458,6 +513,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -492,6 +548,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libfind_duplicates.la: $(libfind_duplicates_la_OBJECTS) $(libfind_duplicates_la_DEPENDENCIES) $(EXTRA_libfind_duplicates_la_DEPENDENCIES) $(AM_V_CCLD)$(libfind_duplicates_la_LINK) -rpath $(extensiondir) $(libfind_duplicates_la_OBJECTS) $(libfind_duplicates_la_LIBADD) $(LIBS) @@ -513,14 +570,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -604,14 +661,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -632,31 +688,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -672,12 +710,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -689,15 +722,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -706,9 +735,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -890,25 +920,23 @@ uninstall-am: uninstall-extensionLTLIBRARIES \ uninstall-extensioniniDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-extensionLTLIBRARIES \ - clean-generic clean-libtool cscopelist cscopelist-recursive \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extensionLTLIBRARIES \ - install-extensioniniDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-extensionLTLIBRARIES clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-extensionLTLIBRARIES install-extensioniniDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA diff -Nru gthumb-3.0.2/extensions/find_duplicates/data/Makefile.in gthumb-3.2.3/extensions/find_duplicates/data/Makefile.in --- gthumb-3.0.2/extensions/find_duplicates/data/Makefile.in 2012-08-20 19:54:13.000000000 +0000 +++ gthumb-3.2.3/extensions/find_duplicates/data/Makefile.in 2013-07-10 13:33:46.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/find_duplicates/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/find_duplicates/data/ui/Makefile.in gthumb-3.2.3/extensions/find_duplicates/data/ui/Makefile.in --- gthumb-3.0.2/extensions/find_duplicates/data/ui/Makefile.in 2012-08-20 19:54:13.000000000 +0000 +++ gthumb-3.2.3/extensions/find_duplicates/data/ui/Makefile.in 2013-07-10 13:33:46.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/find_duplicates/data/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -385,11 +419,9 @@ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -530,16 +562,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-uiDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-uiDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/find_duplicates/data/ui/find-duplicates-dialog.ui gthumb-3.2.3/extensions/find_duplicates/data/ui/find-duplicates-dialog.ui --- gthumb-3.0.2/extensions/find_duplicates/data/ui/find-duplicates-dialog.ui 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/find_duplicates/data/ui/find-duplicates-dialog.ui 2013-04-30 16:56:12.000000000 +0000 @@ -1,6 +1,6 @@ - + @@ -13,8 +13,15 @@ + + + + + + files_liststore + False 6 @@ -155,6 +162,7 @@ True False + 0.02 True @@ -222,10 +230,11 @@ False False - + True - False - 12 + True + vertical + 315 True @@ -284,9 +293,8 @@ - True - True - 0 + True + False @@ -355,14 +363,16 @@ True True - files_liststore + files_treemodelfilter + False True False + 1 - + - + autosize @@ -373,13 +383,11 @@ - - True - autosize + File + True True True - 2 @@ -389,13 +397,11 @@ - - True + autosize Last modified + True True - True - 4 @@ -405,12 +411,11 @@ - + True Position + True True - True - 3 @@ -515,9 +520,8 @@ - False - True - 1 + False + False diff -Nru gthumb-3.0.2/extensions/find_duplicates/dlg-find-duplicates.c gthumb-3.2.3/extensions/find_duplicates/dlg-find-duplicates.c --- gthumb-3.0.2/extensions/find_duplicates/dlg-find-duplicates.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/find_duplicates/dlg-find-duplicates.c 2013-07-03 09:34:13.000000000 +0000 @@ -108,9 +108,9 @@ file_chooser = _gtk_builder_get_widget (data->builder, "location_filechooserbutton"); if (GTH_IS_FILE_SOURCE_VFS (gth_browser_get_location_source (browser))) - gtk_file_chooser_set_current_folder_file (GTK_FILE_CHOOSER (file_chooser), gth_browser_get_location (browser), NULL); + gtk_file_chooser_set_file (GTK_FILE_CHOOSER (file_chooser), gth_browser_get_location (browser), NULL); else - gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (file_chooser), get_home_uri ()); + gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (file_chooser), get_home_uri ()); tests = gth_main_get_registered_objects_id (GTH_TYPE_TEST); general_filter = g_settings_get_string (settings, PREF_BROWSER_GENERAL_FILTER); diff -Nru gthumb-3.0.2/extensions/find_duplicates/gth-find-duplicates.c gthumb-3.2.3/extensions/find_duplicates/gth-find-duplicates.c --- gthumb-3.0.2/extensions/find_duplicates/gth-find-duplicates.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/find_duplicates/gth-find-duplicates.c 2013-04-30 16:56:12.000000000 +0000 @@ -32,6 +32,18 @@ #define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x))) #define BUFFER_SIZE 4096 #define SELECT_COMMAND_ID_DATA "delete-command-id" +#define PULSE_DELAY 50 + + +enum { + FILE_LIST_COLUMN_FILE = 0, + FILE_LIST_COLUMN_CHECKED, + FILE_LIST_COLUMN_FILENAME, + FILE_LIST_COLUMN_POSITION, + FILE_LIST_COLUMN_LAST_MODIFIED, + FILE_LIST_COLUMN_VISIBLE, + FILE_LIST_COLUMN_LAST_MODIFIED_TIME, +}; typedef enum { @@ -71,6 +83,7 @@ GString *attributes; GCancellable *cancellable; gboolean io_operation; + gboolean closing; GthFileSource *file_source; int n_duplicates; goffset duplicates_size; @@ -85,6 +98,7 @@ GInputStream *file_stream; GHashTable *duplicated; gulong folder_changed_id; + guint pulse_event_id; }; @@ -130,6 +144,8 @@ self = GTH_FIND_DUPLICATES (object); + if (self->priv->pulse_event_id != 0) + g_source_remove (self->priv->pulse_event_id); if (self->priv->folder_changed_id != 0) g_signal_handler_disconnect (gth_main_get_default_monitor (), self->priv->folder_changed_id); @@ -202,9 +218,13 @@ if (gtk_tree_model_get_iter_first (model, &iter)) { do { gboolean active; + gboolean visible; - gtk_tree_model_get (model, &iter, 1, &active, -1); - if (active) { + gtk_tree_model_get (model, &iter, + FILE_LIST_COLUMN_CHECKED, &active, + FILE_LIST_COLUMN_VISIBLE, &visible, + -1); + if (active && visible) { one_active = TRUE; break; } @@ -235,13 +255,15 @@ do { GthFileData *file_data; gboolean active; + gboolean visible; gtk_tree_model_get (model, &iter, - 0, &file_data, - 1, &active, + FILE_LIST_COLUMN_FILE, &file_data, + FILE_LIST_COLUMN_CHECKED, &active, + FILE_LIST_COLUMN_VISIBLE, &visible, -1); - if (active) { + if (active && visible) { n_files += 1; total_size += g_file_info_get_size (file_data->info); } @@ -279,6 +301,9 @@ } +#if 0 + + static void duplicates_list_view_selection_changed_cb (GthFileView *fileview, gpointer user_data) @@ -315,11 +340,11 @@ parent_name = NULL; gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("files_liststore")), &iter); gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("files_liststore")), &iter, - 0, file_data, - 1, TRUE, - 2, g_file_info_get_display_name (file_data->info), - 3, parent_name, - 4, g_file_info_get_attribute_string (file_data->info, "gth::file::display-mtime"), + FILE_LIST_COLUMN_FILE, file_data, + FILE_LIST_COLUMN_CHECKED, TRUE, + FILE_LIST_COLUMN_FILENAME, g_file_info_get_display_name (file_data->info), + FILE_LIST_COLUMN_POSITION, parent_name, + FILE_LIST_COLUMN_LAST_MODIFIED, g_file_info_get_attribute_string (file_data->info, "gth::file::display-mtime"), -1); g_free (parent_name); @@ -334,6 +359,104 @@ } +#endif + + +static void +duplicates_list_view_selection_changed_cb (GthFileView *fileview, + gpointer user_data) +{ + + GthFindDuplicates *self = user_data; + GList *file_data_list; + GHashTable *selected_files; + GtkTreeModel *files_treemodel; + GtkTreeIter iter; + GList *scan; + + selected_files = g_hash_table_new_full (g_file_hash, (GEqualFunc) g_file_equal, g_object_unref, NULL); + file_data_list = get_duplicates_file_data_list (self); + for (scan = file_data_list; scan; scan = scan->next) { + GthFileData *selected_file_data = (GthFileData *) scan->data; + const char *checksum; + DuplicatedData *d_data; + GList *scan_duplicated; + + checksum = g_file_info_get_attribute_string (selected_file_data->info, "find-duplicates::checksum"); + d_data = g_hash_table_lookup (self->priv->duplicated, checksum); + + g_return_if_fail (d_data != NULL); + + for (scan_duplicated = d_data->files; scan_duplicated; scan_duplicated = scan_duplicated->next) { + GthFileData *file_data = scan_duplicated->data; + g_hash_table_insert (selected_files, g_object_ref (file_data->file), GINT_TO_POINTER (1)); + } + } + + files_treemodel = GTK_TREE_MODEL (GET_WIDGET ("files_liststore")); + if (gtk_tree_model_get_iter_first (files_treemodel, &iter)) { + do { + GthFileData *file_data; + + gtk_tree_model_get (files_treemodel, &iter, + FILE_LIST_COLUMN_FILE, &file_data, + -1); + gtk_list_store_set (GTK_LIST_STORE (files_treemodel), &iter, + FILE_LIST_COLUMN_VISIBLE, (g_hash_table_lookup (selected_files, file_data->file) != NULL), + -1); + + g_object_unref (file_data); + } + while (gtk_tree_model_iter_next (files_treemodel, &iter)); + } + + update_file_list_sensitivity (self); + update_file_list_selection_info (self); + + _g_object_list_unref (file_data_list); + g_hash_table_unref (selected_files); +} + + +static void +files_tree_view_selection_changed_cb (GtkTreeSelection *tree_selection, + gpointer user_data) +{ + GthFindDuplicates *self = user_data; + GtkTreeModel *model; + GtkTreeIter iter; + GthFileData *file_data; + const char *checksum; + DuplicatedData *d_data; + + if (! gtk_tree_selection_get_selected (tree_selection, &model, &iter)) + return; + + gtk_tree_model_get (model, &iter, + FILE_LIST_COLUMN_FILE, &file_data, + -1); + + checksum = g_file_info_get_attribute_string (file_data->info, "find-duplicates::checksum"); + d_data = g_hash_table_lookup (self->priv->duplicated, checksum); + if (d_data != NULL) { + GtkWidget *duplicates_view; + int pos; + + duplicates_view = gth_file_list_get_view (GTH_FILE_LIST (self->priv->duplicates_list)); + pos = gth_file_store_get_pos (GTH_FILE_STORE (gth_file_view_get_model (GTH_FILE_VIEW (duplicates_view))), d_data->file_data->file); + if (pos >= 0) { + /* FIXME */ + /*g_signal_handlers_block_by_data (duplicates_view, self); + gth_file_selection_select (GTH_FILE_SELECTION (duplicates_view), pos);*/ + gth_file_view_scroll_to (GTH_FILE_VIEW (duplicates_view), pos, 0.5); + /*g_signal_handlers_unblock_by_data (duplicates_view, self);*/ + } + } + + g_object_unref (file_data); +} + + static void start_next_checksum (GthFindDuplicates *self); @@ -353,6 +476,39 @@ static void +_file_list_add_file (GthFindDuplicates *self, + GthFileData *file_data) +{ + GFile *parent; + char *parent_name; + GTimeVal timeval; + GtkTreeIter iter; + + parent = g_file_get_parent (file_data->file); + if (parent != NULL) + parent_name = g_file_get_parse_name (parent); + else + parent_name = NULL; + + g_file_info_get_modification_time (file_data->info, &timeval); + + gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("files_liststore")), &iter); + gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("files_liststore")), &iter, + FILE_LIST_COLUMN_FILE, file_data, + FILE_LIST_COLUMN_CHECKED, TRUE, + FILE_LIST_COLUMN_FILENAME, g_file_info_get_display_name (file_data->info), + FILE_LIST_COLUMN_POSITION, parent_name, + FILE_LIST_COLUMN_LAST_MODIFIED, g_file_info_get_attribute_string (file_data->info, "gth::file::display-mtime"), + FILE_LIST_COLUMN_VISIBLE, TRUE, + FILE_LIST_COLUMN_LAST_MODIFIED_TIME, timeval.tv_sec, + -1); + + g_free (parent_name); + g_object_unref (parent); +} + + +static void file_input_stream_read_ready_cb (GObject *source, GAsyncResult *result, gpointer user_data) @@ -361,7 +517,14 @@ GError *error = NULL; gssize buffer_size; + self->priv->io_operation = FALSE; + if (self->priv->closing) { + gtk_widget_destroy (GET_WIDGET ("find_duplicates_dialog")); + return; + } + buffer_size = g_input_stream_read_finish (G_INPUT_STREAM (source), result, &error); + if (buffer_size < 0) { start_next_checksum (self); return; @@ -401,10 +564,13 @@ g_free (text); singleton = g_list_append (NULL, d_data->file_data); - if (d_data->n_files == 2) + if (d_data->n_files == 2) { gth_file_list_add_files (GTH_FILE_LIST (self->priv->duplicates_list), singleton, -1); + _file_list_add_file (self, d_data->file_data); /* add the first one as well */ + } else gth_file_list_update_files (GTH_FILE_LIST (self->priv->duplicates_list), singleton); + _file_list_add_file (self, self->priv->current_file); g_list_free (singleton); self->priv->n_duplicates += 1; @@ -413,11 +579,14 @@ } duplicates_list_view_selection_changed_cb (NULL, self); + start_next_checksum (self); return; } + self->priv->io_operation = TRUE; + g_checksum_update (self->priv->checksum, self->priv->buffer, buffer_size); g_input_stream_read_async (self->priv->file_stream, self->priv->buffer, @@ -437,6 +606,12 @@ GthFindDuplicates *self = user_data; GError *error = NULL; + self->priv->io_operation = FALSE; + if (self->priv->closing) { + gtk_widget_destroy (GET_WIDGET ("find_duplicates_dialog")); + return; + } + if (self->priv->file_stream != NULL) g_object_unref (self->priv->file_stream); self->priv->file_stream = (GInputStream *) g_file_read_finish (G_FILE (source), result, &error); @@ -445,6 +620,7 @@ return; } + self->priv->io_operation = TRUE; g_input_stream_read_async (self->priv->file_stream, self->priv->buffer, BUFFER_SIZE, @@ -537,6 +713,7 @@ gtk_label_set_text (GTK_LABEL (GET_WIDGET ("search_details_label")), ""); gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (GET_WIDGET ("search_progressbar")), 1.0); gtk_widget_set_sensitive (GET_WIDGET ("stop_button"), FALSE); + duplicates_list_view_selection_changed_cb (NULL, self); return; } @@ -560,6 +737,7 @@ else g_checksum_reset (self->priv->checksum); + self->priv->io_operation = TRUE; g_file_read_async (self->priv->current_file->file, G_PRIORITY_DEFAULT, self->priv->cancellable, @@ -575,8 +753,15 @@ { GthFindDuplicates *self = user_data; + g_source_remove (self->priv->pulse_event_id); + self->priv->pulse_event_id = 0; self->priv->io_operation = FALSE; + if (self->priv->closing) { + gtk_widget_destroy (GET_WIDGET ("find_duplicates_dialog")); + return; + } + if ((error != NULL) && ! g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { _gtk_error_dialog_from_gerror_show (GTK_WINDOW (self->priv->browser), _("Could not perform the operation"), error); gtk_widget_destroy (GET_WIDGET ("find_duplicates_dialog")); @@ -624,6 +809,17 @@ } +gboolean +pulse_progressbar_cb (gpointer user_data) +{ + GthFindDuplicates *self = user_data; + + gtk_progress_bar_pulse (GTK_PROGRESS_BAR (GET_WIDGET ("search_progressbar"))); + + return TRUE; +} + + static void search_directory (GthFindDuplicates *self, GFile *directory) @@ -634,6 +830,7 @@ gtk_label_set_text (GTK_LABEL (GET_WIDGET ("progress_label")), _("Getting the file list")); gtk_label_set_text (GTK_LABEL (GET_WIDGET ("search_details_label")), ""); gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (GET_WIDGET ("search_progressbar")), 0.0); + self->priv->pulse_event_id = g_timeout_add (PULSE_DELAY, pulse_progressbar_cb, self); gth_file_source_for_each_child (self->priv->file_source, directory, @@ -655,6 +852,22 @@ static void +close_button_clicked_cb (GtkButton *button, + gpointer user_data) +{ + GthFindDuplicates *self = user_data; + + if (! self->priv->io_operation) { + gtk_widget_destroy (GET_WIDGET ("find_duplicates_dialog")); + } + else { + self->priv->closing = TRUE; + g_cancellable_cancel (self->priv->cancellable); + } +} + + +static void help_button_clicked_cb (GtkButton *button, gpointer user_data) { @@ -671,27 +884,86 @@ { GthFindDuplicates *self = user_data; GtkTreeModel *model; - GtkTreePath *tree_path; + GtkTreePath *filter_path; + GtkTreePath *child_path; GtkTreeIter iter; gboolean active; model = GTK_TREE_MODEL (GET_WIDGET ("files_liststore")); - tree_path = gtk_tree_path_new_from_string (path); - if (! gtk_tree_model_get_iter (model, &iter, tree_path)) { - gtk_tree_path_free (tree_path); + filter_path = gtk_tree_path_new_from_string (path); + child_path = gtk_tree_model_filter_convert_path_to_child_path (GTK_TREE_MODEL_FILTER (GET_WIDGET ("files_treemodelfilter")), filter_path); + if (! gtk_tree_model_get_iter (model, &iter, child_path)) { + gtk_tree_path_free (child_path); + gtk_tree_path_free (filter_path); return; } - gtk_tree_model_get (model, &iter, 1, &active, -1); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, 1, ! active, -1); + gtk_tree_model_get (model, &iter, FILE_LIST_COLUMN_CHECKED, &active, -1); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, FILE_LIST_COLUMN_CHECKED, ! active, -1); update_file_list_sensitivity (self); update_file_list_selection_info (self); - gtk_tree_path_free (tree_path); + gtk_tree_path_free (child_path); + gtk_tree_path_free (filter_path); } +static void +_file_list_set_sort_column_id (GthFindDuplicates *self, + GtkTreeViewColumn *treeviewcolumn, + int column) +{ + int old_column; + GtkSortType order; + GList *columns; + GList *scan; + + gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (GET_WIDGET ("files_liststore")), &old_column, &order); + if (column == old_column) + order = (order == GTK_SORT_ASCENDING) ? GTK_SORT_DESCENDING : GTK_SORT_ASCENDING; + else + order = GTK_SORT_ASCENDING; + + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (GET_WIDGET ("files_liststore")), column, order); + + columns = gtk_tree_view_get_columns (GTK_TREE_VIEW (GET_WIDGET ("files_treeview"))); + for (scan = columns; scan; scan = scan->next) { + GtkTreeViewColumn *c = scan->data; + gtk_tree_view_column_set_sort_indicator (c, c == treeviewcolumn); + } + g_list_free (columns); + + gtk_tree_view_column_set_sort_order (treeviewcolumn, order); +} + + +static void +file_treeviewcolumn_clicked_cb (GtkTreeViewColumn *treeviewcolumn, + gpointer user_data) +{ + GthFindDuplicates *self = user_data; + _file_list_set_sort_column_id (self, treeviewcolumn, FILE_LIST_COLUMN_FILENAME); +} + + +static void +modified_treeviewcolumn_clicked_cb (GtkTreeViewColumn *treeviewcolumn, + gpointer user_data) +{ + GthFindDuplicates *self = user_data; + _file_list_set_sort_column_id (self, treeviewcolumn, FILE_LIST_COLUMN_LAST_MODIFIED_TIME); +} + + +static void +position_treeviewcolumn_clicked_cb (GtkTreeViewColumn *treeviewcolumn, + gpointer user_data) +{ + GthFindDuplicates *self = user_data; + _file_list_set_sort_column_id (self, treeviewcolumn, FILE_LIST_COLUMN_POSITION); +} + static GList * get_selected_files (GthFindDuplicates *self) { @@ -707,13 +979,17 @@ do { GthFileData *file_data; gboolean active; + gboolean visible; gtk_tree_model_get (model, &iter, - 0, &file_data, - 1, &active, + FILE_LIST_COLUMN_FILE, &file_data, + FILE_LIST_COLUMN_CHECKED, &active, + FILE_LIST_COLUMN_VISIBLE, &visible, -1); - if (active) + if (active && visible) list = g_list_prepend (list, g_object_ref (file_data)); + + g_object_unref (file_data); } while (gtk_tree_model_iter_next (model, &iter)); @@ -827,15 +1103,24 @@ if (gtk_tree_model_get_iter_first (model, &iter)) { do { GthFileData *file_data; + gboolean visible; const char *checksum; GthFileData *newest_file; gboolean active; - gtk_tree_model_get (model, &iter, 0, &file_data, -1); - checksum = g_file_info_get_attribute_string (file_data->info, "find-duplicates::checksum"); - newest_file = g_hash_table_lookup (newest_files, checksum); - active = ((newest_file == NULL) || ! g_file_equal (newest_file->file, file_data->file)); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, 1, active, -1); + gtk_tree_model_get (model, &iter, + FILE_LIST_COLUMN_FILE, &file_data, + FILE_LIST_COLUMN_VISIBLE, &visible, + -1); + + if (visible) { + checksum = g_file_info_get_attribute_string (file_data->info, "find-duplicates::checksum"); + newest_file = g_hash_table_lookup (newest_files, checksum); + active = ((newest_file == NULL) || ! g_file_equal (newest_file->file, file_data->file)); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, + FILE_LIST_COLUMN_CHECKED, active, + -1); + } g_object_unref (file_data); } @@ -864,7 +1149,15 @@ case SELECT_NONE: if (gtk_tree_model_get_iter_first (model, &iter)) { do { - gtk_list_store_set (GTK_LIST_STORE (model), &iter, 1, (id == SELECT_ALL), -1); + gboolean visible; + + gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, + FILE_LIST_COLUMN_VISIBLE, &visible, + -1); + if (visible) + gtk_list_store_set (GTK_LIST_STORE (model), &iter, + FILE_LIST_COLUMN_CHECKED, (id == SELECT_ALL), + -1); } while (gtk_tree_model_iter_next (model, &iter)); } @@ -882,16 +1175,22 @@ if (gtk_tree_model_get_iter_first (model, &iter)) { do { GthFileData *file_data; + gboolean visible; GFile *folder; - gtk_tree_model_get (model, &iter, 0, &file_data, -1); + gtk_tree_model_get (model, &iter, + FILE_LIST_COLUMN_FILE, &file_data, + FILE_LIST_COLUMN_VISIBLE, &visible, + -1); + + if (visible) { + folder = g_file_get_parent (file_data->file); + if (folder != NULL) { + if (g_hash_table_lookup (folders_table, folder) == NULL) + g_hash_table_insert (folders_table, g_object_ref (folder), GINT_TO_POINTER (1)); - folder = g_file_get_parent (file_data->file); - if (folder != NULL) { - if (g_hash_table_lookup (folders_table, folder) == NULL) - g_hash_table_insert (folders_table, g_object_ref (folder), GINT_TO_POINTER (1)); - - g_object_unref (folder); + g_object_unref (folder); + } } g_object_unref (file_data); @@ -919,15 +1218,23 @@ if (gtk_tree_model_get_iter_first (model, &iter)) { do { GthFileData *file_data; - GFile *parent; - gboolean active; + gboolean visible; + + gtk_tree_model_get (model, &iter, + FILE_LIST_COLUMN_FILE, &file_data, + FILE_LIST_COLUMN_VISIBLE, &visible, + -1); + if (visible) { + GFile *parent; + gboolean active; + + parent = g_file_get_parent (file_data->file); + active = (parent != NULL) && g_hash_table_lookup (selected_folders, parent) != NULL; + gtk_list_store_set (GTK_LIST_STORE (model), &iter, 1, active, -1); - gtk_tree_model_get (model, &iter, 0, &file_data, -1); - parent = g_file_get_parent (file_data->file); - active = (parent != NULL) && g_hash_table_lookup (selected_folders, parent) != NULL; - gtk_list_store_set (GTK_LIST_STORE (model), &iter, 1, active, -1); + _g_object_unref (parent); + } - _g_object_unref (parent); g_object_unref (file_data); } while (gtk_tree_model_iter_next (model, &iter)); @@ -985,7 +1292,9 @@ } self->priv->builder = _gtk_builder_new_from_file ("find-duplicates-dialog.ui", "find_duplicates"); - self->priv->duplicates_list = gth_file_list_new (gth_grid_view_new (), GTH_FILE_LIST_TYPE_NORMAL, FALSE); + self->priv->duplicates_list = gth_file_list_new (gth_grid_view_new (), GTH_FILE_LIST_MODE_NORMAL, FALSE); + gtk_tree_model_filter_set_visible_column (GTK_TREE_MODEL_FILTER (GET_WIDGET ("files_treemodelfilter")), FILE_LIST_COLUMN_VISIBLE); + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (GET_WIDGET ("files_liststore")), FILE_LIST_COLUMN_FILENAME, GTK_SORT_ASCENDING); gth_file_selection_set_selection_mode (GTH_FILE_SELECTION (gth_file_list_get_view (GTH_FILE_LIST (self->priv->duplicates_list))), GTK_SELECTION_MULTIPLE); gth_file_list_set_caption (GTH_FILE_LIST (self->priv->duplicates_list), "find-duplicates::n-duplicates,gth::file::display-size"); gth_file_list_set_thumb_size (GTH_FILE_LIST (self->priv->duplicates_list), 112); @@ -1021,10 +1330,10 @@ "destroy", G_CALLBACK (find_duplicates_dialog_destroy_cb), self); - g_signal_connect_swapped (GET_WIDGET ("close_button"), - "clicked", - G_CALLBACK (gtk_widget_destroy), - GET_WIDGET ("find_duplicates_dialog")); + g_signal_connect (GET_WIDGET ("close_button"), + "clicked", + G_CALLBACK (close_button_clicked_cb), + self); g_signal_connect_swapped (GET_WIDGET ("stop_button"), "clicked", G_CALLBACK (g_cancellable_cancel), @@ -1037,10 +1346,26 @@ "file-selection-changed", G_CALLBACK (duplicates_list_view_selection_changed_cb), self); + g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (GET_WIDGET ("files_treeview"))), + "changed", + G_CALLBACK (files_tree_view_selection_changed_cb), + self); g_signal_connect (GET_WIDGET ("file_cellrenderertoggle"), "toggled", G_CALLBACK (file_cellrenderertoggle_toggled_cb), self); + g_signal_connect (GET_WIDGET ("file_treeviewcolumn"), + "clicked", + G_CALLBACK (file_treeviewcolumn_clicked_cb), + self); + g_signal_connect (GET_WIDGET ("modified_treeviewcolumn"), + "clicked", + G_CALLBACK (modified_treeviewcolumn_clicked_cb), + self); + g_signal_connect (GET_WIDGET ("position_treeviewcolumn"), + "clicked", + G_CALLBACK (position_treeviewcolumn_clicked_cb), + self); g_signal_connect (GET_WIDGET ("view_button"), "clicked", G_CALLBACK (view_button_clicked_cb), diff -Nru gthumb-3.0.2/extensions/flicker/Makefile.am gthumb-3.2.3/extensions/flicker/Makefile.am --- gthumb-3.0.2/extensions/flicker/Makefile.am 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker/Makefile.am 2013-04-30 16:56:12.000000000 +0000 @@ -10,9 +10,9 @@ callbacks.h \ main.c -libflicker_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(GNOME_KEYRING_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb +libflicker_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(LIBSECRET_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb libflicker_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -libflicker_la_LIBADD = $(GTHUMB_LIBS) $(LIBSOUP_LIBS) $(GNOME_KEYRING_LIBS) ../importer/libimporter.la ../export_tools/libexport_tools.la ../flicker_utils/libflicker_utils.la +libflicker_la_LIBADD = $(GTHUMB_LIBS) $(LIBSOUP_LIBS) $(LIBSECRET_LIBS) ../importer/libimporter.la ../export_tools/libexport_tools.la ../flicker_utils/libflicker_utils.la libflicker_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) extensioninidir = $(extensiondir) diff -Nru gthumb-3.0.2/extensions/flicker/Makefile.in gthumb-3.2.3/extensions/flicker/Makefile.in --- gthumb-3.0.2/extensions/flicker/Makefile.in 2012-08-20 19:54:13.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker/Makefile.in 2013-07-10 13:33:46.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/flicker -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -155,6 +183,23 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(extensionini_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -187,9 +232,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -203,13 +246,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -238,7 +280,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -254,11 +299,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -275,7 +324,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -305,7 +353,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -371,9 +422,9 @@ @ENABLE_WEB_SERVICES_TRUE@ callbacks.h \ @ENABLE_WEB_SERVICES_TRUE@ main.c -@ENABLE_WEB_SERVICES_TRUE@libflicker_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(GNOME_KEYRING_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb +@ENABLE_WEB_SERVICES_TRUE@libflicker_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(LIBSECRET_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb @ENABLE_WEB_SERVICES_TRUE@libflicker_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -@ENABLE_WEB_SERVICES_TRUE@libflicker_la_LIBADD = $(GTHUMB_LIBS) $(LIBSOUP_LIBS) $(GNOME_KEYRING_LIBS) ../importer/libimporter.la ../export_tools/libexport_tools.la ../flicker_utils/libflicker_utils.la +@ENABLE_WEB_SERVICES_TRUE@libflicker_la_LIBADD = $(GTHUMB_LIBS) $(LIBSOUP_LIBS) $(LIBSECRET_LIBS) ../importer/libimporter.la ../export_tools/libexport_tools.la ../flicker_utils/libflicker_utils.la @ENABLE_WEB_SERVICES_TRUE@libflicker_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) @ENABLE_WEB_SERVICES_TRUE@extensioninidir = $(extensiondir) @ENABLE_WEB_SERVICES_TRUE@extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension) @@ -414,6 +465,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -448,6 +500,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libflicker.la: $(libflicker_la_OBJECTS) $(libflicker_la_DEPENDENCIES) $(EXTRA_libflicker_la_DEPENDENCIES) $(AM_V_CCLD)$(libflicker_la_LINK) $(am_libflicker_la_rpath) $(libflicker_la_OBJECTS) $(libflicker_la_LIBADD) $(LIBS) @@ -466,14 +519,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -530,26 +583,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(extensioninidir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -561,15 +603,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -578,9 +616,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -738,21 +777,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ clean-extensionLTLIBRARIES clean-generic clean-libtool \ - cscopelist ctags distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-extensionLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-extensionLTLIBRARIES \ install-extensioniniDATA install-html install-html-am \ install-info install-info-am install-man install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-extensionLTLIBRARIES \ - uninstall-extensioniniDATA + tags tags-am uninstall uninstall-am \ + uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA @GTHUMB_EXTENSION_IN_RULE@ diff -Nru gthumb-3.0.2/extensions/flicker/actions.c gthumb-3.2.3/extensions/flicker/actions.c --- gthumb-3.0.2/extensions/flicker/actions.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker/actions.c 2013-04-30 16:56:12.000000000 +0000 @@ -30,14 +30,21 @@ static FlickrServer www_flickr_com = { "Flickr", + "flickr", "http://www.flickr.com", - "http://www.flickr.com/services/auth/", - "http://api.flickr.com/services/rest", - "http://api.flickr.com/services/upload/", - "static.flickr.com", + "http", + + "http://www.flickr.com/services/oauth/request_token", + "http://www.flickr.com/services/oauth/authorize", + "http://www.flickr.com/services/oauth/access_token", "8960706ee7f4151e893b11837e9c24ce", "1ff8d1e45c873423", - FALSE + + "http://api.flickr.com/services/rest", + "http://api.flickr.com/services/upload", + "static.flickr.com", + FALSE, + TRUE }; diff -Nru gthumb-3.0.2/extensions/flicker_utils/Makefile.am gthumb-3.2.3/extensions/flicker_utils/Makefile.am --- gthumb-3.0.2/extensions/flicker_utils/Makefile.am 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/Makefile.am 2013-04-30 16:56:12.000000000 +0000 @@ -12,14 +12,8 @@ dlg-import-from-flickr.h \ flickr-account.c \ flickr-account.h \ - flickr-account-chooser-dialog.c \ - flickr-account-chooser-dialog.h \ - flickr-account-manager-dialog.c \ - flickr-account-manager-dialog.h \ - flickr-authentication.c \ - flickr-authentication.h \ - flickr-connection.c \ - flickr-connection.h \ + flickr-consumer.c \ + flickr-consumer.h \ flickr-photo.c \ flickr-photo.h \ flickr-photoset.c \ @@ -27,13 +21,12 @@ flickr-service.c \ flickr-service.h \ flickr-types.h \ - flickr-user.c \ - flickr-user.h \ - main.c + main.c \ + preferences.h -libflicker_utils_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(GNOME_KEYRING_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb +libflicker_utils_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(LIBSECRET_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb libflicker_utils_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -libflicker_utils_la_LIBADD = $(GTHUMB_LIBS) $(LIBSOUP_LIBS) $(GNOME_KEYRING_LIBS) ../importer/libimporter.la ../export_tools/libexport_tools.la +libflicker_utils_la_LIBADD = $(GTHUMB_LIBS) $(LIBSOUP_LIBS) $(LIBSECRET_LIBS) ../importer/libimporter.la ../export_tools/libexport_tools.la ../oauth/liboauth.la libflicker_utils_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) extensioninidir = $(extensiondir) diff -Nru gthumb-3.0.2/extensions/flicker_utils/Makefile.in gthumb-3.2.3/extensions/flicker_utils/Makefile.in --- gthumb-3.0.2/extensions/flicker_utils/Makefile.in 2012-08-20 19:54:14.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/Makefile.in 2013-07-10 13:33:46.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/flicker_utils -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -100,26 +128,17 @@ am__libflicker_utils_la_SOURCES_DIST = dlg-export-to-flickr.c \ dlg-export-to-flickr.h dlg-import-from-flickr.c \ dlg-import-from-flickr.h flickr-account.c flickr-account.h \ - flickr-account-chooser-dialog.c \ - flickr-account-chooser-dialog.h \ - flickr-account-manager-dialog.c \ - flickr-account-manager-dialog.h flickr-authentication.c \ - flickr-authentication.h flickr-connection.c \ - flickr-connection.h flickr-photo.c flickr-photo.h \ - flickr-photoset.c flickr-photoset.h flickr-service.c \ - flickr-service.h flickr-types.h flickr-user.c flickr-user.h \ - main.c + flickr-consumer.c flickr-consumer.h flickr-photo.c \ + flickr-photo.h flickr-photoset.c flickr-photoset.h \ + flickr-service.c flickr-service.h flickr-types.h main.c \ + preferences.h @ENABLE_WEB_SERVICES_TRUE@am_libflicker_utils_la_OBJECTS = libflicker_utils_la-dlg-export-to-flickr.lo \ @ENABLE_WEB_SERVICES_TRUE@ libflicker_utils_la-dlg-import-from-flickr.lo \ @ENABLE_WEB_SERVICES_TRUE@ libflicker_utils_la-flickr-account.lo \ -@ENABLE_WEB_SERVICES_TRUE@ libflicker_utils_la-flickr-account-chooser-dialog.lo \ -@ENABLE_WEB_SERVICES_TRUE@ libflicker_utils_la-flickr-account-manager-dialog.lo \ -@ENABLE_WEB_SERVICES_TRUE@ libflicker_utils_la-flickr-authentication.lo \ -@ENABLE_WEB_SERVICES_TRUE@ libflicker_utils_la-flickr-connection.lo \ +@ENABLE_WEB_SERVICES_TRUE@ libflicker_utils_la-flickr-consumer.lo \ @ENABLE_WEB_SERVICES_TRUE@ libflicker_utils_la-flickr-photo.lo \ @ENABLE_WEB_SERVICES_TRUE@ libflicker_utils_la-flickr-photoset.lo \ @ENABLE_WEB_SERVICES_TRUE@ libflicker_utils_la-flickr-service.lo \ -@ENABLE_WEB_SERVICES_TRUE@ libflicker_utils_la-flickr-user.lo \ @ENABLE_WEB_SERVICES_TRUE@ libflicker_utils_la-main.lo libflicker_utils_la_OBJECTS = $(am_libflicker_utils_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) @@ -168,13 +187,14 @@ am__v_CCLD_1 = SOURCES = $(libflicker_utils_la_SOURCES) DIST_SOURCES = $(am__libflicker_utils_la_SOURCES_DIST) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -183,9 +203,29 @@ DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = data @@ -244,9 +284,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -260,13 +298,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -295,7 +332,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -311,11 +351,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -332,7 +376,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -362,7 +405,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -429,14 +475,8 @@ @ENABLE_WEB_SERVICES_TRUE@ dlg-import-from-flickr.h \ @ENABLE_WEB_SERVICES_TRUE@ flickr-account.c \ @ENABLE_WEB_SERVICES_TRUE@ flickr-account.h \ -@ENABLE_WEB_SERVICES_TRUE@ flickr-account-chooser-dialog.c \ -@ENABLE_WEB_SERVICES_TRUE@ flickr-account-chooser-dialog.h \ -@ENABLE_WEB_SERVICES_TRUE@ flickr-account-manager-dialog.c \ -@ENABLE_WEB_SERVICES_TRUE@ flickr-account-manager-dialog.h \ -@ENABLE_WEB_SERVICES_TRUE@ flickr-authentication.c \ -@ENABLE_WEB_SERVICES_TRUE@ flickr-authentication.h \ -@ENABLE_WEB_SERVICES_TRUE@ flickr-connection.c \ -@ENABLE_WEB_SERVICES_TRUE@ flickr-connection.h \ +@ENABLE_WEB_SERVICES_TRUE@ flickr-consumer.c \ +@ENABLE_WEB_SERVICES_TRUE@ flickr-consumer.h \ @ENABLE_WEB_SERVICES_TRUE@ flickr-photo.c \ @ENABLE_WEB_SERVICES_TRUE@ flickr-photo.h \ @ENABLE_WEB_SERVICES_TRUE@ flickr-photoset.c \ @@ -444,13 +484,12 @@ @ENABLE_WEB_SERVICES_TRUE@ flickr-service.c \ @ENABLE_WEB_SERVICES_TRUE@ flickr-service.h \ @ENABLE_WEB_SERVICES_TRUE@ flickr-types.h \ -@ENABLE_WEB_SERVICES_TRUE@ flickr-user.c \ -@ENABLE_WEB_SERVICES_TRUE@ flickr-user.h \ -@ENABLE_WEB_SERVICES_TRUE@ main.c +@ENABLE_WEB_SERVICES_TRUE@ main.c \ +@ENABLE_WEB_SERVICES_TRUE@ preferences.h -@ENABLE_WEB_SERVICES_TRUE@libflicker_utils_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(GNOME_KEYRING_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb +@ENABLE_WEB_SERVICES_TRUE@libflicker_utils_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(LIBSECRET_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb @ENABLE_WEB_SERVICES_TRUE@libflicker_utils_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -@ENABLE_WEB_SERVICES_TRUE@libflicker_utils_la_LIBADD = $(GTHUMB_LIBS) $(LIBSOUP_LIBS) $(GNOME_KEYRING_LIBS) ../importer/libimporter.la ../export_tools/libexport_tools.la +@ENABLE_WEB_SERVICES_TRUE@libflicker_utils_la_LIBADD = $(GTHUMB_LIBS) $(LIBSOUP_LIBS) $(LIBSECRET_LIBS) ../importer/libimporter.la ../export_tools/libexport_tools.la ../oauth/liboauth.la @ENABLE_WEB_SERVICES_TRUE@libflicker_utils_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) @ENABLE_WEB_SERVICES_TRUE@extensioninidir = $(extensiondir) @ENABLE_WEB_SERVICES_TRUE@extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension) @@ -491,6 +530,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -525,6 +565,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libflicker_utils.la: $(libflicker_utils_la_OBJECTS) $(libflicker_utils_la_DEPENDENCIES) $(EXTRA_libflicker_utils_la_DEPENDENCIES) $(AM_V_CCLD)$(libflicker_utils_la_LINK) $(am_libflicker_utils_la_rpath) $(libflicker_utils_la_OBJECTS) $(libflicker_utils_la_LIBADD) $(LIBS) @@ -536,15 +577,11 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libflicker_utils_la-dlg-export-to-flickr.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libflicker_utils_la-dlg-import-from-flickr.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libflicker_utils_la-flickr-account-chooser-dialog.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libflicker_utils_la-flickr-account-manager-dialog.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libflicker_utils_la-flickr-account.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libflicker_utils_la-flickr-authentication.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libflicker_utils_la-flickr-connection.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libflicker_utils_la-flickr-consumer.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libflicker_utils_la-flickr-photo.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libflicker_utils_la-flickr-photoset.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libflicker_utils_la-flickr-service.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libflicker_utils_la-flickr-user.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libflicker_utils_la-main.Plo@am__quote@ .c.o: @@ -552,14 +589,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -589,33 +626,12 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libflicker_utils_la_CFLAGS) $(CFLAGS) -c -o libflicker_utils_la-flickr-account.lo `test -f 'flickr-account.c' || echo '$(srcdir)/'`flickr-account.c -libflicker_utils_la-flickr-account-chooser-dialog.lo: flickr-account-chooser-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libflicker_utils_la_CFLAGS) $(CFLAGS) -MT libflicker_utils_la-flickr-account-chooser-dialog.lo -MD -MP -MF $(DEPDIR)/libflicker_utils_la-flickr-account-chooser-dialog.Tpo -c -o libflicker_utils_la-flickr-account-chooser-dialog.lo `test -f 'flickr-account-chooser-dialog.c' || echo '$(srcdir)/'`flickr-account-chooser-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libflicker_utils_la-flickr-account-chooser-dialog.Tpo $(DEPDIR)/libflicker_utils_la-flickr-account-chooser-dialog.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='flickr-account-chooser-dialog.c' object='libflicker_utils_la-flickr-account-chooser-dialog.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libflicker_utils_la_CFLAGS) $(CFLAGS) -c -o libflicker_utils_la-flickr-account-chooser-dialog.lo `test -f 'flickr-account-chooser-dialog.c' || echo '$(srcdir)/'`flickr-account-chooser-dialog.c - -libflicker_utils_la-flickr-account-manager-dialog.lo: flickr-account-manager-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libflicker_utils_la_CFLAGS) $(CFLAGS) -MT libflicker_utils_la-flickr-account-manager-dialog.lo -MD -MP -MF $(DEPDIR)/libflicker_utils_la-flickr-account-manager-dialog.Tpo -c -o libflicker_utils_la-flickr-account-manager-dialog.lo `test -f 'flickr-account-manager-dialog.c' || echo '$(srcdir)/'`flickr-account-manager-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libflicker_utils_la-flickr-account-manager-dialog.Tpo $(DEPDIR)/libflicker_utils_la-flickr-account-manager-dialog.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='flickr-account-manager-dialog.c' object='libflicker_utils_la-flickr-account-manager-dialog.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libflicker_utils_la_CFLAGS) $(CFLAGS) -c -o libflicker_utils_la-flickr-account-manager-dialog.lo `test -f 'flickr-account-manager-dialog.c' || echo '$(srcdir)/'`flickr-account-manager-dialog.c - -libflicker_utils_la-flickr-authentication.lo: flickr-authentication.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libflicker_utils_la_CFLAGS) $(CFLAGS) -MT libflicker_utils_la-flickr-authentication.lo -MD -MP -MF $(DEPDIR)/libflicker_utils_la-flickr-authentication.Tpo -c -o libflicker_utils_la-flickr-authentication.lo `test -f 'flickr-authentication.c' || echo '$(srcdir)/'`flickr-authentication.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libflicker_utils_la-flickr-authentication.Tpo $(DEPDIR)/libflicker_utils_la-flickr-authentication.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='flickr-authentication.c' object='libflicker_utils_la-flickr-authentication.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libflicker_utils_la_CFLAGS) $(CFLAGS) -c -o libflicker_utils_la-flickr-authentication.lo `test -f 'flickr-authentication.c' || echo '$(srcdir)/'`flickr-authentication.c - -libflicker_utils_la-flickr-connection.lo: flickr-connection.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libflicker_utils_la_CFLAGS) $(CFLAGS) -MT libflicker_utils_la-flickr-connection.lo -MD -MP -MF $(DEPDIR)/libflicker_utils_la-flickr-connection.Tpo -c -o libflicker_utils_la-flickr-connection.lo `test -f 'flickr-connection.c' || echo '$(srcdir)/'`flickr-connection.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libflicker_utils_la-flickr-connection.Tpo $(DEPDIR)/libflicker_utils_la-flickr-connection.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='flickr-connection.c' object='libflicker_utils_la-flickr-connection.lo' libtool=yes @AMDEPBACKSLASH@ +libflicker_utils_la-flickr-consumer.lo: flickr-consumer.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libflicker_utils_la_CFLAGS) $(CFLAGS) -MT libflicker_utils_la-flickr-consumer.lo -MD -MP -MF $(DEPDIR)/libflicker_utils_la-flickr-consumer.Tpo -c -o libflicker_utils_la-flickr-consumer.lo `test -f 'flickr-consumer.c' || echo '$(srcdir)/'`flickr-consumer.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libflicker_utils_la-flickr-consumer.Tpo $(DEPDIR)/libflicker_utils_la-flickr-consumer.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='flickr-consumer.c' object='libflicker_utils_la-flickr-consumer.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libflicker_utils_la_CFLAGS) $(CFLAGS) -c -o libflicker_utils_la-flickr-connection.lo `test -f 'flickr-connection.c' || echo '$(srcdir)/'`flickr-connection.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libflicker_utils_la_CFLAGS) $(CFLAGS) -c -o libflicker_utils_la-flickr-consumer.lo `test -f 'flickr-consumer.c' || echo '$(srcdir)/'`flickr-consumer.c libflicker_utils_la-flickr-photo.lo: flickr-photo.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libflicker_utils_la_CFLAGS) $(CFLAGS) -MT libflicker_utils_la-flickr-photo.lo -MD -MP -MF $(DEPDIR)/libflicker_utils_la-flickr-photo.Tpo -c -o libflicker_utils_la-flickr-photo.lo `test -f 'flickr-photo.c' || echo '$(srcdir)/'`flickr-photo.c @@ -638,13 +654,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libflicker_utils_la_CFLAGS) $(CFLAGS) -c -o libflicker_utils_la-flickr-service.lo `test -f 'flickr-service.c' || echo '$(srcdir)/'`flickr-service.c -libflicker_utils_la-flickr-user.lo: flickr-user.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libflicker_utils_la_CFLAGS) $(CFLAGS) -MT libflicker_utils_la-flickr-user.lo -MD -MP -MF $(DEPDIR)/libflicker_utils_la-flickr-user.Tpo -c -o libflicker_utils_la-flickr-user.lo `test -f 'flickr-user.c' || echo '$(srcdir)/'`flickr-user.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libflicker_utils_la-flickr-user.Tpo $(DEPDIR)/libflicker_utils_la-flickr-user.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='flickr-user.c' object='libflicker_utils_la-flickr-user.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libflicker_utils_la_CFLAGS) $(CFLAGS) -c -o libflicker_utils_la-flickr-user.lo `test -f 'flickr-user.c' || echo '$(srcdir)/'`flickr-user.c - libflicker_utils_la-main.lo: main.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libflicker_utils_la_CFLAGS) $(CFLAGS) -MT libflicker_utils_la-main.lo -MD -MP -MF $(DEPDIR)/libflicker_utils_la-main.Tpo -c -o libflicker_utils_la-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libflicker_utils_la-main.Tpo $(DEPDIR)/libflicker_utils_la-main.Plo @@ -685,14 +694,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -713,31 +721,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -753,12 +743,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -770,15 +755,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -787,9 +768,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -971,25 +953,23 @@ uninstall-am: uninstall-extensionLTLIBRARIES \ uninstall-extensioniniDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-extensionLTLIBRARIES \ - clean-generic clean-libtool cscopelist cscopelist-recursive \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extensionLTLIBRARIES \ - install-extensioniniDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-extensionLTLIBRARIES clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-extensionLTLIBRARIES install-extensioniniDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA diff -Nru gthumb-3.0.2/extensions/flicker_utils/data/Makefile.in gthumb-3.2.3/extensions/flicker_utils/data/Makefile.in --- gthumb-3.0.2/extensions/flicker_utils/data/Makefile.in 2012-08-20 19:54:14.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/data/Makefile.in 2013-07-10 13:33:46.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/flicker_utils/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/flicker_utils/data/ui/Makefile.am gthumb-3.2.3/extensions/flicker_utils/data/ui/Makefile.am --- gthumb-3.0.2/extensions/flicker_utils/data/ui/Makefile.am 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/data/ui/Makefile.am 2013-04-30 16:56:12.000000000 +0000 @@ -1,11 +1,8 @@ uidir = $(pkgdatadir)/ui ui_DATA = \ export-to-flickr.ui \ - flicker-account-chooser.ui \ - flicker-account-manager.ui \ - flicker-ask-authorization.ui \ - flicker-complete-authorization.ui \ flicker-export-completed.ui \ + flickr-ask-authorization-old.ui \ import-from-flickr.ui EXTRA_DIST = $(ui_DATA) diff -Nru gthumb-3.0.2/extensions/flicker_utils/data/ui/Makefile.in gthumb-3.2.3/extensions/flicker_utils/data/ui/Makefile.in --- gthumb-3.0.2/extensions/flicker_utils/data/ui/Makefile.in 2012-08-20 19:54:14.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/data/ui/Makefile.in 2013-07-10 13:33:46.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/flicker_utils/data/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -321,11 +355,8 @@ uidir = $(pkgdatadir)/ui ui_DATA = \ export-to-flickr.ui \ - flicker-account-chooser.ui \ - flicker-account-manager.ui \ - flicker-ask-authorization.ui \ - flicker-complete-authorization.ui \ flicker-export-completed.ui \ + flickr-ask-authorization-old.ui \ import-from-flickr.ui EXTRA_DIST = $(ui_DATA) @@ -389,11 +420,9 @@ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -534,16 +563,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-uiDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-uiDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/flicker_utils/data/ui/export-to-flickr.ui gthumb-3.2.3/extensions/flicker_utils/data/ui/export-to-flickr.ui --- gthumb-3.0.2/extensions/flicker_utils/data/ui/export-to-flickr.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/data/ui/export-to-flickr.ui 2013-04-30 16:56:12.000000000 +0000 @@ -1,6 +1,6 @@ - + @@ -27,11 +27,9 @@ gtk-cancel - False True True True - False True @@ -43,11 +41,9 @@ _Upload - False True True True - False upload_image True @@ -60,11 +56,9 @@ gtk-help - False True True True - False True @@ -123,7 +117,7 @@ True False - 5 + 6 2 6 5 @@ -180,17 +174,15 @@ - False True True True Edit accounts - False True False - gtk-edit + view-list-symbolic @@ -312,11 +304,9 @@ Hi_de from public searches - False True True False - False True 0 True @@ -325,7 +315,7 @@ 2 4 5 - GTK_FILL + @@ -381,6 +371,66 @@ GTK_FILL + + + True + False + 6 + + + _Resize if larger than: + True + True + False + True + 0 + True + + + False + False + 0 + + + + + True + False + 6 + + + True + False + resize_liststore + 0 + + + + 0 + + + + + False + False + 0 + + + + + False + False + 1 + + + + + 2 + 5 + 6 + + + False @@ -452,6 +502,14 @@ + + + + + + + + diff -Nru gthumb-3.0.2/extensions/flicker_utils/data/ui/flicker-account-chooser.ui gthumb-3.2.3/extensions/flicker_utils/data/ui/flicker-account-chooser.ui --- gthumb-3.0.2/extensions/flicker_utils/data/ui/flicker-account-chooser.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/data/ui/flicker-account-chooser.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - True - False - 5 - 6 - - - True - False - 6 - - - True - False - 0 - A_ccount: - True - - - False - True - 0 - - - - - 300 - True - False - account_liststore - - - True - True - 1 - - - - - False - True - 0 - - - - diff -Nru gthumb-3.0.2/extensions/flicker_utils/data/ui/flicker-account-manager.ui gthumb-3.2.3/extensions/flicker_utils/data/ui/flicker-account-manager.ui --- gthumb-3.0.2/extensions/flicker_utils/data/ui/flicker-account-manager.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/data/ui/flicker-account-manager.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,115 +0,0 @@ - - - - - - - - - - - - - True - False - 5 - - - True - False - 0 - A_ccounts: - True - account_treeview - - - False - True - 0 - - - - - True - False - 6 - - - 300 - 150 - True - True - in - - - True - True - accounts_liststore - False - False - True - 1 - - - - - - - - - 1 - - - - - - - - - True - True - 0 - - - - - True - False - 6 - - - False - True - True - True - False - - - True - False - gtk-delete - - - - - False - True - 0 - - - - - False - True - 1 - - - - - True - True - 1 - - - - diff -Nru gthumb-3.0.2/extensions/flicker_utils/data/ui/flicker-ask-authorization.ui gthumb-3.2.3/extensions/flicker_utils/data/ui/flicker-ask-authorization.ui --- gthumb-3.0.2/extensions/flicker_utils/data/ui/flicker-ask-authorization.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/data/ui/flicker-ask-authorization.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,84 +0,0 @@ - - - - - True - False - gtk-dialog-authentication - - - False - 5 - False - True - normal - True - other - icon_image - - - True - False - vertical - 2 - - - True - False - end - - - gtk-cancel - False - True - True - True - False - True - - - False - False - 0 - - - - - _Authorize... - False - True - True - True - False - button_image - True - - - False - False - 1 - - - - - False - True - end - 0 - - - - - - cancel_button - authorize_button - - - - True - False - 0 - gtk-dialog-authentication - 6 - - diff -Nru gthumb-3.0.2/extensions/flicker_utils/data/ui/flicker-complete-authorization.ui gthumb-3.2.3/extensions/flicker_utils/data/ui/flicker-complete-authorization.ui --- gthumb-3.0.2/extensions/flicker_utils/data/ui/flicker-complete-authorization.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/data/ui/flicker-complete-authorization.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,85 +0,0 @@ - - - - - True - False - gtk-dialog-authentication - - - False - 5 - False - True - normal - True - other - icon_image1 - - - True - False - vertical - 2 - - - True - False - end - - - gtk-cancel - False - True - True - True - False - True - 0.50999999046325684 - - - False - False - 0 - - - - - C_ontinue - False - True - True - True - False - button_image1 - True - - - False - False - 1 - - - - - False - True - end - 0 - - - - - - cancel_button1 - complete_button - - - - True - False - 0 - gtk-dialog-authentication - 6 - - diff -Nru gthumb-3.0.2/extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui gthumb-3.2.3/extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui --- gthumb-3.0.2/extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/data/ui/flickr-ask-authorization-old.ui 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,102 @@ + + + + + False + 5 + False + True + normal + True + other + icon_image1 + + + True + False + vertical + 2 + + + True + False + end + + + gtk-cancel + True + True + True + True + 0.50999999046325684 + + + False + False + 0 + + + + + C_ontinue + True + True + True + button_image1 + True + + + False + False + 1 + + + + + _Authorize... + True + True + True + button_image + True + + + False + False + 2 + + + + + False + True + end + 0 + + + + + + cancel_button1 + complete_button + authorize_button + + + + True + False + gtk-dialog-authentication + + + True + False + gtk-dialog-authentication + + + True + False + 0 + gtk-dialog-authentication + 6 + + diff -Nru gthumb-3.0.2/extensions/flicker_utils/data/ui/import-from-flickr.ui gthumb-3.2.3/extensions/flicker_utils/data/ui/import-from-flickr.ui --- gthumb-3.0.2/extensions/flicker_utils/data/ui/import-from-flickr.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/data/ui/import-from-flickr.ui 2013-04-30 16:56:12.000000000 +0000 @@ -1,6 +1,6 @@ - + @@ -29,30 +29,11 @@ False end - - gtk-help - False - True - True - True - False - True - - - False - False - 0 - True - - - gtk-cancel - False True True True - False True @@ -64,11 +45,9 @@ _Import - False True True True - False download_image True @@ -136,17 +115,15 @@ - False True True True Edit accounts - False True False - gtk-edit + view-list-symbolic @@ -302,7 +279,6 @@ - button1 close_button download_button diff -Nru gthumb-3.0.2/extensions/flicker_utils/dlg-export-to-flickr.c gthumb-3.2.3/extensions/flicker_utils/dlg-export-to-flickr.c --- gthumb-3.0.2/extensions/flicker_utils/dlg-export-to-flickr.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/dlg-export-to-flickr.c 2013-04-30 16:56:12.000000000 +0000 @@ -23,10 +23,10 @@ #include #include #include "dlg-export-to-flickr.h" -#include "flickr-authentication.h" +#include "flickr-account.h" #include "flickr-photoset.h" #include "flickr-service.h" -#include "flickr-user.h" +#include "preferences.h" #define GET_WIDGET(x) (_gtk_builder_get_widget (data->builder, (x))) @@ -50,6 +50,7 @@ typedef struct { FlickrServer *server; GthBrowser *browser; + GSettings *settings; GthFileData *location; GList *file_list; GtkBuilder *builder; @@ -57,10 +58,7 @@ GtkWidget *list_view; GtkWidget *progress_dialog; GtkWidget *photoset_combobox; - FlickrConnection *conn; - FlickrAuthentication *auth; FlickrService *service; - FlickrUser *user; GList *photosets; FlickrPhotoset *photoset; GList *photos_ids; @@ -73,19 +71,18 @@ { if (data->dialog != NULL) gtk_widget_destroy (data->dialog); - if (data->conn != NULL) - gth_task_completed (GTH_TASK (data->conn), NULL); + if (data->service != NULL) + gth_task_completed (GTH_TASK (data->service), NULL); _g_object_unref (data->cancellable); _g_string_list_free (data->photos_ids); _g_object_unref (data->photoset); _g_object_list_unref (data->photosets); - _g_object_unref (data->user); _g_object_unref (data->service); - _g_object_unref (data->auth); - _g_object_unref (data->conn); + gtk_widget_destroy (data->progress_dialog); _g_object_unref (data->builder); _g_object_list_unref (data->file_list); _g_object_unref (data->location); + g_object_unref (data->settings); g_free (data); } @@ -106,13 +103,16 @@ case _OPEN_IN_BROWSER_RESPONSE: { - GdkScreen *screen; - char *url = NULL; - GError *error = NULL; + GdkScreen *screen; + OAuthAccount *account; + char *url = NULL; + GError *error = NULL; screen = gtk_widget_get_screen (GTK_WIDGET (dialog)); gtk_widget_destroy (GTK_WIDGET (dialog)); + account = web_service_get_current_account (WEB_SERVICE (data->service)); + if (data->photoset == NULL) { GString *ids; GList *scan; @@ -130,11 +130,11 @@ else if (data->photoset->url != NULL) url = g_strdup (data->photoset->url); else if (data->photoset->id != NULL) - url = g_strconcat (data->server->url, "/photos/", data->user->id, "/sets/", data->photoset->id, NULL); + url = g_strconcat (data->server->url, "/photos/", account->id, "/sets/", data->photoset->id, NULL); if ((url != NULL) && ! gtk_show_uri (screen, url, 0, &error)) { - if (data->conn != NULL) - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); + if (data->service != NULL) + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); _gtk_error_dialog_from_gerror_run (GTK_WINDOW (data->browser), _("Could not connect to the server"), error); g_clear_error (&error); } @@ -156,7 +156,7 @@ GtkBuilder *builder; GtkWidget *dialog; - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); builder = _gtk_builder_new_from_file ("flicker-export-completed.ui", "flicker_utils"); dialog = _gtk_builder_get_widget (builder, "completed_messagedialog"); @@ -301,9 +301,11 @@ { const char *photoset_title; GList *file_list; + int max_width; + int max_height; gtk_widget_hide (data->dialog); - gth_task_dialog (GTH_TASK (data->conn), FALSE, NULL); + gth_task_dialog (GTH_TASK (data->service), FALSE, NULL); data->photoset = NULL; photoset_title = gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (data->photoset_combobox)))); @@ -321,10 +323,23 @@ } file_list = gth_file_data_list_to_file_list (data->file_list); + + max_width = -1; + max_height = -1; + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("resize_checkbutton")))) { + int idx = gtk_combo_box_get_active (GTK_COMBO_BOX (GET_WIDGET ("resize_combobox"))); + max_width = ImageSizeValues[idx].width; + max_height = ImageSizeValues[idx].height; + } + g_settings_set_int (data->settings, PREF_FLICKR_RESIZE_WIDTH, max_width); + g_settings_set_int (data->settings, PREF_FLICKR_RESIZE_HEIGHT, max_height); + flickr_service_post_photos (data->service, gtk_combo_box_get_active (GTK_COMBO_BOX (GET_WIDGET ("privacy_combobox"))), gtk_combo_box_get_active (GTK_COMBO_BOX (GET_WIDGET ("safety_combobox"))), gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("hidden_checkbutton"))), + max_width, + max_height, file_list, data->cancellable, post_photos_ready_cb, @@ -343,40 +358,40 @@ static void update_account_list (DialogData *data) { - int current_account_idx; - FlickrAccount *current_account; - int idx; - GList *scan; - GtkTreeIter iter; - char *free_space; + int current_account_idx; + OAuthAccount *current_account; + int idx; + GList *scan; + GtkTreeIter iter; + char *free_space; gtk_list_store_clear (GTK_LIST_STORE (GET_WIDGET ("account_liststore"))); current_account_idx = 0; - current_account = flickr_authentication_get_account (data->auth); - for (scan = flickr_authentication_get_accounts (data->auth), idx = 0; scan; scan = scan->next, idx++) { - FlickrAccount *account = scan->data; + current_account = web_service_get_current_account (WEB_SERVICE (data->service)); + for (scan = web_service_get_accounts (WEB_SERVICE (data->service)), idx = 0; scan; scan = scan->next, idx++) { + OAuthAccount *account = scan->data; - if ((current_account != NULL) && (g_strcmp0 (current_account->username, account->username) == 0)) + if (oauth_account_cmp (current_account, account) == 0) current_account_idx = idx; gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter); gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter, ACCOUNT_DATA_COLUMN, account, - ACCOUNT_NAME_COLUMN, account->username, + ACCOUNT_NAME_COLUMN, account->name, -1); } gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("account_combobox")), current_account_idx); - free_space = g_format_size (data->user->max_bandwidth - data->user->used_bandwidth); + free_space = g_format_size (FLICKR_ACCOUNT (current_account)->max_bandwidth - FLICKR_ACCOUNT (current_account)->used_bandwidth); gtk_label_set_text (GTK_LABEL (GET_WIDGET ("free_space_label")), free_space); g_free (free_space); } static void -authentication_accounts_changed_cb (FlickrAuthentication *auth, - gpointer user_data) +authentication_accounts_changed_cb (WebService *service, + gpointer user_data) { update_account_list ((DialogData *) user_data); } @@ -394,8 +409,8 @@ _g_object_list_unref (data->photosets); data->photosets = flickr_service_list_photosets_finish (FLICKR_SERVICE (source_object), res, &error); if (error != NULL) { - if (data->conn != NULL) - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); + if (data->service != NULL) + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); _gtk_error_dialog_from_gerror_run (GTK_WINDOW (data->browser), _("Could not connect to the server"), error); g_clear_error (&error); gtk_dialog_response (GTK_DIALOG (data->dialog), GTK_RESPONSE_DELETE_EVENT); @@ -423,7 +438,7 @@ gtk_widget_set_sensitive (GET_WIDGET ("upload_button"), TRUE); - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); gtk_window_set_transient_for (GTK_WINDOW (data->dialog), GTK_WINDOW (data->browser)); gtk_window_set_modal (GTK_WINDOW (data->dialog), FALSE); @@ -432,16 +447,11 @@ static void -authentication_ready_cb (FlickrAuthentication *auth, - FlickrUser *user, - DialogData *data) +authentication_ready_cb (WebService *service, + DialogData *data) { - _g_object_unref (data->user); - data->user = g_object_ref (user); update_account_list (data); - flickr_service_list_photosets (data->service, - NULL, data->cancellable, photoset_list_ready_cb, data); @@ -452,7 +462,7 @@ edit_accounts_button_clicked_cb (GtkButton *button, DialogData *data) { - flickr_authentication_edit_accounts (data->auth, GTK_WINDOW (data->dialog)); + web_service_edit_accounts (WEB_SERVICE (data->service), GTK_WINDOW (data->dialog)); } @@ -460,9 +470,9 @@ account_combobox_changed_cb (GtkComboBox *widget, gpointer user_data) { - DialogData *data = user_data; - GtkTreeIter iter; - FlickrAccount *account; + DialogData *data = user_data; + GtkTreeIter iter; + OAuthAccount *account; if (! gtk_combo_box_get_active_iter (widget, &iter)) return; @@ -472,13 +482,28 @@ ACCOUNT_DATA_COLUMN, &account, -1); - if (flickr_account_cmp (account, flickr_authentication_get_account (data->auth)) != 0) - flickr_authentication_connect (data->auth, account); + if (oauth_account_cmp (account, web_service_get_current_account (WEB_SERVICE (data->service))) != 0) + web_service_connect (WEB_SERVICE (data->service), OAUTH_ACCOUNT (account)); g_object_unref (account); } +static void +update_sensitivity (DialogData *data) +{ + gtk_widget_set_sensitive (GET_WIDGET ("resize_combobox"), gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("resize_checkbutton")))); +} + + +static void +resize_checkbutton_toggled_cb (GtkToggleButton *button, + gpointer user_data) +{ + update_sensitivity (user_data); +} + + void dlg_export_to_flickr (FlickrServer *server, GthBrowser *browser, @@ -495,6 +520,7 @@ data = g_new0 (DialogData, 1); data->server = server; data->browser = browser; + data->settings = g_settings_new (GTHUMB_FLICKR_SCHEMA); data->location = gth_file_data_dup (gth_browser_get_location_data (browser)); data->builder = _gtk_builder_new_from_file ("export-to-flickr.ui", "flicker_utils"); data->dialog = _gtk_builder_get_widget (data->builder, "export_dialog"); @@ -572,7 +598,7 @@ /* Set the widget data */ - data->list_view = gth_file_list_new (gth_grid_view_new (), GTH_FILE_LIST_TYPE_NO_SELECTION, FALSE); + data->list_view = gth_file_list_new (gth_grid_view_new (), GTH_FILE_LIST_MODE_NO_SELECTION, FALSE); gth_file_list_set_thumb_size (GTH_FILE_LIST (data->list_view), 112); gth_file_list_enable_thumbs (GTH_FILE_LIST (data->list_view), TRUE); gth_file_list_set_ignore_hidden (GTH_FILE_LIST (data->list_view), TRUE); @@ -590,6 +616,13 @@ gtk_window_set_title (GTK_WINDOW (data->dialog), title); g_free (title); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("resize_checkbutton")), + g_settings_get_int (data->settings, PREF_FLICKR_RESIZE_WIDTH) != -1); + + _gtk_combo_box_add_image_sizes (GTK_COMBO_BOX (GET_WIDGET ("resize_combobox")), + g_settings_get_int (data->settings, PREF_FLICKR_RESIZE_WIDTH), + g_settings_get_int (data->settings, PREF_FLICKR_RESIZE_HEIGHT)); + /* Set the signals handlers. */ g_signal_connect (data->dialog, @@ -608,25 +641,28 @@ "changed", G_CALLBACK (account_combobox_changed_cb), data); + g_signal_connect (GET_WIDGET ("resize_checkbutton"), + "toggled", + G_CALLBACK (resize_checkbutton_toggled_cb), + data); - data->conn = flickr_connection_new (data->server); - data->service = flickr_service_new (data->conn); - data->auth = flickr_authentication_new (data->conn, - data->service, - data->cancellable, - GTK_WIDGET (data->browser), - data->dialog); - g_signal_connect (data->auth, - "ready", + update_sensitivity (data); + + data->service = flickr_service_new (server, + data->cancellable, + GTK_WIDGET (data->browser), + data->dialog); + g_signal_connect (data->service, + "account-ready", G_CALLBACK (authentication_ready_cb), data); - g_signal_connect (data->auth, - "accounts_changed", + g_signal_connect (data->service, + "accounts-changed", G_CALLBACK (authentication_accounts_changed_cb), data); data->progress_dialog = gth_progress_dialog_new (GTK_WINDOW (data->browser)); - gth_progress_dialog_add_task (GTH_PROGRESS_DIALOG (data->progress_dialog), GTH_TASK (data->conn)); + gth_progress_dialog_add_task (GTH_PROGRESS_DIALOG (data->progress_dialog), GTH_TASK (data->service)); - flickr_authentication_auto_connect (data->auth); + web_service_autoconnect (WEB_SERVICE (data->service)); } diff -Nru gthumb-3.0.2/extensions/flicker_utils/dlg-import-from-flickr.c gthumb-3.2.3/extensions/flicker_utils/dlg-import-from-flickr.c --- gthumb-3.0.2/extensions/flicker_utils/dlg-import-from-flickr.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/dlg-import-from-flickr.c 2013-04-30 16:56:12.000000000 +0000 @@ -25,12 +25,11 @@ #include #include #include "dlg-import-from-flickr.h" -#include "flickr-authentication.h" +#include "flickr-account.h" #include "flickr-photo.h" #include "flickr-photoset.h" #include "flickr-service.h" #include "flickr-types.h" -#include "flickr-user.h" #define GET_WIDGET(x) (_gtk_builder_get_widget (data->builder, (x))) @@ -59,11 +58,8 @@ GtkWidget *dialog; GtkWidget *preferences_dialog; GtkWidget *progress_dialog; - FlickrConnection *conn; - FlickrAuthentication *auth; FlickrService *service; GtkWidget *file_list; - FlickrUser *user; GList *photosets; FlickrPhotoset *photoset; GList *photos; @@ -75,16 +71,14 @@ import_dialog_destroy_cb (GtkWidget *widget, DialogData *data) { - if (data->conn != NULL) - gth_task_completed (GTH_TASK (data->conn), NULL); + if (data->service != NULL) + gth_task_completed (GTH_TASK (data->service), NULL); _g_object_unref (data->cancellable); - _g_object_unref (data->conn); _g_object_unref (data->service); - _g_object_unref (data->auth); - _g_object_unref (data->user); _g_object_list_unref (data->photosets); _g_object_unref (data->photoset); _g_object_list_unref (data->photos); + gtk_widget_destroy (data->progress_dialog); _g_object_unref (data->builder); _g_object_unref (data->location); g_free (data); @@ -194,26 +188,26 @@ static void update_account_list (DialogData *data) { - int current_account_idx; - FlickrAccount *current_account; - int idx; - GList *scan; - GtkTreeIter iter; + int current_account_idx; + OAuthAccount *current_account; + int idx; + GList *scan; + GtkTreeIter iter; gtk_list_store_clear (GTK_LIST_STORE (GET_WIDGET ("account_liststore"))); current_account_idx = 0; - current_account = flickr_authentication_get_account (data->auth); - for (scan = flickr_authentication_get_accounts (data->auth), idx = 0; scan; scan = scan->next, idx++) { - FlickrAccount *account = scan->data; + current_account = web_service_get_current_account (WEB_SERVICE (data->service)); + for (scan = web_service_get_accounts (WEB_SERVICE (data->service)), idx = 0; scan; scan = scan->next, idx++) { + OAuthAccount *account = scan->data; - if ((current_account != NULL) && (g_strcmp0 (current_account->username, account->username) == 0)) + if (oauth_account_cmp (current_account, account) == 0) current_account_idx = idx; gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter); gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter, ACCOUNT_DATA_COLUMN, account, - ACCOUNT_NAME_COLUMN, account->username, + ACCOUNT_NAME_COLUMN, account->name, -1); } gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("account_combobox")), current_account_idx); @@ -232,8 +226,8 @@ _g_object_list_unref (data->photosets); data->photosets = flickr_service_list_photosets_finish (FLICKR_SERVICE (source_object), res, &error); if (error != NULL) { - if (data->conn != NULL) - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); + if (data->service != NULL) + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); _gtk_error_dialog_from_gerror_run (GTK_WINDOW (data->browser), _("Could not connect to the server"), error); g_clear_error (&error); gtk_widget_destroy (data->dialog); @@ -259,7 +253,7 @@ g_free (n_photos); } - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); gtk_window_set_transient_for (GTK_WINDOW (data->dialog), GTK_WINDOW (data->browser)); gtk_window_set_modal (GTK_WINDOW (data->dialog), FALSE); @@ -268,16 +262,11 @@ static void -authentication_ready_cb (FlickrAuthentication *auth, - FlickrUser *user, - DialogData *data) +authentication_ready_cb (WebService *service, + DialogData *data) { - _g_object_unref (data->user); - data->user = g_object_ref (user); update_account_list (data); - flickr_service_list_photosets (data->service, - NULL, data->cancellable, photoset_list_ready_cb, data); @@ -285,10 +274,10 @@ static void -authentication_accounts_changed_cb (FlickrAuthentication *auth, - gpointer user_data) +authentication_accounts_changed_cb (WebService *service, + DialogData *data) { - update_account_list ((DialogData *) user_data); + update_account_list (data); } @@ -296,7 +285,7 @@ edit_accounts_button_clicked_cb (GtkButton *button, DialogData *data) { - flickr_authentication_edit_accounts (data->auth, GTK_WINDOW (data->dialog)); + web_service_edit_accounts (WEB_SERVICE (data->service), GTK_WINDOW (data->dialog)); } @@ -304,9 +293,9 @@ account_combobox_changed_cb (GtkComboBox *widget, gpointer user_data) { - DialogData *data = user_data; - GtkTreeIter iter; - FlickrAccount *account; + DialogData *data = user_data; + GtkTreeIter iter; + OAuthAccount *account; if (! gtk_combo_box_get_active_iter (widget, &iter)) return; @@ -316,8 +305,8 @@ ACCOUNT_DATA_COLUMN, &account, -1); - if (flickr_account_cmp (account, flickr_authentication_get_account (data->auth)) != 0) - flickr_authentication_connect (data->auth, account); + if (oauth_account_cmp (account, web_service_get_current_account (WEB_SERVICE (data->service))) != 0) + web_service_connect (WEB_SERVICE (data->service), account); g_object_unref (account); } @@ -350,13 +339,13 @@ GList *list; GList *scan; - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); _g_object_list_unref (data->photos); data->photos = flickr_service_list_photos_finish (data->service, result, &error); if (error != NULL) { - if (data->conn != NULL) - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); + if (data->service != NULL) + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); _gtk_error_dialog_from_gerror_show (GTK_WINDOW (data->browser), _("Could not get the photo list"), error); g_clear_error (&error); gtk_widget_destroy (data->dialog); @@ -406,7 +395,7 @@ gth_import_preferences_dialog_set_event (GTH_IMPORT_PREFERENCES_DIALOG (data->preferences_dialog), data->photoset->title); - gth_task_dialog (GTH_TASK (data->conn), FALSE, NULL); + gth_task_dialog (GTH_TASK (data->service), FALSE, NULL); flickr_service_list_photos (data->service, data->photoset, "original_format, url_sq, url_t, url_s, url_m, url_z, url_b, url_o", @@ -417,7 +406,8 @@ static GthImage * -flickr_thumbnail_loader (GthFileData *file_data, +flickr_thumbnail_loader (GInputStream *istream, + GthFileData *file_data, int requested_size, int *original_width, int *original_height, @@ -450,7 +440,7 @@ gsize size; file = g_file_new_for_uri (uri); - if (g_load_file_in_buffer (file, &buffer, &size, cancellable, error)) { + if (_g_file_load_in_buffer (file, &buffer, &size, cancellable, error)) { GInputStream *stream; GdkPixbuf *pixbuf; @@ -549,7 +539,7 @@ /* Set the widget data */ - data->file_list = gth_file_list_new (gth_grid_view_new (), GTH_FILE_LIST_TYPE_NORMAL, FALSE); + data->file_list = gth_file_list_new (gth_grid_view_new (), GTH_FILE_LIST_MODE_NORMAL, FALSE); thumb_loader = gth_file_list_get_thumb_loader (GTH_FILE_LIST (data->file_list)); gth_thumb_loader_set_use_cache (thumb_loader, FALSE); gth_thumb_loader_set_loader_func (thumb_loader, flickr_thumbnail_loader); @@ -576,7 +566,7 @@ 0); gtk_widget_show_all (GET_WIDGET ("destination_button_box")); - title = g_strdup_printf (_("Import from %s"), data->server->name); + title = g_strdup_printf (_("Import from %s"), data->server->display_name); gtk_window_set_title (GTK_WINDOW (data->dialog), title); g_free (title); @@ -616,24 +606,21 @@ update_selection_status (data); gth_import_preferences_dialog_set_event (GTH_IMPORT_PREFERENCES_DIALOG (data->preferences_dialog), ""); - data->conn = flickr_connection_new (data->server); - data->service = flickr_service_new (data->conn); - data->auth = flickr_authentication_new (data->conn, - data->service, - data->cancellable, - GTK_WIDGET (data->browser), - data->dialog); - g_signal_connect (data->auth, - "ready", + data->service = flickr_service_new (server, + data->cancellable, + GTK_WIDGET (data->browser), + data->dialog); + g_signal_connect (data->service, + "account-ready", G_CALLBACK (authentication_ready_cb), data); - g_signal_connect (data->auth, - "accounts_changed", + g_signal_connect (data->service, + "accounts-changed", G_CALLBACK (authentication_accounts_changed_cb), data); data->progress_dialog = gth_progress_dialog_new (GTK_WINDOW (data->browser)); - gth_progress_dialog_add_task (GTH_PROGRESS_DIALOG (data->progress_dialog), GTH_TASK (data->conn)); + gth_progress_dialog_add_task (GTH_PROGRESS_DIALOG (data->progress_dialog), GTH_TASK (data->service)); - flickr_authentication_auto_connect (data->auth); + web_service_autoconnect (WEB_SERVICE (data->service)); } diff -Nru gthumb-3.0.2/extensions/flicker_utils/flicker_utils.extension.in.in gthumb-3.2.3/extensions/flicker_utils/flicker_utils.extension.in.in --- gthumb-3.0.2/extensions/flicker_utils/flicker_utils.extension.in.in 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/flicker_utils.extension.in.in 2013-04-30 16:56:12.000000000 +0000 @@ -5,4 +5,4 @@ Type=module File=%LIBRARY% API=%GTHUMB_API_VERSION% -Requires=importer;export_tools +Requires=importer;export_tools;oauth diff -Nru gthumb-3.0.2/extensions/flicker_utils/flickr-account-chooser-dialog.c gthumb-3.2.3/extensions/flicker_utils/flickr-account-chooser-dialog.c --- gthumb-3.0.2/extensions/flicker_utils/flickr-account-chooser-dialog.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/flickr-account-chooser-dialog.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,236 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include "flickr-account-chooser-dialog.h" - -#define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x))) - - -enum { - ACCOUNT_DATA_COLUMN, - ACCOUNT_NAME_COLUMN, - ACCOUNT_SEPARATOR_COLUMN, - ACCOUNT_ICON_COLUMN -}; - - -G_DEFINE_TYPE (FlickrAccountChooserDialog, flickr_account_chooser_dialog, GTK_TYPE_DIALOG) - - -struct _FlickrAccountChooserDialogPrivate { - GtkBuilder *builder; -}; - - -static void -flickr_account_chooser_dialog_finalize (GObject *object) -{ - FlickrAccountChooserDialog *self; - - self = FLICKR_ACCOUNT_CHOOSER_DIALOG (object); - - _g_object_unref (self->priv->builder); - - G_OBJECT_CLASS (flickr_account_chooser_dialog_parent_class)->finalize (object); -} - - -static void -flickr_account_chooser_dialog_class_init (FlickrAccountChooserDialogClass *klass) -{ - GObjectClass *object_class; - - g_type_class_add_private (klass, sizeof (FlickrAccountChooserDialogPrivate)); - - object_class = (GObjectClass*) klass; - object_class->finalize = flickr_account_chooser_dialog_finalize; -} - - -static void -account_combobox_changed_cb (GtkComboBox *combobox, - gpointer user_data) -{ - FlickrAccountChooserDialog *self = user_data; - GtkTreeIter iter; - FlickrAccount *account; - - if (! gtk_combo_box_get_active_iter (combobox, &iter)) - return; - - gtk_tree_model_get (GTK_TREE_MODEL (GET_WIDGET ("account_liststore")), &iter, - ACCOUNT_DATA_COLUMN, &account, - -1); - - if (account == NULL) - gtk_dialog_response (GTK_DIALOG (self), FLICKR_ACCOUNT_CHOOSER_RESPONSE_NEW); - - _g_object_unref (account); -} - - -static gboolean -row_separator_func (GtkTreeModel *model, - GtkTreeIter *iter, - gpointer user_data) -{ - FlickrAccountChooserDialog *self = user_data; - gboolean is_separator; - - gtk_tree_model_get (GTK_TREE_MODEL (GET_WIDGET ("account_liststore")), - iter, - ACCOUNT_SEPARATOR_COLUMN, &is_separator, - -1); - - return is_separator; -} - - -static void -flickr_account_chooser_dialog_init (FlickrAccountChooserDialog *self) -{ - GtkWidget *content; - - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, FLICKR_TYPE_ACCOUNT_CHOOSER_DIALOG, FlickrAccountChooserDialogPrivate); - self->priv->builder = _gtk_builder_new_from_file ("flicker-account-chooser.ui", "flicker_utils"); - - gtk_window_set_resizable (GTK_WINDOW (self), FALSE); - gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), 5); - gtk_container_set_border_width (GTK_CONTAINER (self), 5); - - content = _gtk_builder_get_widget (self->priv->builder, "account_chooser"); - gtk_container_set_border_width (GTK_CONTAINER (content), 5); - gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), content, TRUE, TRUE, 0); - - { - GtkCellLayout *cell_layout; - GtkCellRenderer *renderer; - - cell_layout = GTK_CELL_LAYOUT (GET_WIDGET ("account_combobox")); - - renderer = gtk_cell_renderer_pixbuf_new (); - gtk_cell_layout_pack_start (cell_layout, renderer, FALSE); - gtk_cell_layout_set_attributes (cell_layout, renderer, - "icon-name", ACCOUNT_ICON_COLUMN, - NULL); - - renderer = gtk_cell_renderer_text_new (); - gtk_cell_layout_pack_start (cell_layout, renderer, TRUE); - gtk_cell_layout_set_attributes (cell_layout, renderer, - "text", ACCOUNT_NAME_COLUMN, - NULL); - } - gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (GET_WIDGET ("account_combobox")), - row_separator_func, - self, - NULL); - g_signal_connect (GET_WIDGET ("account_combobox"), - "changed", - G_CALLBACK (account_combobox_changed_cb), - self); - - gtk_dialog_add_button (GTK_DIALOG (self), - GTK_STOCK_NEW, - FLICKR_ACCOUNT_CHOOSER_RESPONSE_NEW); - gtk_dialog_add_button (GTK_DIALOG (self), - GTK_STOCK_CANCEL, - GTK_RESPONSE_CANCEL); - gtk_dialog_add_button (GTK_DIALOG (self), - GTK_STOCK_OK, - GTK_RESPONSE_OK); - gtk_dialog_set_default_response (GTK_DIALOG (self), GTK_RESPONSE_OK); -} - - -static void -flickr_account_chooser_dialog_construct (FlickrAccountChooserDialog *self, - GList *accounts, - FlickrAccount *default_account) -{ - GtkTreeIter iter; - GList *scan; - int active = 0; - int idx; - - gtk_list_store_clear (GTK_LIST_STORE (GET_WIDGET ("account_liststore"))); - - for (scan = accounts, idx = 0; scan; scan = scan->next, idx++) { - FlickrAccount *account = scan->data; - - if ((default_account != NULL) && (g_strcmp0 (account->username, default_account->username) == 0)) - active = idx; - - gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter); - gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter, - ACCOUNT_DATA_COLUMN, account, - ACCOUNT_NAME_COLUMN, account->username, - ACCOUNT_SEPARATOR_COLUMN, FALSE, - ACCOUNT_ICON_COLUMN, "dialog-password", - -1); - } - - gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter); - gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter, - ACCOUNT_SEPARATOR_COLUMN, TRUE, - -1); - - gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter); - gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter, - ACCOUNT_DATA_COLUMN, NULL, - ACCOUNT_NAME_COLUMN, _("New authentication..."), - ACCOUNT_SEPARATOR_COLUMN, FALSE, - ACCOUNT_ICON_COLUMN, GTK_STOCK_NEW, - -1); - - gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("account_combobox")), active); -} - - -GtkWidget * -flickr_account_chooser_dialog_new (GList *accounts, - FlickrAccount *default_account) -{ - FlickrAccountChooserDialog *self; - - self = g_object_new (FLICKR_TYPE_ACCOUNT_CHOOSER_DIALOG, NULL); - flickr_account_chooser_dialog_construct (self, accounts, default_account); - - return (GtkWidget *) self; -} - - -FlickrAccount * -flickr_account_chooser_dialog_get_active (FlickrAccountChooserDialog *self) -{ - GtkTreeIter iter; - FlickrAccount *account; - - if (! gtk_combo_box_get_active_iter (GTK_COMBO_BOX (GET_WIDGET ("account_combobox")), &iter)) - return NULL; - - gtk_tree_model_get (GTK_TREE_MODEL (GET_WIDGET ("account_liststore")), &iter, - ACCOUNT_DATA_COLUMN, &account, - -1); - - return account; -} diff -Nru gthumb-3.0.2/extensions/flicker_utils/flickr-account-chooser-dialog.h gthumb-3.2.3/extensions/flicker_utils/flickr-account-chooser-dialog.h --- gthumb-3.0.2/extensions/flicker_utils/flickr-account-chooser-dialog.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/flickr-account-chooser-dialog.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef FLICKR_ACCOUNT_CHOOSER_DIALOG_H -#define FLICKR_ACCOUNT_CHOOSER_DIALOG_H - -#include -#include -#include "flickr-account.h" - -G_BEGIN_DECLS - -#define FLICKR_ACCOUNT_CHOOSER_RESPONSE_NEW 1 - -#define FLICKR_TYPE_ACCOUNT_CHOOSER_DIALOG (flickr_account_chooser_dialog_get_type ()) -#define FLICKR_ACCOUNT_CHOOSER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FLICKR_TYPE_ACCOUNT_CHOOSER_DIALOG, FlickrAccountChooserDialog)) -#define FLICKR_ACCOUNT_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FLICKR_TYPE_ACCOUNT_CHOOSER_DIALOG, FlickrAccountChooserDialogClass)) -#define FLICKR_IS_ACCOUNT_CHOOSER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FLICKR_TYPE_ACCOUNT_CHOOSER_DIALOG)) -#define FLICKR_IS_ACCOUNT_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FLICKR_TYPE_ACCOUNT_CHOOSER_DIALOG)) -#define FLICKR_ACCOUNT_CHOOSER_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), FLICKR_TYPE_ACCOUNT_CHOOSER_DIALOG, FlickrAccountChooserDialogClass)) - -typedef struct _FlickrAccountChooserDialog FlickrAccountChooserDialog; -typedef struct _FlickrAccountChooserDialogClass FlickrAccountChooserDialogClass; -typedef struct _FlickrAccountChooserDialogPrivate FlickrAccountChooserDialogPrivate; - -struct _FlickrAccountChooserDialog { - GtkDialog parent_instance; - FlickrAccountChooserDialogPrivate *priv; -}; - -struct _FlickrAccountChooserDialogClass { - GtkDialogClass parent_class; -}; - -GType flickr_account_chooser_dialog_get_type (void); -GtkWidget * flickr_account_chooser_dialog_new (GList *accounts, - FlickrAccount *default_account); -FlickrAccount * flickr_account_chooser_dialog_get_active (FlickrAccountChooserDialog *self); - -G_END_DECLS - -#endif /* FLICKR_ACCOUNT_CHOOSER_DIALOG_H */ diff -Nru gthumb-3.0.2/extensions/flicker_utils/flickr-account-manager-dialog.c gthumb-3.2.3/extensions/flicker_utils/flickr-account-manager-dialog.c --- gthumb-3.0.2/extensions/flicker_utils/flickr-account-manager-dialog.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/flickr-account-manager-dialog.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,219 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include "flickr-account.h" -#include "flickr-account-manager-dialog.h" - - -#define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x))) - - -enum { - ACCOUNT_DATA_COLUMN, - ACCOUNT_NAME_COLUMN, -}; - - -G_DEFINE_TYPE (FlickrAccountManagerDialog, flickr_account_manager_dialog, GTK_TYPE_DIALOG) - - -struct _FlickrAccountManagerDialogPrivate { - GtkBuilder *builder; -}; - - -static void -flickr_account_manager_dialog_finalize (GObject *object) -{ - FlickrAccountManagerDialog *self; - - self = FLICKR_ACCOUNT_MANAGER_DIALOG (object); - - _g_object_unref (self->priv->builder); - - G_OBJECT_CLASS (flickr_account_manager_dialog_parent_class)->finalize (object); -} - - -static void -flickr_account_manager_dialog_class_init (FlickrAccountManagerDialogClass *klass) -{ - GObjectClass *object_class; - - g_type_class_add_private (klass, sizeof (FlickrAccountManagerDialogPrivate)); - - object_class = (GObjectClass*) klass; - object_class->finalize = flickr_account_manager_dialog_finalize; -} - - -static void -delete_button_clicked_cb (GtkWidget *button, - gpointer user_data) -{ - FlickrAccountManagerDialog *self = user_data; - GtkTreeModel *tree_model; - GtkTreeIter iter; - - if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (GET_WIDGET ("account_treeview"))), - &tree_model, - &iter)) - { - gtk_list_store_remove (GTK_LIST_STORE (tree_model), &iter); - } -} - - -static void -text_renderer_edited_cb (GtkCellRendererText *renderer, - char *path, - char *new_text, - gpointer user_data) -{ - FlickrAccountManagerDialog *self = user_data; - GtkTreePath *tree_path; - GtkTreeIter iter; - FlickrAccount *account; - - tree_path = gtk_tree_path_new_from_string (path); - tree_path = gtk_tree_path_new_from_string (path); - if (! gtk_tree_model_get_iter (GTK_TREE_MODEL (GET_WIDGET ("accounts_liststore")), - &iter, - tree_path)) - { - gtk_tree_path_free (tree_path); - return; - } - gtk_tree_path_free (tree_path); - - gtk_tree_model_get (GTK_TREE_MODEL (GET_WIDGET ("accounts_liststore")), &iter, - ACCOUNT_DATA_COLUMN, &account, - -1); - flickr_account_set_username (account, new_text); - - gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("accounts_liststore")), &iter, - ACCOUNT_DATA_COLUMN, account, - ACCOUNT_NAME_COLUMN, new_text, - -1); - - g_object_unref (account); -} - - -static void -flickr_account_manager_dialog_init (FlickrAccountManagerDialog *self) -{ - GtkWidget *content; - - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, FLICKR_TYPE_ACCOUNT_MANAGER_DIALOG, FlickrAccountManagerDialogPrivate); - self->priv->builder = _gtk_builder_new_from_file ("flicker-account-manager.ui", "flicker_utils"); - - gtk_window_set_resizable (GTK_WINDOW (self), FALSE); - gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), 5); - gtk_container_set_border_width (GTK_CONTAINER (self), 5); - - content = _gtk_builder_get_widget (self->priv->builder, "account_manager"); - gtk_container_set_border_width (GTK_CONTAINER (content), 5); - gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), content, TRUE, TRUE, 0); - - gtk_dialog_add_button (GTK_DIALOG (self), - GTK_STOCK_NEW, - FLICKR_ACCOUNT_MANAGER_RESPONSE_NEW); - gtk_dialog_add_button (GTK_DIALOG (self), - GTK_STOCK_CANCEL, - GTK_RESPONSE_CANCEL); - gtk_dialog_add_button (GTK_DIALOG (self), - GTK_STOCK_OK, - GTK_RESPONSE_OK); - - g_object_set (GET_WIDGET ("account_cellrenderertext"), "editable", TRUE, NULL); - g_signal_connect (GET_WIDGET ("account_cellrenderertext"), - "edited", - G_CALLBACK (text_renderer_edited_cb), - self); - - g_signal_connect (GET_WIDGET ("delete_button"), - "clicked", - G_CALLBACK (delete_button_clicked_cb), - self); -} - - -static void -flickr_account_manager_dialog_construct (FlickrAccountManagerDialog *self, - GList *accounts) -{ - GtkListStore *list_store; - GtkTreeIter iter; - GList *scan; - - list_store = GTK_LIST_STORE (GET_WIDGET ("accounts_liststore")); - gtk_list_store_clear (list_store); - for (scan = accounts; scan; scan = scan->next) { - FlickrAccount *account = scan->data; - - gtk_list_store_append (list_store, &iter); - gtk_list_store_set (list_store, &iter, - ACCOUNT_DATA_COLUMN, account, - ACCOUNT_NAME_COLUMN, account->username, - -1); - } -} - - -GtkWidget * -flickr_account_manager_dialog_new (GList *accounts) -{ - FlickrAccountManagerDialog *self; - - self = g_object_new (FLICKR_TYPE_ACCOUNT_MANAGER_DIALOG, NULL); - flickr_account_manager_dialog_construct (self, accounts); - - return (GtkWidget *) self; -} - - -GList * -flickr_account_manager_dialog_get_accounts (FlickrAccountManagerDialog *self) -{ - GList *accounts; - GtkTreeModel *tree_model; - GtkTreeIter iter; - - tree_model = (GtkTreeModel *) GET_WIDGET ("accounts_liststore"); - if (! gtk_tree_model_get_iter_first (tree_model, &iter)) - return NULL; - - accounts = NULL; - do { - FlickrAccount *account; - - gtk_tree_model_get (tree_model, &iter, - ACCOUNT_DATA_COLUMN, &account, - -1); - accounts = g_list_prepend (accounts, account); - } - while (gtk_tree_model_iter_next (tree_model, &iter)); - - return g_list_reverse (accounts); -} diff -Nru gthumb-3.0.2/extensions/flicker_utils/flickr-account-manager-dialog.h gthumb-3.2.3/extensions/flicker_utils/flickr-account-manager-dialog.h --- gthumb-3.0.2/extensions/flicker_utils/flickr-account-manager-dialog.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/flickr-account-manager-dialog.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef FLICKR_ACCOUNT_MANAGER_DIALOG_H -#define FLICKR_ACCOUNT_MANAGER_DIALOG_H - -#include -#include - -G_BEGIN_DECLS - -#define FLICKR_ACCOUNT_MANAGER_RESPONSE_NEW 1 - -#define FLICKR_TYPE_ACCOUNT_MANAGER_DIALOG (flickr_account_manager_dialog_get_type ()) -#define FLICKR_ACCOUNT_MANAGER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FLICKR_TYPE_ACCOUNT_MANAGER_DIALOG, FlickrAccountManagerDialog)) -#define FLICKR_ACCOUNT_MANAGER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FLICKR_TYPE_ACCOUNT_MANAGER_DIALOG, FlickrAccountManagerDialogClass)) -#define FLICKR_IS_ACCOUNT_MANAGER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FLICKR_TYPE_ACCOUNT_MANAGER_DIALOG)) -#define FLICKR_IS_ACCOUNT_MANAGER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FLICKR_TYPE_ACCOUNT_MANAGER_DIALOG)) -#define FLICKR_ACCOUNT_MANAGER_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), FLICKR_TYPE_ACCOUNT_MANAGER_DIALOG, FlickrAccountManagerDialogClass)) - -typedef struct _FlickrAccountManagerDialog FlickrAccountManagerDialog; -typedef struct _FlickrAccountManagerDialogClass FlickrAccountManagerDialogClass; -typedef struct _FlickrAccountManagerDialogPrivate FlickrAccountManagerDialogPrivate; - -struct _FlickrAccountManagerDialog { - GtkDialog parent_instance; - FlickrAccountManagerDialogPrivate *priv; -}; - -struct _FlickrAccountManagerDialogClass { - GtkDialogClass parent_class; -}; - -GType flickr_account_manager_dialog_get_type (void); -GtkWidget * flickr_account_manager_dialog_new (GList *accounts); -GList * flickr_account_manager_dialog_get_accounts (FlickrAccountManagerDialog *dialog); - -G_END_DECLS - -#endif /* FLICKR_ACCOUNT_MANAGER_DIALOG_H */ diff -Nru gthumb-3.0.2/extensions/flicker_utils/flickr-account.c gthumb-3.2.3/extensions/flicker_utils/flickr-account.c --- gthumb-3.0.2/extensions/flicker_utils/flickr-account.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/flickr-account.c 2013-04-30 16:56:12.000000000 +0000 @@ -3,7 +3,7 @@ /* * GThumb * - * Copyright (C) 2010 Free Software Foundation, Inc. + * Copyright (C) 2012 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,10 +22,7 @@ #include #include #include -#ifdef HAVE_GNOME_KEYRING -#include -#endif /* HAVE_GNOME_KEYRING */ -#include +#include #include "flickr-account.h" @@ -34,7 +31,7 @@ G_DEFINE_TYPE_WITH_CODE (FlickrAccount, flickr_account, - G_TYPE_OBJECT, + OAUTH_TYPE_ACCOUNT, G_IMPLEMENT_INTERFACE (DOM_TYPE_DOMIZABLE, flickr_account_dom_domizable_interface_init)) @@ -46,8 +43,7 @@ self = FLICKR_ACCOUNT (obj); - g_free (self->username); - g_free (self->token); + g_free (self->accountname); G_OBJECT_CLASS (flickr_account_parent_class)->finalize (obj); } @@ -60,49 +56,22 @@ } -static DomElement* -flickr_account_create_element (DomDomizable *base, +static DomElement * +flickr_account_create_element (DomDomizable *self, DomDocument *doc) { - FlickrAccount *self; - DomElement *element; - gboolean set_token; - - self = FLICKR_ACCOUNT (base); - - element = dom_document_create_element (doc, "account", NULL); - if (self->username != NULL) - dom_element_set_attribute (element, "username", self->username); - - /* Don't save the token in the configuration file if gnome-keyring is - * available. */ - - set_token = TRUE; -#ifdef HAVE_GNOME_KEYRING - if (gnome_keyring_is_available ()) - set_token = FALSE; -#endif - if (set_token && (self->token != NULL)) - dom_element_set_attribute (element, "token", self->token); - - if (self->is_default) - dom_element_set_attribute (element, "default", "1"); - - return element; + return oauth_account_create_element (self, doc); } static void flickr_account_load_from_element (DomDomizable *base, - DomElement *element) + DomElement *element) { - FlickrAccount *self; - - self = FLICKR_ACCOUNT (base); + FlickrAccount *self = FLICKR_ACCOUNT (base); - flickr_account_set_username (self, dom_element_get_attribute (element, "username")); - flickr_account_set_token (self, dom_element_get_attribute (element, "token")); - self->is_default = (g_strcmp0 (dom_element_get_attribute (element, "default"), "1") == 0); + oauth_account_load_from_element (base, element); + flickr_account_load_extra_data (self, element); } @@ -117,11 +86,18 @@ static void flickr_account_init (FlickrAccount *self) { - /* void */ + self->is_pro = FALSE; + self->accountname = NULL; + self->max_bandwidth = 0; + self->used_bandwidth = 0; + self->max_filesize = 0; + self->max_videosize = 0; + self->n_sets = 0; + self->n_videos = 0; } -FlickrAccount * +OAuthAccount * flickr_account_new (void) { return g_object_new (FLICKR_TYPE_ACCOUNT, NULL); @@ -129,39 +105,103 @@ void -flickr_account_set_username (FlickrAccount *self, - const char *value) +flickr_account_set_is_pro (FlickrAccount *self, + const char *value) +{ + self->is_pro = (g_strcmp0 (value, "1") == 0); +} + + +void +flickr_account_set_accountname (FlickrAccount *self, + const char *value) +{ + _g_strset (&self->accountname, value); +} + + +void +flickr_account_set_max_bandwidth (FlickrAccount *self, + const char *value) { - _g_strset (&self->username, value); + self->max_bandwidth = g_ascii_strtoull (value, NULL, 10); } void -flickr_account_set_token (FlickrAccount *self, - const char *value) +flickr_account_set_used_bandwidth (FlickrAccount *self, + const char *value) { - _g_strset (&self->token, value); + self->used_bandwidth = g_ascii_strtoull (value, NULL, 10); } void -flickr_account_reset (FlickrAccount *self) +flickr_account_set_max_filesize (FlickrAccount *self, + const char *value) { - flickr_account_set_username (self, NULL); - flickr_account_set_token (self, NULL); + self->max_filesize = g_ascii_strtoull (value, NULL, 10); } -int -flickr_account_cmp (FlickrAccount *a, - FlickrAccount *b) +void +flickr_account_set_max_videosize (FlickrAccount *self, + const char *value) { - if ((a == NULL) && (b == NULL)) - return 0; - else if (a == NULL) - return 1; - else if (b == NULL) - return -1; + self->max_videosize = g_ascii_strtoull (value, NULL, 10); +} + + +void +flickr_account_set_n_sets (FlickrAccount *self, + const char *value) +{ + if (value != NULL) + self->n_sets = atoi (value); else - return g_strcmp0 (a->username, b->username); + self->n_sets = 0; +} + + +void +flickr_account_set_n_videos (FlickrAccount *self, + const char *value) +{ + if (value != NULL) + self->n_videos = atoi (value); + else + self->n_videos = 0; +} + + +void +flickr_account_load_extra_data (FlickrAccount *self, + DomElement *element) +{ + DomElement *node; + + flickr_account_set_is_pro (self, dom_element_get_attribute (element, "ispro")); + + for (node = element->first_child; node; node = node->next_sibling) { + if (g_strcmp0 (node->tag_name, "accountname") == 0) { + flickr_account_set_accountname (self, dom_element_get_inner_text (node)); + } + else if (g_strcmp0 (node->tag_name, "bandwidth") == 0) { + flickr_account_set_max_bandwidth (self, dom_element_get_attribute (node, "maxbytes")); + flickr_account_set_used_bandwidth (self, dom_element_get_attribute (node, "usedbytes")); + } + else if (g_strcmp0 (node->tag_name, "filesize") == 0) { + flickr_account_set_max_filesize (self, dom_element_get_attribute (node, "maxbytes")); + } + else if (g_strcmp0 (node->tag_name, "videosize") == 0) { + flickr_account_set_max_videosize (self, dom_element_get_attribute (node, "maxbytes")); + } + else if (g_strcmp0 (node->tag_name, "sets") == 0) { + flickr_account_set_n_sets (self, dom_element_get_attribute (node, "created")); + } + else if (g_strcmp0 (node->tag_name, "videos") == 0) { + flickr_account_set_n_videos (self, dom_element_get_attribute (node, "uploaded")); + } + } + } diff -Nru gthumb-3.0.2/extensions/flicker_utils/flickr-account.h gthumb-3.2.3/extensions/flicker_utils/flickr-account.h --- gthumb-3.0.2/extensions/flicker_utils/flickr-account.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/flickr-account.h 2013-04-30 16:56:12.000000000 +0000 @@ -3,7 +3,7 @@ /* * GThumb * - * Copyright (C) 2010 Free Software Foundation, Inc. + * Copyright (C) 2012 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,6 +24,7 @@ #include #include +#include G_BEGIN_DECLS @@ -36,30 +37,44 @@ typedef struct _FlickrAccount FlickrAccount; typedef struct _FlickrAccountClass FlickrAccountClass; -typedef struct _FlickrAccountPrivate FlickrAccountPrivate; struct _FlickrAccount { - GObject parent_instance; - FlickrAccountPrivate *priv; + OAuthAccount parent_instance; - char *username; - char *token; - gboolean is_default; + gboolean is_pro; + char *accountname; + goffset max_bandwidth; + goffset used_bandwidth; + goffset max_filesize; + goffset max_videosize; + int n_sets; + int n_videos; }; struct _FlickrAccountClass { - GObjectClass parent_class; + OAuthAccountClass parent_class; }; -GType flickr_account_get_type (void); -FlickrAccount * flickr_account_new (void); -void flickr_account_set_username (FlickrAccount *self, - const char *value); -void flickr_account_set_token (FlickrAccount *self, - const char *value); -void flickr_account_reset (FlickrAccount *self); -int flickr_account_cmp (FlickrAccount *a, - FlickrAccount *b); +GType flickr_account_get_type (void); +OAuthAccount * flickr_account_new (void); +void flickr_account_set_is_pro (FlickrAccount *self, + const char *value); +void flickr_account_set_accountname (FlickrAccount *self, + const char *value); +void flickr_account_set_max_bandwidth (FlickrAccount *self, + const char *value); +void flickr_account_set_used_bandwidth (FlickrAccount *self, + const char *value); +void flickr_account_set_max_filesize (FlickrAccount *self, + const char *value); +void flickr_account_set_max_videosize (FlickrAccount *self, + const char *value); +void flickr_account_set_n_sets (FlickrAccount *self, + const char *value); +void flickr_account_set_n_videos (FlickrAccount *self, + const char *value); +void flickr_account_load_extra_data (FlickrAccount *self, + DomElement *element); G_END_DECLS diff -Nru gthumb-3.0.2/extensions/flicker_utils/flickr-authentication.c gthumb-3.2.3/extensions/flicker_utils/flickr-authentication.c --- gthumb-3.0.2/extensions/flicker_utils/flickr-authentication.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/flickr-authentication.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,701 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#ifdef HAVE_GNOME_KEYRING -#include -#endif /* HAVE_GNOME_KEYRING */ -#include "flickr-account-chooser-dialog.h" -#include "flickr-account-manager-dialog.h" -#include "flickr-authentication.h" -#include "flickr-user.h" -#include "flickr-service.h" - - -#define FLICKR_AUTHENTICATION_RESPONSE_CHOOSE_ACCOUNT 2 - - -/* Signals */ -enum { - READY, - ACCOUNTS_CHANGED, - LAST_SIGNAL -}; - -struct _FlickrAuthenticationPrivate -{ - FlickrConnection *conn; - FlickrService *service; - GCancellable *cancellable; - GList *accounts; - FlickrAccount *account; - GtkWidget *browser; - GtkWidget *dialog; -}; - - -static guint flickr_authentication_signals[LAST_SIGNAL] = { 0 }; - - -G_DEFINE_TYPE (FlickrAuthentication, flickr_authentication, G_TYPE_OBJECT) - - -static void -flickr_authentication_finalize (GObject *object) -{ - FlickrAuthentication *self; - - self = FLICKR_AUTHENTICATION (object); - _g_object_unref (self->priv->conn); - _g_object_unref (self->priv->service); - _g_object_unref (self->priv->cancellable); - _g_object_list_unref (self->priv->accounts); - _g_object_unref (self->priv->account); - - G_OBJECT_CLASS (flickr_authentication_parent_class)->finalize (object); -} - - -static void -flickr_authentication_class_init (FlickrAuthenticationClass *class) -{ - GObjectClass *object_class; - - g_type_class_add_private (class, sizeof (FlickrAuthenticationPrivate)); - - object_class = (GObjectClass*) class; - object_class->finalize = flickr_authentication_finalize; - - /* signals */ - - flickr_authentication_signals[READY] = - g_signal_new ("ready", - G_TYPE_FROM_CLASS (class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (FlickrAuthenticationClass, ready), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, - 1, - G_TYPE_OBJECT); - flickr_authentication_signals[ACCOUNTS_CHANGED] = - g_signal_new ("accounts_changed", - G_TYPE_FROM_CLASS (class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (FlickrAuthenticationClass, accounts_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); -} - - -static void -flickr_authentication_init (FlickrAuthentication *self) -{ - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, FLICKR_TYPE_AUTHENTICATION, FlickrAuthenticationPrivate); - self->priv->conn = NULL; - self->priv->accounts = NULL; - self->priv->account = NULL; -} - - -FlickrAuthentication * -flickr_authentication_new (FlickrConnection *conn, - FlickrService *service, - GCancellable *cancellable, - GtkWidget *browser, - GtkWidget *dialog) -{ - FlickrAuthentication *self; - - g_return_val_if_fail (conn != NULL, NULL); - - self = (FlickrAuthentication *) g_object_new (FLICKR_TYPE_AUTHENTICATION, NULL); - self->priv->conn = g_object_ref (conn); - self->priv->service = g_object_ref (service); - self->priv->cancellable = _g_object_ref (cancellable); - self->priv->accounts = flickr_accounts_load_from_file (conn->server->name); - self->priv->account = flickr_accounts_find_default (self->priv->accounts); - self->priv->browser = browser; - self->priv->dialog = dialog; - - return self; -} - - -static void show_choose_account_dialog (FlickrAuthentication *self); - - -static void -authentication_error_dialog_response_cb (GtkDialog *dialog, - int response_id, - gpointer user_data) -{ - FlickrAuthentication *self = user_data; - - switch (response_id) { - case GTK_RESPONSE_DELETE_EVENT: - case GTK_RESPONSE_CANCEL: - gtk_widget_destroy (GTK_WIDGET (dialog)); - gtk_dialog_response (GTK_DIALOG (self->priv->dialog), GTK_RESPONSE_DELETE_EVENT); - break; - - case FLICKR_AUTHENTICATION_RESPONSE_CHOOSE_ACCOUNT: - gtk_widget_destroy (GTK_WIDGET (dialog)); - show_choose_account_dialog (self); - break; - - default: - break; - } -} - - -static void start_authorization_process (FlickrAuthentication *self); - - -static void -show_authentication_error_dialog (FlickrAuthentication *self, - GError **error) -{ - GtkWidget *dialog; - - if (g_error_matches (*error, FLICKR_CONNECTION_ERROR, FLICKR_CONNECTION_ERROR_INVALID_TOKEN)) { - start_authorization_process (self); - return; - } - - dialog = _gtk_message_dialog_new (GTK_WINDOW (self->priv->browser), - GTK_DIALOG_MODAL, - GTK_STOCK_DIALOG_ERROR, - _("Could not connect to the server"), - (*error)->message, - _("Choose _Account..."), FLICKR_AUTHENTICATION_RESPONSE_CHOOSE_ACCOUNT, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - NULL); - if (self->priv->conn != NULL) - gth_task_dialog (GTH_TASK (self->priv->conn), TRUE, dialog); - - g_signal_connect (dialog, - "delete-event", - G_CALLBACK (gtk_true), - NULL); - g_signal_connect (dialog, - "response", - G_CALLBACK (authentication_error_dialog_response_cb), - self); - gtk_widget_show (dialog); - - g_clear_error (error); -} - - -/* -- flickr_authentication_auto_connect -- */ - - -static void -upload_status_ready_cb (GObject *source_object, - GAsyncResult *res, - gpointer user_data) -{ - FlickrAuthentication *self = user_data; - FlickrUser *user; - GError *error = NULL; - - user = flickr_service_get_upload_status_finish (FLICKR_SERVICE (source_object), res, &error); - if (error != NULL) { - show_authentication_error_dialog (self, &error); - return; - } - flickr_accounts_save_to_file (self->priv->conn->server->name, self->priv->accounts, self->priv->account); - - g_signal_emit (self, flickr_authentication_signals[READY], 0, user); - - g_object_unref (user); -} - - -static void -connect_to_server_step2 (FlickrAuthentication *self) -{ - if (self->priv->account->token == NULL) { - start_authorization_process (self); - return; - } - flickr_connection_set_account (self->priv->conn, self->priv->account); - flickr_service_get_upload_status (self->priv->service, - self->priv->cancellable, - upload_status_ready_cb, - self); -} - - -#ifdef HAVE_GNOME_KEYRING -static void -find_password_cb (GnomeKeyringResult result, - const char *string, - gpointer user_data) -{ - FlickrAuthentication *self = user_data; - - if (string != NULL) - self->priv->account->token = g_strdup (string); - connect_to_server_step2 (self); -} -#endif - - -static void -connect_to_server (FlickrAuthentication *self) -{ - g_return_if_fail (self->priv->account != NULL); - -#ifdef HAVE_GNOME_KEYRING - if ((self->priv->account->token == NULL) && gnome_keyring_is_available ()) { - gnome_keyring_find_password (GNOME_KEYRING_NETWORK_PASSWORD, - find_password_cb, - self, - NULL, - "user", self->priv->account->username, - "server", self->priv->conn->server->url, - "protocol", "http", - NULL); - return; - } -#endif - - connect_to_server_step2 (self); -} - - -static void -set_account (FlickrAuthentication *self, - FlickrAccount *account) -{ - GList *link; - - link = g_list_find_custom (self->priv->accounts, self->priv->account, (GCompareFunc) flickr_account_cmp); - if (link != NULL) { - self->priv->accounts = g_list_remove_link (self->priv->accounts, link); - _g_object_list_unref (link); - } - - _g_object_unref (self->priv->account); - self->priv->account = NULL; - - if (account != NULL) { - self->priv->account = g_object_ref (account); - self->priv->accounts = g_list_prepend (self->priv->accounts, g_object_ref (self->priv->account)); - } -} - - -#ifdef HAVE_GNOME_KEYRING -static void -store_password_done_cb (GnomeKeyringResult result, - gpointer user_data) -{ - FlickrAuthentication *self = user_data; - connect_to_server (self); -} -#endif - - -static void -connection_token_ready_cb (GObject *source_object, - GAsyncResult *res, - gpointer user_data) -{ - FlickrAuthentication *self = user_data; - GError *error = NULL; - FlickrAccount *account; - - if (! flickr_connection_get_token_finish (FLICKR_CONNECTION (source_object), res, &error)) { - show_authentication_error_dialog (self, &error); - return; - } - - account = flickr_connection_get_account (self->priv->conn); - set_account (self, account); - -#ifdef HAVE_GNOME_KEYRING - if (gnome_keyring_is_available ()) { - gnome_keyring_store_password (GNOME_KEYRING_NETWORK_PASSWORD, - NULL, - self->priv->conn->server->name, - account->token, - store_password_done_cb, - self, - NULL, - "user", account->username, - "server", self->priv->conn->server->url, - "protocol", "http", - NULL); - return; - } -#endif - - connect_to_server (self); -} - - -static void -complete_authorization_messagedialog_response_cb (GtkDialog *dialog, - int response_id, - gpointer user_data) -{ - FlickrAuthentication *self = user_data; - - switch (response_id) { - case GTK_RESPONSE_HELP: - show_help_dialog (GTK_WINDOW (dialog), "flicker-complete-authorization"); - break; - - case GTK_RESPONSE_DELETE_EVENT: - case GTK_RESPONSE_CANCEL: - gtk_widget_destroy (GTK_WIDGET (dialog)); - gtk_dialog_response (GTK_DIALOG (self->priv->dialog), GTK_RESPONSE_DELETE_EVENT); - break; - - case GTK_RESPONSE_OK: - gtk_widget_destroy (GTK_WIDGET (dialog)); - gth_task_dialog (GTH_TASK (self->priv->conn), FALSE, NULL); - flickr_connection_get_token (self->priv->conn, - self->priv->cancellable, - connection_token_ready_cb, - self); - break; - - default: - break; - } -} - - -static void -complete_authorization (FlickrAuthentication *self) -{ - GtkBuilder *builder; - GtkWidget *dialog; - char *text; - char *secondary_text; - - gth_task_dialog (GTH_TASK (self->priv->conn), TRUE, NULL); - - builder = _gtk_builder_new_from_file ("flicker-complete-authorization.ui", "flicker_utils"); - dialog = _gtk_builder_get_widget (builder, "complete_authorization_messagedialog"); - text = g_strdup_printf (_("Return to this window when you have finished the authorization process on %s"), self->priv->conn->server->name); - secondary_text = g_strdup (_("Once you're done, click the 'Continue' button below.")); - g_object_set (dialog, "text", text, "secondary-text", secondary_text, NULL); - g_object_set_data_full (G_OBJECT (dialog), "builder", builder, g_object_unref); - g_signal_connect (dialog, - "delete-event", - G_CALLBACK (gtk_true), - NULL); - g_signal_connect (dialog, - "response", - G_CALLBACK (complete_authorization_messagedialog_response_cb), - self); - - if (gtk_widget_get_visible (self->priv->dialog)) - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self->priv->dialog)); - else - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self->priv->browser)); - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - gtk_window_present (GTK_WINDOW (dialog)); - - g_free (secondary_text); - g_free (text); -} - - -static void -ask_authorization_messagedialog_response_cb (GtkDialog *dialog, - int response_id, - gpointer user_data) -{ - FlickrAuthentication *self = user_data; - - switch (response_id) { - case GTK_RESPONSE_HELP: - show_help_dialog (GTK_WINDOW (dialog), "flicker-ask-authorization"); - break; - - case GTK_RESPONSE_DELETE_EVENT: - case GTK_RESPONSE_CANCEL: - gtk_widget_destroy (GTK_WIDGET (dialog)); - gtk_dialog_response (GTK_DIALOG (self->priv->dialog), GTK_RESPONSE_DELETE_EVENT); - break; - - case GTK_RESPONSE_OK: - { - GdkScreen *screen; - char *url; - GError *error = NULL; - - screen = gtk_widget_get_screen (GTK_WIDGET (dialog)); - gtk_widget_destroy (GTK_WIDGET (dialog)); - - url = flickr_connection_get_login_link (self->priv->conn, FLICKR_ACCESS_WRITE); - if (gtk_show_uri (screen, url, 0, &error)) - complete_authorization (self); - else - show_authentication_error_dialog (self, &error); - - g_free (url); - } - break; - - default: - break; - } -} - - -static void -ask_authorization (FlickrAuthentication *self) -{ - GtkBuilder *builder; - GtkWidget *dialog; - char *text; - char *secondary_text; - - gth_task_dialog (GTH_TASK (self->priv->conn), TRUE, NULL); - - builder = _gtk_builder_new_from_file ("flicker-ask-authorization.ui", "flicker_utils"); - dialog = _gtk_builder_get_widget (builder, "ask_authorization_messagedialog"); - text = g_strdup_printf (_("gthumb requires your authorization to upload the photos to %s"), self->priv->conn->server->name); - secondary_text = g_strdup_printf (_("Click 'Authorize' to open your web browser and authorize gthumb to upload photos to %s. When you're finished, return to this window to complete the authorization."), self->priv->conn->server->name); - g_object_set (dialog, "text", text, "secondary-text", secondary_text, NULL); - g_object_set_data_full (G_OBJECT (dialog), "builder", builder, g_object_unref); - g_signal_connect (dialog, - "delete-event", - G_CALLBACK (gtk_true), - NULL); - g_signal_connect (dialog, - "response", - G_CALLBACK (ask_authorization_messagedialog_response_cb), - self); - - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - if (gtk_widget_get_visible (self->priv->dialog)) - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self->priv->dialog)); - else - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self->priv->browser)); - gtk_window_present (GTK_WINDOW (dialog)); - - g_free (secondary_text); - g_free (text); -} - - -static void -connection_frob_ready_cb (GObject *source_object, - GAsyncResult *res, - gpointer user_data) -{ - FlickrAuthentication *self = user_data; - GError *error = NULL; - - if (! flickr_connection_get_frob_finish (FLICKR_CONNECTION (source_object), res, &error)) - show_authentication_error_dialog (self, &error); - else - ask_authorization (self); -} - - -static void -start_authorization_process (FlickrAuthentication *self) -{ - flickr_connection_get_frob (self->priv->conn, - self->priv->cancellable, - connection_frob_ready_cb, - self); -} - - -static void -account_chooser_dialog_response_cb (GtkDialog *dialog, - int response_id, - gpointer user_data) -{ - FlickrAuthentication *self = user_data; - - switch (response_id) { - case GTK_RESPONSE_DELETE_EVENT: - case GTK_RESPONSE_CANCEL: - gtk_widget_destroy (GTK_WIDGET (dialog)); - gtk_dialog_response (GTK_DIALOG (self->priv->dialog), GTK_RESPONSE_DELETE_EVENT); - break; - - case GTK_RESPONSE_OK: - _g_object_unref (self->priv->account); - self->priv->account = flickr_account_chooser_dialog_get_active (FLICKR_ACCOUNT_CHOOSER_DIALOG (dialog)); - if (self->priv->account != NULL) { - gtk_widget_destroy (GTK_WIDGET (dialog)); - connect_to_server (self); - } - - break; - - case FLICKR_ACCOUNT_CHOOSER_RESPONSE_NEW: - gtk_widget_destroy (GTK_WIDGET (dialog)); - start_authorization_process (self); - break; - - default: - break; - } -} - - -static void -show_choose_account_dialog (FlickrAuthentication *self) -{ - GtkWidget *dialog; - - gth_task_dialog (GTH_TASK (self->priv->conn), TRUE, NULL); - dialog = flickr_account_chooser_dialog_new (self->priv->accounts, self->priv->account); - g_signal_connect (dialog, - "delete-event", - G_CALLBACK (gtk_true), - NULL); - g_signal_connect (dialog, - "response", - G_CALLBACK (account_chooser_dialog_response_cb), - self); - - gtk_window_set_title (GTK_WINDOW (dialog), _("Choose Account")); - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self->priv->browser)); - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - gtk_window_present (GTK_WINDOW (dialog)); -} - - -void -flickr_authentication_auto_connect (FlickrAuthentication *self) -{ - gtk_widget_hide (self->priv->dialog); - gth_task_dialog (GTH_TASK (self->priv->conn), FALSE, NULL); - - if (self->priv->accounts != NULL) { - if (self->priv->account != NULL) { - connect_to_server (self); - } - else if (self->priv->accounts->next == NULL) { - self->priv->account = g_object_ref (self->priv->accounts->data); - connect_to_server (self); - } - else - show_choose_account_dialog (self); - } - else - start_authorization_process (self); -} - - -void -flickr_authentication_connect (FlickrAuthentication *self, - FlickrAccount *account) -{ - set_account (self, account); - flickr_authentication_auto_connect (self); -} - - -FlickrAccount * -flickr_authentication_get_account (FlickrAuthentication *self) -{ - return self->priv->account; -} - - -GList * -flickr_authentication_get_accounts (FlickrAuthentication *self) -{ - return self->priv->accounts; -} - - -/* -- flickr_authentication_edit_accounts -- */ - - -static void -account_manager_dialog_response_cb (GtkDialog *dialog, - int response_id, - gpointer user_data) -{ - FlickrAuthentication *self = user_data; - - switch (response_id) { - case GTK_RESPONSE_DELETE_EVENT: - case GTK_RESPONSE_CANCEL: - gtk_widget_destroy (GTK_WIDGET (dialog)); - break; - - case GTK_RESPONSE_OK: - _g_object_list_unref (self->priv->accounts); - self->priv->accounts = flickr_account_manager_dialog_get_accounts (FLICKR_ACCOUNT_MANAGER_DIALOG (dialog)); - if (! g_list_find_custom (self->priv->accounts, self->priv->account, (GCompareFunc) flickr_account_cmp)) { - _g_object_unref (self->priv->account); - self->priv->account = NULL; - flickr_authentication_auto_connect (self); - } - else - g_signal_emit (self, flickr_authentication_signals[ACCOUNTS_CHANGED], 0); - flickr_accounts_save_to_file (self->priv->conn->server->name, self->priv->accounts, self->priv->account); - gtk_widget_destroy (GTK_WIDGET (dialog)); - break; - - case FLICKR_ACCOUNT_MANAGER_RESPONSE_NEW: - gtk_widget_destroy (GTK_WIDGET (dialog)); - start_authorization_process (self); - break; - - default: - break; - } -} - - -void -flickr_authentication_edit_accounts (FlickrAuthentication *self, - GtkWindow *parent) -{ - GtkWidget *dialog; - - dialog = flickr_account_manager_dialog_new (self->priv->accounts); - g_signal_connect (dialog, - "delete-event", - G_CALLBACK (gtk_true), - NULL); - g_signal_connect (dialog, - "response", - G_CALLBACK (account_manager_dialog_response_cb), - self); - - gtk_window_set_title (GTK_WINDOW (dialog), _("Edit Accounts")); - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self->priv->dialog)); - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - gtk_window_present (GTK_WINDOW (dialog)); -} diff -Nru gthumb-3.0.2/extensions/flicker_utils/flickr-authentication.h gthumb-3.2.3/extensions/flicker_utils/flickr-authentication.h --- gthumb-3.0.2/extensions/flicker_utils/flickr-authentication.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/flickr-authentication.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef FLICKR_AUTHENTICATION_H -#define FLICKR_AUTHENTICATION_H - -#include -#include -#include "flickr-account.h" -#include "flickr-connection.h" -#include "flickr-service.h" -#include "flickr-user.h" - -G_BEGIN_DECLS - -#define FLICKR_TYPE_AUTHENTICATION (flickr_authentication_get_type ()) -#define FLICKR_AUTHENTICATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FLICKR_TYPE_AUTHENTICATION, FlickrAuthentication)) -#define FLICKR_AUTHENTICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FLICKR_TYPE_AUTHENTICATION, FlickrAuthenticationClass)) -#define FLICKR_IS_AUTHENTICATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FLICKR_TYPE_AUTHENTICATION)) -#define FLICKR_IS_AUTHENTICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FLICKR_TYPE_AUTHENTICATION)) -#define FLICKR_AUTHENTICATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), FLICKR_TYPE_AUTHENTICATION, FlickrAuthenticationClass)) - -typedef struct _FlickrAuthentication FlickrAuthentication; -typedef struct _FlickrAuthenticationClass FlickrAuthenticationClass; -typedef struct _FlickrAuthenticationPrivate FlickrAuthenticationPrivate; - -struct _FlickrAuthentication { - GObject parent_instance; - FlickrAuthenticationPrivate *priv; -}; - -struct _FlickrAuthenticationClass { - GObjectClass parent_class; - - /*< signals >*/ - - void (*ready) (FlickrAuthentication *auth, - FlickrUser *user); - void (*accounts_changed) (FlickrAuthentication *auth); -}; - -GType flickr_authentication_get_type (void); -FlickrAuthentication * flickr_authentication_new (FlickrConnection *conn, - FlickrService *service, - GCancellable *cancellable, - GtkWidget *browser, - GtkWidget *dialog); -void flickr_authentication_auto_connect (FlickrAuthentication *auth); -void flickr_authentication_connect (FlickrAuthentication *auth, - FlickrAccount *account); -FlickrAccount * flickr_authentication_get_account (FlickrAuthentication *auth); -GList * flickr_authentication_get_accounts (FlickrAuthentication *auth); -void flickr_authentication_edit_accounts (FlickrAuthentication *auth, - GtkWindow *parent); - -G_END_DECLS - -#endif /* FLICKR_AUTHENTICATION_H */ diff -Nru gthumb-3.0.2/extensions/flicker_utils/flickr-connection.c gthumb-3.2.3/extensions/flicker_utils/flickr-connection.c --- gthumb-3.0.2/extensions/flicker_utils/flickr-connection.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/flickr-connection.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,532 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include -#include "flickr-account.h" -#include "flickr-connection.h" -#include "flickr-user.h" - - -#undef DEBUG_FLICKR_CONNECTION - - -GQuark -flickr_connection_error_quark (void) -{ - static GQuark quark; - - if (!quark) - quark = g_quark_from_static_string ("flickr_connection"); - - return quark; -} - - -/* -- FlickrConnection -- */ - - -struct _FlickrConnectionPrivate -{ - SoupSession *session; - SoupMessage *msg; - char *frob; - FlickrAccount *account; - GCancellable *cancellable; - GSimpleAsyncResult *result; - GChecksum *checksum; -}; - - -G_DEFINE_TYPE (FlickrConnection, flickr_connection, GTH_TYPE_TASK) - - -static void -flickr_connection_finalize (GObject *object) -{ - FlickrConnection *self; - - self = FLICKR_CONNECTION (object); - - g_checksum_free (self->priv->checksum); - _g_object_unref (self->priv->result); - _g_object_unref (self->priv->cancellable); - _g_object_unref (self->priv->account); - g_free (self->priv->frob); - _g_object_unref (self->priv->session); - - G_OBJECT_CLASS (flickr_connection_parent_class)->finalize (object); -} - - -static void -flickr_connection_exec (GthTask *base) -{ - /* void */ -} - - -static void -flickr_connection_cancelled (GthTask *base) -{ - FlickrConnection *self = FLICKR_CONNECTION (base); - - if ((self->priv->session == NULL) || (self->priv->msg == NULL)) - return; - - soup_session_cancel_message (self->priv->session, self->priv->msg, SOUP_STATUS_CANCELLED); -} - - -static void -flickr_connection_class_init (FlickrConnectionClass *klass) -{ - GObjectClass *object_class; - GthTaskClass *task_class; - - g_type_class_add_private (klass, sizeof (FlickrConnectionPrivate)); - - object_class = (GObjectClass*) klass; - object_class->finalize = flickr_connection_finalize; - - task_class = (GthTaskClass*) klass; - task_class->exec = flickr_connection_exec; - task_class->cancelled = flickr_connection_cancelled; -} - - -static void -flickr_connection_init (FlickrConnection *self) -{ - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, FLICKR_TYPE_CONNECTION, FlickrConnectionPrivate); - self->priv->session = NULL; - self->priv->msg = NULL; - self->priv->account = flickr_account_new (); - self->priv->frob = NULL; - self->priv->cancellable = NULL; - self->priv->result = NULL; - self->priv->checksum = g_checksum_new (G_CHECKSUM_MD5); -} - - -FlickrConnection * -flickr_connection_new (FlickrServer *server) -{ - FlickrConnection *self; - - self = (FlickrConnection *) g_object_new (FLICKR_TYPE_CONNECTION, NULL); - self->server = server; - - return self; -} - - -FlickrServer * -flickr_connection_get_server (FlickrConnection *self) -{ - return self->server; -} - - -void -flickr_connection_send_message (FlickrConnection *self, - SoupMessage *msg, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data, - gpointer source_tag, - SoupSessionCallback soup_session_cb, - gpointer soup_session_cb_data) -{ - if (self->priv->session == NULL) { - self->priv->session = soup_session_async_new_with_options ( -#ifdef HAVE_LIBSOUP_GNOME - SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_PROXY_RESOLVER_GNOME, -#endif - NULL); - -#ifdef DEBUG_FLICKR_CONNECTION - { - SoupLogger *logger; - - logger = soup_logger_new (SOUP_LOGGER_LOG_BODY, -1); - soup_session_add_feature (self->priv->session, SOUP_SESSION_FEATURE (logger)); - - g_object_unref (logger); - } -#endif - } - - _g_object_unref (self->priv->cancellable); - self->priv->cancellable = _g_object_ref (cancellable); - - _g_object_unref (self->priv->result); - self->priv->result = g_simple_async_result_new (G_IS_OBJECT (soup_session_cb_data) ? G_OBJECT (soup_session_cb_data) : NULL, - callback, - user_data, - source_tag); - - self->priv->msg = msg; - g_object_add_weak_pointer (G_OBJECT (msg), (gpointer *) &self->priv->msg); - - soup_session_queue_message (self->priv->session, - msg, - soup_session_cb, - soup_session_cb_data); -} - - -GSimpleAsyncResult * -flickr_connection_get_result (FlickrConnection *self) -{ - return self->priv->result; -} - - -void -flickr_connection_reset_result (FlickrConnection *self) -{ - _g_object_unref (self->priv->result); - self->priv->result = NULL; -} - - -void -flickr_connection_add_api_sig (FlickrConnection *self, - GHashTable *data_set) -{ - GList *keys; - GList *scan; - - g_hash_table_insert (data_set, "api_key", (gpointer) self->server->api_key); - if (self->priv->account->token != NULL) - g_hash_table_insert (data_set, "auth_token", self->priv->account->token); - - g_checksum_reset (self->priv->checksum); - g_checksum_update (self->priv->checksum, (guchar *) self->server->shared_secret, -1); - - keys = g_hash_table_get_keys (data_set); - keys = g_list_sort (keys, (GCompareFunc) strcmp); - for (scan = keys; scan; scan = scan->next) { - char *key = scan->data; - - g_checksum_update (self->priv->checksum, (guchar *) key, -1); - g_checksum_update (self->priv->checksum, g_hash_table_lookup (data_set, key), -1); - } - g_hash_table_insert (data_set, "api_sig", (gpointer) g_checksum_get_string (self->priv->checksum)); - - g_list_free (keys); -} - - -static void -connection_frob_ready_cb (SoupSession *session, - SoupMessage *msg, - gpointer user_data) -{ - FlickrConnection *self = user_data; - SoupBuffer *body; - DomDocument *doc = NULL; - GError *error = NULL; - - g_free (self->priv->frob); - self->priv->frob = NULL; - - body = soup_message_body_flatten (msg->response_body); - if (flickr_utils_parse_response (body, &doc, &error)) { - DomElement *root; - DomElement *child; - - root = DOM_ELEMENT (doc)->first_child; - for (child = root->first_child; child; child = child->next_sibling) - if (g_strcmp0 (child->tag_name, "frob") == 0) - self->priv->frob = g_strdup (dom_element_get_inner_text (child)); - - if (self->priv->frob == NULL) { - error = g_error_new_literal (FLICKR_CONNECTION_ERROR, 0, _("Unknown error")); - g_simple_async_result_set_from_error (self->priv->result, error); - } - else - g_simple_async_result_set_op_res_gboolean (self->priv->result, TRUE); - - g_object_unref (doc); - } - else - g_simple_async_result_set_from_error (self->priv->result, error); - - g_simple_async_result_complete_in_idle (self->priv->result); - - soup_buffer_free (body); -} - - -void -flickr_connection_get_frob (FlickrConnection *self, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - GHashTable *data_set; - SoupMessage *msg; - - gth_task_progress (GTH_TASK (self), _("Connecting to the server"), NULL, TRUE, 0.0); - - flickr_account_set_token (self->priv->account, NULL); - - data_set = g_hash_table_new (g_str_hash, g_str_equal); - g_hash_table_insert (data_set, "method", "flickr.auth.getFrob"); - flickr_connection_add_api_sig (self, data_set); - msg = soup_form_request_new_from_hash ("GET", self->server->rest_url, data_set); - flickr_connection_send_message (self, - msg, - cancellable, - callback, - user_data, - flickr_connection_get_frob, - connection_frob_ready_cb, - self); - - g_hash_table_destroy (data_set); -} - - -gboolean -flickr_connection_get_frob_finish (FlickrConnection *self, - GAsyncResult *result, - GError **error) -{ - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return FALSE; - else - return TRUE; -} - - -static char * -get_access_type_name (FlickrAccessType access_type) -{ - char *name = NULL; - - switch (access_type) { - case FLICKR_ACCESS_READ: - name = "read"; - break; - - case FLICKR_ACCESS_WRITE: - name = "write"; - break; - - case FLICKR_ACCESS_DELETE: - name = "delete"; - break; - } - - return name; -} - -char * -flickr_connection_get_login_link (FlickrConnection *self, - FlickrAccessType access_type) -{ - GHashTable *data_set; - GString *link; - GList *keys; - GList *scan; - - g_return_val_if_fail (self->priv->frob != NULL, NULL); - - data_set = g_hash_table_new (g_str_hash, g_str_equal); - g_hash_table_insert (data_set, "frob", self->priv->frob); - g_hash_table_insert (data_set, "perms", get_access_type_name (access_type)); - flickr_connection_add_api_sig (self, data_set); - - link = g_string_new (self->server->authentication_url); - g_string_append (link, "?"); - keys = g_hash_table_get_keys (data_set); - for (scan = keys; scan; scan = scan->next) { - char *key = scan->data; - - if (scan != keys) - g_string_append (link, "&"); - g_string_append (link, key); - g_string_append (link, "="); - g_string_append (link, g_hash_table_lookup (data_set, key)); - } - - g_list_free (keys); - g_hash_table_destroy (data_set); - - return g_string_free (link, FALSE); -} - - -static void -connection_token_ready_cb (SoupSession *session, - SoupMessage *msg, - gpointer user_data) -{ - FlickrConnection *self = user_data; - SoupBuffer *body; - DomDocument *doc = NULL; - GError *error = NULL; - - body = soup_message_body_flatten (msg->response_body); - if (flickr_utils_parse_response (body, &doc, &error)) { - DomElement *response; - DomElement *auth; - - response = DOM_ELEMENT (doc)->first_child; - for (auth = response->first_child; auth; auth = auth->next_sibling) { - if (g_strcmp0 (auth->tag_name, "auth") == 0) { - DomElement *node; - - for (node = auth->first_child; node; node = node->next_sibling) { - if (g_strcmp0 (node->tag_name, "token") == 0) - flickr_account_set_token (self->priv->account, dom_element_get_inner_text (node)); - else if (g_strcmp0 (node->tag_name, "user") == 0) - flickr_account_set_username (self->priv->account, dom_element_get_attribute (node, "username")); - } - } - } - - if (self->priv->account->token == NULL) { - error = g_error_new_literal (FLICKR_CONNECTION_ERROR, 0, _("Unknown error")); - g_simple_async_result_set_from_error (self->priv->result, error); - } - else - g_simple_async_result_set_op_res_gboolean (self->priv->result, TRUE); - - g_object_unref (doc); - } - else - g_simple_async_result_set_from_error (self->priv->result, error); - - g_simple_async_result_complete_in_idle (self->priv->result); - - soup_buffer_free (body); -} - - -void -flickr_connection_get_token (FlickrConnection *self, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - GHashTable *data_set; - SoupMessage *msg; - - gth_task_progress (GTH_TASK (self), _("Connecting to the server"), NULL, TRUE, 0.0); - - flickr_account_set_token (self->priv->account, NULL); - - data_set = g_hash_table_new (g_str_hash, g_str_equal); - g_hash_table_insert (data_set, "method", "flickr.auth.getToken"); - g_hash_table_insert (data_set, "frob", self->priv->frob); - flickr_connection_add_api_sig (self, data_set); - msg = soup_form_request_new_from_hash ("GET", self->server->rest_url, data_set); - flickr_connection_send_message (self, - msg, - cancellable, - callback, - user_data, - flickr_connection_get_token, - connection_token_ready_cb, - self); - - g_hash_table_destroy (data_set); -} - - -gboolean -flickr_connection_get_token_finish (FlickrConnection *self, - GAsyncResult *result, - GError **error) -{ - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return FALSE; - else - return TRUE; -} - - -void -flickr_connection_set_account (FlickrConnection *self, - FlickrAccount *account) -{ - if (account != NULL) { - _g_object_unref (self->priv->account); - self->priv->account = _g_object_ref (account); - } - else - flickr_account_reset (self->priv->account); -} - - -FlickrAccount * -flickr_connection_get_account (FlickrConnection *self) -{ - return self->priv->account; -} - - -/* utilities */ - - -gboolean -flickr_utils_parse_response (SoupBuffer *body, - DomDocument **doc_p, - GError **error) -{ - DomDocument *doc; - DomElement *node; - - doc = dom_document_new (); - if (! dom_document_load (doc, body->data, body->length, error)) { - g_object_unref (doc); - return FALSE; - } - - for (node = DOM_ELEMENT (doc)->first_child; node; node = node->next_sibling) { - if (g_strcmp0 (node->tag_name, "rsp") == 0) { - if (g_strcmp0 (dom_element_get_attribute (node, "stat"), "ok") != 0) { - DomElement *child; - - for (child = node->first_child; child; child = child->next_sibling) { - if (g_strcmp0 (child->tag_name, "err") == 0) { - *error = g_error_new_literal (FLICKR_CONNECTION_ERROR, - atoi (dom_element_get_attribute (child, "code")), - dom_element_get_attribute (child, "msg")); - } - } - - g_object_unref (doc); - return FALSE; - } - } - } - - *doc_p = doc; - - return TRUE; -} diff -Nru gthumb-3.0.2/extensions/flicker_utils/flickr-connection.h gthumb-3.2.3/extensions/flicker_utils/flickr-connection.h --- gthumb-3.0.2/extensions/flicker_utils/flickr-connection.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/flickr-connection.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,107 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef FLICKR_CONNECTION_H -#define FLICKR_CONNECTION_H - -#include -#ifdef HAVE_LIBSOUP_GNOME -#include -#else -#include -#endif /* HAVE_LIBSOUP_GNOME */ -#include -#include "flickr-types.h" - -typedef enum { - FLICKR_ACCESS_READ, - FLICKR_ACCESS_WRITE, - FLICKR_ACCESS_DELETE -} FlickrAccessType; - -#define FLICKR_CONNECTION_ERROR flickr_connection_error_quark () -GQuark flickr_connection_error_quark (void); -#define FLICKR_CONNECTION_ERROR_INVALID_TOKEN 98 - -#define FLICKR_TYPE_CONNECTION (flickr_connection_get_type ()) -#define FLICKR_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), FLICKR_TYPE_CONNECTION, FlickrConnection)) -#define FLICKR_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), FLICKR_TYPE_CONNECTION, FlickrConnectionClass)) -#define FLICKR_IS_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), FLICKR_TYPE_CONNECTION)) -#define FLICKR_IS_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), FLICKR_TYPE_CONNECTION)) -#define FLICKR_CONNECTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), FLICKR_TYPE_CONNECTION, FlickrConnectionClass)) - -typedef struct _FlickrConnection FlickrConnection; -typedef struct _FlickrConnectionPrivate FlickrConnectionPrivate; -typedef struct _FlickrConnectionClass FlickrConnectionClass; - -struct _FlickrConnection -{ - GthTask __parent; - FlickrServer *server; - FlickrConnectionPrivate *priv; -}; - -struct _FlickrConnectionClass -{ - GthTaskClass __parent_class; -}; - -GType flickr_connection_get_type (void) G_GNUC_CONST; -FlickrConnection * flickr_connection_new (FlickrServer *server); -void flickr_connection_send_message (FlickrConnection *self, - SoupMessage *msg, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data, - gpointer source_tag, - SoupSessionCallback soup_session_cb, - gpointer soup_session_cb_data); -GSimpleAsyncResult * flickr_connection_get_result (FlickrConnection *self); -void flickr_connection_reset_result (FlickrConnection *self); -void flickr_connection_add_api_sig (FlickrConnection *self, - GHashTable *data_set); -void flickr_connection_get_frob (FlickrConnection *self, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -gboolean flickr_connection_get_frob_finish (FlickrConnection *self, - GAsyncResult *result, - GError **error); -char * flickr_connection_get_login_link (FlickrConnection *self, - FlickrAccessType access_type); -void flickr_connection_get_token (FlickrConnection *self, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -gboolean flickr_connection_get_token_finish (FlickrConnection *self, - GAsyncResult *result, - GError **error); -void flickr_connection_set_account (FlickrConnection *self, - FlickrAccount *account); -FlickrAccount * flickr_connection_get_account (FlickrConnection *self); - -/* utilities */ - -gboolean flickr_utils_parse_response (SoupBuffer *body, - DomDocument **doc_p, - GError **error); - -#endif /* FLICKR_CONNECTION_H */ diff -Nru gthumb-3.0.2/extensions/flicker_utils/flickr-consumer.c gthumb-3.2.3/extensions/flicker_utils/flickr-consumer.c --- gthumb-3.0.2/extensions/flicker_utils/flickr-consumer.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/flickr-consumer.c 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,139 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + +#include +#include +#include +#include +#include "flickr-account.h" +#include "flickr-consumer.h" +#include "flickr-service.h" + + +gboolean +flickr_utils_parse_response (SoupBuffer *body, + DomDocument **doc_p, + GError **error) +{ + DomDocument *doc; + DomElement *node; + + doc = dom_document_new (); + if (! dom_document_load (doc, body->data, body->length, error)) { + g_object_unref (doc); + return FALSE; + } + + for (node = DOM_ELEMENT (doc)->first_child; node; node = node->next_sibling) { + if (g_strcmp0 (node->tag_name, "rsp") == 0) { + if (g_strcmp0 (dom_element_get_attribute (node, "stat"), "ok") != 0) { + DomElement *child; + + for (child = node->first_child; child; child = child->next_sibling) { + if (g_strcmp0 (child->tag_name, "err") == 0) { + *error = g_error_new_literal (WEB_SERVICE_ERROR, + atoi (dom_element_get_attribute (child, "code")), + dom_element_get_attribute (child, "msg")); + } + } + + g_object_unref (doc); + return FALSE; + } + } + } + + *doc_p = doc; + + return TRUE; +} + + +static char * +flickr_get_authorization_url (OAuthService *self) +{ + FlickrServer *server; + char *escaped_token; + char *uri; + + server = flickr_service_get_server (FLICKR_SERVICE (self)); + escaped_token = soup_uri_encode (oauth_service_get_token (self), NULL); + uri = g_strconcat (server->authorization_url, + "?oauth_token=", escaped_token, + "&perms=write", + NULL); + + g_free (escaped_token); + + return uri; +} + + +static void +flickr_access_token_response (OAuthService *self, + SoupMessage *msg, + SoupBuffer *body, + GSimpleAsyncResult *result) +{ + GHashTable *values; + char *username; + char *token; + char *token_secret; + + values = soup_form_decode (body->data); + + username = g_hash_table_lookup (values, "username"); + token = g_hash_table_lookup (values, "oauth_token"); + token_secret = g_hash_table_lookup (values, "oauth_token_secret"); + if ((username != NULL) && (token != NULL) && (token_secret != NULL)) { + FlickrAccount *account; + + oauth_service_set_token (OAUTH_SERVICE (self), token); + oauth_service_set_token_secret (OAUTH_SERVICE (self), token_secret); + + account = g_object_new (FLICKR_TYPE_ACCOUNT, + "id", g_hash_table_lookup (values, "user_nsid"), + "name", username, + "token", token, + "token-secret", token_secret, + NULL); + g_simple_async_result_set_op_res_gpointer (result, account, g_object_unref); + } + else { + GError *error; + + error = g_error_new_literal (WEB_SERVICE_ERROR, WEB_SERVICE_ERROR_GENERIC, _("Unknown error")); + g_simple_async_result_set_from_error (result, error); + } + + g_hash_table_destroy (values); +} + + +OAuthConsumer flickr_consumer = { + NULL, + NULL, + NULL, + flickr_get_authorization_url, + NULL, + flickr_access_token_response +}; diff -Nru gthumb-3.0.2/extensions/flicker_utils/flickr-consumer.h gthumb-3.2.3/extensions/flicker_utils/flickr-consumer.h --- gthumb-3.0.2/extensions/flicker_utils/flickr-consumer.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/flickr-consumer.h 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,34 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef FLICKR_CONSUMER_H +#define FLICKR_CONSUMER_H + +#include +#include + +extern OAuthConsumer flickr_consumer; + +gboolean flickr_utils_parse_response (SoupBuffer *body, + DomDocument **doc_p, + GError **error); + +#endif /* FLICKR_CONSUMER_H */ diff -Nru gthumb-3.0.2/extensions/flicker_utils/flickr-service.c gthumb-3.2.3/extensions/flicker_utils/flickr-service.c --- gthumb-3.0.2/extensions/flicker_utils/flickr-service.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/flickr-service.c 2013-07-07 10:33:09.000000000 +0000 @@ -24,23 +24,31 @@ #include #include #include "flickr-account.h" -#include "flickr-connection.h" +#include "flickr-consumer.h" #include "flickr-photo.h" #include "flickr-photoset.h" #include "flickr-service.h" -#include "flickr-user.h" #define IMAGES_PER_PAGE 500 +#define RESPONSE_FORMAT "rest" -G_DEFINE_TYPE (FlickrService, flickr_service, G_TYPE_OBJECT) +G_DEFINE_TYPE (FlickrService, flickr_service, OAUTH_TYPE_SERVICE) + + +enum { + PROP_0, + PROP_SERVER +}; typedef struct { - FlickrPrivacyType privacy_level; - FlickrSafetyType safety_level; + FlickrPrivacy privacy_level; + FlickrSafety safety_level; gboolean hidden; + int max_width; + int max_height; GList *file_list; GCancellable *cancellable; GAsyncReadyCallback callback; @@ -91,72 +99,533 @@ } -struct _FlickrServicePrivate -{ - FlickrConnection *conn; - FlickrUser *user; - PostPhotosData *post_photos; - AddPhotosData *add_photos; +/* -- flickr_service -- */ + + +struct _FlickrServicePrivate { + PostPhotosData *post_photos; + AddPhotosData *add_photos; + FlickrServer *server; + OAuthConsumer *consumer; + GChecksum *checksum; + char *frob; }; static void +flickr_service_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + FlickrService *self; + + self = FLICKR_SERVICE (object); + + switch (property_id) { + case PROP_SERVER: + self->priv->server = g_value_get_pointer (value); + self->priv->consumer = oauth_consumer_copy (&flickr_consumer); + self->priv->consumer->request_token_url = self->priv->server->request_token_url; + self->priv->consumer->access_token_url = self->priv->server->access_token_url; + self->priv->consumer->consumer_key = self->priv->server->consumer_key; + self->priv->consumer->consumer_secret = self->priv->server->consumer_secret; + g_object_set (self, "consumer", self->priv->consumer, NULL); + break; + default: + break; + } +} + + +static void +flickr_service_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) +{ + FlickrService *self; + + self = FLICKR_SERVICE (object); + + switch (property_id) { + case PROP_SERVER: + g_value_set_pointer (value, self->priv->server); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + + +static void flickr_service_finalize (GObject *object) { FlickrService *self; self = FLICKR_SERVICE (object); - _g_object_unref (self->priv->conn); - _g_object_unref (self->priv->user); post_photos_data_free (self->priv->post_photos); add_photos_data_free (self->priv->add_photos); + oauth_consumer_free (self->priv->consumer); + g_checksum_free (self->priv->checksum); + g_free (self->priv->frob); G_OBJECT_CLASS (flickr_service_parent_class)->finalize (object); } +/* -- flickr_service_old_auth_get_frob -- */ + + static void -flickr_service_class_init (FlickrServiceClass *klass) +flickr_service_old_auth_add_api_sig (FlickrService *self, + GHashTable *data_set) { - GObjectClass *object_class; + GList *keys; + GList *scan; - g_type_class_add_private (klass, sizeof (FlickrServicePrivate)); + g_hash_table_insert (data_set, "api_key", (gpointer) self->priv->server->consumer_key); + if (oauth_service_get_token (OAUTH_SERVICE (self)) != NULL) + g_hash_table_insert (data_set, "auth_token", (gpointer) oauth_service_get_token (OAUTH_SERVICE (self))); - object_class = (GObjectClass*) klass; - object_class->finalize = flickr_service_finalize; + g_checksum_reset (self->priv->checksum); + g_checksum_update (self->priv->checksum, (guchar *) self->priv->server->consumer_secret, -1); + + keys = g_hash_table_get_keys (data_set); + keys = g_list_sort (keys, (GCompareFunc) strcmp); + for (scan = keys; scan; scan = scan->next) { + char *key = scan->data; + + g_checksum_update (self->priv->checksum, (guchar *) key, -1); + g_checksum_update (self->priv->checksum, g_hash_table_lookup (data_set, key), -1); + } + g_hash_table_insert (data_set, "api_sig", (gpointer) g_checksum_get_string (self->priv->checksum)); + + g_list_free (keys); } static void -flickr_service_init (FlickrService *self) +flickr_service_old_auth_get_frob_ready_cb (SoupSession *session, + SoupMessage *msg, + gpointer user_data) { - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, FLICKR_TYPE_SERVICE, FlickrServicePrivate); - self->priv->conn = NULL; - self->priv->user = NULL; - self->priv->post_photos = NULL; + FlickrService *self = user_data; + GSimpleAsyncResult *result; + SoupBuffer *body; + DomDocument *doc = NULL; + GError *error = NULL; + + g_free (self->priv->frob); + self->priv->frob = NULL; + + result = _web_service_get_result (WEB_SERVICE (self)); + + body = soup_message_body_flatten (msg->response_body); + if (flickr_utils_parse_response (body, &doc, &error)) { + DomElement *root; + DomElement *child; + + root = DOM_ELEMENT (doc)->first_child; + for (child = root->first_child; child; child = child->next_sibling) + if (g_strcmp0 (child->tag_name, "frob") == 0) + self->priv->frob = g_strdup (dom_element_get_inner_text (child)); + + if (self->priv->frob == NULL) { + error = g_error_new_literal (WEB_SERVICE_ERROR, WEB_SERVICE_ERROR_GENERIC, _("Unknown error")); + g_simple_async_result_set_from_error (result, error); + } + else + g_simple_async_result_set_op_res_gboolean (result, TRUE); + + g_object_unref (doc); + } + else + g_simple_async_result_set_from_error (result, error); + + g_simple_async_result_complete_in_idle (result); + + soup_buffer_free (body); } -FlickrService * -flickr_service_new (FlickrConnection *conn) +void +flickr_service_old_auth_get_frob (FlickrService *self, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) { - FlickrService *self; + GHashTable *data_set; + SoupMessage *msg; + + oauth_service_set_token (OAUTH_SERVICE (self), NULL); + + data_set = g_hash_table_new (g_str_hash, g_str_equal); + g_hash_table_insert (data_set, "method", "flickr.auth.getFrob"); + flickr_service_old_auth_add_api_sig (self, data_set); + msg = soup_form_request_new_from_hash ("GET", self->priv->server->rest_url, data_set); + _web_service_send_message (WEB_SERVICE (self), + msg, + cancellable, + callback, + user_data, + flickr_service_old_auth_get_frob, + flickr_service_old_auth_get_frob_ready_cb, + self); + + g_hash_table_destroy (data_set); +} + + +static gboolean +flickr_service_old_auth_get_frob_finish (FlickrService *self, + GAsyncResult *result, + GError **error) +{ + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) + return FALSE; + else + return TRUE; +} + + +/* -- flickr_service_old_auth_get_token -- */ + + +static void +flickr_service_old_auth_get_token_ready_cb (SoupSession *session, + SoupMessage *msg, + gpointer user_data) +{ + FlickrService *self = user_data; + GSimpleAsyncResult *result; + SoupBuffer *body; + DomDocument *doc = NULL; + GError *error = NULL; + + result = _web_service_get_result (WEB_SERVICE (self)); + + body = soup_message_body_flatten (msg->response_body); + if (flickr_utils_parse_response (body, &doc, &error)) { + DomElement *response; + DomElement *auth; + const char *token; + + token = NULL; + response = DOM_ELEMENT (doc)->first_child; + for (auth = response->first_child; auth; auth = auth->next_sibling) { + if (g_strcmp0 (auth->tag_name, "auth") == 0) { + DomElement *node; + + for (node = auth->first_child; node; node = node->next_sibling) { + if (g_strcmp0 (node->tag_name, "token") == 0) { + token = dom_element_get_inner_text (node); + oauth_service_set_token (OAUTH_SERVICE (self), token); + break; + } + } + + for (node = auth->first_child; node; node = node->next_sibling) { + if (g_strcmp0 (node->tag_name, "user") == 0) { + FlickrAccount *account; + + account = g_object_new (FLICKR_TYPE_ACCOUNT, + "id", dom_element_get_attribute (node, "nsid"), + "username", dom_element_get_attribute (node, "username"), + "name", dom_element_get_attribute (node, "fullname"), + "token", token, + NULL); + g_simple_async_result_set_op_res_gpointer (result, account, g_object_unref); + break; + } + } + } + } + + if (token == NULL) { + error = g_error_new_literal (WEB_SERVICE_ERROR, WEB_SERVICE_ERROR_GENERIC, _("Unknown error")); + g_simple_async_result_set_from_error (result, error); + } + + g_object_unref (doc); + } + else + g_simple_async_result_set_from_error (result, error); + + g_simple_async_result_complete_in_idle (result); + + soup_buffer_free (body); +} + + +static void +flickr_service_old_auth_get_token (FlickrService *self, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GHashTable *data_set; + SoupMessage *msg; + + oauth_service_set_token (OAUTH_SERVICE (self), NULL); + + data_set = g_hash_table_new (g_str_hash, g_str_equal); + g_hash_table_insert (data_set, "method", "flickr.auth.getToken"); + g_hash_table_insert (data_set, "frob", self->priv->frob); + flickr_service_old_auth_add_api_sig (self, data_set); + msg = soup_form_request_new_from_hash ("GET", self->priv->server->rest_url, data_set); + _web_service_send_message (WEB_SERVICE (self), + msg, + cancellable, + callback, + user_data, + flickr_service_old_auth_get_token, + flickr_service_old_auth_get_token_ready_cb, + self); + + g_hash_table_destroy (data_set); +} + + +static OAuthAccount * +flickr_service_old_auth_get_token_finish (FlickrService *self, + GAsyncResult *result, + GError **error) +{ + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) + return FALSE; + else + return g_object_ref (g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result))); +} + + +static char * +old_auth_get_access_type_name (WebAuthorization access_type) +{ + char *name = NULL; + + switch (access_type) { + case WEB_AUTHORIZATION_READ: + name = "read"; + break; + + case WEB_AUTHORIZATION_WRITE: + name = "write"; + break; + } + + return name; +} + + +char * +flickr_service_old_auth_get_login_link (FlickrService *self, + WebAuthorization access_type) +{ + GHashTable *data_set; + GString *link; + GList *keys; + GList *scan; + + g_return_val_if_fail (self->priv->frob != NULL, NULL); + + data_set = g_hash_table_new (g_str_hash, g_str_equal); + g_hash_table_insert (data_set, "frob", self->priv->frob); + g_hash_table_insert (data_set, "perms", old_auth_get_access_type_name (access_type)); + flickr_service_old_auth_add_api_sig (self, data_set); + + link = g_string_new (self->priv->server->authorization_url); + g_string_append (link, "?"); + keys = g_hash_table_get_keys (data_set); + for (scan = keys; scan; scan = scan->next) { + char *key = scan->data; + + if (scan != keys) + g_string_append (link, "&"); + g_string_append (link, key); + g_string_append (link, "="); + g_string_append (link, g_hash_table_lookup (data_set, key)); + } + + g_list_free (keys); + g_hash_table_destroy (data_set); + + return g_string_free (link, FALSE); +} + + +/* -- flickr_service_ask_authorization -- */ + + +#define _RESPONSE_CONTINUE 1 +#define _RESPONSE_AUTHORIZE 2 + + +static void +old_auth_token_ready_cb (GObject *source_object, + GAsyncResult *res, + gpointer user_data) +{ + FlickrService *self = user_data; + GError *error = NULL; + OAuthAccount *account; + + account = flickr_service_old_auth_get_token_finish (self, res, &error); + + if (account == NULL) { + gtk_dialog_response (GTK_DIALOG (_web_service_get_auth_dialog (WEB_SERVICE (self))), GTK_RESPONSE_CANCEL); + gth_task_completed (GTH_TASK (self), error); + return; + } + + web_service_set_current_account (WEB_SERVICE (self), account); + gtk_dialog_response (GTK_DIALOG (_web_service_get_auth_dialog (WEB_SERVICE (self))), GTK_RESPONSE_OK); + + g_object_unref (account); +} + + +static void +old_authorization_complete (FlickrService *self) +{ + GtkWidget *dialog; + GtkBuilder *builder; + char *text; + char *secondary_text; + + dialog = _web_service_get_auth_dialog (WEB_SERVICE (self)); + builder = g_object_get_data (G_OBJECT (dialog), "builder"); + gtk_widget_hide (_gtk_builder_get_widget (builder, "authorize_button")); + gtk_widget_show (_gtk_builder_get_widget (builder, "complete_button")); + text = g_strdup_printf (_("Return to this window when you have finished the authorization process on %s"), self->priv->server->display_name); + secondary_text = g_strdup (_("Once you're done, click the 'Continue' button below.")); + g_object_set (dialog, "text", text, "secondary-text", secondary_text, NULL); + gtk_window_present (GTK_WINDOW (dialog)); + + g_free (secondary_text); + g_free (text); +} + + +static void +old_authorization_dialog_response_cb (GtkDialog *dialog, + int response_id, + gpointer user_data) +{ + FlickrService *self = user_data; + + switch (response_id) { + case _RESPONSE_AUTHORIZE: + { + GdkScreen *screen; + char *url; + GError *error = NULL; + + screen = gtk_widget_get_screen (GTK_WIDGET (dialog)); + url = flickr_service_old_auth_get_login_link (self, WEB_AUTHORIZATION_WRITE); + if (gtk_show_uri (screen, url, 0, &error)) + old_authorization_complete (self); + else + gth_task_completed (GTH_TASK (self), error); + + g_free (url); + } + break; + + case _RESPONSE_CONTINUE: + gtk_widget_hide (GTK_WIDGET (dialog)); + gth_task_dialog (GTH_TASK (self), FALSE, NULL); + flickr_service_old_auth_get_token (self, + gth_task_get_cancellable (GTH_TASK (self)), + old_auth_token_ready_cb, + self); + break; + + default: + break; + } +} + + +static void +old_auth_frob_ready_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) +{ + FlickrService *self = user_data; + GError *error = NULL; + GtkBuilder *builder; + GtkWidget *dialog; + char *text; + char *secondary_text; + + if (! flickr_service_old_auth_get_frob_finish (self, result, &error)) { + gth_task_completed (GTH_TASK (self), error); + return; + } + + builder = _gtk_builder_new_from_file ("flickr-ask-authorization-old.ui", "flicker_utils"); + dialog = _gtk_builder_get_widget (builder, "ask_authorization_dialog"); + text = g_strdup_printf (_("gThumb requires your authorization to upload the photos to %s"), self->priv->server->display_name); + secondary_text = g_strdup_printf (_("Click 'Authorize' to open your web browser and authorize gthumb to upload photos to %s. When you're finished, return to this window to complete the authorization."), self->priv->server->display_name); + g_object_set (dialog, "text", text, "secondary-text", secondary_text, NULL); + gtk_widget_show (_gtk_builder_get_widget (builder, "authorize_button")); + gtk_widget_hide (_gtk_builder_get_widget (builder, "complete_button")); + g_object_set_data_full (G_OBJECT (dialog), "builder", builder, g_object_unref); + g_signal_connect (dialog, + "response", + G_CALLBACK (old_authorization_dialog_response_cb), + self); + + _web_service_set_auth_dialog (WEB_SERVICE (self), GTK_DIALOG (dialog)); + gtk_window_present (GTK_WINDOW (dialog)); + + g_free (secondary_text); + g_free (text); +} + + +static void +flickr_service_ask_authorization (WebService *base) +{ + FlickrService *self = FLICKR_SERVICE (base); + + if (self->priv->server->new_authentication) { + WEB_SERVICE_CLASS (flickr_service_parent_class)->ask_authorization (base); + return; + } + + /* old authentication process, still used by 23hq.com */ + + flickr_service_old_auth_get_frob (self, + gth_task_get_cancellable (GTH_TASK (self)), + old_auth_frob_ready_cb, + self); +} - self = (FlickrService *) g_object_new (FLICKR_TYPE_SERVICE, NULL); - self->priv->conn = g_object_ref (conn); - return self; +static void +flickr_service_add_signature (FlickrService *self, + const char *method, + const char *url, + GHashTable *parameters) +{ + if (self->priv->server->new_authentication) + oauth_service_add_signature (OAUTH_SERVICE (self), method, url, parameters); + else + flickr_service_old_auth_add_api_sig (self, parameters); } -/* -- flickr_service_get_upload_status -- */ +/* -- flickr_service_get_user_info -- */ static void -get_upload_status_ready_cb (SoupSession *session, - SoupMessage *msg, - gpointer user_data) +get_user_info_ready_cb (SoupSession *session, + SoupMessage *msg, + gpointer user_data) { FlickrService *self = user_data; GSimpleAsyncResult *result; @@ -164,7 +633,7 @@ DomDocument *doc = NULL; GError *error = NULL; - result = flickr_connection_get_result (self->priv->conn); + result = _web_service_get_result (WEB_SERVICE (self)); if (msg->status_code != 200) { g_simple_async_result_set_error (result, @@ -178,24 +647,33 @@ body = soup_message_body_flatten (msg->response_body); if (flickr_utils_parse_response (body, &doc, &error)) { - DomElement *response; - DomElement *node; - FlickrUser *user = NULL; + OAuthAccount *account; + DomElement *response; + DomElement *node; + gboolean success = FALSE; + + account = _g_object_ref (web_service_get_current_account (WEB_SERVICE (self))); + if (account == NULL) + account = g_object_new (FLICKR_TYPE_ACCOUNT, + "token", oauth_service_get_token (OAUTH_SERVICE (self)), + "token-secret", oauth_service_get_token_secret (OAUTH_SERVICE (self)), + NULL); response = DOM_ELEMENT (doc)->first_child; for (node = response->first_child; node; node = node->next_sibling) { if (g_strcmp0 (node->tag_name, "user") == 0) { - user = flickr_user_new (); - dom_domizable_load_from_element (DOM_DOMIZABLE (user), node); - g_simple_async_result_set_op_res_gpointer (result, user, (GDestroyNotify) g_object_unref); + success = TRUE; + flickr_account_load_extra_data (FLICKR_ACCOUNT (account), node); + g_simple_async_result_set_op_res_gpointer (result, g_object_ref (account), (GDestroyNotify) g_object_unref); } } - if (user == NULL) { - error = g_error_new_literal (FLICKR_CONNECTION_ERROR, 0, _("Unknown error")); + if (! success) { + error = g_error_new_literal (WEB_SERVICE_ERROR, WEB_SERVICE_ERROR_GENERIC, _("Unknown error")); g_simple_async_result_set_from_error (result, error); } + g_object_unref (account); g_object_unref (doc); } else @@ -207,43 +685,106 @@ } -void -flickr_service_get_upload_status (FlickrService *self, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) +static void +flickr_service_get_user_info (WebService *base, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) { - GHashTable *data_set; - SoupMessage *msg; + FlickrService *self = FLICKR_SERVICE (base); + OAuthAccount *account; + GHashTable *data_set; + SoupMessage *msg; - gth_task_progress (GTH_TASK (self->priv->conn), _("Connecting to the server"), _("Getting account information"), TRUE, 0.0); + account = web_service_get_current_account (WEB_SERVICE (self)); + if (account != NULL) { + oauth_service_set_token (OAUTH_SERVICE (self), account->token); + oauth_service_set_token_secret (OAUTH_SERVICE (self), account->token_secret); + } data_set = g_hash_table_new (g_str_hash, g_str_equal); + g_hash_table_insert (data_set, "format", RESPONSE_FORMAT); g_hash_table_insert (data_set, "method", "flickr.people.getUploadStatus"); - flickr_connection_add_api_sig (self->priv->conn, data_set); - msg = soup_form_request_new_from_hash ("GET", self->priv->conn->server->rest_url, data_set); - flickr_connection_send_message (self->priv->conn, - msg, - cancellable, - callback, - user_data, - flickr_service_get_upload_status, - get_upload_status_ready_cb, - self); + flickr_service_add_signature (self, "GET", self->priv->server->rest_url, data_set); + msg = soup_form_request_new_from_hash ("GET", self->priv->server->rest_url, data_set); + _web_service_send_message (WEB_SERVICE (self), + msg, + cancellable, + callback, + user_data, + flickr_service_get_user_info, + get_user_info_ready_cb, + self); g_hash_table_destroy (data_set); } -FlickrUser * -flickr_service_get_upload_status_finish (FlickrService *self, - GAsyncResult *result, - GError **error) +static void +flickr_service_class_init (FlickrServiceClass *klass) { - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return NULL; - else - return g_object_ref (g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result))); + GObjectClass *object_class; + WebServiceClass *service_class; + + g_type_class_add_private (klass, sizeof (FlickrServicePrivate)); + + object_class = (GObjectClass*) klass; + object_class->set_property = flickr_service_set_property; + object_class->get_property = flickr_service_get_property; + object_class->finalize = flickr_service_finalize; + + service_class = (WebServiceClass*) klass; + service_class->ask_authorization = flickr_service_ask_authorization; + service_class->get_user_info = flickr_service_get_user_info; + + /* properties */ + + g_object_class_install_property (object_class, + PROP_SERVER, + g_param_spec_pointer ("server", + "Server", + "", + G_PARAM_READWRITE)); +} + + +static void +flickr_service_init (FlickrService *self) +{ + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, FLICKR_TYPE_SERVICE, FlickrServicePrivate); + self->priv->post_photos = NULL; + self->priv->add_photos = NULL; + self->priv->server = NULL; + self->priv->checksum = g_checksum_new (G_CHECKSUM_MD5); + self->priv->frob = NULL; +} + + +FlickrService * +flickr_service_new (FlickrServer *server, + GCancellable *cancellable, + GtkWidget *browser, + GtkWidget *dialog) +{ + g_return_val_if_fail (server != NULL, NULL); + + return g_object_new (FLICKR_TYPE_SERVICE, + "service-name", server->name, + "service-address", server->url, + "service-protocol", server->protocol, + "account-type", FLICKR_TYPE_ACCOUNT, + "cancellable", cancellable, + "browser", browser, + "dialog", dialog, + "server", server, + NULL); +} + + +FlickrServer * +flickr_service_get_server (FlickrService *self) +{ + return self->priv->server; } @@ -261,7 +802,7 @@ DomDocument *doc = NULL; GError *error = NULL; - result = flickr_connection_get_result (self->priv->conn); + result = _web_service_get_result (WEB_SERVICE (self)); if (msg->status_code != 200) { g_simple_async_result_set_error (result, @@ -312,7 +853,6 @@ void flickr_service_list_photosets (FlickrService *self, - const char *user_id, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data) @@ -320,22 +860,21 @@ GHashTable *data_set; SoupMessage *msg; - gth_task_progress (GTH_TASK (self->priv->conn), _("Getting the album list"), NULL, TRUE, 0.0); + gth_task_progress (GTH_TASK (self), _("Getting the album list"), NULL, TRUE, 0.0); data_set = g_hash_table_new (g_str_hash, g_str_equal); + g_hash_table_insert (data_set, "format", RESPONSE_FORMAT); g_hash_table_insert (data_set, "method", "flickr.photosets.getList"); - if (user_id != NULL) - g_hash_table_insert (data_set, "user_id", (char *) user_id); - flickr_connection_add_api_sig (self->priv->conn, data_set); - msg = soup_form_request_new_from_hash ("GET", self->priv->conn->server->rest_url, data_set); - flickr_connection_send_message (self->priv->conn, - msg, - cancellable, - callback, - user_data, - flickr_service_list_photosets, - list_photosets_ready_cb, - self); + flickr_service_add_signature (self, "GET", self->priv->server->rest_url, data_set); + msg = soup_form_request_new_from_hash ("GET", self->priv->server->rest_url, data_set); + _web_service_send_message (WEB_SERVICE (self), + msg, + cancellable, + callback, + user_data, + flickr_service_list_photosets, + list_photosets_ready_cb, + self); g_hash_table_destroy (data_set); } @@ -367,7 +906,7 @@ DomDocument *doc = NULL; GError *error = NULL; - result = flickr_connection_get_result (self->priv->conn); + result = _web_service_get_result (WEB_SERVICE (self)); if (msg->status_code != 200) { g_simple_async_result_set_error (result, @@ -395,7 +934,7 @@ } if (photoset == NULL) { - error = g_error_new_literal (FLICKR_CONNECTION_ERROR, 0, _("Unknown error")); + error = g_error_new_literal (WEB_SERVICE_ERROR, WEB_SERVICE_ERROR_GENERIC, _("Unknown error")); g_simple_async_result_set_from_error (result, error); } @@ -423,22 +962,23 @@ g_return_if_fail (photoset != NULL); g_return_if_fail (photoset->primary != NULL); - gth_task_progress (GTH_TASK (self->priv->conn), _("Creating the new album"), NULL, TRUE, 0.0); + gth_task_progress (GTH_TASK (self), _("Creating the new album"), NULL, TRUE, 0.0); data_set = g_hash_table_new (g_str_hash, g_str_equal); + g_hash_table_insert (data_set, "format", RESPONSE_FORMAT); g_hash_table_insert (data_set, "method", "flickr.photosets.create"); g_hash_table_insert (data_set, "title", photoset->title); g_hash_table_insert (data_set, "primary_photo_id", photoset->primary); - flickr_connection_add_api_sig (self->priv->conn, data_set); - msg = soup_form_request_new_from_hash ("GET", self->priv->conn->server->rest_url, data_set); - flickr_connection_send_message (self->priv->conn, - msg, - cancellable, - callback, - user_data, - flickr_service_create_photoset, - create_photoset_ready_cb, - self); + flickr_service_add_signature (self, "GET", self->priv->server->rest_url, data_set); + msg = soup_form_request_new_from_hash ("GET", self->priv->server->rest_url, data_set); + _web_service_send_message (WEB_SERVICE (self), + msg, + cancellable, + callback, + user_data, + flickr_service_create_photoset, + create_photoset_ready_cb, + self); g_hash_table_destroy (data_set); } @@ -465,7 +1005,8 @@ { GSimpleAsyncResult *result; - result = flickr_connection_get_result (self->priv->conn); + result = _web_service_get_result (WEB_SERVICE (self)); + if (result == NULL) result = g_simple_async_result_new (G_OBJECT (self), self->priv->add_photos->callback, @@ -504,7 +1045,7 @@ DomDocument *doc = NULL; GError *error = NULL; - result = flickr_connection_get_result (self->priv->conn); + result = _web_service_get_result (WEB_SERVICE (self)); if (msg->status_code != 200) { g_simple_async_result_set_error (result, @@ -542,7 +1083,7 @@ return; } - gth_task_progress (GTH_TASK (self->priv->conn), + gth_task_progress (GTH_TASK (self), _("Creating the new album"), "", FALSE, @@ -555,19 +1096,20 @@ } data_set = g_hash_table_new (g_str_hash, g_str_equal); + g_hash_table_insert (data_set, "format", RESPONSE_FORMAT); g_hash_table_insert (data_set, "method", "flickr.photosets.addPhoto"); g_hash_table_insert (data_set, "photoset_id", self->priv->add_photos->photoset->id); g_hash_table_insert (data_set, "photo_id", photo_id); - flickr_connection_add_api_sig (self->priv->conn, data_set); - msg = soup_form_request_new_from_hash ("POST", self->priv->conn->server->rest_url, data_set); - flickr_connection_send_message (self->priv->conn, - msg, - self->priv->add_photos->cancellable, - self->priv->add_photos->callback, - self->priv->add_photos->user_data, - flickr_service_add_photos_to_set, - add_current_photo_to_set_ready_cb, - self); + flickr_service_add_signature (self, "POST", self->priv->server->rest_url, data_set); + msg = soup_form_request_new_from_hash ("POST", self->priv->server->rest_url, data_set); + _web_service_send_message (WEB_SERVICE (self), + msg, + self->priv->add_photos->cancellable, + self->priv->add_photos->callback, + self->priv->add_photos->user_data, + flickr_service_add_photos_to_set, + add_current_photo_to_set_ready_cb, + self); g_hash_table_destroy (data_set); } @@ -581,7 +1123,7 @@ GAsyncReadyCallback callback, gpointer user_data) { - gth_task_progress (GTH_TASK (self->priv->conn), _("Creating the new album"), NULL, TRUE, 0.0); + gth_task_progress (GTH_TASK (self), _("Creating the new album"), NULL, TRUE, 0.0); add_photos_data_free (self->priv->add_photos); self->priv->add_photos = g_new0 (AddPhotosData, 1); @@ -594,7 +1136,7 @@ self->priv->add_photos->current = self->priv->add_photos->photo_ids; self->priv->add_photos->n_current = 1; - flickr_connection_reset_result (self->priv->conn); + _web_service_reset_result (WEB_SERVICE (self)); add_current_photo_to_set (self); } @@ -620,7 +1162,7 @@ { GSimpleAsyncResult *result; - result = flickr_connection_get_result (self->priv->conn); + result = _web_service_get_result (WEB_SERVICE (self)); if (error == NULL) { self->priv->post_photos->ids = g_list_reverse (self->priv->post_photos->ids); g_simple_async_result_set_op_res_gpointer (result, self->priv->post_photos->ids, (GDestroyNotify) _g_string_list_free); @@ -701,7 +1243,7 @@ static char * -get_safety_value (FlickrSafetyType safety_level) +get_safety_value (FlickrSafety safety_level) { char *value = NULL; @@ -744,7 +1286,7 @@ /* Translators: %s is a filename */ details = g_strdup_printf (_("Uploading '%s'"), g_file_info_get_display_name (file_data->info)); current_file_fraction = (double) self->priv->post_photos->wrote_body_data_size / msg->request_body->length; - gth_task_progress (GTH_TASK (self->priv->conn), + gth_task_progress (GTH_TASK (self), NULL, details, FALSE, @@ -765,6 +1307,8 @@ SoupMultipart *multipart; char *uri; SoupBuffer *body; + void *resized_buffer; + gsize resized_count; SoupMessage *msg; if (error != NULL) { @@ -787,6 +1331,7 @@ GList *scan; data_set = g_hash_table_new (g_str_hash, g_str_equal); + g_hash_table_insert (data_set, "format", RESPONSE_FORMAT); title = gth_file_data_get_attribute_as_string (file_data, "general::title"); if (title != NULL) @@ -808,7 +1353,7 @@ g_hash_table_insert (data_set, "is_family", ((self->priv->post_photos->privacy_level == FLICKR_PRIVACY_FAMILY) || (self->priv->post_photos->privacy_level == FLICKR_PRIVACY_FRIENDS_FAMILY)) ? "1" : "0"); g_hash_table_insert (data_set, "safety_level", get_safety_value (self->priv->post_photos->safety_level)); g_hash_table_insert (data_set, "hidden", self->priv->post_photos->hidden ? "2" : "1"); - flickr_connection_add_api_sig (self->priv->conn, data_set); + flickr_service_add_signature (self, "POST", self->priv->server->upload_url, data_set); keys = g_hash_table_get_keys (data_set); for (scan = keys; scan; scan = scan->next) { @@ -823,8 +1368,28 @@ /* the file part */ + if (_g_buffer_resize_image (*buffer, + count, + file_data, + self->priv->post_photos->max_width, + self->priv->post_photos->max_height, + &resized_buffer, + &resized_count, + self->priv->post_photos->cancellable, + &error)) + { + body = soup_buffer_new (SOUP_MEMORY_TAKE, resized_buffer, resized_count); + } + else if (error == NULL) { + body = soup_buffer_new (SOUP_MEMORY_TEMPORARY, *buffer, count); + } + else { + soup_multipart_free (multipart); + post_photos_done (self, error); + return; + } + uri = g_file_get_uri (file_data->file); - body = soup_buffer_new (SOUP_MEMORY_TEMPORARY, *buffer, count); soup_multipart_append_form_file (multipart, "photo", uri, @@ -837,20 +1402,20 @@ /* send the file */ self->priv->post_photos->wrote_body_data_size = 0; - msg = soup_form_request_new_from_multipart (self->priv->conn->server->upload_url, multipart); + msg = soup_form_request_new_from_multipart (self->priv->server->upload_url, multipart); g_signal_connect (msg, "wrote-body-data", (GCallback) upload_photo_wrote_body_data_cb, self); - flickr_connection_send_message (self->priv->conn, - msg, - self->priv->post_photos->cancellable, - self->priv->post_photos->callback, - self->priv->post_photos->user_data, - flickr_service_post_photos, - post_photo_ready_cb, - self); + _web_service_send_message (WEB_SERVICE (self), + msg, + self->priv->post_photos->cancellable, + self->priv->post_photos->callback, + self->priv->post_photos->user_data, + flickr_service_post_photos, + post_photo_ready_cb, + self); soup_multipart_free (multipart); } @@ -867,11 +1432,11 @@ } file_data = self->priv->post_photos->current->data; - g_load_file_async (file_data->file, - G_PRIORITY_DEFAULT, - self->priv->post_photos->cancellable, - post_photo_file_buffer_ready_cb, - self); + _g_file_load_async (file_data->file, + G_PRIORITY_DEFAULT, + self->priv->post_photos->cancellable, + post_photo_file_buffer_ready_cb, + self); } @@ -903,21 +1468,29 @@ void flickr_service_post_photos (FlickrService *self, - FlickrPrivacyType privacy_level, - FlickrSafetyType safety_level, + FlickrPrivacy privacy_level, + FlickrSafety safety_level, gboolean hidden, + int max_width, + int max_height, GList *file_list, /* GFile list */ GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data) { - gth_task_progress (GTH_TASK (self->priv->conn), _("Uploading the files to the server"), NULL, TRUE, 0.0); + gth_task_progress (GTH_TASK (self), + _("Uploading the files to the server"), + "", + TRUE, + 0.0); post_photos_data_free (self->priv->post_photos); self->priv->post_photos = g_new0 (PostPhotosData, 1); self->priv->post_photos->privacy_level = privacy_level; self->priv->post_photos->safety_level = safety_level; self->priv->post_photos->hidden = hidden; + self->priv->post_photos->max_width = max_width; + self->priv->post_photos->max_height = max_height; self->priv->post_photos->cancellable = _g_object_ref (cancellable); self->priv->post_photos->callback = callback; self->priv->post_photos->user_data = user_data; @@ -988,7 +1561,7 @@ DomDocument *doc = NULL; GError *error = NULL; - result = flickr_connection_get_result (self->priv->conn); + result = _web_service_get_result (WEB_SERVICE (self)); if (msg->status_code != 200) { g_simple_async_result_set_error (result, @@ -1017,7 +1590,7 @@ if (g_strcmp0 (child->tag_name, "photo") == 0) { FlickrPhoto *photo; - photo = flickr_photo_new (self->priv->conn->server); + photo = flickr_photo_new (self->priv->server); dom_domizable_load_from_element (DOM_DOMIZABLE (photo), child); photo->position = data->position++; data->photos = g_list_prepend (data->photos, photo); @@ -1074,9 +1647,14 @@ g_return_if_fail (data->photoset != NULL); - gth_task_progress (GTH_TASK (self->priv->conn), _("Getting the photo list"), NULL, TRUE, 0.0); + gth_task_progress (GTH_TASK (self), + _("Getting the photo list"), + NULL, + TRUE, + 0.0); data_set = g_hash_table_new (g_str_hash, g_str_equal); + g_hash_table_insert (data_set, "format", RESPONSE_FORMAT); g_hash_table_insert (data_set, "method", "flickr.photosets.getPhotos"); g_hash_table_insert (data_set, "photoset_id", data->photoset->id); if (data->extras != NULL) @@ -1090,16 +1668,16 @@ g_hash_table_insert (data_set, "page", per_page); } - flickr_connection_add_api_sig (self->priv->conn, data_set); - msg = soup_form_request_new_from_hash ("GET", self->priv->conn->server->rest_url, data_set); - flickr_connection_send_message (self->priv->conn, - msg, - data->cancellable, - data->callback, - data->user_data, - flickr_service_list_photos, - flickr_service_list_photoset_paged_ready_cb, - data); + flickr_service_add_signature (self, "GET", self->priv->server->rest_url, data_set); + msg = soup_form_request_new_from_hash ("GET", self->priv->server->rest_url, data_set); + _web_service_send_message (WEB_SERVICE (self), + msg, + data->cancellable, + data->callback, + data->user_data, + flickr_service_list_photos, + flickr_service_list_photoset_paged_ready_cb, + data); g_free (per_page); g_free (page); @@ -1141,136 +1719,3 @@ else return _g_object_list_ref (g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result))); } - - -/* utilities */ - - -/* Used for compatibility with the original Flickr uploader that used - * flickr.xml as filename */ -static char * -get_server_accounts_filename (const char *server_name) -{ - char *name; - char *filename; - - name = g_ascii_strdown (server_name, -1); - filename = g_strconcat (name, ".xml", NULL); - - g_free (name); - - return filename; -} - - -GList * -flickr_accounts_load_from_file (const char *server_name) -{ - GList *accounts = NULL; - char *filename; - char *buffer; - char *accounts_filename; - gsize len; - DomDocument *doc; - - accounts_filename = get_server_accounts_filename (server_name); - filename = gth_user_dir_get_file (GTH_DIR_CONFIG, GTHUMB_DIR, "accounts", accounts_filename, NULL); - g_free (accounts_filename); - - if (! g_file_get_contents (filename, &buffer, &len, NULL)) { - g_free (filename); - return NULL; - } - - doc = dom_document_new (); - if (dom_document_load (doc, buffer, len, NULL)) { - DomElement *node; - - node = DOM_ELEMENT (doc)->first_child; - if ((node != NULL) && (g_strcmp0 (node->tag_name, "accounts") == 0)) { - DomElement *child; - - for (child = node->first_child; - child != NULL; - child = child->next_sibling) - { - if (strcmp (child->tag_name, "account") == 0) { - FlickrAccount *account; - - account = flickr_account_new (); - dom_domizable_load_from_element (DOM_DOMIZABLE (account), child); - - accounts = g_list_prepend (accounts, account); - } - } - - accounts = g_list_reverse (accounts); - } - } - - g_object_unref (doc); - g_free (buffer); - g_free (filename); - - return accounts; -} - - -FlickrAccount * -flickr_accounts_find_default (GList *accounts) -{ - GList *scan; - - for (scan = accounts; scan; scan = scan->next) { - FlickrAccount *account = scan->data; - - if (account->is_default) - return g_object_ref (account); - } - - return NULL; -} - - -void -flickr_accounts_save_to_file (const char *server_name, - GList *accounts, - FlickrAccount *default_account) -{ - DomDocument *doc; - DomElement *root; - GList *scan; - char *buffer; - gsize len; - char *accounts_filename; - char *filename; - GFile *file; - - doc = dom_document_new (); - root = dom_document_create_element (doc, "accounts", NULL); - dom_element_append_child (DOM_ELEMENT (doc), root); - for (scan = accounts; scan; scan = scan->next) { - FlickrAccount *account = scan->data; - DomElement *node; - - if ((default_account != NULL) && g_strcmp0 (account->username, default_account->username) == 0) - account->is_default = TRUE; - else - account->is_default = FALSE; - node = dom_domizable_create_element (DOM_DOMIZABLE (account), doc); - dom_element_append_child (root, node); - } - - accounts_filename = get_server_accounts_filename (server_name); - gth_user_dir_make_dir_for_file (GTH_DIR_CONFIG, GTHUMB_DIR, "accounts", accounts_filename, NULL); - filename = gth_user_dir_get_file (GTH_DIR_CONFIG, GTHUMB_DIR, "accounts", accounts_filename, NULL); - file = g_file_new_for_path (filename); - buffer = dom_document_dump (doc, &len); - g_write_file (file, FALSE, G_FILE_CREATE_PRIVATE | G_FILE_CREATE_REPLACE_DESTINATION, buffer, len, NULL, NULL); - - g_free (buffer); - g_object_unref (file); - g_free (filename); - g_free (accounts_filename); - g_object_unref (doc); -} diff -Nru gthumb-3.0.2/extensions/flicker_utils/flickr-service.h gthumb-3.2.3/extensions/flicker_utils/flickr-service.h --- gthumb-3.0.2/extensions/flicker_utils/flickr-service.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/flickr-service.h 2013-04-30 16:56:12.000000000 +0000 @@ -22,25 +22,10 @@ #ifndef FLICKR_SERVICE_H #define FLICKR_SERVICE_H -#include -#include "flickr-account.h" -#include "flickr-connection.h" +#include +#include #include "flickr-photoset.h" -#include "flickr-user.h" - -typedef enum { - FLICKR_PRIVACY_PUBLIC, - FLICKR_PRIVACY_FRIENDS_FAMILY, - FLICKR_PRIVACY_FRIENDS, - FLICKR_PRIVACY_FAMILY, - FLICKR_PRIVACY_PRIVATE -} FlickrPrivacyType; - -typedef enum { - FLICKR_SAFETY_SAFE, - FLICKR_SAFETY_MODERATE, - FLICKR_SAFETY_RESTRICTED -} FlickrSafetyType; +#include "flickr-types.h" #define FLICKR_TYPE_SERVICE (flickr_service_get_type ()) #define FLICKR_SERVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), FLICKR_TYPE_SERVICE, FlickrService)) @@ -53,28 +38,22 @@ typedef struct _FlickrServicePrivate FlickrServicePrivate; typedef struct _FlickrServiceClass FlickrServiceClass; -struct _FlickrService -{ - GObject __parent; +struct _FlickrService { + OAuthService __parent; FlickrServicePrivate *priv; }; -struct _FlickrServiceClass -{ - GObjectClass __parent_class; +struct _FlickrServiceClass { + OAuthServiceClass __parent_class; }; GType flickr_service_get_type (void) G_GNUC_CONST; -FlickrService * flickr_service_new (FlickrConnection *conn); -void flickr_service_get_upload_status (FlickrService *self, +FlickrService * flickr_service_new (FlickrServer *server, GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -FlickrUser * flickr_service_get_upload_status_finish (FlickrService *self, - GAsyncResult *result, - GError **error); + GtkWidget *browser, + GtkWidget *dialog); +FlickrServer * flickr_service_get_server (FlickrService *self); void flickr_service_list_photosets (FlickrService *self, - const char *user_id, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); @@ -99,9 +78,11 @@ GAsyncResult *result, GError **error); void flickr_service_post_photos (FlickrService *self, - FlickrPrivacyType privacy_level, - FlickrSafetyType safety_level, + FlickrPrivacy privacy_level, + FlickrSafety safety_level, gboolean hidden, + int max_width, + int max_height, GList *file_list, /* GFile list */ GCancellable *cancellable, GAsyncReadyCallback callback, @@ -119,12 +100,4 @@ GAsyncResult *result, GError **error); -/* utilities */ - -GList * flickr_accounts_load_from_file (const char *server_name); -FlickrAccount * flickr_accounts_find_default (GList *accounts); -void flickr_accounts_save_to_file (const char *server_name, - GList *accounts, - FlickrAccount *default_account); - #endif /* FLICKR_SERVICE_H */ diff -Nru gthumb-3.0.2/extensions/flicker_utils/flickr-types.h gthumb-3.2.3/extensions/flicker_utils/flickr-types.h --- gthumb-3.0.2/extensions/flicker_utils/flickr-types.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/flickr-types.h 2013-04-30 16:56:12.000000000 +0000 @@ -22,11 +22,22 @@ #ifndef FLICKR_TYPES_H #define FLICKR_TYPES_H -typedef enum { - FLICKR_SAFETY_LEVEL_SAFE = 1, - FLICKR_SAFETY_LEVEL_MODERATE = 2, - FLICKR_SAFETY_LEVEL_RESTRICTED = 3 -} FlickrSafetyLevel; + +typedef enum { + FLICKR_PRIVACY_PUBLIC, + FLICKR_PRIVACY_FRIENDS_FAMILY, + FLICKR_PRIVACY_FRIENDS, + FLICKR_PRIVACY_FAMILY, + FLICKR_PRIVACY_PRIVATE +} FlickrPrivacy; + + +typedef enum { + FLICKR_SAFETY_SAFE, + FLICKR_SAFETY_MODERATE, + FLICKR_SAFETY_RESTRICTED +} FlickrSafety; + typedef enum { FLICKR_CONTENT_TYPE_PHOTO = 1, @@ -34,11 +45,13 @@ FLICKR_CONTENT_TYPE_OTHER = 3 } FlickrContentType; + typedef enum { FLICKR_HIDDEN_PUBLIC = 1, FLICKR_HIDDEN_HIDDEN = 2, } FlickrHiddenType; + typedef enum { FLICKR_SIZE_SMALL_SQUARE = 75, FLICKR_SIZE_THUMBNAIL = 100, @@ -47,16 +60,25 @@ FLICKR_SIZE_LARGE = 1024 } FlickrSize; + typedef struct { + const char *display_name; const char *name; const char *url; - const char *authentication_url; + const char *protocol; + + const char *request_token_url; + const char *authorization_url; + const char *access_token_url; + const char *consumer_key; + const char *consumer_secret; + const char *rest_url; const char *upload_url; const char *static_url; - const char *api_key; - const char *shared_secret; gboolean automatic_urls; + gboolean new_authentication; } FlickrServer; + #endif /* FLICKR_TYPES_H */ diff -Nru gthumb-3.0.2/extensions/flicker_utils/flickr-user.c gthumb-3.2.3/extensions/flicker_utils/flickr-user.c --- gthumb-3.0.2/extensions/flicker_utils/flickr-user.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/flickr-user.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,211 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include -#include "flickr-user.h" - - -static void flickr_user_dom_domizable_interface_init (DomDomizableInterface *iface); - - -G_DEFINE_TYPE_WITH_CODE (FlickrUser, - flickr_user, - G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (DOM_TYPE_DOMIZABLE, - flickr_user_dom_domizable_interface_init)) - - -static void -flickr_user_finalize (GObject *obj) -{ - FlickrUser *self; - - self = FLICKR_USER (obj); - - g_free (self->id); - g_free (self->username); - - G_OBJECT_CLASS (flickr_user_parent_class)->finalize (obj); -} - - -static void -flickr_user_class_init (FlickrUserClass *klass) -{ - G_OBJECT_CLASS (klass)->finalize = flickr_user_finalize; -} - - -static DomElement * -flickr_user_create_element (DomDomizable *base, - DomDocument *doc) -{ - FlickrUser *self; - DomElement *element; - - self = FLICKR_USER (base); - - element = dom_document_create_element (doc, "user", NULL); - if (self->id != NULL) - dom_element_set_attribute (element, "id", self->id); - - return element; -} - - -static void -flickr_user_load_from_element (DomDomizable *base, - DomElement *element) -{ - FlickrUser *self; - DomElement *node; - - self = FLICKR_USER (base); - - flickr_user_set_id (self, dom_element_get_attribute (element, "id")); - flickr_user_set_is_pro (self, dom_element_get_attribute (element, "ispro")); - - for (node = element->first_child; node; node = node->next_sibling) { - if (g_strcmp0 (node->tag_name, "username") == 0) { - flickr_user_set_username (self, dom_element_get_inner_text (node)); - } - else if (g_strcmp0 (node->tag_name, "bandwidth") == 0) { - flickr_user_set_max_bandwidth (self, dom_element_get_attribute (node, "maxbytes")); - flickr_user_set_used_bandwidth (self, dom_element_get_attribute (node, "usedbytes")); - } - else if (g_strcmp0 (node->tag_name, "filesize") == 0) { - flickr_user_set_max_filesize (self, dom_element_get_attribute (node, "maxbytes")); - } - else if (g_strcmp0 (node->tag_name, "videosize") == 0) { - flickr_user_set_max_videosize (self, dom_element_get_attribute (node, "maxbytes")); - } - else if (g_strcmp0 (node->tag_name, "sets") == 0) { - flickr_user_set_n_sets (self, dom_element_get_attribute (node, "created")); - } - else if (g_strcmp0 (node->tag_name, "videos") == 0) { - flickr_user_set_n_videos (self, dom_element_get_attribute (node, "uploaded")); - } - } -} - - -static void -flickr_user_dom_domizable_interface_init (DomDomizableInterface *iface) -{ - iface->create_element = flickr_user_create_element; - iface->load_from_element = flickr_user_load_from_element; -} - - -static void -flickr_user_init (FlickrUser *self) -{ - self->id = NULL; - self->username = NULL; -} - - -FlickrUser * -flickr_user_new (void) -{ - return g_object_new (FLICKR_TYPE_USER, NULL); -} - - -void -flickr_user_set_id (FlickrUser *self, - const char *value) -{ - _g_strset (&self->id, value); -} - - -void -flickr_user_set_is_pro (FlickrUser *self, - const char *value) -{ - self->is_pro = (g_strcmp0 (value, "1") == 0); -} - - -void -flickr_user_set_username(FlickrUser *self, - const char *value) -{ - _g_strset (&self->username, value); -} - - -void -flickr_user_set_max_bandwidth (FlickrUser *self, - const char *value) -{ - self->max_bandwidth = g_ascii_strtoull (value, NULL, 10); -} - - -void -flickr_user_set_used_bandwidth (FlickrUser *self, - const char *value) -{ - self->used_bandwidth = g_ascii_strtoull (value, NULL, 10); -} - - -void -flickr_user_set_max_filesize (FlickrUser *self, - const char *value) -{ - self->max_filesize = g_ascii_strtoull (value, NULL, 10); -} - - -void -flickr_user_set_max_videosize (FlickrUser *self, - const char *value) -{ - self->max_videosize = g_ascii_strtoull (value, NULL, 10); -} - - -void -flickr_user_set_n_sets (FlickrUser *self, - const char *value) -{ - if (value != NULL) - self->n_sets = atoi (value); - else - self->n_sets = 0; -} - - -void -flickr_user_set_n_videos (FlickrUser *self, - const char *value) -{ - if (value != NULL) - self->n_videos = atoi (value); - else - self->n_videos = 0; -} diff -Nru gthumb-3.0.2/extensions/flicker_utils/flickr-user.h gthumb-3.2.3/extensions/flicker_utils/flickr-user.h --- gthumb-3.0.2/extensions/flicker_utils/flickr-user.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/flickr-user.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,81 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef FLICKR_USER_H -#define FLICKR_USER_H - -#include -#include - -G_BEGIN_DECLS - -#define FLICKR_TYPE_USER (flickr_user_get_type ()) -#define FLICKR_USER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FLICKR_TYPE_USER, FlickrUser)) -#define FLICKR_USER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FLICKR_TYPE_USER, FlickrUserClass)) -#define FLICKR_IS_USER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FLICKR_TYPE_USER)) -#define FLICKR_IS_USER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FLICKR_TYPE_USER)) -#define FLICKR_USER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), FLICKR_TYPE_USER, FlickrUserClass)) - -typedef struct _FlickrUser FlickrUser; -typedef struct _FlickrUserClass FlickrUserClass; - -struct _FlickrUser { - GObject parent_instance; - - char *id; - gboolean is_pro; - char *username; - goffset max_bandwidth; - goffset used_bandwidth; - goffset max_filesize; - goffset max_videosize; - int n_sets; - int n_videos; -}; - -struct _FlickrUserClass { - GObjectClass parent_class; -}; - -GType flickr_user_get_type (void); -FlickrUser * flickr_user_new (void); -void flickr_user_set_id (FlickrUser *self, - const char *value); -void flickr_user_set_is_pro (FlickrUser *self, - const char *value); -void flickr_user_set_username (FlickrUser *self, - const char *value); -void flickr_user_set_max_bandwidth (FlickrUser *self, - const char *value); -void flickr_user_set_used_bandwidth (FlickrUser *self, - const char *value); -void flickr_user_set_max_filesize (FlickrUser *self, - const char *value); -void flickr_user_set_max_videosize (FlickrUser *self, - const char *value); -void flickr_user_set_n_sets (FlickrUser *self, - const char *value); -void flickr_user_set_n_videos (FlickrUser *self, - const char *value); - -G_END_DECLS - -#endif /* FLICKR_USER_H */ diff -Nru gthumb-3.0.2/extensions/flicker_utils/preferences.h gthumb-3.2.3/extensions/flicker_utils/preferences.h --- gthumb-3.0.2/extensions/flicker_utils/preferences.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/flicker_utils/preferences.h 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,34 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2010 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef PREFERENCES_H +#define PREFERENCES_H + +/* schema */ + +#define GTHUMB_FLICKR_SCHEMA GTHUMB_SCHEMA ".flickr" + +/* keys */ + +#define PREF_FLICKR_RESIZE_WIDTH "resize-width" +#define PREF_FLICKR_RESIZE_HEIGHT "resize-height" + +#endif /* PREFERENCES_H */ diff -Nru gthumb-3.0.2/extensions/gstreamer_tools/Makefile.in gthumb-3.2.3/extensions/gstreamer_tools/Makefile.in --- gthumb-3.0.2/extensions/gstreamer_tools/Makefile.in 2012-08-20 19:54:14.000000000 +0000 +++ gthumb-3.2.3/extensions/gstreamer_tools/Makefile.in 2013-07-10 13:33:46.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/gstreamer_tools -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -153,13 +181,14 @@ am__v_CCLD_1 = SOURCES = $(libgstreamer_tools_la_SOURCES) DIST_SOURCES = $(am__libgstreamer_tools_la_SOURCES_DIST) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -168,9 +197,29 @@ DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = data @@ -229,9 +278,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -245,13 +292,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -280,7 +326,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -296,11 +345,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -317,7 +370,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -347,7 +399,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -460,6 +515,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -494,6 +550,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libgstreamer_tools.la: $(libgstreamer_tools_la_OBJECTS) $(libgstreamer_tools_la_DEPENDENCIES) $(EXTRA_libgstreamer_tools_la_DEPENDENCIES) $(AM_V_CCLD)$(libgstreamer_tools_la_LINK) $(am_libgstreamer_tools_la_rpath) $(libgstreamer_tools_la_OBJECTS) $(libgstreamer_tools_la_LIBADD) $(LIBS) @@ -513,14 +570,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -590,14 +647,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -618,31 +674,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -658,12 +696,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -675,15 +708,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -692,9 +721,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -876,25 +906,23 @@ uninstall-am: uninstall-extensionLTLIBRARIES \ uninstall-extensioniniDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-extensionLTLIBRARIES \ - clean-generic clean-libtool cscopelist cscopelist-recursive \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extensionLTLIBRARIES \ - install-extensioniniDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-extensionLTLIBRARIES clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-extensionLTLIBRARIES install-extensioniniDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA diff -Nru gthumb-3.0.2/extensions/gstreamer_tools/actions.c gthumb-3.2.3/extensions/gstreamer_tools/actions.c --- gthumb-3.0.2/extensions/gstreamer_tools/actions.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/gstreamer_tools/actions.c 2013-07-10 13:33:24.000000000 +0000 @@ -39,7 +39,7 @@ GSettings *settings; GthMediaViewerPage *page; gboolean playing_before_screenshot; - GdkPixbuf *pixbuf; + GthImage *image; GthFileData *file_data; } SaveData; @@ -48,16 +48,16 @@ save_date_free (SaveData *save_data) { _g_object_unref (save_data->file_data); - _g_object_unref (save_data->pixbuf); + _g_object_unref (save_data->image); _g_object_unref (save_data->settings); g_free (save_data); } static void -screenshot_saved_cb (GthFileData *file_data, - GError *error, - gpointer user_data) +save_screenshot_task_completed_cb (GthTask *task, + GError *error, + gpointer user_data) { SaveData *save_data = user_data; GthMediaViewerPage *page = save_data->page; @@ -68,6 +68,7 @@ gst_element_set_state (gth_media_viewer_page_get_playbin (page), GST_STATE_PLAYING); save_date_free (save_data); + g_object_unref (task); } @@ -76,10 +77,11 @@ int response, SaveData *save_data) { - GFile *file; - GFile *folder; - char *folder_uri; - const char *mime_type; + GFile *file; + const char *mime_type; + GFile *folder; + char *folder_uri; + GthTask *task; if (response != GTK_RESPONSE_OK) { GthMediaViewerPage *page = save_data->page; @@ -100,12 +102,15 @@ save_data->file_data = gth_file_data_new (file, NULL); gth_file_data_set_mime_type (save_data->file_data, mime_type); - _gdk_pixbuf_save_async (save_data->pixbuf, - save_data->file_data, - mime_type, - TRUE, - screenshot_saved_cb, - save_data); + task = gth_save_image_task_new (save_data->image, + mime_type, + save_data->file_data, + GTH_OVERWRITE_RESPONSE_YES); + g_signal_connect (task, + "completed", + G_CALLBACK (save_screenshot_task_completed_cb), + save_data); + gth_browser_exec_task (GTH_BROWSER (save_data->browser), task, FALSE); gtk_widget_destroy (GTK_WIDGET (file_sel)); @@ -128,8 +133,9 @@ return; } - save_data->pixbuf = pixbuf; - file_sel = gth_file_chooser_dialog_new (_("Save Image"), GTK_WINDOW (save_data->browser), "pixbuf-saver"); + save_data->image = gth_image_new_for_pixbuf (pixbuf); + file_sel = gth_file_chooser_dialog_new (_("Save Image"), GTK_WINDOW (save_data->browser), "image-saver"); + gtk_window_set_modal (GTK_WINDOW (file_sel), TRUE); { char *last_uri; @@ -140,8 +146,15 @@ int attempt; last_uri = g_settings_get_string (save_data->settings, PREF_GSTREAMER_TOOLS_SCREESHOT_LOCATION); - if ((last_uri == NULL) || (strcmp (last_uri, "~") == 0)) - last_folder = g_file_new_for_path (g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP)); + if ((last_uri == NULL) || (strcmp (last_uri, "~") == 0) || (strcmp (last_uri, "file://~") == 0)) { + const char *dir; + + dir = g_get_user_special_dir (G_USER_DIRECTORY_PICTURES); + if (dir != NULL) + last_folder = g_file_new_for_path (dir); + else + last_folder = g_file_new_for_uri (get_home_uri ()); + } else last_folder = g_file_new_for_uri (last_uri); gtk_file_chooser_set_current_folder_file (GTK_FILE_CHOOSER (file_sel), last_folder, NULL); diff -Nru gthumb-3.0.2/extensions/gstreamer_tools/data/Makefile.in gthumb-3.2.3/extensions/gstreamer_tools/data/Makefile.in --- gthumb-3.0.2/extensions/gstreamer_tools/data/Makefile.in 2012-08-20 19:54:14.000000000 +0000 +++ gthumb-3.2.3/extensions/gstreamer_tools/data/Makefile.in 2013-07-10 13:33:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/gstreamer_tools/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/gstreamer_tools/data/ui/Makefile.in gthumb-3.2.3/extensions/gstreamer_tools/data/ui/Makefile.in --- gthumb-3.0.2/extensions/gstreamer_tools/data/ui/Makefile.in 2012-08-20 19:54:14.000000000 +0000 +++ gthumb-3.2.3/extensions/gstreamer_tools/data/ui/Makefile.in 2013-07-10 13:33:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/gstreamer_tools/data/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -381,11 +415,9 @@ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -526,16 +558,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-uiDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-uiDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/gstreamer_tools/gth-media-viewer-page.c gthumb-3.2.3/extensions/gstreamer_tools/gth-media-viewer-page.c --- gthumb-3.0.2/extensions/gstreamer_tools/gth-media-viewer-page.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/gstreamer_tools/gth-media-viewer-page.c 2013-06-18 17:31:31.000000000 +0000 @@ -24,11 +24,12 @@ #include #include #include -#include +#include #include #include #include "actions.h" #include "gth-media-viewer-page.h" +#include "preferences.h" #define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x))) @@ -64,7 +65,7 @@ gboolean has_video; gboolean has_audio; gulong update_progress_id; - guint set_to_pause_id; + gulong update_volume_id; gdouble rate; GtkWidget *mediabar; GtkWidget *fullscreen_toolbar; @@ -87,7 +88,6 @@ "" " " " " -" " " " " " " " @@ -215,7 +215,7 @@ if (size > allocation.height) size = allocation.height; size = size / 3; - self->priv->icon = _g_icon_get_pixbuf (icon, size, gtk_icon_theme_get_for_screen (gtk_widget_get_screen (widget))); + self->priv->icon = _g_icon_get_pixbuf (icon, size, _gtk_widget_get_icon_theme (widget)); g_object_unref (icon); g_free (type); @@ -319,41 +319,38 @@ static void -update_current_position_bar (GthMediaViewerPage *self, - gboolean update_progressbar) +update_current_position_bar (GthMediaViewerPage *self) { GstFormat format; gint64 current_value = 0; format = GST_FORMAT_TIME; - if (gst_element_query_position (self->priv->playbin, &format, ¤t_value)) { + if (gst_element_query_position (self->priv->playbin, format, ¤t_value)) { char *s; - if (self->priv->duration <= 0) { - gst_element_query_duration (self->priv->playbin, &format, &self->priv->duration); - s = _g_format_duration_for_display (GST_TIME_AS_MSECONDS (self->priv->duration)); - gtk_label_set_text (GTK_LABEL (GET_WIDGET ("label_duration")), s); - - g_free (s); - } - - /* - g_print ("==> %" G_GINT64_FORMAT " / %" G_GINT64_FORMAT " (%0.3g)\n" , - current_value, - self->priv->duration, - ((double) current_value / self->priv->duration) * 100.0); + if (self->priv->duration <= 0) { + gst_element_query_duration (self->priv->playbin, format, &self->priv->duration); + s = _g_format_duration_for_display (GST_TIME_AS_MSECONDS (self->priv->duration)); + gtk_label_set_text (GTK_LABEL (GET_WIDGET ("label_duration")), s); + + g_free (s); + } + + /* + g_print ("==> %" G_GINT64_FORMAT " / %" G_GINT64_FORMAT " (%0.3g)\n" , + current_value, + self->priv->duration, + ((double) current_value / self->priv->duration) * 100.0); */ - if (update_progressbar) { - g_signal_handlers_block_by_func(GET_WIDGET ("position_adjustment"), position_value_changed_cb, self); - gtk_adjustment_set_value (GTK_ADJUSTMENT (GET_WIDGET ("position_adjustment")), (self->priv->duration > 0) ? ((double) current_value / self->priv->duration) * 100.0 : 0.0); - g_signal_handlers_unblock_by_func(GET_WIDGET ("position_adjustment"), position_value_changed_cb, self); - } + g_signal_handlers_block_by_func(GET_WIDGET ("position_adjustment"), position_value_changed_cb, self); + gtk_adjustment_set_value (GTK_ADJUSTMENT (GET_WIDGET ("position_adjustment")), (self->priv->duration > 0) ? ((double) current_value / self->priv->duration) * 100.0 : 0.0); + g_signal_handlers_unblock_by_func(GET_WIDGET ("position_adjustment"), position_value_changed_cb, self); - s = _g_format_duration_for_display (GST_TIME_AS_MSECONDS (current_value)); - gtk_label_set_text (GTK_LABEL (GET_WIDGET ("label_position")), s); + s = _g_format_duration_for_display (GST_TIME_AS_MSECONDS (current_value)); + gtk_label_set_text (GTK_LABEL (GET_WIDGET ("label_position")), s); - g_free (s); + g_free (s); } } @@ -417,15 +414,18 @@ GdkEventButton *event, gpointer user_data) { +#if ! GTK_CHECK_VERSION(3,6,0) /* In a video player when clicking on the progress bar the user expect * to jump to the specified position directly instead of scrolling one * page up or down as happens by default in Gtk+. The button 2 - * behavior is what we want by default for button 1. */ + * behavior is what we want by default for button 1. This is the + * default behaviour in Gtk+ 3.6.0 or greater. */ if (event->button == 1) event->button = 2; else if (event->button == 2) event->button = 1; +#endif return FALSE; } @@ -438,11 +438,13 @@ { GthMediaViewerPage *self = user_data; +#if ! GTK_CHECK_VERSION(3,6,0) /* Swap button 1 and 2 behaviors, see position_scale_button_press_event_cb */ if (event->button == 1) event->button = 2; else if (event->button == 2) event->button = 1; +#endif if (self->priv->playing) self->priv->block_next_jump = TRUE; @@ -609,13 +611,18 @@ } -static void +static gboolean update_volume_from_playbin (GthMediaViewerPage *self) { double volume; + if (self->priv->update_volume_id != 0) { + g_source_remove (self->priv->update_volume_id); + self->priv->update_volume_id = 0; + } + if ((self->priv->builder == NULL) || (self->priv->playbin == NULL)) - return; + return FALSE; g_object_get (self->priv->playbin, "volume", &volume, NULL); @@ -628,9 +635,15 @@ else gtk_image_set_from_icon_name (GTK_IMAGE (GET_WIDGET ("volume_togglebutton_image")), "audio-volume-high-symbolic", GTK_ICON_SIZE_BUTTON); - g_signal_handlers_block_by_func(GET_WIDGET ("volume_adjustment"), volume_value_changed_cb, self); + g_signal_handlers_block_by_func (GET_WIDGET ("volume_adjustment"), volume_value_changed_cb, self); gtk_adjustment_set_value (GTK_ADJUSTMENT (GET_WIDGET ("volume_adjustment")), volume * 100.0); - g_signal_handlers_unblock_by_func(GET_WIDGET ("volume_adjustment"), volume_value_changed_cb, self); + g_signal_handlers_unblock_by_func (GET_WIDGET ("volume_adjustment"), volume_value_changed_cb, self); + + g_signal_handlers_block_by_func (GET_WIDGET ("volume_togglebutton"), volume_togglebutton_toggled_cb, self); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("volume_togglebutton")), volume == 0.0); + g_signal_handlers_unblock_by_func (GET_WIDGET ("volume_togglebutton"), volume_togglebutton_toggled_cb, self); + + return FALSE; } @@ -644,7 +657,7 @@ self->priv->update_progress_id = 0; } - update_current_position_bar (self, TRUE); + update_current_position_bar (self); self->priv->update_progress_id = gdk_threads_add_timeout (PROGRESS_DELAY, update_progress_cb, self); @@ -659,7 +672,7 @@ self->priv->playing = playing; if (self->priv->playing) gth_screensaver_inhibit (self->priv->screensaver, - GTK_WIDGET (self->priv->browser), + GTK_WINDOW (self->priv->browser), _("Playing video")); else gth_screensaver_uninhibit (self->priv->screensaver); @@ -815,7 +828,7 @@ gtk_widget_show (self->priv->area_box); gth_browser_set_viewer_widget (browser, self->priv->area_box); - gtk_widget_realize (self->priv->area_box); + gtk_widget_realize (self->priv->area); gth_viewer_page_focus (GTH_VIEWER_PAGE (self)); } @@ -841,6 +854,20 @@ static void +save_volume (GthMediaViewerPage *self) +{ + GSettings *settings; + double volume; + + settings = g_settings_new (GTHUMB_GSTREAMER_TOOLS_SCHEMA); + g_object_get (self->priv->playbin, "volume", &volume, NULL); + g_settings_set_int (settings, PREF_GSTREAMER_TOOLS_VOLUME, (int) (volume * 100.0)); + + g_object_unref (settings); +} + + +static void gth_media_viewer_page_real_deactivate (GthViewerPage *base) { GthMediaViewerPage *self; @@ -857,7 +884,13 @@ self->priv->update_progress_id = 0; } + if (self->priv->update_volume_id != 0) { + g_source_remove (self->priv->update_volume_id); + self->priv->update_volume_id = 0; + } + if (self->priv->playbin != NULL) { + save_volume (self); gst_element_set_state (self->priv->playbin, GST_STATE_NULL); gst_object_unref (GST_OBJECT (self->priv->playbin)); self->priv->playbin = NULL; @@ -879,20 +912,15 @@ GthMediaViewerPage *self) { /* ignore anything but 'prepare-xwindow-id' element messages */ - - if (GST_MESSAGE_TYPE (message) != GST_MESSAGE_ELEMENT) - return GST_BUS_PASS; - if (! gst_structure_has_name (message->structure, "prepare-xwindow-id")) + if (! gst_is_video_overlay_prepare_window_handle_message (message)) return GST_BUS_PASS; if (self->priv->video_window_xid != 0) { - GstXOverlay *xoverlay; + GstVideoOverlay *video_overlay; - xoverlay = GST_X_OVERLAY (GST_MESSAGE_SRC (message)); - gst_x_overlay_set_window_handle (xoverlay, self->priv->video_window_xid); + video_overlay = GST_VIDEO_OVERLAY (GST_MESSAGE_SRC (message)); + gst_video_overlay_set_window_handle (video_overlay, self->priv->video_window_xid); self->priv->xwin_assigned = TRUE; - - g_object_set (xoverlay, "force-aspect-ratio", TRUE, NULL); } else g_warning ("Should have obtained video_window_xid by now!"); @@ -920,64 +948,46 @@ static void update_stream_info (GthMediaViewerPage *self) { - GList *streaminfo; - GstPad *videopad; - - streaminfo = NULL; - videopad = NULL; - - g_object_get (self->priv->playbin, "stream-info", &streaminfo, NULL); - streaminfo = g_list_copy (streaminfo); - g_list_foreach (streaminfo, (GFunc) g_object_ref, NULL); - - for (/* void */ ; streaminfo; streaminfo = streaminfo->next) { - GObject *info; - int type; - GParamSpec *pspec; - GEnumValue *val; - - info = streaminfo->data; - if (info == NULL) - continue; - - type = -1; - - g_object_get (info, "type", &type, NULL); - pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (info), "type"); - val = g_enum_get_value (G_PARAM_SPEC_ENUM (pspec)->enum_class, type); - - if (strcmp (val->value_nick, "audio") == 0) { + GstElement *audio_sink; + GstElement *video_sink; + GstPad *audio_pad; + GstPad *video_pad; + + g_object_get (self->priv->playbin, + "audio-sink", &audio_sink, + "video-sink", &video_sink, + NULL); + + if (audio_sink != NULL) { + audio_pad = gst_element_get_static_pad (GST_ELEMENT (audio_sink), "sink"); + if (audio_pad != NULL) self->priv->has_audio = TRUE; - } - else if (strcmp (val->value_nick, "video") == 0) { - self->priv->has_video = TRUE; - if (videopad == NULL) - g_object_get (info, "object", &videopad, NULL); - } } - if (videopad != NULL) { - GstCaps *caps; + if (video_sink != NULL) { + video_pad = gst_element_get_static_pad (GST_ELEMENT (video_sink), "sink"); + if (video_pad != NULL) { + GstCaps *caps; + + self->priv->has_video = TRUE; - if ((caps = gst_pad_get_negotiated_caps (videopad)) != NULL) { - GstStructure *structure; - int video_width; - int video_height; - - structure = gst_caps_get_structure (caps, 0); - gst_structure_get_fraction (structure, "framerate", &self->priv->video_fps_n, &self->priv->video_fps_d); - gst_structure_get_int (structure, "width", &video_width); - gst_structure_get_int (structure, "height", &video_height); + if ((caps = gst_pad_get_current_caps (video_pad)) != NULL) { + GstStructure *structure; + int video_width; + int video_height; + + structure = gst_caps_get_structure (caps, 0); + gst_structure_get_fraction (structure, "framerate", &self->priv->video_fps_n, &self->priv->video_fps_d); + gst_structure_get_int (structure, "width", &video_width); + gst_structure_get_int (structure, "height", &video_height); - g_file_info_set_attribute_int32 (self->priv->file_data->info, "frame::width", video_width); - g_file_info_set_attribute_int32 (self->priv->file_data->info, "frame::height", video_height); + g_file_info_set_attribute_int32 (self->priv->file_data->info, "frame::width", video_width); + g_file_info_set_attribute_int32 (self->priv->file_data->info, "frame::height", video_height); - gst_caps_unref (caps); + gst_caps_unref (caps); + } } } - - g_list_foreach (streaminfo, (GFunc) g_object_unref, NULL); - g_list_free (streaminfo); } @@ -988,6 +998,9 @@ { GthMediaViewerPage *self = user_data; + if (GST_MESSAGE_SRC (message) != GST_OBJECT (self->priv->playbin)) + return; + switch (GST_MESSAGE_TYPE (message)) { case GST_MESSAGE_STATE_CHANGED: { GstState old_state; @@ -996,15 +1009,11 @@ old_state = new_state = GST_STATE_NULL; gst_message_parse_state_changed (message, &old_state, &new_state, &pending_state); - - self->priv->paused = (new_state == GST_STATE_PAUSED); - if (old_state == new_state) break; - if (GST_MESSAGE_SRC (message) != GST_OBJECT (self->priv->playbin)) - break; - update_current_position_bar (self, TRUE); + self->priv->paused = (new_state == GST_STATE_PAUSED); + update_current_position_bar (self); if ((old_state == GST_STATE_NULL) && (new_state == GST_STATE_READY) && (pending_state != GST_STATE_PAUSED)) { update_stream_info (self); @@ -1023,14 +1032,10 @@ break; } - case GST_MESSAGE_DURATION: { - GstFormat format; - - format = GST_FORMAT_TIME; - gst_message_parse_duration (message, &format, &self->priv->duration); - update_current_position_bar (self, TRUE); + case GST_MESSAGE_DURATION_CHANGED: + self->priv->duration = 0; + update_current_position_bar (self); break; - } case GST_MESSAGE_EOS: reset_player_state (self); @@ -1039,13 +1044,13 @@ case GST_MESSAGE_BUFFERING: { int percent = 0; gst_message_parse_buffering (message, &percent); - /* g_print ("Buffering (%%%u percent done)", percent); */ + gst_element_set_state(self->priv->playbin, (percent == 100) ? GST_STATE_PLAYING : GST_STATE_PAUSED); break; + } case GST_MESSAGE_ERROR: gth_viewer_page_file_loaded (GTH_VIEWER_PAGE (self), self->priv->file_data, FALSE); break; - } default: break; @@ -1058,27 +1063,59 @@ GParamSpec *pspec, gpointer user_data) { - update_volume_from_playbin ((GthMediaViewerPage *) user_data); + GthMediaViewerPage *self = user_data; + + if (self->priv->update_volume_id == 0) + self->priv->update_volume_id = g_idle_add ((GSourceFunc) update_volume_from_playbin, user_data); } static void create_playbin (GthMediaViewerPage *self) { - GstBus *bus; + GSettings *settings; + GstBus *bus; if (self->priv->playbin != NULL) return; self->priv->playbin = gst_element_factory_make ("playbin", "playbin"); - g_signal_connect (self->priv->playbin, "notify::volume", G_CALLBACK (playbin_notify_volume_cb), self); + + settings = g_settings_new (GTHUMB_GSTREAMER_TOOLS_SCHEMA); + g_object_set (self->priv->playbin, + "volume", (double) g_settings_get_int (settings, PREF_GSTREAMER_TOOLS_VOLUME) / 100.0, + "force-aspect-ratio", TRUE, + NULL); + g_object_unref (settings); bus = gst_pipeline_get_bus (GST_PIPELINE (self->priv->playbin)); gst_bus_enable_sync_message_emission (bus); - gst_bus_set_sync_handler (bus, (GstBusSyncHandler) set_playbin_window, self); + gst_bus_set_sync_handler (bus, (GstBusSyncHandler) set_playbin_window, self, NULL); gst_bus_add_signal_watch (bus); - g_signal_connect (bus, "message", G_CALLBACK (bus_message_cb), self); + g_signal_connect (self->priv->playbin, + "notify::volume", + G_CALLBACK (playbin_notify_volume_cb), + self); + g_signal_connect (bus, + "message", + G_CALLBACK (bus_message_cb), + self); +} + + +static void +_gth_media_viewer_page_set_uri (GthMediaViewerPage *self, + const char *uri, + GstState state) +{ + g_return_if_fail (self->priv->playbin != NULL); + + gst_element_set_state (self->priv->playbin, GST_STATE_NULL); + + g_object_set (G_OBJECT (self->priv->playbin), "uri", uri, NULL); + gst_element_set_state (self->priv->playbin, state); + gst_element_get_state (self->priv->playbin, NULL, NULL, GST_CLOCK_TIME_NONE); } @@ -1104,8 +1141,7 @@ char *uri; uri = g_file_get_uri (self->priv->file_data->file); - g_object_set (G_OBJECT (self->priv->playbin), "uri", uri, NULL); - gst_element_set_state (self->priv->playbin, GST_STATE_PLAYING); + _gth_media_viewer_page_set_uri (self, uri, GST_STATE_PLAYING); g_free (uri); } @@ -1141,19 +1177,6 @@ } -static gboolean -set_to_paused (gpointer user_data) -{ - GthMediaViewerPage *self = user_data; - - self->priv->set_to_pause_id = 0; - if (self->priv->playbin != NULL) - gst_element_set_state (self->priv->playbin, self->priv->visible ? GST_STATE_PLAYING : GST_STATE_READY); - - return FALSE; -} - - static void gth_media_viewer_page_real_view (GthViewerPage *base, GthFileData *file_data) @@ -1201,13 +1224,8 @@ if (self->priv->playbin == NULL) return; - gst_element_set_state (self->priv->playbin, GST_STATE_NULL); uri = g_file_get_uri (self->priv->file_data->file); - g_object_set (G_OBJECT (self->priv->playbin), "uri", uri, NULL); - - if (self->priv->set_to_pause_id != 0) - g_source_remove (self->priv->set_to_pause_id); - self->priv->set_to_pause_id = gdk_threads_add_idle (set_to_paused, self); + _gth_media_viewer_page_set_uri (self, uri, self->priv->visible ? GST_STATE_PLAYING : GST_STATE_PAUSED); g_free (uri); } @@ -1382,17 +1400,18 @@ self = GTH_MEDIA_VIEWER_PAGE (obj); - if (self->priv->set_to_pause_id != 0) { - g_source_remove (self->priv->set_to_pause_id); - self->priv->set_to_pause_id = 0; - } - if (self->priv->update_progress_id != 0) { g_source_remove (self->priv->update_progress_id); self->priv->update_progress_id = 0; } + if (self->priv->update_volume_id != 0) { + g_source_remove (self->priv->update_volume_id); + self->priv->update_volume_id = 0; + } + if (self->priv->playbin != NULL) { + save_volume (self); gst_element_set_state (self->priv->playbin, GST_STATE_NULL); gst_object_unref (GST_OBJECT (self->priv->playbin)); self->priv->playbin = NULL; @@ -1444,7 +1463,7 @@ { self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_MEDIA_VIEWER_PAGE, GthMediaViewerPagePrivate); self->priv->update_progress_id = 0; - self->priv->set_to_pause_id = 0; + self->priv->update_volume_id = 0; self->priv->video_window_xid = 0; self->priv->xwin_assigned = FALSE; self->priv->has_video = FALSE; diff -Nru gthumb-3.0.2/extensions/gstreamer_tools/preferences.h gthumb-3.2.3/extensions/gstreamer_tools/preferences.h --- gthumb-3.0.2/extensions/gstreamer_tools/preferences.h 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/gstreamer_tools/preferences.h 2013-04-30 16:56:12.000000000 +0000 @@ -29,5 +29,6 @@ /* keys */ #define PREF_GSTREAMER_TOOLS_SCREESHOT_LOCATION "screenshot-location" +#define PREF_GSTREAMER_TOOLS_VOLUME "volume" #endif /* PREFERENCES_H */ diff -Nru gthumb-3.0.2/extensions/gstreamer_utils/Makefile.am gthumb-3.2.3/extensions/gstreamer_utils/Makefile.am --- gthumb-3.0.2/extensions/gstreamer_utils/Makefile.am 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/gstreamer_utils/Makefile.am 2013-04-30 16:56:12.000000000 +0000 @@ -6,8 +6,6 @@ libgstreamer_utils_la_SOURCES = \ gstreamer-utils.c \ gstreamer-utils.h \ - gstscreenshot.c \ - gstscreenshot.h \ main.c libgstreamer_utils_la_CPPFLAGS = $(GTHUMB_CFLAGS) $(GSTREAMER_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb diff -Nru gthumb-3.0.2/extensions/gstreamer_utils/Makefile.in gthumb-3.2.3/extensions/gstreamer_utils/Makefile.in --- gthumb-3.0.2/extensions/gstreamer_utils/Makefile.in 2012-08-20 19:54:14.000000000 +0000 +++ gthumb-3.2.3/extensions/gstreamer_utils/Makefile.in 2013-07-10 13:33:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/gstreamer_utils -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -98,9 +126,8 @@ LTLIBRARIES = $(extension_LTLIBRARIES) am__DEPENDENCIES_1 = am__libgstreamer_utils_la_SOURCES_DIST = gstreamer-utils.c \ - gstreamer-utils.h gstscreenshot.c gstscreenshot.h main.c + gstreamer-utils.h main.c @ENABLE_GSTREAMER_TRUE@am_libgstreamer_utils_la_OBJECTS = libgstreamer_utils_la-gstreamer-utils.lo \ -@ENABLE_GSTREAMER_TRUE@ libgstreamer_utils_la-gstscreenshot.lo \ @ENABLE_GSTREAMER_TRUE@ libgstreamer_utils_la-main.lo libgstreamer_utils_la_OBJECTS = $(am_libgstreamer_utils_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) @@ -155,6 +182,23 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(extensionini_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -187,9 +231,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -203,13 +245,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -238,7 +279,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -254,11 +298,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -275,7 +323,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -305,7 +352,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -367,8 +417,6 @@ @ENABLE_GSTREAMER_TRUE@libgstreamer_utils_la_SOURCES = \ @ENABLE_GSTREAMER_TRUE@ gstreamer-utils.c \ @ENABLE_GSTREAMER_TRUE@ gstreamer-utils.h \ -@ENABLE_GSTREAMER_TRUE@ gstscreenshot.c \ -@ENABLE_GSTREAMER_TRUE@ gstscreenshot.h \ @ENABLE_GSTREAMER_TRUE@ main.c @ENABLE_GSTREAMER_TRUE@libgstreamer_utils_la_CPPFLAGS = $(GTHUMB_CFLAGS) $(GSTREAMER_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb @@ -414,6 +462,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -448,6 +497,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libgstreamer_utils.la: $(libgstreamer_utils_la_OBJECTS) $(libgstreamer_utils_la_DEPENDENCIES) $(EXTRA_libgstreamer_utils_la_DEPENDENCIES) $(AM_V_CCLD)$(libgstreamer_utils_la_LINK) $(am_libgstreamer_utils_la_rpath) $(libgstreamer_utils_la_OBJECTS) $(libgstreamer_utils_la_LIBADD) $(LIBS) @@ -458,7 +508,6 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstreamer_utils_la-gstreamer-utils.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstreamer_utils_la-gstscreenshot.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstreamer_utils_la-main.Plo@am__quote@ .c.o: @@ -466,14 +515,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -489,13 +538,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgstreamer_utils_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgstreamer_utils_la-gstreamer-utils.lo `test -f 'gstreamer-utils.c' || echo '$(srcdir)/'`gstreamer-utils.c -libgstreamer_utils_la-gstscreenshot.lo: gstscreenshot.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgstreamer_utils_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgstreamer_utils_la-gstscreenshot.lo -MD -MP -MF $(DEPDIR)/libgstreamer_utils_la-gstscreenshot.Tpo -c -o libgstreamer_utils_la-gstscreenshot.lo `test -f 'gstscreenshot.c' || echo '$(srcdir)/'`gstscreenshot.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstreamer_utils_la-gstscreenshot.Tpo $(DEPDIR)/libgstreamer_utils_la-gstscreenshot.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstscreenshot.c' object='libgstreamer_utils_la-gstscreenshot.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgstreamer_utils_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgstreamer_utils_la-gstscreenshot.lo `test -f 'gstscreenshot.c' || echo '$(srcdir)/'`gstscreenshot.c - libgstreamer_utils_la-main.lo: main.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgstreamer_utils_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgstreamer_utils_la-main.lo -MD -MP -MF $(DEPDIR)/libgstreamer_utils_la-main.Tpo -c -o libgstreamer_utils_la-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstreamer_utils_la-main.Tpo $(DEPDIR)/libgstreamer_utils_la-main.Plo @@ -530,26 +572,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(extensioninidir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -561,15 +592,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -578,9 +605,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -738,21 +766,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ clean-extensionLTLIBRARIES clean-generic clean-libtool \ - cscopelist ctags distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-extensionLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-extensionLTLIBRARIES \ install-extensioniniDATA install-html install-html-am \ install-info install-info-am install-man install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-extensionLTLIBRARIES \ - uninstall-extensioniniDATA + tags tags-am uninstall uninstall-am \ + uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA @GTHUMB_EXTENSION_IN_RULE@ diff -Nru gthumb-3.0.2/extensions/gstreamer_utils/gstreamer-utils.c gthumb-3.2.3/extensions/gstreamer_utils/gstreamer-utils.c --- gthumb-3.0.2/extensions/gstreamer_utils/gstreamer-utils.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/gstreamer_utils/gstreamer-utils.c 2013-04-30 16:56:12.000000000 +0000 @@ -44,7 +44,6 @@ #include #include #include "gstreamer-utils.h" -#include "gstscreenshot.h" static gboolean gstreamer_initialized = FALSE; @@ -109,8 +108,14 @@ gstreamer_init (void) { if (! gstreamer_initialized) { - if (! gst_init_check (NULL, NULL, NULL)) + GError *error = NULL; + + if (! gst_init_check (NULL, NULL, &error)) { + g_warning ("%s", error->message); + g_error_free (error); return FALSE; + } + gstreamer_initialized = TRUE; } @@ -189,14 +194,14 @@ } if (tag_type == G_TYPE_UCHAR) { - guchar ret = 0; - if (gst_tag_list_get_uchar (list, tag, &ret)) + guint ret = 0; + if (gst_tag_list_get_uint (list, tag, &ret)) add_metadata (info, tag_key, g_strdup_printf ("%u", ret), NULL); } if (tag_type == G_TYPE_CHAR) { - gchar ret = 0; - if (gst_tag_list_get_char (list, tag, &ret)) + int ret = 0; + if (gst_tag_list_get_int (list, tag, &ret)) add_metadata (info, tag_key, g_strdup_printf ("%d", ret), NULL); } @@ -213,15 +218,15 @@ } if (tag_type == G_TYPE_ULONG) { - gulong ret = 0; - if (gst_tag_list_get_ulong (list, tag, &ret)) - add_metadata (info, tag_key, g_strdup_printf ("%lu", ret), NULL); + guint64 ret = 0; + if (gst_tag_list_get_uint64 (list, tag, &ret)) + add_metadata (info, tag_key, g_strdup_printf ("%" G_GUINT64_FORMAT, ret), NULL); } if (tag_type == G_TYPE_LONG) { - glong ret = 0; - if (gst_tag_list_get_long (list, tag, &ret)) - add_metadata (info, tag_key, g_strdup_printf ("%ld", ret), NULL); + gint64 ret = 0; + if (gst_tag_list_get_int64 (list, tag, &ret)) + add_metadata (info, tag_key, g_strdup_printf ("%" G_GINT64_FORMAT, ret), NULL); } if (tag_type == G_TYPE_INT64) { @@ -343,7 +348,7 @@ fmt = GST_FORMAT_TIME; duration = -1; - if (gst_element_query_duration (extractor->playbin, &fmt, &duration) && (duration >= 0)) + if (gst_element_query_duration (extractor->playbin, fmt, &duration) && (duration >= 0)) return duration / GST_SECOND; else return -1; @@ -428,7 +433,7 @@ GstCaps *caps; GstStructure *structure; - if ((caps = gst_pad_get_negotiated_caps (pad)) == NULL) + if ((caps = gst_pad_get_current_caps (pad)) == NULL) return; structure = gst_caps_get_structure (caps, 0); @@ -456,67 +461,43 @@ static void update_stream_info (MetadataExtractor *extractor) { - GList *streaminfo; - GstPad *audiopad; - GstPad *videopad; - - g_return_if_fail (extractor); - - streaminfo = NULL; - audiopad = videopad = NULL; - - g_object_get (extractor->playbin, "stream-info", &streaminfo, NULL); - streaminfo = g_list_copy (streaminfo); - g_list_foreach (streaminfo, (GFunc) g_object_ref, NULL); + GstElement *audio_sink; + GstElement *video_sink; - for (/* void */ ; streaminfo; streaminfo = streaminfo->next) { - GObject *info; - int type; - GParamSpec *pspec; - GEnumValue *val; - - info = streaminfo->data; - if (info == NULL) - continue; - - type = -1; - - g_object_get (info, "type", &type, NULL); - pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (info), "type"); - val = g_enum_get_value (G_PARAM_SPEC_ENUM (pspec)->enum_class, type); - - if (strcmp (val->value_nick, "audio") == 0) { - extractor->has_audio = TRUE; - if (audiopad == NULL) - g_object_get (info, "object", &audiopad, NULL); - } - else if (strcmp (val->value_nick, "video") == 0) { - extractor->has_video = TRUE; - if (videopad == NULL) - g_object_get (info, "object", &videopad, NULL); - } - } + g_object_get (extractor->playbin, + "audio-sink", &audio_sink, + "video-sink", &video_sink, + NULL); - if (audiopad != NULL) { - GstCaps *caps; + if (audio_sink != NULL) { + GstPad *audio_pad; - if ((caps = gst_pad_get_negotiated_caps (audiopad)) != NULL) { - caps_set (audiopad, extractor, "audio"); - gst_caps_unref (caps); + audio_pad = gst_element_get_static_pad (GST_ELEMENT (audio_sink), "sink"); + if (audio_pad != NULL) { + GstCaps *caps; + + if ((caps = gst_pad_get_current_caps (audio_pad)) != NULL) { + extractor->has_audio = TRUE; + caps_set (audio_pad, extractor, "audio"); + gst_caps_unref (caps); + } } } - if (videopad != NULL) { - GstCaps *caps; + if (video_sink != NULL) { + GstPad *video_pad; - if ((caps = gst_pad_get_negotiated_caps (videopad)) != NULL) { - caps_set (videopad, extractor, "video"); - gst_caps_unref (caps); + video_pad = gst_element_get_static_pad (GST_ELEMENT (video_sink), "sink"); + if (video_pad != NULL) { + GstCaps *caps; + + if ((caps = gst_pad_get_current_caps (video_pad)) != NULL) { + extractor->has_video = TRUE; + caps_set (video_pad, extractor, "video"); + gst_caps_unref (caps); + } } } - - g_list_foreach (streaminfo, (GFunc) g_object_unref, NULL); - g_list_free (streaminfo); } @@ -675,7 +656,6 @@ typedef struct { - GdkPixbuf *pixbuf; FrameReadyCallback cb; gpointer user_data; @@ -694,54 +674,7 @@ static void destroy_pixbuf (guchar *pix, gpointer data) { - gst_buffer_unref (GST_BUFFER (data)); -} - - -static void -get_current_frame_step2 (GstBuffer *buf, - gpointer user_data) -{ - ScreenshotData *data = user_data; - GstStructure *s; - int outwidth = 0; - int outheight = 0; - - if (buf == NULL) { - g_warning ("Could not take screenshot: %s", "conversion failed"); - screenshot_data_finalize (data); - return; - } - - if (GST_BUFFER_CAPS (buf) == NULL) { - g_warning ("Could not take screenshot: %s", "no caps on output buffer"); - screenshot_data_finalize (data); - return; - } - - s = gst_caps_get_structure (GST_BUFFER_CAPS (buf), 0); - gst_structure_get_int (s, "width", &outwidth); - gst_structure_get_int (s, "height", &outheight); - - g_return_if_fail (outwidth > 0 && outheight > 0); - - /* create pixbuf from that - use our own destroy function */ - - data->pixbuf = gdk_pixbuf_new_from_data (GST_BUFFER_DATA (buf), - GDK_COLORSPACE_RGB, - FALSE, - 8, - outwidth, - outheight, - GST_ROUND_UP_4 (outwidth * 3), - destroy_pixbuf, - buf); - if (data->pixbuf == NULL) { - g_warning ("Could not take screenshot: %s", "could not create pixbuf"); - gst_buffer_unref (buf); - } - - screenshot_data_finalize (data); + gst_sample_unref (GST_SAMPLE (data)); } @@ -753,46 +686,73 @@ gpointer user_data) { ScreenshotData *data; - GstBuffer *buf; GstCaps *to_caps; - - g_object_get (playbin, "frame", &buf, NULL); - - if (buf == NULL) { - g_warning ("Could not take screenshot: %s", "no last video frame"); - return FALSE; - } - - if (GST_BUFFER_CAPS (buf) == NULL) { - g_warning ("Could not take screenshot: %s", "no caps on buffer"); - return FALSE; - } - - /* convert to our desired format (RGB24) */ + GstSample *sample; + GstCaps *sample_caps; + GstStructure *s; + int outwidth; + int outheight; data = g_new0 (ScreenshotData, 1); data->cb = cb; data->user_data = user_data; - to_caps = gst_caps_new_simple ("video/x-raw-rgb", - "bpp", G_TYPE_INT, 24, - "depth", G_TYPE_INT, 24, + /* our desired output format (RGB24) */ + to_caps = gst_caps_new_simple ("video/x-raw", + "format", G_TYPE_STRING, "RGB", /* Note: we don't ask for a specific width/height here, so that * videoscale can adjust dimensions from a non-1/1 pixel aspect - * ratio to a 1/1 pixel-aspect-ratio */ + * ratio to a 1/1 pixel-aspect-ratio. We also don't ask for a + * specific framerate, because the input framerate won't + * necessarily match the output framerate if there's a deinterlacer + * in the pipeline. */ "pixel-aspect-ratio", GST_TYPE_FRACTION, 1, 1, - "endianness", G_TYPE_INT, G_BIG_ENDIAN, - "red_mask", G_TYPE_INT, 0xff0000, - "green_mask", G_TYPE_INT, 0x00ff00, - "blue_mask", G_TYPE_INT, 0x0000ff, NULL); - if (video_fps_n > 0 && video_fps_d > 0) { - gst_caps_set_simple (to_caps, "framerate", - GST_TYPE_FRACTION, video_fps_n, video_fps_d, - NULL); + /* get frame */ + sample = NULL; + g_signal_emit_by_name (playbin, "convert-sample", to_caps, &sample); + gst_caps_unref (to_caps); + + if (sample == NULL) { + g_warning ("Could not take screenshot: %s", "failed to retrieve or convert video frame"); + screenshot_data_finalize (data); + return FALSE; + } + + sample_caps = gst_sample_get_caps (sample); + if (sample_caps == NULL) { + g_warning ("Could not take screenshot: %s", "no caps on output buffer"); + return FALSE; } - return bvw_frame_conv_convert (buf, to_caps, get_current_frame_step2, data); + s = gst_caps_get_structure (sample_caps, 0); + gst_structure_get_int (s, "width", &outwidth); + gst_structure_get_int (s, "height", &outheight); + if ((outwidth > 0) && (outheight > 0)) { + GstMemory *memory; + GstMapInfo info; + + memory = gst_buffer_get_memory (gst_sample_get_buffer (sample), 0); + gst_memory_map (memory, &info, GST_MAP_READ); + data->pixbuf = gdk_pixbuf_new_from_data (info.data, + GDK_COLORSPACE_RGB, + FALSE, + 8, + outwidth, + outheight, + GST_ROUND_UP_4 (outwidth * 3), + destroy_pixbuf, + sample); + + gst_memory_unmap (memory, &info); + } + + if (data->pixbuf == NULL) + g_warning ("Could not take screenshot: %s", "could not create pixbuf"); + + screenshot_data_finalize (data); + + return TRUE; } diff -Nru gthumb-3.0.2/extensions/gstreamer_utils/gstscreenshot.c gthumb-3.2.3/extensions/gstreamer_utils/gstscreenshot.c --- gthumb-3.0.2/extensions/gstreamer_utils/gstscreenshot.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/gstreamer_utils/gstscreenshot.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,259 +0,0 @@ -/* Small helper element for format conversion - * (c) 2004 Ronald Bultje - * Portion Copyright © 2009 Nokia Corporation and/or its - * subsidiary(-ies).* All rights reserved. * - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -#include "gstscreenshot.h" - -typedef struct { - GstBuffer *result; - GstElement *src; - GstElement *sink; - GstElement *pipeline; - BvwFrameConvCb cb; - gpointer cb_data; -} GstScreenshotData; - -/* GST_DEBUG_CATEGORY_EXTERN (_totem_gst_debug_cat); */ -/* #define GST_CAT_DEFAULT _totem_gst_debug_cat */ - -static void feed_fakesrc(GstElement *src, GstBuffer *buf, GstPad *pad, - gpointer data) -{ - GstBuffer *in_buf = GST_BUFFER(data); - - g_assert(GST_BUFFER_SIZE(buf) >= GST_BUFFER_SIZE(in_buf)); - g_assert(!GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_READONLY)); - - gst_buffer_set_caps(buf, GST_BUFFER_CAPS(in_buf)); - - memcpy(GST_BUFFER_DATA(buf), GST_BUFFER_DATA(in_buf), - GST_BUFFER_SIZE(in_buf)); - - GST_BUFFER_SIZE(buf) = GST_BUFFER_SIZE(in_buf); - - GST_DEBUG("feeding buffer %p, size %u, caps %" GST_PTR_FORMAT, - buf, GST_BUFFER_SIZE(buf), GST_BUFFER_CAPS(buf)); - - gst_buffer_unref(in_buf); -} - -static void save_result(GstElement *sink, GstBuffer *buf, GstPad *pad, - gpointer data) -{ - GstScreenshotData *gsd = data; - - gsd->result = gst_buffer_ref(buf); - - GST_DEBUG("received converted buffer %p with caps %" GST_PTR_FORMAT, - gsd->result, GST_BUFFER_CAPS(gsd->result)); -} - -static gboolean create_element(const gchar *factory_name, GstElement **element, - GError **err) -{ - *element = gst_element_factory_make(factory_name, NULL); - if (*element) - return TRUE; - - if (err && *err == NULL) { - *err = g_error_new( - GST_CORE_ERROR, GST_CORE_ERROR_MISSING_PLUGIN, - "cannot create element '%s' - please check your " - "GStreamer installation", factory_name); - } - - return FALSE; -} - -static gboolean finalize_process(GstScreenshotData *gsd) -{ - g_signal_handlers_disconnect_matched(gsd->sink, (GSignalMatchType) - G_SIGNAL_MATCH_FUNC, 0, 0, NULL, - save_result, NULL); - g_signal_handlers_disconnect_matched(gsd->src, (GSignalMatchType) - G_SIGNAL_MATCH_FUNC, 0, 0, NULL, - feed_fakesrc, NULL); - gst_element_set_state(gsd->pipeline, GST_STATE_NULL); - - g_free(gsd); - - return FALSE; -} - -static gboolean async_bus_handler(GstBus *bus, GstMessage *msg, - gpointer data) -{ - GstScreenshotData *gsd = data; - gboolean keep_watch = TRUE; - - switch (GST_MESSAGE_TYPE(msg)) { - case GST_MESSAGE_EOS: { - if (gsd->result != NULL) { - GST_DEBUG("conversion successful: result = %p", - gsd->result); - } else { - GST_WARNING("EOS but no result frame?!"); - } - gsd->cb(gsd->result, gsd->cb_data); - keep_watch = finalize_process(gsd); - break; - } - case GST_MESSAGE_ERROR: { - gchar *dbg = NULL; - GError *error = NULL; - - gst_message_parse_error(msg, &error, &dbg); - if (error != NULL) { - g_warning("Could not take screenshot: %s", - error->message); - GST_DEBUG("%s [debug: %s]", error->message, - GST_STR_NULL(dbg)); - g_error_free(error); - } else { - g_warning("Could not take screenshot(and " - "NULL error!)"); - } - g_free(dbg); - gsd->result = NULL; - gsd->cb(gsd->result, gsd->cb_data); - keep_watch = finalize_process(gsd); - break; - } - default: - break; - } - - return keep_watch; -} - -/* takes ownership of the input buffer */ -gboolean bvw_frame_conv_convert(GstBuffer *buf, GstCaps *to_caps, - BvwFrameConvCb cb, gpointer cb_data) -{ - static GstElement *src = NULL, *sink = NULL, *pipeline = NULL, - *filter1 = NULL, *filter2 = NULL; - static GstBus *bus; - GError *error = NULL; - GstCaps *to_caps_no_par; - GstScreenshotData *gsd; - - g_return_val_if_fail(GST_BUFFER_CAPS(buf) != NULL, FALSE); - g_return_val_if_fail(cb != NULL, FALSE); - - if (pipeline == NULL) { - GstElement *csp, *vscale; - - pipeline = gst_pipeline_new("screenshot-pipeline"); - if(pipeline == NULL) { - g_warning("Could not take screenshot: " - "no pipeline (unknown error)"); - return FALSE; - } - - /* videoscale is here to correct for the - * pixel-aspect-ratio for us */ - GST_DEBUG("creating elements"); - if(!create_element("fakesrc", &src, &error) || - !create_element("ffmpegcolorspace", &csp, &error) || - !create_element("videoscale", &vscale, &error) || - !create_element("capsfilter", &filter1, &error) || - !create_element("capsfilter", &filter2, &error) || - !create_element("fakesink", &sink, &error)) { - g_warning("Could not take screenshot: %s", - error->message); - g_error_free(error); - return FALSE; - } - - GST_DEBUG("adding elements"); - gst_bin_add_many(GST_BIN(pipeline), src, csp, filter1, vscale, - filter2, sink, NULL); - - g_object_set(sink, "preroll-queue-len", 1, - "signal-handoffs", TRUE, NULL); - - /* set to 'fixed' sizetype */ - g_object_set(src, "sizetype", 2, "num-buffers", 1, - "signal-handoffs", TRUE, NULL); - - /* FIXME: linking is still way too expensive, profile - * this properly */ - GST_DEBUG("linking src->csp"); - if(!gst_element_link_pads(src, "src", csp, "sink")) - return FALSE; - - GST_DEBUG("linking csp->filter1"); - if(!gst_element_link_pads(csp, "src", filter1, "sink")) - return FALSE; - - GST_DEBUG("linking filter1->vscale"); - if(!gst_element_link_pads(filter1, "src", vscale, "sink")) - return FALSE; - - GST_DEBUG("linking vscale->capsfilter"); - if(!gst_element_link_pads(vscale, "src", filter2, "sink")) - return FALSE; - - GST_DEBUG("linking capsfilter->sink"); - if(!gst_element_link_pads(filter2, "src", sink, "sink")) - return FALSE; - - bus = gst_element_get_bus(pipeline); - } - - /* adding this superfluous capsfilter makes linking cheaper */ - to_caps_no_par = gst_caps_copy(to_caps); - gst_structure_remove_field(gst_caps_get_structure(to_caps_no_par, 0), - "pixel-aspect-ratio"); - g_object_set(filter1, "caps", to_caps_no_par, NULL); - gst_caps_unref(to_caps_no_par); - - g_object_set(filter2, "caps", to_caps, NULL); - gst_caps_unref(to_caps); - - gsd = g_new0(GstScreenshotData, 1); - - gsd->src = src; - gsd->sink = sink; - gsd->pipeline = pipeline; - gsd->cb = cb; - gsd->cb_data = cb_data; - - g_signal_connect(sink, "handoff", G_CALLBACK(save_result), gsd); - - g_signal_connect(src, "handoff", G_CALLBACK(feed_fakesrc), buf); - - gst_bus_add_watch(bus, async_bus_handler, gsd); - - /* set to 'fixed' sizetype */ - g_object_set(src, "sizemax", GST_BUFFER_SIZE(buf), NULL); - - GST_DEBUG("running conversion pipeline"); - gst_element_set_state(pipeline, GST_STATE_PLAYING); - - return TRUE; -} diff -Nru gthumb-3.0.2/extensions/gstreamer_utils/gstscreenshot.h gthumb-3.2.3/extensions/gstreamer_utils/gstscreenshot.h --- gthumb-3.0.2/extensions/gstreamer_utils/gstscreenshot.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/gstreamer_utils/gstscreenshot.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -/* Small helper element for format conversion - * (c) 2004 Ronald Bultje - * Portion Copyright © 2009 Nokia Corporation and/or its - * subsidiary(-ies).* All rights reserved. * - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __BVW_FRAME_CONV_H__ -#define __BVW_FRAME_CONV_H__ - -#include - -G_BEGIN_DECLS - -typedef void (*BvwFrameConvCb)(GstBuffer *result, gpointer user_data); - -gboolean bvw_frame_conv_convert (GstBuffer *buf, GstCaps *to, - BvwFrameConvCb cb, gpointer cb_data); - -G_END_DECLS - -#endif /* __BVW_FRAME_CONV_H__ */ diff -Nru gthumb-3.0.2/extensions/image_print/Makefile.in gthumb-3.2.3/extensions/image_print/Makefile.in --- gthumb-3.0.2/extensions/image_print/Makefile.in 2012-08-20 19:54:14.000000000 +0000 +++ gthumb-3.2.3/extensions/image_print/Makefile.in 2013-07-10 13:33:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/image_print -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -148,13 +176,14 @@ am__v_CCLD_1 = SOURCES = $(libimage_print_la_SOURCES) DIST_SOURCES = $(libimage_print_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -163,9 +192,29 @@ DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -224,9 +273,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -240,13 +287,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -275,7 +321,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -291,11 +340,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -312,7 +365,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -342,7 +394,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -460,6 +515,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -494,6 +550,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libimage_print.la: $(libimage_print_la_OBJECTS) $(libimage_print_la_DEPENDENCIES) $(EXTRA_libimage_print_la_DEPENDENCIES) $(AM_V_CCLD)$(libimage_print_la_LINK) -rpath $(extensiondir) $(libimage_print_la_OBJECTS) $(libimage_print_la_LIBADD) $(LIBS) @@ -516,14 +573,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -614,14 +671,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -642,31 +698,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -682,12 +720,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -699,15 +732,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -716,9 +745,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -900,25 +930,23 @@ uninstall-am: uninstall-extensionLTLIBRARIES \ uninstall-extensioniniDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-extensionLTLIBRARIES \ - clean-generic clean-libtool cscopelist cscopelist-recursive \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extensionLTLIBRARIES \ - install-extensioniniDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-extensionLTLIBRARIES clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-extensionLTLIBRARIES install-extensioniniDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA diff -Nru gthumb-3.0.2/extensions/image_print/actions.c gthumb-3.2.3/extensions/image_print/actions.c --- gthumb-3.0.2/extensions/image_print/actions.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/image_print/actions.c 2013-04-30 16:56:12.000000000 +0000 @@ -37,7 +37,7 @@ items = gth_file_selection_get_selected (GTH_FILE_SELECTION (gth_browser_get_file_list_view (browser))); file_list = gth_file_list_get_files (GTH_FILE_LIST (gth_browser_get_file_list (browser)), items); if (file_list != NULL) { - GdkPixbuf *current_image; + cairo_surface_t *current_image; GtkWidget *viewer_page; GthImagePrintJob *print_job; GError *error = NULL; @@ -51,14 +51,14 @@ GtkWidget *viewer; viewer = gth_image_viewer_page_get_image_viewer (GTH_IMAGE_VIEWER_PAGE (viewer_page)); - current_image = gth_image_viewer_get_current_pixbuf (GTH_IMAGE_VIEWER (viewer)); + current_image = gth_image_viewer_get_current_image (GTH_IMAGE_VIEWER (viewer)); } print_job = gth_image_print_job_new (file_list, gth_browser_get_current_file (browser), current_image, g_file_info_get_display_name (gth_browser_get_location_data (browser)->info), &error); - _g_object_unref (current_image); + cairo_surface_destroy (current_image); if (print_job != NULL) { gth_image_print_job_run (print_job, diff -Nru gthumb-3.0.2/extensions/image_print/callbacks.c gthumb-3.2.3/extensions/image_print/callbacks.c --- gthumb-3.0.2/extensions/image_print/callbacks.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/image_print/callbacks.c 2013-04-30 16:56:12.000000000 +0000 @@ -45,6 +45,17 @@ " " " " " " +" " +" " +" " +" " +" " + +" " +" " +" " +" " +" " ""; diff -Nru gthumb-3.0.2/extensions/image_print/data/Makefile.in gthumb-3.2.3/extensions/image_print/data/Makefile.in --- gthumb-3.0.2/extensions/image_print/data/Makefile.in 2012-08-20 19:54:14.000000000 +0000 +++ gthumb-3.2.3/extensions/image_print/data/Makefile.in 2013-07-10 13:33:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/image_print/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/image_print/data/ui/Makefile.in gthumb-3.2.3/extensions/image_print/data/ui/Makefile.in --- gthumb-3.0.2/extensions/image_print/data/ui/Makefile.in 2012-08-20 19:54:14.000000000 +0000 +++ gthumb-3.2.3/extensions/image_print/data/ui/Makefile.in 2013-07-10 13:33:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/image_print/data/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -381,11 +415,9 @@ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -526,16 +558,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-uiDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-uiDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/image_print/gth-image-info.c gthumb-3.2.3/extensions/image_print/gth-image-info.c --- gthumb-3.0.2/extensions/image_print/gth-image-info.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/image_print/gth-image-info.c 2013-04-30 16:56:12.000000000 +0000 @@ -45,7 +45,7 @@ image_info = g_new0 (GthImageInfo, 1); image_info->ref_count = 1; image_info->file_data = g_object_ref (file_data); - image_info->pixbuf = NULL; + image_info->image = NULL; image_info->thumbnail_original = NULL; image_info->thumbnail = NULL; image_info->thumbnail_active = NULL; @@ -57,10 +57,10 @@ image_info->page = -1; image_info->active = FALSE; image_info->reset = TRUE; - gth_rectangle_init (&image_info->boundary); - gth_rectangle_init (&image_info->maximized); - gth_rectangle_init (&image_info->image); - gth_rectangle_init (&image_info->comment); + gth_rectangle_init (&image_info->boundary_box); + gth_rectangle_init (&image_info->maximized_box); + gth_rectangle_init (&image_info->image_box); + gth_rectangle_init (&image_info->comment_box); return image_info; } @@ -85,43 +85,43 @@ return; _g_object_unref (image_info->file_data); - _g_object_unref (image_info->pixbuf); - _g_object_unref (image_info->thumbnail_original); - _g_object_unref (image_info->thumbnail); - _g_object_unref (image_info->thumbnail_active); + cairo_surface_destroy (image_info->image); + cairo_surface_destroy (image_info->thumbnail_original); + cairo_surface_destroy (image_info->thumbnail); + cairo_surface_destroy (image_info->thumbnail_active); g_free (image_info->comment_text); g_free (image_info); } void -gth_image_info_set_pixbuf (GthImageInfo *image_info, - GdkPixbuf *pixbuf) +gth_image_info_set_image (GthImageInfo *image_info, + cairo_surface_t *image) { int thumb_w; int thumb_h; - g_return_if_fail (pixbuf != NULL); + g_return_if_fail (image != NULL); - _g_clear_object (&image_info->pixbuf); - _g_clear_object (&image_info->thumbnail_original); - _g_clear_object (&image_info->thumbnail); - _g_clear_object (&image_info->thumbnail_active); - - image_info->pixbuf = g_object_ref (pixbuf); - thumb_w = image_info->original_width = image_info->pixbuf_width = gdk_pixbuf_get_width (pixbuf); - thumb_h = image_info->original_height = image_info->pixbuf_height = gdk_pixbuf_get_height (pixbuf); + _cairo_clear_surface (&image_info->image); + _cairo_clear_surface (&image_info->thumbnail_original); + _cairo_clear_surface (&image_info->thumbnail); + _cairo_clear_surface (&image_info->thumbnail_active); + + image_info->image = cairo_surface_reference (image); + thumb_w = image_info->original_width = image_info->image_width = cairo_image_surface_get_width (image); + thumb_h = image_info->original_height = image_info->image_height = cairo_image_surface_get_height (image); if (scale_keeping_ratio (&thumb_w, &thumb_h, THUMBNAIL_SIZE, THUMBNAIL_SIZE, FALSE)) - image_info->thumbnail_original = gdk_pixbuf_scale_simple (pixbuf, - thumb_w, - thumb_h, - GDK_INTERP_BILINEAR); + image_info->thumbnail_original = _cairo_image_surface_scale (image, + thumb_w, + thumb_h, + SCALE_FILTER_BEST, + NULL); else - image_info->thumbnail_original = g_object_ref (image_info->pixbuf); + image_info->thumbnail_original = cairo_surface_reference (image_info->image); - image_info->thumbnail = g_object_ref (image_info->thumbnail_original); - image_info->thumbnail_active = gdk_pixbuf_copy (image_info->thumbnail); - _gdk_pixbuf_colorshift (image_info->thumbnail_active, image_info->thumbnail_active, 30); + image_info->thumbnail = cairo_surface_reference (image_info->thumbnail_original); + image_info->thumbnail_active = _cairo_image_surface_color_shift (image_info->thumbnail, 30); } @@ -152,22 +152,20 @@ break; } - _g_clear_object (&image_info->thumbnail); + _cairo_clear_surface (&image_info->thumbnail); if (image_info->thumbnail_original != NULL) - image_info->thumbnail = _gdk_pixbuf_transform (image_info->thumbnail_original, image_info->rotation); + image_info->thumbnail = _cairo_image_surface_transform (image_info->thumbnail_original, image_info->rotation); - _g_clear_object (&image_info->thumbnail_active); - if (image_info->thumbnail != NULL) { - image_info->thumbnail_active = gdk_pixbuf_copy (image_info->thumbnail); - _gdk_pixbuf_colorshift (image_info->thumbnail_active, image_info->thumbnail_active, 30); - } + _cairo_clear_surface (&image_info->thumbnail_active); + if (image_info->thumbnail != NULL) + image_info->thumbnail_active = _cairo_image_surface_color_shift (image_info->thumbnail, 30); if ((angle == 90) || (angle == 270)) { - image_info->pixbuf_width = image_info->original_height; - image_info->pixbuf_height = image_info->original_width; + image_info->image_width = image_info->original_height; + image_info->image_height = image_info->original_width; } else { - image_info->pixbuf_width = image_info->original_width; - image_info->pixbuf_height = image_info->original_height; + image_info->image_width = image_info->original_width; + image_info->image_height = image_info->original_height; } } diff -Nru gthumb-3.0.2/extensions/image_print/gth-image-info.h gthumb-3.2.3/extensions/image_print/gth-image-info.h --- gthumb-3.0.2/extensions/image_print/gth-image-info.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/image_print/gth-image-info.h 2013-04-30 16:56:12.000000000 +0000 @@ -35,40 +35,40 @@ } GthRectangle; typedef struct { - int ref_count; - GthFileData *file_data; - int original_width; - int original_height; - int pixbuf_width; - int pixbuf_height; - GdkPixbuf *pixbuf; - GdkPixbuf *thumbnail_original; - GdkPixbuf *thumbnail; - GdkPixbuf *thumbnail_active; - int page; - int row; - int col; - GthTransform rotation; - double zoom; - GthRectangle transformation; - gboolean active; - gboolean reset; - gboolean print_comment; - char *comment_text; - GthRectangle boundary; - GthRectangle maximized; - GthRectangle image; - GthRectangle comment; + int ref_count; + GthFileData *file_data; + int original_width; + int original_height; + int image_width; + int image_height; + cairo_surface_t *image; + cairo_surface_t *thumbnail_original; + cairo_surface_t *thumbnail; + cairo_surface_t *thumbnail_active; + int page; + int row; + int col; + GthTransform rotation; + double zoom; + GthRectangle transformation; + gboolean active; + gboolean reset; + gboolean print_comment; + char *comment_text; + GthRectangle boundary_box; + GthRectangle maximized_box; + GthRectangle image_box; + GthRectangle comment_box; } GthImageInfo; -GthImageInfo * gth_image_info_new (GthFileData *file_data); -GthImageInfo * gth_image_info_ref (GthImageInfo *image_info); -void gth_image_info_unref (GthImageInfo *image_info); -void gth_image_info_set_pixbuf (GthImageInfo *image_info, - GdkPixbuf *pixbuf); -void gth_image_info_reset (GthImageInfo *image_info); -void gth_image_info_rotate (GthImageInfo *image_info, - int angle); +GthImageInfo * gth_image_info_new (GthFileData *file_data); +GthImageInfo * gth_image_info_ref (GthImageInfo *image_info); +void gth_image_info_unref (GthImageInfo *image_info); +void gth_image_info_set_image (GthImageInfo *image_info, + cairo_surface_t *image); +void gth_image_info_reset (GthImageInfo *image_info); +void gth_image_info_rotate (GthImageInfo *image_info, + int angle); G_END_DECLS diff -Nru gthumb-3.0.2/extensions/image_print/gth-image-print-job.c gthumb-3.2.3/extensions/image_print/gth-image-print-job.c --- gthumb-3.0.2/extensions/image_print/gth-image-print-job.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/image_print/gth-image-print-job.c 2013-04-30 16:56:12.000000000 +0000 @@ -420,24 +420,24 @@ if (self->priv->selected == NULL) self->priv->selected = image_info; - image_info->boundary.x = (image_info->col - 1) * (self->priv->max_image_width + self->priv->x_padding); - image_info->boundary.y = (image_info->row - 1) * (self->priv->max_image_height + self->priv->y_padding); + image_info->boundary_box.x = (image_info->col - 1) * (self->priv->max_image_width + self->priv->x_padding); + image_info->boundary_box.y = (image_info->row - 1) * (self->priv->max_image_height + self->priv->y_padding); if (self->priv->header_rectangle.height > 0) - image_info->boundary.y += self->priv->header_rectangle.height + self->priv->y_padding; - image_info->boundary.width = self->priv->max_image_width; - image_info->boundary.height = self->priv->max_image_height; + image_info->boundary_box.y += self->priv->header_rectangle.height + self->priv->y_padding; + image_info->boundary_box.width = self->priv->max_image_width; + image_info->boundary_box.height = self->priv->max_image_height; - max_image_width = image_info->boundary.width; - max_image_height = image_info->boundary.height; + max_image_width = image_info->boundary_box.width; + max_image_height = image_info->boundary_box.height; image_info->print_comment = FALSE; g_free (image_info->comment_text); image_info->comment_text = NULL; - image_info->comment.x = 0.0; - image_info->comment.y = 0.0; - image_info->comment.width = 0.0; - image_info->comment.height = 0.0; + image_info->comment_box.x = 0.0; + image_info->comment_box.y = 0.0; + image_info->comment_box.width = 0.0; + image_info->comment_box.height = 0.0; if (strcmp (self->priv->caption_attributes, "") != 0) { gboolean comment_present = FALSE; @@ -469,54 +469,54 @@ pango_layout_set_width (pango_layout, max_image_width * self->priv->scale_factor * PANGO_SCALE); pango_layout_get_pixel_extents (pango_layout, NULL, &logical_rect); - image_info->comment.x = 0; - image_info->comment.y = 0; - image_info->comment.width = image_info->boundary.width; - image_info->comment.height = logical_rect.height / self->priv->scale_factor; - max_image_height -= image_info->comment.height; + image_info->comment_box.x = 0; + image_info->comment_box.y = 0; + image_info->comment_box.width = image_info->boundary_box.width; + image_info->comment_box.height = logical_rect.height / self->priv->scale_factor; + max_image_height -= image_info->comment_box.height; if (max_image_height < 0) { image_info->print_comment = FALSE; - max_image_height = image_info->boundary.height; + max_image_height = image_info->boundary_box.height; } } } - factor = MIN (max_image_width / image_info->pixbuf_width, max_image_height / image_info->pixbuf_height); - image_info->maximized.width = (double) image_info->pixbuf_width * factor; - image_info->maximized.height = (double) image_info->pixbuf_height * factor; - image_info->maximized.x = image_info->boundary.x + ((max_image_width - image_info->maximized.width) / 2); - image_info->maximized.y = image_info->boundary.y + ((max_image_height - image_info->maximized.height) / 2); + factor = MIN (max_image_width / image_info->image_width, max_image_height / image_info->image_height); + image_info->maximized_box.width = (double) image_info->image_width * factor; + image_info->maximized_box.height = (double) image_info->image_height * factor; + image_info->maximized_box.x = image_info->boundary_box.x + ((max_image_width - image_info->maximized_box.width) / 2); + image_info->maximized_box.y = image_info->boundary_box.y + ((max_image_height - image_info->maximized_box.height) / 2); if (image_info->reset) { - /* calculate the transformation to center the image */ - image_info->transformation.x = (image_info->maximized.x - image_info->boundary.x) / self->priv->max_image_width; - image_info->transformation.y = (image_info->maximized.y - image_info->boundary.y) / self->priv->max_image_height; + /* calculate the transformation to center the image_box */ + image_info->transformation.x = (image_info->maximized_box.x - image_info->boundary_box.x) / self->priv->max_image_width; + image_info->transformation.y = (image_info->maximized_box.y - image_info->boundary_box.y) / self->priv->max_image_height; image_info->zoom = 1.0; image_info->reset = FALSE; } - image_info->image.x = image_info->boundary.x + (self->priv->max_image_width * image_info->transformation.x); - image_info->image.y = image_info->boundary.y + (self->priv->max_image_height * image_info->transformation.y); - image_info->image.width = image_info->maximized.width * image_info->zoom; - image_info->image.height = image_info->maximized.height * image_info->zoom; + image_info->image_box.x = image_info->boundary_box.x + (self->priv->max_image_width * image_info->transformation.x); + image_info->image_box.y = image_info->boundary_box.y + (self->priv->max_image_height * image_info->transformation.y); + image_info->image_box.width = image_info->maximized_box.width * image_info->zoom; + image_info->image_box.height = image_info->maximized_box.height * image_info->zoom; /* check the limits */ - if (image_info->image.x - image_info->boundary.x + image_info->image.width > image_info->boundary.width) { - image_info->image.x = image_info->boundary.x + image_info->boundary.width - image_info->image.width; - image_info->transformation.x = (image_info->image.x - image_info->boundary.x) / self->priv->max_image_width; + if (image_info->image_box.x - image_info->boundary_box.x + image_info->image_box.width > image_info->boundary_box.width) { + image_info->image_box.x = image_info->boundary_box.x + image_info->boundary_box.width - image_info->image_box.width; + image_info->transformation.x = (image_info->image_box.x - image_info->boundary_box.x) / self->priv->max_image_width; } - if (image_info->image.y - image_info->boundary.y + image_info->image.height > image_info->boundary.height) { - image_info->image.y = image_info->boundary.y + image_info->boundary.height - image_info->image.height; - image_info->transformation.y = (image_info->image.y - image_info->boundary.y) / self->priv->max_image_height; + if (image_info->image_box.y - image_info->boundary_box.y + image_info->image_box.height > image_info->boundary_box.height) { + image_info->image_box.y = image_info->boundary_box.y + image_info->boundary_box.height - image_info->image_box.height; + image_info->transformation.y = (image_info->image_box.y - image_info->boundary_box.y) / self->priv->max_image_height; } - /* the comment position */ + /* the comment_box position */ if (image_info->print_comment) { - image_info->comment.x += image_info->boundary.x; - image_info->comment.y += image_info->image.y + image_info->image.height; + image_info->comment_box.x += image_info->boundary_box.x; + image_info->comment_box.y += image_info->image_box.y + image_info->image_box.height; } } @@ -586,20 +586,16 @@ static void -_cairo_paint_pixbuf (cairo_t *cr, - double x, - double y, - double width, - double height, - GdkPixbuf *original_pixbuf, - int dpi) +_cairo_paint_image (cairo_t *cr, + double x, + double y, + double width, + double height, + cairo_surface_t *original_image, + int dpi) { double scale_factor; - GdkPixbuf *pixbuf; - guchar *p; - int pw, ph, rs; - guchar *np; - cairo_surface_t *s; + cairo_surface_t *scaled; cairo_pattern_t *pattern; cairo_matrix_t matrix; @@ -607,68 +603,15 @@ 72 dpi unless we apply a scaling factor. This scaling boosts the output to 300 dpi (if required). */ - scale_factor = MIN ((double) gdk_pixbuf_get_width (original_pixbuf) / width, (double) dpi / 72.0); - pixbuf = gdk_pixbuf_scale_simple (original_pixbuf, - width * scale_factor, - height * scale_factor, - GDK_INTERP_BILINEAR); - - p = gdk_pixbuf_get_pixels (pixbuf); - pw = gdk_pixbuf_get_width (pixbuf); - ph = gdk_pixbuf_get_height (pixbuf); - rs = gdk_pixbuf_get_rowstride (pixbuf); - if (gdk_pixbuf_get_has_alpha (pixbuf)) { - guchar *kk; - guchar *kp; - int i; - - np = g_malloc (pw*ph*4); - for (i=0; i>8))>>8); - t = (kk[3] * kk[1]) + 0x80; - kk[1] = ((t+(t>>8))>>8); - t = (kk[3] * kk[2]) + 0x80; - kk[2] = ((t+(t>>8))>>8); - } - *((unsigned int *)kp) = kk[2] + (kk[1] << 8) + (kk[0] << 16) + (kk[3] << 24); - } - kk += 4; - kp += 4; - } - } - s = cairo_image_surface_create_for_data (np, CAIRO_FORMAT_ARGB32, pw, ph, pw*4); - } - else { - guchar* kk; - guchar* kp; - int i; - - np = g_malloc (pw*ph*4); - for (i=0; ipriv->caption_font_name, preview); for (i = 0; i < self->priv->n_images; i++) { - GthImageInfo *image_info = self->priv->images[i]; - GdkPixbuf *fullsize_pixbuf; + GthImageInfo *image_info = self->priv->images[i]; + cairo_surface_t *fullsize_image; if (image_info->page != page) continue; @@ -749,10 +690,10 @@ cairo_set_line_width (cr, 0.5); cairo_set_source_rgb (cr, 1.0, 0.0, 0.0); cairo_rectangle (cr, - x_offset + image_info->comment.x, - y_offset + image_info->comment.y, - image_info->comment.width, - image_info->comment.height); + x_offset + image_info->comment_box.x, + y_offset + image_info->comment_box.y, + image_info->comment_box.width, + image_info->comment_box.height); cairo_stroke (cr); cairo_restore (cr); #endif @@ -766,66 +707,68 @@ else cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); cairo_rectangle (cr, - x_offset + image_info->boundary.x, - y_offset + image_info->boundary.y, - image_info->boundary.width, - image_info->boundary.height); + x_offset + image_info->boundary_box.x, + y_offset + image_info->boundary_box.y, + image_info->boundary_box.width, + image_info->boundary_box.height); cairo_stroke (cr); cairo_restore (cr); } if (! preview) { if (image_info->rotation != GTH_TRANSFORM_NONE) - fullsize_pixbuf = _gdk_pixbuf_transform (image_info->pixbuf, image_info->rotation); + fullsize_image = _cairo_image_surface_transform (image_info->image, image_info->rotation); else - fullsize_pixbuf = g_object_ref (image_info->pixbuf); + fullsize_image = cairo_surface_reference (image_info->image); } else if (image_info->active) - fullsize_pixbuf = g_object_ref (image_info->thumbnail_active); + fullsize_image = cairo_surface_reference (image_info->thumbnail_active); else - fullsize_pixbuf = g_object_ref (image_info->thumbnail); + fullsize_image = cairo_surface_reference (image_info->thumbnail); - if ((image_info->image.width >= 1.0) && (image_info->image.height >= 1.0)) { + if ((image_info->image_box.width >= 1.0) && (image_info->image_box.height >= 1.0)) { if (preview) { - GdkPixbuf *pixbuf; + cairo_surface_t *scaled; + + scaled = _cairo_image_surface_scale (fullsize_image, + image_info->image_box.width, + image_info->image_box.height, + (preview ? SCALE_FILTER_FAST : SCALE_FILTER_BEST), + NULL); - pixbuf = gdk_pixbuf_scale_simple (fullsize_pixbuf, - image_info->image.width, - image_info->image.height, - preview ? GDK_INTERP_NEAREST : GDK_INTERP_BILINEAR); cairo_save (cr); - gdk_cairo_set_source_pixbuf (cr, - pixbuf, - x_offset + image_info->image.x, - y_offset + image_info->image.y); + cairo_set_source_surface (cr, + scaled, + x_offset + image_info->image_box.x, + y_offset + image_info->image_box.y); cairo_rectangle (cr, - x_offset + image_info->image.x, - y_offset + image_info->image.y, - gdk_pixbuf_get_width (pixbuf), - gdk_pixbuf_get_height (pixbuf)); + x_offset + image_info->image_box.x, + y_offset + image_info->image_box.y, + cairo_image_surface_get_width (scaled), + cairo_image_surface_get_height (scaled)); cairo_clip (cr); cairo_paint (cr); cairo_restore (cr); - g_object_unref (pixbuf); + cairo_surface_destroy (scaled); } else - _cairo_paint_pixbuf (cr, - x_offset + image_info->image.x, - y_offset + image_info->image.y, - image_info->image.width, - image_info->image.height, - fullsize_pixbuf, + _cairo_paint_image (cr, + x_offset + image_info->image_box.x, + y_offset + image_info->image_box.y, + image_info->image_box.width, + image_info->image_box.height, + fullsize_image, self->priv->dpi); } if (image_info->print_comment) { cairo_save (cr); - pango_layout_set_width (pango_layout, image_info->comment.width * self->priv->scale_factor * PANGO_SCALE); + pango_layout_set_width (pango_layout, image_info->comment_box.width * self->priv->scale_factor * PANGO_SCALE); pango_layout_set_text (pango_layout, image_info->comment_text, -1); - cairo_move_to (cr, x_offset + image_info->comment.x, y_offset + image_info->comment.y); + cairo_move_to (cr, x_offset + image_info->comment_box.x, y_offset + image_info->comment_box.y); if (preview) cairo_scale (cr, 1.0 / self->priv->scale_factor, 1.0 / self->priv->scale_factor); @@ -836,7 +779,7 @@ cairo_restore (cr); } - g_object_unref (fullsize_pixbuf); + cairo_surface_destroy (fullsize_image); } } @@ -923,31 +866,31 @@ g_signal_handler_block (GET_WIDGET ("left_adjustment"), self->priv->left_adjustment_value_changed_event); gtk_adjustment_set_lower (GTK_ADJUSTMENT (GET_WIDGET ("left_adjustment")), 0.0); - gtk_adjustment_set_upper (GTK_ADJUSTMENT (GET_WIDGET ("left_adjustment")), TO_UNIT (self->priv->selected->boundary.width - self->priv->selected->image.width)); - gtk_adjustment_set_value (GTK_ADJUSTMENT (GET_WIDGET ("left_adjustment")), TO_UNIT (self->priv->selected->image.x - self->priv->selected->boundary.x)); + gtk_adjustment_set_upper (GTK_ADJUSTMENT (GET_WIDGET ("left_adjustment")), TO_UNIT (self->priv->selected->boundary_box.width - self->priv->selected->image_box.width)); + gtk_adjustment_set_value (GTK_ADJUSTMENT (GET_WIDGET ("left_adjustment")), TO_UNIT (self->priv->selected->image_box.x - self->priv->selected->boundary_box.x)); g_signal_handler_unblock (GET_WIDGET ("left_adjustment"), self->priv->left_adjustment_value_changed_event); g_signal_handler_block (GET_WIDGET ("top_adjustment"), self->priv->top_adjustment_value_changed_event); gtk_adjustment_set_lower (GTK_ADJUSTMENT (GET_WIDGET ("top_adjustment")), 0.0); - gtk_adjustment_set_upper (GTK_ADJUSTMENT (GET_WIDGET ("top_adjustment")), TO_UNIT (self->priv->selected->boundary.height - self->priv->selected->comment.height - self->priv->selected->image.height)); - gtk_adjustment_set_value (GTK_ADJUSTMENT (GET_WIDGET ("top_adjustment")), TO_UNIT (self->priv->selected->image.y - self->priv->selected->boundary.y)); + gtk_adjustment_set_upper (GTK_ADJUSTMENT (GET_WIDGET ("top_adjustment")), TO_UNIT (self->priv->selected->boundary_box.height - self->priv->selected->comment_box.height - self->priv->selected->image_box.height)); + gtk_adjustment_set_value (GTK_ADJUSTMENT (GET_WIDGET ("top_adjustment")), TO_UNIT (self->priv->selected->image_box.y - self->priv->selected->boundary_box.y)); g_signal_handler_unblock (GET_WIDGET ("top_adjustment"), self->priv->top_adjustment_value_changed_event); g_signal_handler_block (GET_WIDGET ("width_adjustment"), self->priv->width_adjustment_value_changed_event); gtk_adjustment_set_lower (GTK_ADJUSTMENT (GET_WIDGET ("width_adjustment")), 0.0); - gtk_adjustment_set_upper (GTK_ADJUSTMENT (GET_WIDGET ("width_adjustment")), TO_UNIT (self->priv->selected->maximized.width)); - gtk_adjustment_set_value (GTK_ADJUSTMENT (GET_WIDGET ("width_adjustment")), TO_UNIT (self->priv->selected->image.width)); + gtk_adjustment_set_upper (GTK_ADJUSTMENT (GET_WIDGET ("width_adjustment")), TO_UNIT (self->priv->selected->maximized_box.width)); + gtk_adjustment_set_value (GTK_ADJUSTMENT (GET_WIDGET ("width_adjustment")), TO_UNIT (self->priv->selected->image_box.width)); g_signal_handler_unblock (GET_WIDGET ("width_adjustment"), self->priv->width_adjustment_value_changed_event); g_signal_handler_block (GET_WIDGET ("height_adjustment"), self->priv->height_adjustment_value_changed_event); gtk_adjustment_set_lower (GTK_ADJUSTMENT (GET_WIDGET ("height_adjustment")), 0.0); - gtk_adjustment_set_upper (GTK_ADJUSTMENT (GET_WIDGET ("height_adjustment")), TO_UNIT (self->priv->selected->maximized.height)); - gtk_adjustment_set_value (GTK_ADJUSTMENT (GET_WIDGET ("height_adjustment")), TO_UNIT (self->priv->selected->image.height)); + gtk_adjustment_set_upper (GTK_ADJUSTMENT (GET_WIDGET ("height_adjustment")), TO_UNIT (self->priv->selected->maximized_box.height)); + gtk_adjustment_set_value (GTK_ADJUSTMENT (GET_WIDGET ("height_adjustment")), TO_UNIT (self->priv->selected->image_box.height)); g_signal_handler_unblock (GET_WIDGET ("height_adjustment"), self->priv->height_adjustment_value_changed_event); g_signal_handler_block (GET_WIDGET ("position_combobox"), self->priv->position_combobox_changed_event); - centered = (self->priv->selected->image.x == ((self->priv->selected->boundary.width - self->priv->selected->image.width) / 2.0)) - && (self->priv->selected->image.y == ((self->priv->selected->boundary.height - self->priv->selected->comment.height - self->priv->selected->image.height) / 2.0)); + centered = (self->priv->selected->image_box.x == ((self->priv->selected->boundary_box.width - self->priv->selected->image_box.width) / 2.0)) + && (self->priv->selected->image_box.y == ((self->priv->selected->boundary_box.height - self->priv->selected->comment_box.height - self->priv->selected->image_box.height) / 2.0)); gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("position_combobox")), centered ? 0 : 1); g_signal_handler_unblock (GET_WIDGET ("position_combobox"), self->priv->position_combobox_changed_event); } @@ -1059,10 +1002,10 @@ if (image_info->page != self->priv->current_page) continue; - if ((x >= image_info->boundary.x) - && (x <= image_info->boundary.x + image_info->boundary.width) - && (y >= image_info->boundary.y ) - && (y <= image_info->boundary.y + image_info->boundary.height)) + if ((x >= image_info->boundary_box.x) + && (x <= image_info->boundary_box.x + image_info->boundary_box.width) + && (y >= image_info->boundary_box.y ) + && (y <= image_info->boundary_box.y + image_info->boundary_box.height)) { if (! image_info->active) { image_info->active = TRUE; @@ -1127,10 +1070,10 @@ if (image_info->page != self->priv->current_page) continue; - if ((x >= image_info->boundary.x) - && (x <= image_info->boundary.x + image_info->boundary.width) - && (y >= image_info->boundary.y ) - && (y <= image_info->boundary.y + image_info->boundary.height)) + if ((x >= image_info->boundary_box.x) + && (x <= image_info->boundary_box.x + image_info->boundary_box.width) + && (y >= image_info->boundary_box.y ) + && (y <= image_info->boundary_box.y + image_info->boundary_box.height)) { self->priv->selected = image_info; gtk_widget_queue_draw (GET_WIDGET ("preview_drawingarea")); @@ -1351,22 +1294,22 @@ double x, y; self->priv->selected->zoom = CLAMP (zoom, 0.0, 1.0); - self->priv->selected->image.width = self->priv->selected->maximized.width * self->priv->selected->zoom; - self->priv->selected->image.height = self->priv->selected->maximized.height * self->priv->selected->zoom; + self->priv->selected->image_box.width = self->priv->selected->maximized_box.width * self->priv->selected->zoom; + self->priv->selected->image_box.height = self->priv->selected->maximized_box.height * self->priv->selected->zoom; - x = self->priv->selected->image.x - self->priv->selected->boundary.x; - y = self->priv->selected->image.y - self->priv->selected->boundary.y; - if (x + self->priv->selected->image.width > self->priv->selected->boundary.width) - x = self->priv->selected->boundary.width - self->priv->selected->image.width; - if (x + self->priv->selected->image.width > self->priv->selected->boundary.width) - self->priv->selected->image.width = self->priv->selected->boundary.width - x; - - if (y + self->priv->selected->image.height > self->priv->selected->boundary.height - self->priv->selected->comment.height) - y = self->priv->selected->boundary.height - self->priv->selected->comment.height - self->priv->selected->image.height; - if (y + self->priv->selected->image.height > self->priv->selected->boundary.height - self->priv->selected->comment.height) - self->priv->selected->image.height = self->priv->selected->boundary.height - self->priv->selected->comment.height - y; + x = self->priv->selected->image_box.x - self->priv->selected->boundary_box.x; + y = self->priv->selected->image_box.y - self->priv->selected->boundary_box.y; + if (x + self->priv->selected->image_box.width > self->priv->selected->boundary_box.width) + x = self->priv->selected->boundary_box.width - self->priv->selected->image_box.width; + if (x + self->priv->selected->image_box.width > self->priv->selected->boundary_box.width) + self->priv->selected->image_box.width = self->priv->selected->boundary_box.width - x; + + if (y + self->priv->selected->image_box.height > self->priv->selected->boundary_box.height - self->priv->selected->comment_box.height) + y = self->priv->selected->boundary_box.height - self->priv->selected->comment_box.height - self->priv->selected->image_box.height; + if (y + self->priv->selected->image_box.height > self->priv->selected->boundary_box.height - self->priv->selected->comment_box.height) + self->priv->selected->image_box.height = self->priv->selected->boundary_box.height - self->priv->selected->comment_box.height - y; - self->priv->selected->zoom = MIN (self->priv->selected->image.width / self->priv->selected->maximized.width, self->priv->selected->image.height / self->priv->selected->maximized.height); + self->priv->selected->zoom = MIN (self->priv->selected->image_box.width / self->priv->selected->maximized_box.width, self->priv->selected->image_box.height / self->priv->selected->maximized_box.height); self->priv->selected->transformation.x = x / self->priv->max_image_width; self->priv->selected->transformation.y = y / self->priv->max_image_height; @@ -1424,7 +1367,7 @@ if (self->priv->selected == NULL) return; - gth_image_print_job_set_selected_zoom (self, TO_PIXELS (gtk_adjustment_get_value (adjustment)) / self->priv->selected->maximized.width); + gth_image_print_job_set_selected_zoom (self, TO_PIXELS (gtk_adjustment_get_value (adjustment)) / self->priv->selected->maximized_box.width); } @@ -1437,7 +1380,7 @@ if (self->priv->selected == NULL) return; - gth_image_print_job_set_selected_zoom (self, TO_PIXELS (gtk_adjustment_get_value (adjustment)) / self->priv->selected->maximized.height); + gth_image_print_job_set_selected_zoom (self, TO_PIXELS (gtk_adjustment_get_value (adjustment)) / self->priv->selected->maximized_box.height); } @@ -1451,10 +1394,10 @@ return; if (gtk_combo_box_get_active (combo_box) == 0) { - self->priv->selected->image.x = (self->priv->selected->boundary.width - self->priv->selected->image.width) / 2.0; - self->priv->selected->image.y = (self->priv->selected->boundary.height - self->priv->selected->comment.height - self->priv->selected->image.height) / 2.0; - self->priv->selected->transformation.x = self->priv->selected->image.x / self->priv->max_image_width; - self->priv->selected->transformation.y = self->priv->selected->image.y / self->priv->max_image_height; + self->priv->selected->image_box.x = (self->priv->selected->boundary_box.width - self->priv->selected->image_box.width) / 2.0; + self->priv->selected->image_box.y = (self->priv->selected->boundary_box.height - self->priv->selected->comment_box.height - self->priv->selected->image_box.height) / 2.0; + self->priv->selected->transformation.x = self->priv->selected->image_box.x / self->priv->max_image_width; + self->priv->selected->transformation.y = self->priv->selected->image_box.y / self->priv->max_image_height; gth_image_print_job_update_preview (self); } } @@ -1653,6 +1596,7 @@ { GthImagePrintJob *self = user_data; GtkPrintSettings *settings; + GFile *file; char *filename; PangoLayout *pango_layout; @@ -1664,9 +1608,11 @@ /* save the page setup */ - filename = gth_user_dir_get_file (GTH_DIR_CONFIG, "gthumb", "page_setup", NULL); + file = gth_user_dir_get_file_for_write (GTH_DIR_CONFIG, GTHUMB_DIR, "page_setup", NULL); + filename = g_file_get_path (file); gtk_page_setup_to_file (self->priv->page_setup, filename, NULL); g_free (filename); + g_object_unref (file); self->priv->printing = TRUE; @@ -1737,12 +1683,16 @@ } else if (result == GTK_PRINT_OPERATION_RESULT_APPLY) { GtkPrintSettings *settings; + GFile *file; char *filename; settings = gtk_print_operation_get_print_settings (operation); - filename = gth_user_dir_get_file (GTH_DIR_CONFIG, "gthumb", "print_settings", NULL); + file = gth_user_dir_get_file_for_write (GTH_DIR_CONFIG, GTHUMB_DIR, "print_settings", NULL); + filename = g_file_get_path (file); gtk_print_settings_to_file (settings, filename, NULL); + g_free (filename); + g_object_unref (file); } g_object_unref (self); @@ -1750,11 +1700,11 @@ GthImagePrintJob * -gth_image_print_job_new (GList *file_data_list, - GthFileData *current, - GdkPixbuf *current_image, - const char *event_name, - GError **error) +gth_image_print_job_new (GList *file_data_list, + GthFileData *current, + cairo_surface_t *current_image, + const char *event_name, + GError **error) { GthImagePrintJob *self; GList *scan; @@ -1772,7 +1722,7 @@ image_info = gth_image_info_new (file_data); if ((current_image != NULL) && g_file_equal (file_data->file, current->file)) - gth_image_info_set_pixbuf (image_info, current_image); + gth_image_info_set_image (image_info, current_image); self->priv->images[n++] = image_info; } @@ -1827,6 +1777,39 @@ static void +_gth_image_print_job_set_output_uri (GthImagePrintJob *self, + GtkPrintSettings *settings) +{ + char *basename; + const char *default_dir; + const char *ext; + char *path; + char *uri; + + if (self->priv->n_images == 1) + basename = _g_uri_remove_extension (g_file_info_get_name (self->priv->images[0]->file_data->info)); + else + basename = g_strdup (g_file_info_get_edit_name (gth_browser_get_location_data (self->priv->browser)->info)); + default_dir = g_get_user_special_dir (G_USER_DIRECTORY_PICTURES); + if (default_dir == NULL) + default_dir = g_get_home_dir (); + ext = gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT); + if (ext == NULL) { + gtk_print_settings_set (settings, GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT, "pdf"); + ext = "pdf"; + } + path = g_strconcat (default_dir, G_DIR_SEPARATOR_S, basename, ".", ext, NULL); + uri = g_filename_to_uri (path, NULL, NULL); + if (uri != NULL) + gtk_print_settings_set (settings, GTK_PRINT_SETTINGS_OUTPUT_URI, uri); + + g_free (uri); + g_free (path); + g_free (basename); +} + + +static void load_image_info_task_completed_cb (GthTask *task, GError *error, gpointer user_data) @@ -1836,6 +1819,7 @@ GthImageInfo **loaded_images; int i, j; GtkPrintOperationResult result; + GFile *file; char *filename; GtkPrintSettings *settings; @@ -1878,17 +1862,23 @@ self->priv->images = loaded_images; self->priv->n_images = n_loaded_images; - filename = gth_user_dir_get_file (GTH_DIR_CONFIG, "gthumb", "print_settings", NULL); + file = gth_user_dir_get_file_for_read (GTH_DIR_CONFIG, GTHUMB_DIR, "print_settings", NULL); + filename = g_file_get_path (file); settings = gtk_print_settings_new_from_file (filename, NULL); - if (settings != NULL) + if (settings != NULL) { + _gth_image_print_job_set_output_uri (self, settings); gtk_print_operation_set_print_settings (self->priv->print_operation, settings); + } g_free (filename); + g_object_unref (file); - filename = gth_user_dir_get_file (GTH_DIR_CONFIG, "gthumb", "page_setup", NULL); + file = gth_user_dir_get_file_for_read (GTH_DIR_CONFIG, GTHUMB_DIR, "page_setup", NULL); + filename = g_file_get_path (file); self->priv->page_setup = gtk_page_setup_new_from_file (filename, NULL); if (self->priv->page_setup != NULL) gtk_print_operation_set_default_page_setup (self->priv->print_operation, self->priv->page_setup); g_free (filename); + g_object_unref (file); result = gtk_print_operation_run (self->priv->print_operation, self->priv->action, diff -Nru gthumb-3.0.2/extensions/image_print/gth-image-print-job.h gthumb-3.2.3/extensions/image_print/gth-image-print-job.h --- gthumb-3.0.2/extensions/image_print/gth-image-print-job.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/image_print/gth-image-print-job.h 2013-04-30 16:56:12.000000000 +0000 @@ -50,7 +50,7 @@ GType gth_image_print_job_get_type (void); GthImagePrintJob * gth_image_print_job_new (GList *file_data_list, GthFileData *current, - GdkPixbuf *current_image, + cairo_surface_t *current_image, const char *event_name, GError **error); void gth_image_print_job_run (GthImagePrintJob *self, diff -Nru gthumb-3.0.2/extensions/image_print/gth-load-image-info-task.c gthumb-3.2.3/extensions/image_print/gth-load-image-info-task.c --- gthumb-3.0.2/extensions/image_print/gth-load-image-info-task.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/image_print/gth-load-image-info-task.c 2013-04-30 16:56:12.000000000 +0000 @@ -125,13 +125,13 @@ g_cancellable_set_error_if_cancelled (gth_task_get_cancellable (GTH_TASK (self)), &error); if (error == NULL) { - GdkPixbuf *pixbuf; + cairo_surface_t *surface; image_info = self->priv->images[self->priv->current]; - pixbuf = gth_image_get_pixbuf (image); - if (pixbuf != NULL) { - gth_image_info_set_pixbuf (image_info, pixbuf); - g_object_unref (pixbuf); + surface = gth_image_get_cairo_surface (image); + if (surface != NULL) { + gth_image_info_set_image (image_info, surface); + cairo_surface_destroy (surface); } } else if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { @@ -168,7 +168,7 @@ FALSE, ((double) self->priv->current + 0.5) / self->priv->n_images); - if (image_info->pixbuf == NULL) + if (image_info->image == NULL) gth_image_loader_load (self->priv->loader, image_info->file_data, -1, diff -Nru gthumb-3.0.2/extensions/image_rotation/Makefile.in gthumb-3.2.3/extensions/image_rotation/Makefile.in --- gthumb-3.0.2/extensions/image_rotation/Makefile.in 2012-08-20 19:54:14.000000000 +0000 +++ gthumb-3.2.3/extensions/image_rotation/Makefile.in 2013-07-10 13:33:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/image_rotation -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -161,6 +189,23 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(extensionini_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -193,9 +238,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -209,13 +252,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -244,7 +286,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -260,11 +305,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -281,7 +330,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -311,7 +359,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -427,6 +478,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -461,6 +513,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libimage_rotation.la: $(libimage_rotation_la_OBJECTS) $(libimage_rotation_la_DEPENDENCIES) $(EXTRA_libimage_rotation_la_DEPENDENCIES) $(AM_V_CCLD)$(libimage_rotation_la_LINK) $(am_libimage_rotation_la_rpath) $(libimage_rotation_la_OBJECTS) $(libimage_rotation_la_LIBADD) $(LIBS) @@ -482,14 +535,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -567,26 +620,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(extensioninidir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -598,15 +640,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -615,9 +653,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -775,21 +814,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ clean-extensionLTLIBRARIES clean-generic clean-libtool \ - cscopelist ctags distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-extensionLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-extensionLTLIBRARIES \ install-extensioniniDATA install-html install-html-am \ install-info install-info-am install-man install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-extensionLTLIBRARIES \ - uninstall-extensioniniDATA + tags tags-am uninstall uninstall-am \ + uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA @GTHUMB_EXTENSION_IN_RULE@ diff -Nru gthumb-3.0.2/extensions/image_rotation/rotation-utils.c gthumb-3.2.3/extensions/image_rotation/rotation-utils.c --- gthumb-3.0.2/extensions/image_rotation/rotation-utils.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/image_rotation/rotation-utils.c 2013-04-30 16:56:12.000000000 +0000 @@ -266,6 +266,8 @@ gpointer user_data) { TransformatioData *tdata = user_data; + GthMetadata *metadata; + GthTransform orientation; if (error != NULL) { tdata->ready_func (error, tdata->user_data); @@ -273,23 +275,22 @@ return; } + orientation = GTH_TRANSFORM_NONE; + metadata = (GthMetadata *) g_file_info_get_attribute_object (tdata->file_data->info, "Embedded::Image::Orientation"); + if ((metadata != NULL) && (gth_metadata_get_raw (metadata) != NULL)) + orientation = strtol (gth_metadata_get_raw (metadata), (char **) NULL, 10); + orientation = get_next_transformation (orientation, tdata->transform); + #ifdef HAVE_LIBJPEG if (g_content_type_equals (gth_file_data_get_mime_type (tdata->file_data), "image/jpeg")) { - GthMetadata *metadata; - GthTransform current_orientation; - void *out_buffer; - gsize out_buffer_size; - - current_orientation = 1; - metadata = (GthMetadata *) g_file_info_get_attribute_object (tdata->file_data->info, "Embedded::Image::Orientation"); - if ((metadata != NULL) && (gth_metadata_get_raw (metadata) != NULL)) - current_orientation = strtol (gth_metadata_get_raw (metadata), (char **) NULL, 10); + void *out_buffer; + gsize out_buffer_size; if (! jpegtran (*buffer, count, &out_buffer, &out_buffer_size, - get_next_transformation (current_orientation, tdata->transform), + orientation, tdata->mcu_action, &error)) { @@ -298,45 +299,45 @@ return; } - g_write_file_async (tdata->file_data->file, - out_buffer, - out_buffer_size, - TRUE, - G_PRIORITY_DEFAULT, - tdata->cancellable, - write_file_ready_cb, - tdata); + _g_file_write_async (tdata->file_data->file, + out_buffer, + out_buffer_size, + TRUE, + G_PRIORITY_DEFAULT, + tdata->cancellable, + write_file_ready_cb, + tdata); } else #endif /* HAVE_LIBJPEG */ { - GInputStream *istream; - GdkPixbuf *original_pixbuf; - GdkPixbuf *tmp; - GdkPixbuf *transformed_pixbuf; + GInputStream *istream; + GthImage *image; + cairo_surface_t *surface; + cairo_surface_t *transformed; istream = g_memory_input_stream_new_from_data (*buffer, count, NULL); - original_pixbuf = gdk_pixbuf_new_from_stream (istream, tdata->cancellable, &error); - if (original_pixbuf == NULL) { + image = gth_image_new_from_stream (istream, -1, NULL, NULL, tdata->cancellable, &error); + if (image == NULL) { tdata->ready_func (error, tdata->user_data); transformation_data_free (tdata); return; } - tmp = gdk_pixbuf_apply_embedded_orientation (original_pixbuf); - g_object_unref (original_pixbuf); - original_pixbuf = tmp; - - transformed_pixbuf = _gdk_pixbuf_transform (original_pixbuf, tdata->transform); - _gdk_pixbuf_save_async (transformed_pixbuf, - tdata->file_data, + surface = gth_image_get_cairo_surface (image); + transformed = _cairo_image_surface_transform (surface, orientation); + gth_image_set_cairo_surface (image, transformed); + gth_image_save_to_file (image, gth_file_data_get_mime_type (tdata->file_data), + tdata->file_data, TRUE, + tdata->cancellable, pixbuf_saved_cb, tdata); - g_object_unref (transformed_pixbuf); - g_object_unref (original_pixbuf); + cairo_surface_destroy (transformed); + cairo_surface_destroy (surface); + g_object_unref (image); g_object_unref (istream); } } @@ -360,9 +361,9 @@ tdata->ready_func = ready_func; tdata->user_data = user_data; - g_load_file_async (tdata->file_data->file, - G_PRIORITY_DEFAULT, - tdata->cancellable, - file_buffer_ready_cb, - tdata); + _g_file_load_async (tdata->file_data->file, + G_PRIORITY_DEFAULT, + tdata->cancellable, + file_buffer_ready_cb, + tdata); } diff -Nru gthumb-3.0.2/extensions/image_viewer/Makefile.in gthumb-3.2.3/extensions/image_viewer/Makefile.in --- gthumb-3.0.2/extensions/image_viewer/Makefile.in 2012-08-20 19:54:14.000000000 +0000 +++ gthumb-3.2.3/extensions/image_viewer/Makefile.in 2013-07-10 13:33:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,17 +81,17 @@ host_triplet = @host@ @ENABLE_JPEG_TOOLS_TRUE@am__append_1 = ../jpeg_utils/libjpeg_utils.la subdir = extensions/image_viewer -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -148,13 +176,14 @@ am__v_CCLD_1 = SOURCES = $(libimage_viewer_la_SOURCES) DIST_SOURCES = $(libimage_viewer_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -163,9 +192,29 @@ DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -224,9 +273,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -240,13 +287,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -275,7 +321,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -291,11 +340,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -312,7 +365,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -342,7 +394,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -456,6 +511,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -490,6 +546,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libimage_viewer.la: $(libimage_viewer_la_OBJECTS) $(libimage_viewer_la_DEPENDENCIES) $(EXTRA_libimage_viewer_la_DEPENDENCIES) $(AM_V_CCLD)$(libimage_viewer_la_LINK) -rpath $(extensiondir) $(libimage_viewer_la_OBJECTS) $(libimage_viewer_la_LIBADD) $(LIBS) @@ -510,14 +567,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -594,14 +651,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -622,31 +678,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -662,12 +700,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -679,15 +712,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -696,9 +725,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -880,25 +910,23 @@ uninstall-am: uninstall-extensionLTLIBRARIES \ uninstall-extensioniniDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-extensionLTLIBRARIES \ - clean-generic clean-libtool cscopelist cscopelist-recursive \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extensionLTLIBRARIES \ - install-extensioniniDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-extensionLTLIBRARIES clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-extensionLTLIBRARIES install-extensioniniDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA diff -Nru gthumb-3.0.2/extensions/image_viewer/data/Makefile.in gthumb-3.2.3/extensions/image_viewer/data/Makefile.in --- gthumb-3.0.2/extensions/image_viewer/data/Makefile.in 2012-08-20 19:54:14.000000000 +0000 +++ gthumb-3.2.3/extensions/image_viewer/data/Makefile.in 2013-07-10 13:33:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/image_viewer/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/image_viewer/data/ui/Makefile.in gthumb-3.2.3/extensions/image_viewer/data/ui/Makefile.in --- gthumb-3.0.2/extensions/image_viewer/data/ui/Makefile.in 2012-08-20 19:54:15.000000000 +0000 +++ gthumb-3.2.3/extensions/image_viewer/data/ui/Makefile.in 2013-07-10 13:33:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/image_viewer/data/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -381,11 +415,9 @@ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -526,16 +558,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-uiDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-uiDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/image_viewer/gth-image-viewer-page.c gthumb-3.2.3/extensions/image_viewer/gth-image-viewer-page.c --- gthumb-3.0.2/extensions/image_viewer/gth-image-viewer-page.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/image_viewer/gth-image-viewer-page.c 2013-04-30 16:56:12.000000000 +0000 @@ -518,19 +518,6 @@ static void -pref_black_background_changed (GSettings *settings, - char *key, - gpointer user_data) -{ - GthImageViewerPage *self = user_data; - - gth_image_viewer_set_black_background (GTH_IMAGE_VIEWER (self->priv->viewer), - g_settings_get_boolean (self->priv->settings, PREF_IMAGE_VIEWER_BLACK_BACKGROUND)); - gtk_widget_queue_draw (self->priv->viewer); -} - - -static void pref_reset_scrollbars_changed (GSettings *settings, char *key, gpointer user_data) @@ -631,7 +618,7 @@ GIcon *gicon; gicon = g_themed_icon_new (GTK_STOCK_PROPERTIES); - icon = _g_icon_get_pixbuf (gicon, 24, NULL); + icon = _g_icon_get_pixbuf (gicon, 24, _gtk_widget_get_icon_theme (GTK_WIDGET (image_viewer))); g_object_unref (gicon); } @@ -693,7 +680,6 @@ GthBrowser *browser) { GthImageViewerPage *self; - GtkAction *action; self = (GthImageViewerPage*) base; @@ -707,9 +693,6 @@ self); gtk_ui_manager_insert_action_group (gth_browser_get_ui_manager (browser), self->priv->actions, 0); - action = gtk_action_group_get_action (gth_browser_get_actions (browser), "Viewer_Tools"); - g_object_set (action, "sensitive", TRUE, NULL); - self->priv->preloader = gth_browser_get_image_preloader (browser); self->priv->requested_ready_id = g_signal_connect (G_OBJECT (self->priv->preloader), "requested_ready", @@ -731,8 +714,6 @@ g_settings_get_enum (self->priv->settings, PREF_IMAGE_VIEWER_CHECK_TYPE)); gth_image_viewer_set_check_size (GTH_IMAGE_VIEWER (self->priv->viewer), g_settings_get_enum (self->priv->settings, PREF_IMAGE_VIEWER_CHECK_SIZE)); - gth_image_viewer_set_black_background (GTH_IMAGE_VIEWER (self->priv->viewer), - g_settings_get_boolean (self->priv->settings, PREF_IMAGE_VIEWER_BLACK_BACKGROUND)); gth_image_viewer_set_reset_scrollbars (GTH_IMAGE_VIEWER (self->priv->viewer), g_settings_get_boolean (self->priv->settings, PREF_IMAGE_VIEWER_RESET_SCROLLBARS)); @@ -800,10 +781,6 @@ G_CALLBACK (pref_check_size_changed), self); g_signal_connect (self->priv->settings, - "changed::" PREF_IMAGE_VIEWER_BLACK_BACKGROUND, - G_CALLBACK (pref_black_background_changed), - self); - g_signal_connect (self->priv->settings, "changed::" PREF_IMAGE_VIEWER_RESET_SCROLLBARS, G_CALLBACK (pref_reset_scrollbars_changed), self); @@ -814,13 +791,9 @@ gth_image_viewer_page_real_deactivate (GthViewerPage *base) { GthImageViewerPage *self; - GtkAction *action; self = (GthImageViewerPage*) base; - action = gtk_action_group_get_action (gth_browser_get_actions (self->priv->browser), "Viewer_Tools"); - g_object_set (action, "sensitive", FALSE, NULL); - if (self->priv->browser_merge_id != 0) { gtk_ui_manager_remove_ui (gth_browser_get_ui_manager (self->priv->browser), self->priv->browser_merge_id); self->priv->browser_merge_id = 0; @@ -981,19 +954,8 @@ gth_image_viewer_page_real_fullscreen (GthViewerPage *base, gboolean active) { - GthImageViewerPage *self; - - self = (GthImageViewerPage *) base; - - if (active) { - gth_image_navigator_set_automatic_scrollbars (GTH_IMAGE_NAVIGATOR (self->priv->image_navigator), FALSE); - gth_image_viewer_set_black_background (GTH_IMAGE_VIEWER (self->priv->viewer), TRUE); - } - else { - gth_image_navigator_set_automatic_scrollbars (GTH_IMAGE_NAVIGATOR (self->priv->image_navigator), TRUE); - gth_image_viewer_set_black_background (GTH_IMAGE_VIEWER (self->priv->viewer), - g_settings_get_boolean (self->priv->settings, PREF_IMAGE_VIEWER_BLACK_BACKGROUND)); - } + GthImageViewerPage *self = GTH_IMAGE_VIEWER_PAGE (base); + gth_image_navigator_set_automatic_scrollbars (GTH_IMAGE_NAVIGATOR (self->priv->image_navigator), ! active); } @@ -1059,9 +1021,9 @@ static void -image_saved_cb (GthFileData *file_data, - GError *error, - gpointer user_data) +save_image_task_completed_cb (GthTask *task, + GError *error, + gpointer user_data) { SaveData *data = user_data; GthImageViewerPage *self = data->self; @@ -1108,7 +1070,8 @@ GthImageViewerPage *self; SaveData *data; GthFileData *current_file; - GdkPixbuf *pixbuf; + GthImage *image; + GthTask *task; self = (GthImageViewerPage *) base; @@ -1147,15 +1110,16 @@ * wants to save (see load_file_delayed_cb in gth-browser.c). */ g_file_info_set_attribute_boolean (data->file_to_save->info, "gth::file::is-modified", FALSE); - pixbuf = gth_image_viewer_get_current_pixbuf (GTH_IMAGE_VIEWER (self->priv->viewer)); - _gdk_pixbuf_save_async (pixbuf, - data->file_to_save, - mime_type, - TRUE, - image_saved_cb, - data); + image = gth_image_new_for_surface (gth_image_viewer_get_current_image (GTH_IMAGE_VIEWER (self->priv->viewer))); + task = gth_save_image_task_new (image, mime_type, data->file_to_save, GTH_OVERWRITE_RESPONSE_YES); + g_signal_connect (task, + "completed", + G_CALLBACK (save_image_task_completed_cb), + data); + gth_browser_exec_task (GTH_BROWSER (self->priv->browser), task, FALSE); - _g_object_unref (pixbuf); + _g_object_unref (task); + _g_object_unref (image); } @@ -1164,7 +1128,7 @@ { GArray *savers; - savers = gth_main_get_type_set ("pixbuf-saver"); + savers = gth_main_get_type_set ("image-saver"); return (savers != NULL) && (savers->len > 0); } @@ -1222,12 +1186,15 @@ if (! gth_file_chooser_dialog_get_file (GTH_FILE_CHOOSER_DIALOG (file_sel), &file, &mime_type)) return; + gtk_widget_hide (GTK_WIDGET (data->file_sel)); + gth_file_data_set_file (data->file_data, file); _gth_image_viewer_page_real_save ((GthViewerPage *) data->self, file, mime_type, data->func, data->user_data); + gtk_widget_destroy (GTK_WIDGET (data->file_sel)); g_object_unref (file); @@ -1247,7 +1214,7 @@ self = GTH_IMAGE_VIEWER_PAGE (base); file_sel = gth_file_chooser_dialog_new (_("Save Image"), GTK_WINDOW (self->priv->browser), - "pixbuf-saver"); + "image-saver"); uri = g_file_get_uri (self->priv->file_data->file); gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (file_sel), uri); diff -Nru gthumb-3.0.2/extensions/image_viewer/gth-metadata-provider-image.c gthumb-3.2.3/extensions/image_viewer/gth-metadata-provider-image.c --- gthumb-3.0.2/extensions/image_viewer/gth-metadata-provider-image.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/image_viewer/gth-metadata-provider-image.c 2013-04-30 16:56:12.000000000 +0000 @@ -27,10 +27,13 @@ #if HAVE_LIBJPEG #include #endif /* HAVE_LIBJPEG */ +#if HAVE_LIBWEBP +#include +#endif /* HAVE_LIBWEBP */ #include "gth-metadata-provider-image.h" -#define BUFFER_SIZE 32 +#define BUFFER_SIZE 1024 G_DEFINE_TYPE (GthMetadataProviderImage, gth_metadata_provider_image, GTH_TYPE_METADATA_PROVIDER) @@ -104,10 +107,9 @@ width = (buffer[16] << 24) + (buffer[17] << 16) + (buffer[18] << 8) + buffer[19]; height = (buffer[20] << 24) + (buffer[21] << 16) + (buffer[22] << 8) + buffer[23]; - - format_recognized = TRUE; - description = "PNG"; + description = _("PNG"); mime_type = "image/png"; + format_recognized = TRUE; } #if HAVE_LIBJPEG @@ -135,9 +137,9 @@ cancellable, NULL)) { - format_recognized = TRUE; - description = "JPEG"; + description = _("JPEG"); mime_type = "image/jpeg"; + format_recognized = TRUE; if ((orientation == GTH_TRANSFORM_ROTATE_90) || (orientation == GTH_TRANSFORM_ROTATE_270) @@ -151,6 +153,57 @@ } } #endif /* HAVE_LIBJPEG */ + +#if HAVE_LIBWEBP + else if ((size > 15) && (memcmp (buffer + 8, "WEBPVP8", 7) == 0)) { + WebPDecoderConfig config; + + if (WebPInitDecoderConfig (&config)) { + if (WebPGetFeatures (buffer, buffer_size, &config.input) == VP8_STATUS_OK) { + width = config.input.width; + height = config.input.height; + description = _("WebP"); + mime_type = "image/webp"; + format_recognized = TRUE; + } + WebPFreeDecBuffer (&config.output); + } + } +#endif /* HAVE_LIBWEBP */ + + else if ((size >= 26) + && (strncmp ((char *) buffer, "gimp xcf ", 9) == 0)) + { + /* XCF */ + + GInputStream *mem_stream; + GDataInputStream *data_stream; + + mem_stream = g_memory_input_stream_new_from_data (buffer, BUFFER_SIZE, NULL); + data_stream = g_data_input_stream_new (mem_stream); + g_data_input_stream_set_byte_order (data_stream, G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN); + + if (g_seekable_seek (G_SEEKABLE (data_stream), 14, G_SEEK_SET, NULL, NULL)) { + int base_type; + + width = g_data_input_stream_read_uint32 (data_stream, NULL, NULL); + height = g_data_input_stream_read_uint32 (data_stream, NULL, NULL); + base_type = g_data_input_stream_read_uint32 (data_stream, NULL, NULL); + if (base_type == 0) + description = "XCF RGB"; + else if (base_type == 1) + description = "XCF grayscale"; + else if (base_type == 2) + description = "XCF indexed"; + else + description = "XCF"; + mime_type = "image/x-xcf"; + format_recognized = TRUE; + } + + g_object_unref (data_stream); + g_object_unref (mem_stream); + } } g_free (buffer); diff -Nru gthumb-3.0.2/extensions/image_viewer/preferences.h gthumb-3.2.3/extensions/image_viewer/preferences.h --- gthumb-3.0.2/extensions/image_viewer/preferences.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/image_viewer/preferences.h 2013-04-30 16:56:12.000000000 +0000 @@ -36,7 +36,6 @@ #define PREF_IMAGE_VIEWER_RESET_SCROLLBARS "reset-scrollbars" #define PREF_IMAGE_VIEWER_CHECK_TYPE "check-type" #define PREF_IMAGE_VIEWER_CHECK_SIZE "check-size" -#define PREF_IMAGE_VIEWER_BLACK_BACKGROUND "black-background" void image_viewer__dlg_preferences_construct_cb (GtkWidget *dialog, GthBrowser *browser, diff -Nru gthumb-3.0.2/extensions/importer/Makefile.in gthumb-3.2.3/extensions/importer/Makefile.in --- gthumb-3.0.2/extensions/importer/Makefile.in 2012-08-20 19:54:15.000000000 +0000 +++ gthumb-3.2.3/extensions/importer/Makefile.in 2013-07-10 13:33:48.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,17 +82,17 @@ @ENABLE_JPEG_TOOLS_TRUE@am__append_1 = ../image_rotation/libimage_rotation.la @ENABLE_EXIV2_TRUE@am__append_2 = ../exiv2_tools/libexiv2_tools.la subdir = extensions/importer -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -151,13 +179,14 @@ am__v_CCLD_1 = SOURCES = $(libimporter_la_SOURCES) DIST_SOURCES = $(libimporter_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -166,9 +195,29 @@ DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -227,9 +276,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -243,13 +290,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -278,7 +324,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -294,11 +343,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -315,7 +368,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -345,7 +397,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -473,6 +528,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -507,6 +563,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libimporter.la: $(libimporter_la_OBJECTS) $(libimporter_la_DEPENDENCIES) $(EXTRA_libimporter_la_DEPENDENCIES) $(AM_V_CCLD)$(libimporter_la_LINK) -rpath $(extensiondir) $(libimporter_la_OBJECTS) $(libimporter_la_LIBADD) $(LIBS) @@ -528,14 +585,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -619,14 +676,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -647,31 +703,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -687,12 +725,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -704,15 +737,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -721,9 +750,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -912,25 +942,24 @@ uninstall-am: uninstall-extensionLTLIBRARIES \ uninstall-extensioniniDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ - cscopelist-recursive ctags-recursive install install-am \ - install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-extensionLTLIBRARIES \ - clean-generic clean-libtool cscopelist cscopelist-recursive \ - ctags ctags-recursive dist-hook distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extensionLTLIBRARIES \ - install-extensioniniDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +.MAKE: $(am__recursive_targets) all check install install-am \ + install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-extensionLTLIBRARIES clean-generic \ + clean-libtool cscopelist-am ctags ctags-am dist-hook distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-extensionLTLIBRARIES install-extensioniniDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA diff -Nru gthumb-3.0.2/extensions/importer/data/Makefile.in gthumb-3.2.3/extensions/importer/data/Makefile.in --- gthumb-3.0.2/extensions/importer/data/Makefile.in 2012-08-20 19:54:15.000000000 +0000 +++ gthumb-3.2.3/extensions/importer/data/Makefile.in 2013-07-10 13:33:48.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/importer/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/importer/data/ui/Makefile.in gthumb-3.2.3/extensions/importer/data/ui/Makefile.in --- gthumb-3.0.2/extensions/importer/data/ui/Makefile.in 2012-08-20 19:54:15.000000000 +0000 +++ gthumb-3.2.3/extensions/importer/data/ui/Makefile.in 2013-07-10 13:33:48.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/importer/data/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -381,11 +415,9 @@ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -526,16 +558,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-uiDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-uiDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/importer/data/ui/import-preferences.ui gthumb-3.2.3/extensions/importer/data/ui/import-preferences.ui --- gthumb-3.0.2/extensions/importer/data/ui/import-preferences.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/importer/data/ui/import-preferences.ui 2013-04-30 16:56:12.000000000 +0000 @@ -1,45 +1,51 @@ - + - - + True + False 5 - vertical 12 True + False 0 none True + False 6 12 True - vertical + False 6 True + False 6 True - False + False select-folder False + + True + True 0 False + True 0 @@ -50,6 +56,7 @@ True + False _Destination True True @@ -62,22 +69,25 @@ False + True 0 True - vertical + False True True False + 0.5 True True + False _Automatic subfolder True @@ -88,46 +98,55 @@ False + True 0 True + False 6 14 True + False 6 True - vertical + False True + False 6 + True + True 0 + True + True 0 True - vertical + False True + False False False @@ -137,6 +156,7 @@ True False True + 0.5 True @@ -147,10 +167,8 @@ True True - ● + ● gtk-help - True - True Help @@ -174,11 +192,15 @@ + True + True 0 + True + True 1 @@ -187,19 +209,23 @@ False + True 1 + False 6 28 True + False True + False 8 2 12 @@ -207,6 +233,7 @@ True + False 0 %E @@ -221,6 +248,7 @@ True + False 0 The event description @@ -237,6 +265,7 @@ True + False 0 Special code @@ -248,6 +277,7 @@ True + False 0 Description @@ -263,6 +293,7 @@ True + False 0 %Y @@ -277,6 +308,7 @@ True + False 0 %m @@ -291,6 +323,7 @@ True + False 0 %d @@ -305,6 +338,7 @@ True + False 0 %H @@ -319,6 +353,7 @@ True + False 0 %M @@ -333,6 +368,7 @@ True + False 0 %S @@ -347,6 +383,7 @@ True + False 0 The year @@ -363,6 +400,7 @@ True + False 0 The month @@ -379,6 +417,7 @@ True + False 0 The day of the month @@ -395,6 +434,7 @@ True + False 0 The hour @@ -411,6 +451,7 @@ True + False 0 The minutes @@ -427,6 +468,7 @@ True + False 0 The seconds @@ -443,6 +485,7 @@ False + True 0 @@ -451,17 +494,20 @@ False + True 2 True + False 6 14 True + False 0 example: file:///home/paolo/images/2009/08/12 @@ -472,11 +518,14 @@ False + True 3 + True + True 1 diff -Nru gthumb-3.0.2/extensions/importer/gth-import-task.c gthumb-3.2.3/extensions/importer/gth-import-task.c --- gthumb-3.0.2/extensions/importer/gth-import-task.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/importer/gth-import-task.c 2013-04-30 16:56:12.000000000 +0000 @@ -204,19 +204,12 @@ static void -transformation_ready_cb (GError *error, - gpointer user_data) +write_file_tags (GthImportTask *self) { - GthImportTask *self = user_data; GthStringList *tag_list; GthMetadata *metadata; GList *file_list; - if ((error != NULL) && g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { - gth_task_completed (GTH_TASK (self), error); - return; - } - if ((self->priv->tags == NULL) || (self->priv->tags[0] == NULL)) { catalog_imported_file (self); return; @@ -243,7 +236,7 @@ write_file_to_destination (GthImportTask *self, GFile *destination_file, void *buffer, - gsize count, + gsize buffer_size, gboolean overwrite); @@ -326,7 +319,6 @@ GError *error) { GthFileData *file_data; - gboolean appling_tranformation = FALSE; file_data = self->priv->current->data; @@ -334,7 +326,7 @@ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_EXISTS)) { if (self->priv->default_response != GTH_OVERWRITE_RESPONSE_ALWAYS_NO) { GInputStream *stream; - GdkPixbuf *pixbuf; + GthImage *image; GtkWidget *dialog; /* take ownership of the buffer */ @@ -353,15 +345,15 @@ if (self->priv->buffer != NULL) { stream = g_memory_input_stream_new_from_data (self->priv->buffer, self->priv->buffer_size, NULL); - pixbuf = gdk_pixbuf_new_from_stream_at_scale (stream, 128, 128, TRUE, NULL, NULL); + image = gth_image_new_from_stream (stream, 128, NULL, NULL, NULL, NULL); } else { stream = NULL; - pixbuf = NULL; + image = NULL; } dialog = gth_overwrite_dialog_new (file_data->file, - pixbuf, + image, self->priv->destination_file->file, self->priv->default_response, self->priv->files->next == NULL); @@ -372,7 +364,7 @@ gtk_widget_show (dialog); gth_task_dialog (GTH_TASK (self), TRUE, dialog); - _g_object_unref (pixbuf); + _g_object_unref (image); _g_object_unref (stream); } else @@ -404,18 +396,7 @@ } } - if (self->priv->adjust_orientation && gth_main_extension_is_active ("image_rotation")) { - apply_transformation_async (self->priv->destination_file, - GTH_TRANSFORM_NONE, - JPEG_MCU_ACTION_ABORT, - gth_task_get_cancellable (GTH_TASK (self)), - transformation_ready_cb, - self); - appling_tranformation = TRUE; - } - - if (! appling_tranformation) - transformation_ready_cb (NULL, self); + write_file_tags (self); } @@ -463,7 +444,7 @@ write_file_to_destination (GthImportTask *self, GFile *destination_file, void *buffer, - gsize count, + gsize buffer_size, gboolean replace) { GthFileData *file_data; @@ -482,16 +463,48 @@ FALSE, (double) (self->priv->copied_size + ((double) self->priv->current_file_size / 3.0 * 2.0)) / self->priv->tot_size); - self->priv->buffer = NULL; /* the buffer will be deallocated in g_write_file_async */ + self->priv->buffer = NULL; /* the buffer will be deallocated in _g_file_write_async */ - g_write_file_async (self->priv->destination_file->file, - buffer, - count, - replace, - G_PRIORITY_DEFAULT, - gth_task_get_cancellable (GTH_TASK (self)), - write_buffer_ready_cb, - self); +#ifdef HAVE_LIBJPEG + if (self->priv->adjust_orientation && gth_main_extension_is_active ("image_rotation")) { + if (g_content_type_equals (gth_file_data_get_mime_type (self->priv->destination_file), "image/jpeg")) { + GthTransform orientation; + GthMetadata *metadata; + + orientation = GTH_TRANSFORM_NONE; + metadata = (GthMetadata *) g_file_info_get_attribute_object (self->priv->destination_file->info, "Embedded::Image::Orientation"); + if ((metadata != NULL) && (gth_metadata_get_raw (metadata) != NULL)) + orientation = strtol (gth_metadata_get_raw (metadata), (char **) NULL, 10); + + if (orientation != GTH_TRANSFORM_NONE) { + void *out_buffer; + gsize out_buffer_size; + + if (jpegtran (buffer, + buffer_size, + &out_buffer, + &out_buffer_size, + orientation, + JPEG_MCU_ACTION_ABORT, + NULL)) + { + g_free (buffer); + buffer = out_buffer; + buffer_size = out_buffer_size; + } + } + } + } +#endif /* HAVE_LIBJPEG */ + + _g_file_write_async (self->priv->destination_file->file, + buffer, + buffer_size, + replace, + G_PRIORITY_DEFAULT, + gth_task_get_cancellable (GTH_TASK (self)), + write_buffer_ready_cb, + self); } else g_file_copy_async (file_data->file, @@ -564,7 +577,11 @@ file_data = self->priv->current->data; if (gth_main_extension_is_active ("exiv2_tools")) - exiv2_read_metadata_from_buffer (*buffer, count, file_data->info, NULL); + exiv2_read_metadata_from_buffer (*buffer, + count, + file_data->info, + TRUE, + NULL); destination_file = get_destination_file (self, file_data); if (destination_file == NULL) @@ -575,7 +592,7 @@ *buffer, count, self->priv->default_response == GTH_OVERWRITE_RESPONSE_ALWAYS_YES); - *buffer = NULL; /* g_write_file_async takes ownership of the buffer */ + *buffer = NULL; /* _g_file_write_async takes ownership of the buffer */ g_object_unref (destination_file); } @@ -585,6 +602,8 @@ import_current_file (GthImportTask *self) { GthFileData *file_data; + gboolean adjust_image_orientation; + gboolean need_image_metadata; g_free (self->priv->buffer); self->priv->buffer = NULL; @@ -644,20 +663,21 @@ file_data = self->priv->current->data; self->priv->current_file_size = g_file_info_get_size (file_data->info); - if (_g_mime_type_is_image (gth_file_data_get_mime_type (file_data)) - && (self->priv->subfolder_type == GTH_SUBFOLDER_TYPE_FILE_DATE)) - { + adjust_image_orientation = self->priv->adjust_orientation && gth_main_extension_is_active ("image_rotation"); + need_image_metadata = (self->priv->subfolder_type == GTH_SUBFOLDER_TYPE_FILE_DATE) || adjust_image_orientation; + + if (_g_mime_type_is_image (gth_file_data_get_mime_type (file_data)) && need_image_metadata) { gth_task_progress (GTH_TASK (self), _("Importing files"), g_file_info_get_display_name (file_data->info), FALSE, (double) (self->priv->copied_size + ((double) self->priv->current_file_size / 3.0)) / self->priv->tot_size); - g_load_file_async (file_data->file, - G_PRIORITY_DEFAULT, - gth_task_get_cancellable (GTH_TASK (self)), - file_buffer_ready_cb, - self); + _g_file_load_async (file_data->file, + G_PRIORITY_DEFAULT, + gth_task_get_cancellable (GTH_TASK (self)), + file_buffer_ready_cb, + self); } else { GFile *destination_file; diff -Nru gthumb-3.0.2/extensions/jpeg_utils/Makefile.in gthumb-3.2.3/extensions/jpeg_utils/Makefile.in --- gthumb-3.0.2/extensions/jpeg_utils/Makefile.in 2012-08-20 19:54:15.000000000 +0000 +++ gthumb-3.2.3/extensions/jpeg_utils/Makefile.in 2013-07-10 13:33:48.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -61,17 +89,17 @@ @ENABLE_JPEG_TOOLS_TRUE@@HAVE_LIBJPEG_80_FALSE@ transupp-62.h subdir = extensions/jpeg_utils -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -172,6 +200,23 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(extensionini_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -204,9 +249,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -220,13 +263,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -255,7 +297,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -271,11 +316,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -292,7 +341,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -322,7 +370,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -429,6 +480,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -463,6 +515,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libjpeg_utils.la: $(libjpeg_utils_la_OBJECTS) $(libjpeg_utils_la_DEPENDENCIES) $(EXTRA_libjpeg_utils_la_DEPENDENCIES) $(AM_V_CCLD)$(libjpeg_utils_la_LINK) $(am_libjpeg_utils_la_rpath) $(libjpeg_utils_la_OBJECTS) $(libjpeg_utils_la_LIBADD) $(LIBS) @@ -485,14 +538,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -577,26 +630,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(extensioninidir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -608,15 +650,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -625,9 +663,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -785,21 +824,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ clean-extensionLTLIBRARIES clean-generic clean-libtool \ - cscopelist ctags distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-extensionLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-extensionLTLIBRARIES \ install-extensioniniDATA install-html install-html-am \ install-info install-info-am install-man install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-extensionLTLIBRARIES \ - uninstall-extensioniniDATA + tags tags-am uninstall uninstall-am \ + uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA @GTHUMB_EXTENSION_IN_RULE@ diff -Nru gthumb-3.0.2/extensions/jpeg_utils/jmemorysrc.c gthumb-3.2.3/extensions/jpeg_utils/jmemorysrc.c --- gthumb-3.0.2/extensions/jpeg_utils/jmemorysrc.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/jpeg_utils/jmemorysrc.c 2013-04-30 16:56:12.000000000 +0000 @@ -63,7 +63,7 @@ } -void +static void skip_input_data (j_decompress_ptr cinfo, long num_bytes) { diff -Nru gthumb-3.0.2/extensions/list_tools/Makefile.in gthumb-3.2.3/extensions/list_tools/Makefile.in --- gthumb-3.0.2/extensions/list_tools/Makefile.in 2012-08-20 19:54:15.000000000 +0000 +++ gthumb-3.2.3/extensions/list_tools/Makefile.in 2013-07-10 13:33:48.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/list_tools -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -149,13 +177,14 @@ am__v_CCLD_1 = SOURCES = $(liblist_tools_la_SOURCES) DIST_SOURCES = $(liblist_tools_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -164,9 +193,29 @@ DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -225,9 +274,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -241,13 +288,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -276,7 +322,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -292,11 +341,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -313,7 +366,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -343,7 +395,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -463,6 +518,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -497,6 +553,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + liblist_tools.la: $(liblist_tools_la_OBJECTS) $(liblist_tools_la_DEPENDENCIES) $(EXTRA_liblist_tools_la_DEPENDENCIES) $(AM_V_CCLD)$(liblist_tools_la_LINK) -rpath $(extensiondir) $(liblist_tools_la_OBJECTS) $(liblist_tools_la_LIBADD) $(LIBS) @@ -520,14 +577,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -625,14 +682,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -653,31 +709,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -693,12 +731,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -710,15 +743,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -727,9 +756,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -911,25 +941,23 @@ uninstall-am: uninstall-extensionLTLIBRARIES \ uninstall-extensioniniDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-extensionLTLIBRARIES \ - clean-generic clean-libtool cscopelist cscopelist-recursive \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extensionLTLIBRARIES \ - install-extensioniniDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-extensionLTLIBRARIES clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-extensionLTLIBRARIES install-extensioniniDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA diff -Nru gthumb-3.0.2/extensions/list_tools/data/Makefile.in gthumb-3.2.3/extensions/list_tools/data/Makefile.in --- gthumb-3.0.2/extensions/list_tools/data/Makefile.in 2012-08-20 19:54:15.000000000 +0000 +++ gthumb-3.2.3/extensions/list_tools/data/Makefile.in 2013-07-10 13:33:48.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/list_tools/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/list_tools/data/ui/Makefile.in gthumb-3.2.3/extensions/list_tools/data/ui/Makefile.in --- gthumb-3.0.2/extensions/list_tools/data/ui/Makefile.in 2012-08-20 19:54:15.000000000 +0000 +++ gthumb-3.2.3/extensions/list_tools/data/ui/Makefile.in 2013-07-10 13:33:48.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/list_tools/data/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -381,11 +415,9 @@ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -526,16 +558,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-uiDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-uiDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/list_tools/gth-script-file.c gthumb-3.2.3/extensions/list_tools/gth-script-file.c --- gthumb-3.0.2/extensions/list_tools/gth-script-file.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/list_tools/gth-script-file.c 2013-04-30 16:56:12.000000000 +0000 @@ -153,7 +153,7 @@ static gboolean gth_script_file_load_from_file (GthScriptFile *self, - const char *filename, + GFile *file, GError **error) { char *buffer; @@ -162,10 +162,10 @@ gboolean retval; g_return_val_if_fail (self != NULL, FALSE); - g_return_val_if_fail (filename != NULL, FALSE); + g_return_val_if_fail (file != NULL, FALSE); read_error = NULL; - g_file_get_contents (filename, &buffer, &len, &read_error); + _g_file_load_in_buffer (file, (void **) &buffer, &len, NULL, &read_error); if (read_error != NULL) { g_propagate_error (error, read_error); return FALSE; @@ -191,16 +191,16 @@ static void _gth_script_file_load_if_needed (GthScriptFile *self) { - char *default_script_file; + GFile *default_script_file; if (self->priv->loaded) return; - default_script_file = gth_user_dir_get_file (GTH_DIR_CONFIG, GTHUMB_DIR, "scripts.xml", NULL); + default_script_file = gth_user_dir_get_file_for_read (GTH_DIR_CONFIG, GTHUMB_DIR, "scripts.xml", NULL); gth_script_file_load_from_file (self, default_script_file, NULL); self->priv->loaded = TRUE; - g_free (default_script_file); + g_object_unref (default_script_file); } @@ -231,7 +231,7 @@ static gboolean gth_script_file_to_file (GthScriptFile *self, - const char *filename, + GFile *file, GError **error) { char *data; @@ -240,7 +240,7 @@ gboolean retval; g_return_val_if_fail (self != NULL, FALSE); - g_return_val_if_fail (filename != NULL, FALSE); + g_return_val_if_fail (file != NULL, FALSE); data_error = NULL; data = gth_script_file_to_data (self, &len, &data_error); @@ -250,8 +250,7 @@ } write_error = NULL; - g_file_set_contents (filename, data, len, &write_error); - if (write_error) { + if (! _g_file_write (file, FALSE, 0, data, len, NULL, &write_error)) { g_propagate_error (error, write_error); retval = FALSE; } @@ -285,17 +284,17 @@ gth_script_file_save (GthScriptFile *self, GError **error) { - char *default_script_file; + GFile *default_script_file; gboolean result; _gth_script_file_load_if_needed (self); - default_script_file = gth_user_dir_get_file (GTH_DIR_CONFIG, GTHUMB_DIR, "scripts.xml", NULL); + default_script_file = gth_user_dir_get_file_for_write (GTH_DIR_CONFIG, GTHUMB_DIR, "scripts.xml", NULL); result = gth_script_file_to_file (self, default_script_file, error); if (result) g_signal_emit (G_OBJECT (self), gth_script_file_signals[CHANGED], 0); - g_free (default_script_file); + g_object_unref (default_script_file); return result; } diff -Nru gthumb-3.0.2/extensions/map_view/Makefile.in gthumb-3.2.3/extensions/map_view/Makefile.in --- gthumb-3.0.2/extensions/map_view/Makefile.in 2012-08-20 19:54:15.000000000 +0000 +++ gthumb-3.2.3/extensions/map_view/Makefile.in 2013-07-10 13:33:48.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/map_view -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -154,6 +182,23 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(extensionini_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -186,9 +231,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -202,13 +245,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -237,7 +279,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -253,11 +298,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -274,7 +323,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -304,7 +352,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -411,6 +462,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -445,6 +497,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libmap_view.la: $(libmap_view_la_OBJECTS) $(libmap_view_la_DEPENDENCIES) $(EXTRA_libmap_view_la_DEPENDENCIES) $(AM_V_CCLD)$(libmap_view_la_LINK) $(am_libmap_view_la_rpath) $(libmap_view_la_OBJECTS) $(libmap_view_la_LIBADD) $(LIBS) @@ -462,14 +515,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -519,26 +572,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(extensioninidir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -550,15 +592,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -567,9 +605,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -727,21 +766,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ clean-extensionLTLIBRARIES clean-generic clean-libtool \ - cscopelist ctags distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-extensionLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-extensionLTLIBRARIES \ install-extensioniniDATA install-html install-html-am \ install-info install-info-am install-man install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-extensionLTLIBRARIES \ - uninstall-extensioniniDATA + tags tags-am uninstall uninstall-am \ + uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA @GTHUMB_EXTENSION_IN_RULE@ diff -Nru gthumb-3.0.2/extensions/oauth/Makefile.am gthumb-3.2.3/extensions/oauth/Makefile.am --- gthumb-3.0.2/extensions/oauth/Makefile.am 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/oauth/Makefile.am 2013-04-30 16:56:12.000000000 +0000 @@ -7,20 +7,25 @@ liboauth_la_SOURCES = \ main.c \ + oauth.h \ + oauth-ask-authorization-dialog.c \ + oauth-ask-authorization-dialog.h \ oauth-account.c \ oauth-account.h \ oauth-account-chooser-dialog.c \ oauth-account-chooser-dialog.h \ oauth-account-manager-dialog.c \ oauth-account-manager-dialog.h \ - oauth-authentication.c \ - oauth-authentication.h \ - oauth-connection.c \ - oauth-connection.h + oauth-consumer.c \ + oauth-consumer.h \ + oauth-service.c \ + oauth-service.h \ + web-service.c \ + web-service.h -liboauth_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(GNOME_KEYRING_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb +liboauth_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(LIBSECRET_CFLAGS) $(WEBKIT2_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb liboauth_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -liboauth_la_LIBADD = $(GTHUMB_LIBS) $(JPEG_LIBS) $(GNOME_KEYRING_LIBS) $(LIBSOUP_LIBS) +liboauth_la_LIBADD = $(GTHUMB_LIBS) $(JPEG_LIBS) $(LIBSECRET_LIBS) $(LIBSOUP_LIBS) $(WEBKIT2_LIBS) liboauth_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) extensioninidir = $(extensiondir) diff -Nru gthumb-3.0.2/extensions/oauth/Makefile.in gthumb-3.2.3/extensions/oauth/Makefile.in --- gthumb-3.0.2/extensions/oauth/Makefile.in 2012-08-20 19:54:15.000000000 +0000 +++ gthumb-3.2.3/extensions/oauth/Makefile.in 2013-07-10 13:33:48.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/oauth -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -97,18 +125,23 @@ "$(DESTDIR)$(extensioninidir)" LTLIBRARIES = $(extension_LTLIBRARIES) am__DEPENDENCIES_1 = -am__liboauth_la_SOURCES_DIST = main.c oauth-account.c oauth-account.h \ - oauth-account-chooser-dialog.c oauth-account-chooser-dialog.h \ - oauth-account-manager-dialog.c oauth-account-manager-dialog.h \ - oauth-authentication.c oauth-authentication.h \ - oauth-connection.c oauth-connection.h +am__liboauth_la_SOURCES_DIST = main.c oauth.h \ + oauth-ask-authorization-dialog.c \ + oauth-ask-authorization-dialog.h oauth-account.c \ + oauth-account.h oauth-account-chooser-dialog.c \ + oauth-account-chooser-dialog.h oauth-account-manager-dialog.c \ + oauth-account-manager-dialog.h oauth-consumer.c \ + oauth-consumer.h oauth-service.c oauth-service.h web-service.c \ + web-service.h @ENABLE_WEB_SERVICES_TRUE@am_liboauth_la_OBJECTS = \ @ENABLE_WEB_SERVICES_TRUE@ liboauth_la-main.lo \ +@ENABLE_WEB_SERVICES_TRUE@ liboauth_la-oauth-ask-authorization-dialog.lo \ @ENABLE_WEB_SERVICES_TRUE@ liboauth_la-oauth-account.lo \ @ENABLE_WEB_SERVICES_TRUE@ liboauth_la-oauth-account-chooser-dialog.lo \ @ENABLE_WEB_SERVICES_TRUE@ liboauth_la-oauth-account-manager-dialog.lo \ -@ENABLE_WEB_SERVICES_TRUE@ liboauth_la-oauth-authentication.lo \ -@ENABLE_WEB_SERVICES_TRUE@ liboauth_la-oauth-connection.lo +@ENABLE_WEB_SERVICES_TRUE@ liboauth_la-oauth-consumer.lo \ +@ENABLE_WEB_SERVICES_TRUE@ liboauth_la-oauth-service.lo \ +@ENABLE_WEB_SERVICES_TRUE@ liboauth_la-web-service.lo liboauth_la_OBJECTS = $(am_liboauth_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -155,13 +188,14 @@ am__v_CCLD_1 = SOURCES = $(liboauth_la_SOURCES) DIST_SOURCES = $(am__liboauth_la_SOURCES_DIST) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -170,9 +204,29 @@ DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = data @@ -231,9 +285,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -247,13 +299,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -282,7 +333,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -298,11 +352,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -319,7 +377,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -349,7 +406,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -411,20 +471,25 @@ @ENABLE_WEB_SERVICES_TRUE@extension_LTLIBRARIES = liboauth.la @ENABLE_WEB_SERVICES_TRUE@liboauth_la_SOURCES = \ @ENABLE_WEB_SERVICES_TRUE@ main.c \ +@ENABLE_WEB_SERVICES_TRUE@ oauth.h \ +@ENABLE_WEB_SERVICES_TRUE@ oauth-ask-authorization-dialog.c \ +@ENABLE_WEB_SERVICES_TRUE@ oauth-ask-authorization-dialog.h \ @ENABLE_WEB_SERVICES_TRUE@ oauth-account.c \ @ENABLE_WEB_SERVICES_TRUE@ oauth-account.h \ @ENABLE_WEB_SERVICES_TRUE@ oauth-account-chooser-dialog.c \ @ENABLE_WEB_SERVICES_TRUE@ oauth-account-chooser-dialog.h \ @ENABLE_WEB_SERVICES_TRUE@ oauth-account-manager-dialog.c \ @ENABLE_WEB_SERVICES_TRUE@ oauth-account-manager-dialog.h \ -@ENABLE_WEB_SERVICES_TRUE@ oauth-authentication.c \ -@ENABLE_WEB_SERVICES_TRUE@ oauth-authentication.h \ -@ENABLE_WEB_SERVICES_TRUE@ oauth-connection.c \ -@ENABLE_WEB_SERVICES_TRUE@ oauth-connection.h +@ENABLE_WEB_SERVICES_TRUE@ oauth-consumer.c \ +@ENABLE_WEB_SERVICES_TRUE@ oauth-consumer.h \ +@ENABLE_WEB_SERVICES_TRUE@ oauth-service.c \ +@ENABLE_WEB_SERVICES_TRUE@ oauth-service.h \ +@ENABLE_WEB_SERVICES_TRUE@ web-service.c \ +@ENABLE_WEB_SERVICES_TRUE@ web-service.h -@ENABLE_WEB_SERVICES_TRUE@liboauth_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(GNOME_KEYRING_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb +@ENABLE_WEB_SERVICES_TRUE@liboauth_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(LIBSECRET_CFLAGS) $(WEBKIT2_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb @ENABLE_WEB_SERVICES_TRUE@liboauth_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -@ENABLE_WEB_SERVICES_TRUE@liboauth_la_LIBADD = $(GTHUMB_LIBS) $(JPEG_LIBS) $(GNOME_KEYRING_LIBS) $(LIBSOUP_LIBS) +@ENABLE_WEB_SERVICES_TRUE@liboauth_la_LIBADD = $(GTHUMB_LIBS) $(JPEG_LIBS) $(LIBSECRET_LIBS) $(LIBSOUP_LIBS) $(WEBKIT2_LIBS) @ENABLE_WEB_SERVICES_TRUE@liboauth_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) @ENABLE_WEB_SERVICES_TRUE@extensioninidir = $(extensiondir) @ENABLE_WEB_SERVICES_TRUE@extensionini_in_files = oauth.extension.in.in @@ -465,6 +530,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -499,6 +565,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + liboauth.la: $(liboauth_la_OBJECTS) $(liboauth_la_DEPENDENCIES) $(EXTRA_liboauth_la_DEPENDENCIES) $(AM_V_CCLD)$(liboauth_la_LINK) $(am_liboauth_la_rpath) $(liboauth_la_OBJECTS) $(liboauth_la_LIBADD) $(LIBS) @@ -512,22 +579,24 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liboauth_la-oauth-account-chooser-dialog.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liboauth_la-oauth-account-manager-dialog.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liboauth_la-oauth-account.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liboauth_la-oauth-authentication.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liboauth_la-oauth-connection.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liboauth_la-oauth-ask-authorization-dialog.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liboauth_la-oauth-consumer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liboauth_la-oauth-service.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liboauth_la-web-service.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -543,6 +612,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liboauth_la_CFLAGS) $(CFLAGS) -c -o liboauth_la-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c +liboauth_la-oauth-ask-authorization-dialog.lo: oauth-ask-authorization-dialog.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liboauth_la_CFLAGS) $(CFLAGS) -MT liboauth_la-oauth-ask-authorization-dialog.lo -MD -MP -MF $(DEPDIR)/liboauth_la-oauth-ask-authorization-dialog.Tpo -c -o liboauth_la-oauth-ask-authorization-dialog.lo `test -f 'oauth-ask-authorization-dialog.c' || echo '$(srcdir)/'`oauth-ask-authorization-dialog.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liboauth_la-oauth-ask-authorization-dialog.Tpo $(DEPDIR)/liboauth_la-oauth-ask-authorization-dialog.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='oauth-ask-authorization-dialog.c' object='liboauth_la-oauth-ask-authorization-dialog.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liboauth_la_CFLAGS) $(CFLAGS) -c -o liboauth_la-oauth-ask-authorization-dialog.lo `test -f 'oauth-ask-authorization-dialog.c' || echo '$(srcdir)/'`oauth-ask-authorization-dialog.c + liboauth_la-oauth-account.lo: oauth-account.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liboauth_la_CFLAGS) $(CFLAGS) -MT liboauth_la-oauth-account.lo -MD -MP -MF $(DEPDIR)/liboauth_la-oauth-account.Tpo -c -o liboauth_la-oauth-account.lo `test -f 'oauth-account.c' || echo '$(srcdir)/'`oauth-account.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liboauth_la-oauth-account.Tpo $(DEPDIR)/liboauth_la-oauth-account.Plo @@ -564,19 +640,26 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liboauth_la_CFLAGS) $(CFLAGS) -c -o liboauth_la-oauth-account-manager-dialog.lo `test -f 'oauth-account-manager-dialog.c' || echo '$(srcdir)/'`oauth-account-manager-dialog.c -liboauth_la-oauth-authentication.lo: oauth-authentication.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liboauth_la_CFLAGS) $(CFLAGS) -MT liboauth_la-oauth-authentication.lo -MD -MP -MF $(DEPDIR)/liboauth_la-oauth-authentication.Tpo -c -o liboauth_la-oauth-authentication.lo `test -f 'oauth-authentication.c' || echo '$(srcdir)/'`oauth-authentication.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liboauth_la-oauth-authentication.Tpo $(DEPDIR)/liboauth_la-oauth-authentication.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='oauth-authentication.c' object='liboauth_la-oauth-authentication.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liboauth_la_CFLAGS) $(CFLAGS) -c -o liboauth_la-oauth-authentication.lo `test -f 'oauth-authentication.c' || echo '$(srcdir)/'`oauth-authentication.c - -liboauth_la-oauth-connection.lo: oauth-connection.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liboauth_la_CFLAGS) $(CFLAGS) -MT liboauth_la-oauth-connection.lo -MD -MP -MF $(DEPDIR)/liboauth_la-oauth-connection.Tpo -c -o liboauth_la-oauth-connection.lo `test -f 'oauth-connection.c' || echo '$(srcdir)/'`oauth-connection.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liboauth_la-oauth-connection.Tpo $(DEPDIR)/liboauth_la-oauth-connection.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='oauth-connection.c' object='liboauth_la-oauth-connection.lo' libtool=yes @AMDEPBACKSLASH@ +liboauth_la-oauth-consumer.lo: oauth-consumer.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liboauth_la_CFLAGS) $(CFLAGS) -MT liboauth_la-oauth-consumer.lo -MD -MP -MF $(DEPDIR)/liboauth_la-oauth-consumer.Tpo -c -o liboauth_la-oauth-consumer.lo `test -f 'oauth-consumer.c' || echo '$(srcdir)/'`oauth-consumer.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liboauth_la-oauth-consumer.Tpo $(DEPDIR)/liboauth_la-oauth-consumer.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='oauth-consumer.c' object='liboauth_la-oauth-consumer.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liboauth_la_CFLAGS) $(CFLAGS) -c -o liboauth_la-oauth-consumer.lo `test -f 'oauth-consumer.c' || echo '$(srcdir)/'`oauth-consumer.c + +liboauth_la-oauth-service.lo: oauth-service.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liboauth_la_CFLAGS) $(CFLAGS) -MT liboauth_la-oauth-service.lo -MD -MP -MF $(DEPDIR)/liboauth_la-oauth-service.Tpo -c -o liboauth_la-oauth-service.lo `test -f 'oauth-service.c' || echo '$(srcdir)/'`oauth-service.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liboauth_la-oauth-service.Tpo $(DEPDIR)/liboauth_la-oauth-service.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='oauth-service.c' object='liboauth_la-oauth-service.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liboauth_la_CFLAGS) $(CFLAGS) -c -o liboauth_la-oauth-service.lo `test -f 'oauth-service.c' || echo '$(srcdir)/'`oauth-service.c + +liboauth_la-web-service.lo: web-service.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liboauth_la_CFLAGS) $(CFLAGS) -MT liboauth_la-web-service.lo -MD -MP -MF $(DEPDIR)/liboauth_la-web-service.Tpo -c -o liboauth_la-web-service.lo `test -f 'web-service.c' || echo '$(srcdir)/'`web-service.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liboauth_la-web-service.Tpo $(DEPDIR)/liboauth_la-web-service.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='web-service.c' object='liboauth_la-web-service.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liboauth_la_CFLAGS) $(CFLAGS) -c -o liboauth_la-oauth-connection.lo `test -f 'oauth-connection.c' || echo '$(srcdir)/'`oauth-connection.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liboauth_la_CFLAGS) $(CFLAGS) -c -o liboauth_la-web-service.lo `test -f 'web-service.c' || echo '$(srcdir)/'`web-service.c mostlyclean-libtool: -rm -f *.lo @@ -611,14 +694,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -639,31 +721,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -679,12 +743,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -696,15 +755,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -713,9 +768,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -897,25 +953,23 @@ uninstall-am: uninstall-extensionLTLIBRARIES \ uninstall-extensioniniDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-extensionLTLIBRARIES \ - clean-generic clean-libtool cscopelist cscopelist-recursive \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extensionLTLIBRARIES \ - install-extensioniniDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-extensionLTLIBRARIES clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-extensionLTLIBRARIES install-extensioniniDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA diff -Nru gthumb-3.0.2/extensions/oauth/data/Makefile.in gthumb-3.2.3/extensions/oauth/data/Makefile.in --- gthumb-3.0.2/extensions/oauth/data/Makefile.in 2012-08-20 19:54:15.000000000 +0000 +++ gthumb-3.2.3/extensions/oauth/data/Makefile.in 2013-07-10 13:33:48.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/oauth/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/oauth/data/ui/Makefile.am gthumb-3.2.3/extensions/oauth/data/ui/Makefile.am --- gthumb-3.0.2/extensions/oauth/data/ui/Makefile.am 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/oauth/data/ui/Makefile.am 2013-04-30 16:56:12.000000000 +0000 @@ -1,9 +1,8 @@ uidir = $(pkgdatadir)/ui -ui_DATA = \ - oauth-account-chooser.ui \ - oauth-account-manager.ui \ - oauth-ask-authorization.ui \ - oauth-complete-authorization.ui +ui_DATA = \ + oauth-account-chooser.ui \ + oauth-account-manager.ui \ + oauth-ask-authorization.ui EXTRA_DIST = $(ui_DATA) diff -Nru gthumb-3.0.2/extensions/oauth/data/ui/Makefile.in gthumb-3.2.3/extensions/oauth/data/ui/Makefile.in --- gthumb-3.0.2/extensions/oauth/data/ui/Makefile.in 2012-08-20 19:54:15.000000000 +0000 +++ gthumb-3.2.3/extensions/oauth/data/ui/Makefile.in 2013-07-10 13:33:48.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/oauth/data/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -320,10 +354,9 @@ top_srcdir = @top_srcdir@ uidir = $(pkgdatadir)/ui ui_DATA = \ - oauth-account-chooser.ui \ - oauth-account-manager.ui \ - oauth-ask-authorization.ui \ - oauth-complete-authorization.ui + oauth-account-chooser.ui \ + oauth-account-manager.ui \ + oauth-ask-authorization.ui EXTRA_DIST = $(ui_DATA) all: all-am @@ -386,11 +419,9 @@ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -531,16 +562,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-uiDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-uiDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/oauth/data/ui/oauth-account-manager.ui gthumb-3.2.3/extensions/oauth/data/ui/oauth-account-manager.ui --- gthumb-3.0.2/extensions/oauth/data/ui/oauth-account-manager.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/oauth/data/ui/oauth-account-manager.ui 2013-04-30 16:56:12.000000000 +0000 @@ -1,6 +1,6 @@ - + @@ -78,16 +78,14 @@ 6 - False True True True - False True False - gtk-delete + list-remove-symbolic diff -Nru gthumb-3.0.2/extensions/oauth/data/ui/oauth-ask-authorization.ui gthumb-3.2.3/extensions/oauth/data/ui/oauth-ask-authorization.ui --- gthumb-3.0.2/extensions/oauth/data/ui/oauth-ask-authorization.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/oauth/data/ui/oauth-ask-authorization.ui 2013-04-30 16:56:12.000000000 +0000 @@ -1,84 +1,90 @@ - - + + True False - gtk-dialog-authentication - - - False 5 - False - True - normal - True - other - icon_image - - + False + False + + True False vertical - 2 - - + + + + + + + + + + + True + False + vertical + + True False - end - - gtk-cancel - False + True - True - True - False - True + False + 6 + + + True + False + True + + + False + True + 0 + + + + + True + False + Loading... + + + False + True + 1 + + - False + True False 0 - - - _Authorize... - False - True - True - True - False - button_image - True - - - False - False - 1 - - - False - True - end + True + False 0 + + 1 + + + + + + + + + + - - cancel_button - authorize_button - - - - True - False - 0 - gtk-dialog-authentication - 6 diff -Nru gthumb-3.0.2/extensions/oauth/data/ui/oauth-complete-authorization.ui gthumb-3.2.3/extensions/oauth/data/ui/oauth-complete-authorization.ui --- gthumb-3.0.2/extensions/oauth/data/ui/oauth-complete-authorization.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/oauth/data/ui/oauth-complete-authorization.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,85 +0,0 @@ - - - - - True - False - gtk-dialog-authentication - - - False - 5 - False - True - normal - True - other - icon_image1 - - - True - False - vertical - 2 - - - True - False - end - - - gtk-cancel - False - True - True - True - False - True - 0.50999999046325684 - - - False - False - 0 - - - - - C_ontinue - False - True - True - True - False - button_image1 - True - - - False - False - 1 - - - - - False - True - end - 0 - - - - - - cancel_button1 - complete_button - - - - True - False - 0 - gtk-dialog-authentication - 6 - - diff -Nru gthumb-3.0.2/extensions/oauth/oauth-account-manager-dialog.c gthumb-3.2.3/extensions/oauth/oauth-account-manager-dialog.c --- gthumb-3.0.2/extensions/oauth/oauth-account-manager-dialog.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/oauth/oauth-account-manager-dialog.c 2013-04-30 16:56:12.000000000 +0000 @@ -72,8 +72,8 @@ gpointer user_data) { OAuthAccountManagerDialog *self = user_data; - GtkTreeModel *tree_model; - GtkTreeIter iter; + GtkTreeModel *tree_model; + GtkTreeIter iter; if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (GET_WIDGET ("account_treeview"))), &tree_model, @@ -91,8 +91,8 @@ gpointer user_data) { OAuthAccountManagerDialog *self = user_data; - GtkTreePath *tree_path; - GtkTreeIter iter; + GtkTreePath *tree_path; + GtkTreeIter iter; OAuthAccount *account; tree_path = gtk_tree_path_new_from_string (path); @@ -109,7 +109,7 @@ gtk_tree_model_get (GTK_TREE_MODEL (GET_WIDGET ("accounts_liststore")), &iter, ACCOUNT_DATA_COLUMN, &account, -1); - oauth_account_set_username (account, new_text); + g_object_set (account, "name", new_text, NULL); gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("accounts_liststore")), &iter, ACCOUNT_DATA_COLUMN, account, @@ -161,7 +161,7 @@ static void oauth_account_manager_dialog_construct (OAuthAccountManagerDialog *self, - GList *accounts) + GList *accounts) { GtkListStore *list_store; GtkTreeIter iter; @@ -175,7 +175,7 @@ gtk_list_store_append (list_store, &iter); gtk_list_store_set (list_store, &iter, ACCOUNT_DATA_COLUMN, account, - ACCOUNT_NAME_COLUMN, account->username, + ACCOUNT_NAME_COLUMN, account->name, -1); } } diff -Nru gthumb-3.0.2/extensions/oauth/oauth-account.c gthumb-3.2.3/extensions/oauth/oauth-account.c --- gthumb-3.0.2/extensions/oauth/oauth-account.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/oauth/oauth-account.c 2013-04-30 16:56:12.000000000 +0000 @@ -22,13 +22,27 @@ #include #include #include -#ifdef HAVE_GNOME_KEYRING -#include -#endif /* HAVE_GNOME_KEYRING */ +#ifdef HAVE_LIBSECRET +#include +#endif /* HAVE_LIBSECRET */ #include #include "oauth-account.h" +#define ACCOUNTS_FORMAT_VERSION "2.0" + + +enum { + PROP_0, + PROP_ID, + PROP_USERNAME, + PROP_NAME, + PROP_TOKEN, + PROP_TOKEN_SECRET, + PROP_IS_DEFAULT +}; + + static void oauth_account_dom_domizable_interface_init (DomDomizableInterface *iface); @@ -46,7 +60,9 @@ self = OAUTH_ACCOUNT (obj); + g_free (self->id); g_free (self->username); + g_free (self->name); g_free (self->token); g_free (self->token_secret); @@ -55,36 +71,164 @@ static void +oauth_account_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + OAuthAccount *self; + + self = OAUTH_ACCOUNT (object); + + switch (property_id) { + case PROP_ID: + _g_strset (&self->id, g_value_get_string (value)); + break; + case PROP_USERNAME: + _g_strset (&self->username, g_value_get_string (value)); + if (self->name == NULL) + _g_strset (&self->name, g_value_get_string (value)); + break; + case PROP_NAME: + _g_strset (&self->name, g_value_get_string (value)); + break; + case PROP_TOKEN: + _g_strset (&self->token, g_value_get_string (value)); + break; + case PROP_TOKEN_SECRET: + _g_strset (&self->token_secret, g_value_get_string (value)); + break; + case PROP_IS_DEFAULT: + self->is_default = g_value_get_boolean (value); + break; + default: + break; + } +} + + +static void +oauth_account_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) +{ + OAuthAccount *self; + + self = OAUTH_ACCOUNT (object); + + switch (property_id) { + case PROP_ID: + g_value_set_string (value, self->id); + break; + case PROP_USERNAME: + g_value_set_string (value, self->username); + break; + case PROP_NAME: + g_value_set_string (value, self->name); + break; + case PROP_TOKEN: + g_value_set_string (value, self->token); + break; + case PROP_TOKEN_SECRET: + g_value_set_string (value, self->token_secret); + break; + case PROP_IS_DEFAULT: + g_value_set_boolean (value, self->is_default); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + + +static void oauth_account_class_init (OAuthAccountClass *klass) { - G_OBJECT_CLASS (klass)->finalize = oauth_account_finalize; + GObjectClass *object_class; + + object_class = G_OBJECT_CLASS (klass); + object_class->finalize = oauth_account_finalize; + object_class->set_property = oauth_account_set_property; + object_class->get_property = oauth_account_get_property; + + /* properties */ + + g_object_class_install_property (object_class, + PROP_ID, + g_param_spec_string ("id", + "ID", + "", + NULL, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_USERNAME, + g_param_spec_string ("username", + "Username", + "", + NULL, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_NAME, + g_param_spec_string ("name", + "Name", + "", + NULL, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_TOKEN, + g_param_spec_string ("token", + "Token", + "", + NULL, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_TOKEN_SECRET, + g_param_spec_string ("token-secret", + "Token secret", + "", + NULL, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_IS_DEFAULT, + g_param_spec_boolean ("is-default", + "Is default", + "", + FALSE, + G_PARAM_READWRITE)); } -DomElement* +DomElement * oauth_account_create_element (DomDomizable *base, DomDocument *doc) { OAuthAccount *self; - DomElement *element; - gboolean set_token; + DomElement *element; + gboolean set_token; self = OAUTH_ACCOUNT (base); element = dom_document_create_element (doc, "account", NULL); + if (self->id != NULL) + dom_element_set_attribute (element, "id", self->id); if (self->username != NULL) dom_element_set_attribute (element, "username", self->username); + if (self->name != NULL) + dom_element_set_attribute (element, "name", self->name); - /* Don't save the token in the configuration file if gnome-keyring is + /* Do not save the token in the configuration file if the keyring is * available. */ +#ifdef HAVE_LIBSECRET + set_token = FALSE; +#else set_token = TRUE; -#ifdef HAVE_GNOME_KEYRING - if (gnome_keyring_is_available ()) - set_token = FALSE; #endif - if (set_token && (self->token != NULL)) - dom_element_set_attribute (element, "token", self->token); + + if (set_token && (self->token_secret != NULL)) + dom_element_set_attribute (element, "token-secret", self->token_secret); if (self->is_default) dom_element_set_attribute (element, "default", "1"); @@ -101,9 +245,13 @@ self = OAUTH_ACCOUNT (base); - oauth_account_set_username (self, dom_element_get_attribute (element, "username")); - oauth_account_set_token (self, dom_element_get_attribute (element, "token")); - self->is_default = (g_strcmp0 (dom_element_get_attribute (element, "default"), "1") == 0); + g_object_set (self, + "id", dom_element_get_attribute (element, "id"), + "username", dom_element_get_attribute (element, "username"), + "name", dom_element_get_attribute (element, "name"), + "token-secret", dom_element_get_attribute (element, "token-secret"), + "is-default", (g_strcmp0 (dom_element_get_attribute (element, "default"), "1") == 0), + NULL); } @@ -118,7 +266,12 @@ static void oauth_account_init (OAuthAccount *self) { - /* void */ + self->id = NULL; + self->username = NULL; + self->name = NULL; + self->token = NULL; + self->token_secret = NULL; + self->is_default = FALSE; } @@ -163,6 +316,130 @@ return 1; else if (b == NULL) return -1; - else + else if ((a->id != NULL) || (b->id != NULL)) + return g_strcmp0 (a->id, b->id); + else if ((a->username != NULL) || (b->username != NULL)) return g_strcmp0 (a->username, b->username); + else + return g_strcmp0 (a->name, b->name); +} + + +GList * +oauth_accounts_load_from_file (const char *service_name, + GType account_type) +{ + GList *accounts = NULL; + char *filename; + GFile *file; + char *buffer; + gsize len; + GError *error = NULL; + DomDocument *doc; + + if (account_type == 0) + account_type = OAUTH_TYPE_ACCOUNT; + + filename = g_strconcat (service_name, ".xml", NULL); + file = gth_user_dir_get_file_for_read (GTH_DIR_CONFIG, GTHUMB_DIR, "accounts", filename, NULL); + if (! _g_file_load_in_buffer (file, (void **) &buffer, &len, NULL, &error)) { + g_error_free (error); + g_object_unref (file); + g_free (filename); + return NULL; + } + + doc = dom_document_new (); + if (dom_document_load (doc, buffer, len, NULL)) { + DomElement *node; + + node = DOM_ELEMENT (doc)->first_child; + if ((node != NULL) + && (g_strcmp0 (node->tag_name, "accounts") == 0) + && (g_strcmp0 (dom_element_get_attribute (node, "version"), ACCOUNTS_FORMAT_VERSION) == 0)) + { + DomElement *child; + + for (child = node->first_child; + child != NULL; + child = child->next_sibling) + { + if (strcmp (child->tag_name, "account") == 0) { + OAuthAccount *account; + + account = g_object_new (account_type, NULL); + dom_domizable_load_from_element (DOM_DOMIZABLE (account), child); + + accounts = g_list_prepend (accounts, account); + } + } + + accounts = g_list_reverse (accounts); + } + } + + g_object_unref (doc); + g_free (buffer); + g_object_unref (file); + g_free (filename); + + return accounts; +} + + +OAuthAccount * +oauth_accounts_find_default (GList *accounts) +{ + GList *scan; + + for (scan = accounts; scan; scan = scan->next) { + OAuthAccount *account = scan->data; + + if (account->is_default) + return g_object_ref (account); + } + + return NULL; +} + + +void +oauth_accounts_save_to_file (const char *service_name, + GList *accounts, + OAuthAccount *default_account) +{ + DomDocument *doc; + DomElement *root; + GList *scan; + char *buffer; + gsize len; + char *filename; + GFile *file; + + doc = dom_document_new (); + root = dom_document_create_element (doc, "accounts", + "version", ACCOUNTS_FORMAT_VERSION, + NULL); + dom_element_append_child (DOM_ELEMENT (doc), root); + for (scan = accounts; scan; scan = scan->next) { + OAuthAccount *account = scan->data; + DomElement *node; + + if ((default_account != NULL) && g_strcmp0 (account->username, default_account->username) == 0) + account->is_default = TRUE; + else + account->is_default = FALSE; + node = dom_domizable_create_element (DOM_DOMIZABLE (account), doc); + dom_element_append_child (root, node); + } + + filename = g_strconcat (service_name, ".xml", NULL); + file = gth_user_dir_get_file_for_write (GTH_DIR_CONFIG, GTHUMB_DIR, "accounts", filename, NULL); + buffer = dom_document_dump (doc, &len); + _g_file_write (file, FALSE, G_FILE_CREATE_PRIVATE | G_FILE_CREATE_REPLACE_DESTINATION, buffer, len, NULL, NULL); + + g_free (buffer); + g_object_unref (file); + g_free (filename); + g_object_unref (doc); } diff -Nru gthumb-3.0.2/extensions/oauth/oauth-account.h gthumb-3.2.3/extensions/oauth/oauth-account.h --- gthumb-3.0.2/extensions/oauth/oauth-account.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/oauth/oauth-account.h 2013-04-30 16:56:12.000000000 +0000 @@ -43,7 +43,9 @@ GObject parent_instance; OAuthAccountPrivate *priv; + char *id; char *username; + char *name; char *token; char *token_secret; gboolean is_default; @@ -64,10 +66,19 @@ int oauth_account_cmp (OAuthAccount *a, OAuthAccount *b); DomElement * oauth_account_create_element (DomDomizable *base, - DomDocument *doc); + DomDocument *doc); void oauth_account_load_from_element (DomDomizable *base, DomElement *element); +/* -- utilities -- */ + +GList * oauth_accounts_load_from_file (const char *service_name, + GType account_type); +OAuthAccount * oauth_accounts_find_default (GList *accounts); +void oauth_accounts_save_to_file (const char *service_name, + GList *accounts, + OAuthAccount *default_account); + G_END_DECLS #endif /* OAUTH_ACCOUNT_H */ diff -Nru gthumb-3.0.2/extensions/oauth/oauth-ask-authorization-dialog.c gthumb-3.2.3/extensions/oauth/oauth-ask-authorization-dialog.c --- gthumb-3.0.2/extensions/oauth/oauth-ask-authorization-dialog.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/oauth/oauth-ask-authorization-dialog.c 2013-07-07 11:32:12.000000000 +0000 @@ -0,0 +1,272 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2010 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include "oauth-ask-authorization-dialog.h" + + +#define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x))) +#define _LOADING_PAGE 1 +#define _WEB_VIEW_PAGE 0 + + +G_DEFINE_TYPE (OAuthAskAuthorizationDialog, oauth_ask_authorization_dialog, GTK_TYPE_DIALOG) + + +/* Signals */ +enum { + LOAD_REQUEST, + LOADED, + REDIRECTED, + LAST_SIGNAL +}; + + +static guint oauth_ask_authorization_dialog_signals[LAST_SIGNAL] = { 0 }; + + +struct _OAuthAskAuthorizationDialogPrivate { + GtkWidget *view; + GtkBuilder *builder; +}; + + +static void +oauth_ask_authorization_dialog_finalize (GObject *obj) +{ + OAuthAskAuthorizationDialog *self; + + self = OAUTH_ASK_AUTHORIZATION_DIALOG (obj); + _g_object_unref (self->priv->builder); + + G_OBJECT_CLASS (oauth_ask_authorization_dialog_parent_class)->finalize (obj); +} + + +static void +oauth_ask_authorization_dialog_class_init (OAuthAskAuthorizationDialogClass *klass) +{ + GObjectClass *object_class; + + g_type_class_add_private (klass, sizeof (OAuthAskAuthorizationDialogPrivate)); + + object_class = G_OBJECT_CLASS (klass); + object_class->finalize = oauth_ask_authorization_dialog_finalize; + + oauth_ask_authorization_dialog_signals[LOAD_REQUEST] = + g_signal_new ("load-request", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (OAuthAskAuthorizationDialogClass, load_request), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); + oauth_ask_authorization_dialog_signals[LOADED] = + g_signal_new ("loaded", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (OAuthAskAuthorizationDialogClass, loaded), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); + oauth_ask_authorization_dialog_signals[REDIRECTED] = + g_signal_new ("redirected", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (OAuthAskAuthorizationDialogClass, redirected), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); +} + + +static void +webkit_view_load_changed_cb (WebKitWebView *web_view, + WebKitLoadEvent load_event, + gpointer user_data) +{ + OAuthAskAuthorizationDialog *self = user_data; + + switch (load_event) { + case WEBKIT_LOAD_STARTED: + case WEBKIT_LOAD_COMMITTED: + gtk_notebook_set_current_page (GTK_NOTEBOOK(GET_WIDGET ("dialog_content")), _LOADING_PAGE); + g_signal_emit (self, oauth_ask_authorization_dialog_signals[LOAD_REQUEST], 0); + break; + case WEBKIT_LOAD_REDIRECTED: + g_signal_emit (self, oauth_ask_authorization_dialog_signals[REDIRECTED], 0); + break; + case WEBKIT_LOAD_FINISHED: + gtk_notebook_set_current_page (GTK_NOTEBOOK(GET_WIDGET ("dialog_content")), _WEB_VIEW_PAGE); + gtk_widget_grab_focus (self->priv->view); + g_signal_emit (self, oauth_ask_authorization_dialog_signals[LOADED], 0); + break; + default: + break; + } +} + + +static GtkWidget * _webkit_web_view_new (OAuthAskAuthorizationDialog *self); + + +static GtkWidget * +webkit_view_create_cb (WebKitWebView *web_view, + gpointer user_data) +{ + return oauth_ask_authorization_dialog_get_view (OAUTH_ASK_AUTHORIZATION_DIALOG (user_data)); +} + + +static void +webkit_view_ready_to_show_cb (WebKitWebView *web_view, + gpointer user_data) +{ + GtkWidget *window; + WebKitWindowProperties *prop; + GdkRectangle geometry; + + window = gtk_widget_get_toplevel (GTK_WIDGET (web_view)); + if (! gtk_widget_is_toplevel (window)) + return; + + prop = webkit_web_view_get_window_properties (web_view); + webkit_window_properties_get_geometry (prop, &geometry); + + gtk_window_set_default_size (GTK_WINDOW (window), geometry.width, geometry.height); + gtk_widget_show_all (window); +} + + +static GtkWidget * +_webkit_web_view_new (OAuthAskAuthorizationDialog *self) +{ + WebKitWebContext *context; + GtkWidget *view; + WebKitSettings *settings; + WebKitCookieManager *cookie_manager; + GFile *file; + char *cookie_filename; + + context = webkit_web_context_get_default (); + view = webkit_web_view_new_with_context (context); + + settings = webkit_settings_new (); + webkit_settings_set_enable_javascript (settings, TRUE); + webkit_settings_set_javascript_can_open_windows_automatically (settings, TRUE); + webkit_web_view_set_settings (WEBKIT_WEB_VIEW (view), settings); + + file = gth_user_dir_get_file_for_write (GTH_DIR_CACHE, GTHUMB_DIR, "cookies", NULL); + cookie_filename = g_file_get_path (file); + + cookie_manager = webkit_web_context_get_cookie_manager (context); + webkit_cookie_manager_set_accept_policy (cookie_manager, WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS); + webkit_cookie_manager_set_persistent_storage (cookie_manager, cookie_filename, WEBKIT_COOKIE_PERSISTENT_STORAGE_TEXT); + webkit_web_context_set_cache_model (context, WEBKIT_CACHE_MODEL_DOCUMENT_BROWSER); + + g_free (cookie_filename); + g_object_unref (file); + + g_signal_connect (view, + "create", + G_CALLBACK (webkit_view_create_cb), + self); + g_signal_connect (view, + "ready-to-show", + G_CALLBACK (webkit_view_ready_to_show_cb), + self); + + return view; +} + + +static void +oauth_ask_authorization_dialog_init (OAuthAskAuthorizationDialog *self) +{ + GtkWidget *dialog_content; + + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, OAUTH_TYPE_ASK_AUTHORIZATION_DIALOG, OAuthAskAuthorizationDialogPrivate); + self->priv->builder = _gtk_builder_new_from_file ("oauth-ask-authorization.ui", "oauth"); + + gtk_window_set_default_size (GTK_WINDOW (self), 500, 500); + gtk_window_set_resizable (GTK_WINDOW (self), TRUE); + gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), 5); + gtk_container_set_border_width (GTK_CONTAINER (self), 5); + + dialog_content = GET_WIDGET ("dialog_content"); + gtk_widget_show (dialog_content); + gtk_container_set_border_width (GTK_CONTAINER (dialog_content), 5); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), dialog_content, TRUE, TRUE, 0); + + self->priv->view = _webkit_web_view_new (self); + gtk_widget_show (self->priv->view); + gtk_box_pack_start (GTK_BOX (GET_WIDGET ("webkit_view_container")), self->priv->view, TRUE, TRUE, 0); + + g_signal_connect (self->priv->view, + "load-changed", + G_CALLBACK (webkit_view_load_changed_cb), + self); + + gtk_dialog_add_button (GTK_DIALOG (self), + GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL); +} + + +GtkWidget * +oauth_ask_authorization_dialog_new (const char *uri) +{ + OAuthAskAuthorizationDialog *self; + + self = g_object_new (OAUTH_TYPE_ASK_AUTHORIZATION_DIALOG, + "title", _("Authorization Required"), + NULL); + if (uri != NULL) + webkit_web_view_load_uri (WEBKIT_WEB_VIEW (self->priv->view), uri); + + return (GtkWidget *) self; +} + + +GtkWidget * +oauth_ask_authorization_dialog_get_view (OAuthAskAuthorizationDialog *self) +{ + return self->priv->view; +} + + +const char * +oauth_ask_authorization_dialog_get_uri (OAuthAskAuthorizationDialog *self) +{ + return webkit_web_view_get_uri (WEBKIT_WEB_VIEW (self->priv->view)); +} + + +const char * +oauth_ask_authorization_dialog_get_title (OAuthAskAuthorizationDialog *self) +{ + return webkit_web_view_get_title (WEBKIT_WEB_VIEW (self->priv->view)); +} diff -Nru gthumb-3.0.2/extensions/oauth/oauth-ask-authorization-dialog.h gthumb-3.2.3/extensions/oauth/oauth-ask-authorization-dialog.h --- gthumb-3.0.2/extensions/oauth/oauth-ask-authorization-dialog.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/oauth/oauth-ask-authorization-dialog.h 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,64 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef OAUTH_ASK_AUTHORIZATION_DIALOG_H +#define OAUTH_ASK_AUTHORIZATION_DIALOG_H + +#include +#include + +G_BEGIN_DECLS + +#define OAUTH_TYPE_ASK_AUTHORIZATION_DIALOG (oauth_ask_authorization_dialog_get_type ()) +#define OAUTH_ASK_AUTHORIZATION_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), OAUTH_TYPE_ASK_AUTHORIZATION_DIALOG, OAuthAskAuthorizationDialog)) +#define OAUTH_ASK_AUTHORIZATION_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), OAUTH_TYPE_ASK_AUTHORIZATION_DIALOG, OAuthAskAuthorizationDialogClass)) +#define OAUTH_IS_ASK_AUTHORIZATION_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), OAUTH_TYPE_ASK_AUTHORIZATION_DIALOG)) +#define OAUTH_IS_ASK_AUTHORIZATION_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), OAUTH_TYPE_ASK_AUTHORIZATION_DIALOG)) +#define OAUTH_ASK_AUTHORIZATION_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), OAUTH_TYPE_ASK_AUTHORIZATION_DIALOG, OAuthAskAuthorizationDialogClass)) + +typedef struct _OAuthAskAuthorizationDialog OAuthAskAuthorizationDialog; +typedef struct _OAuthAskAuthorizationDialogClass OAuthAskAuthorizationDialogClass; +typedef struct _OAuthAskAuthorizationDialogPrivate OAuthAskAuthorizationDialogPrivate; + +struct _OAuthAskAuthorizationDialog { + GtkDialog parent_instance; + OAuthAskAuthorizationDialogPrivate *priv; +}; + +struct _OAuthAskAuthorizationDialogClass { + GtkDialogClass parent_class; + + /*< signals >*/ + + void (*load_request) (OAuthAskAuthorizationDialog *self); + void (*loaded) (OAuthAskAuthorizationDialog *self); + void (*redirected) (OAuthAskAuthorizationDialog *self); +}; + +GType oauth_ask_authorization_dialog_get_type (void); +GtkWidget * oauth_ask_authorization_dialog_new (const char *url); +GtkWidget * oauth_ask_authorization_dialog_get_view (OAuthAskAuthorizationDialog *self); +const char * oauth_ask_authorization_dialog_get_uri (OAuthAskAuthorizationDialog *self); +const char * oauth_ask_authorization_dialog_get_title (OAuthAskAuthorizationDialog *self); + +G_END_DECLS + +#endif /* OAUTH_ASK_AUTHORIZATION_DIALOG_H */ diff -Nru gthumb-3.0.2/extensions/oauth/oauth-authentication.c gthumb-3.2.3/extensions/oauth/oauth-authentication.c --- gthumb-3.0.2/extensions/oauth/oauth-authentication.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/oauth/oauth-authentication.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,838 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#ifdef HAVE_GNOME_KEYRING -#include -#endif /* HAVE_GNOME_KEYRING */ -#include "oauth-account.h" -#include "oauth-account-chooser-dialog.h" -#include "oauth-account-manager-dialog.h" -#include "oauth-authentication.h" - - -#define TOKEN_SECRET_SEPARATOR ("::") -#define OAUTH_AUTHENTICATION_RESPONSE_CHOOSE_ACCOUNT 1 - - -G_DEFINE_TYPE (OAuthAuthentication, oauth_authentication, G_TYPE_OBJECT) - - -/* Signals */ -enum { - READY, - ACCOUNTS_CHANGED, - LAST_SIGNAL -}; - -struct _OAuthAuthenticationPrivate -{ - OAuthConnection *conn; - GCancellable *cancellable; - GList *accounts; - OAuthAccount *account; - GtkWidget *browser; - GtkWidget *dialog; -}; - - -static guint oauth_authentication_signals[LAST_SIGNAL] = { 0 }; - - -static void -oauth_authentication_finalize (GObject *object) -{ - OAuthAuthentication *self; - - self = OAUTH_AUTHENTICATION (object); - _g_object_unref (self->priv->conn); - _g_object_unref (self->priv->cancellable); - _g_object_list_unref (self->priv->accounts); - _g_object_unref (self->priv->account); - - G_OBJECT_CLASS (oauth_authentication_parent_class)->finalize (object); -} - - -static void -oauth_authentication_class_init (OAuthAuthenticationClass *class) -{ - GObjectClass *object_class; - - g_type_class_add_private (class, sizeof (OAuthAuthenticationPrivate)); - - object_class = (GObjectClass*) class; - object_class->finalize = oauth_authentication_finalize; - - /* signals */ - - oauth_authentication_signals[READY] = - g_signal_new ("ready", - G_TYPE_FROM_CLASS (class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (OAuthAuthenticationClass, ready), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); - oauth_authentication_signals[ACCOUNTS_CHANGED] = - g_signal_new ("accounts_changed", - G_TYPE_FROM_CLASS (class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (OAuthAuthenticationClass, accounts_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); -} - - -static void -oauth_authentication_init (OAuthAuthentication *self) -{ - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, OAUTH_TYPE_AUTHENTICATION, OAuthAuthenticationPrivate); - self->priv->conn = NULL; - self->priv->accounts = NULL; - self->priv->account = NULL; -} - - -OAuthAuthentication * -oauth_authentication_new (OAuthConnection *conn, - GType account_type, - GCancellable *cancellable, - GtkWidget *browser, - GtkWidget *dialog) -{ - OAuthAuthentication *self; - - g_return_val_if_fail (conn != NULL, NULL); - - self = (OAuthAuthentication *) g_object_new (OAUTH_TYPE_AUTHENTICATION, NULL); - self->priv->conn = g_object_ref (conn); - self->priv->cancellable = _g_object_ref (cancellable); - self->priv->accounts = oauth_accounts_load_from_file (self->priv->conn->consumer->name, account_type); - self->priv->account = oauth_accounts_find_default (self->priv->accounts); - self->priv->browser = browser; - self->priv->dialog = dialog; - - return self; -} - - -static void show_choose_account_dialog (OAuthAuthentication *self); - - -static void -authentication_error_dialog_response_cb (GtkDialog *dialog, - int response_id, - gpointer user_data) -{ - OAuthAuthentication *self = user_data; - - switch (response_id) { - case GTK_RESPONSE_DELETE_EVENT: - case GTK_RESPONSE_CANCEL: - gtk_widget_destroy (GTK_WIDGET (dialog)); - gtk_widget_destroy (self->priv->dialog); - break; - - case OAUTH_AUTHENTICATION_RESPONSE_CHOOSE_ACCOUNT: - gtk_widget_destroy (GTK_WIDGET (dialog)); - show_choose_account_dialog (self); - break; - - default: - break; - } -} - - -static void start_authorization_process (OAuthAuthentication *self); - - -static void -show_authentication_error_dialog (OAuthAuthentication *self, - GError **error) -{ - GtkWidget *dialog; - - if (g_error_matches (*error, OAUTH_CONNECTION_ERROR, OAUTH_CONNECTION_ERROR_INVALID_TOKEN)) { - start_authorization_process (self); - return; - } - - dialog = _gtk_message_dialog_new (GTK_WINDOW (self->priv->browser), - GTK_DIALOG_MODAL, - GTK_STOCK_DIALOG_ERROR, - _("Could not connect to the server"), - (*error)->message, - _("Choose _Account..."), OAUTH_AUTHENTICATION_RESPONSE_CHOOSE_ACCOUNT, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - NULL); - - if (self->priv->conn != NULL) - gth_task_dialog (GTH_TASK (self->priv->conn), TRUE, dialog); - - g_signal_connect (dialog, - "delete-event", - G_CALLBACK (gtk_true), - NULL); - g_signal_connect (dialog, - "response", - G_CALLBACK (authentication_error_dialog_response_cb), - self); - gtk_widget_show (dialog); - - g_clear_error (error); -} - - -/* -- oauth_authentication_auto_connect -- */ - - -static void -check_token_ready_cb (GObject *source_object, - GAsyncResult *res, - gpointer user_data) -{ - OAuthAuthentication *self = user_data; - GError *error = NULL; - - if (! oauth_connection_check_token_finish (self->priv->conn, res, &error)) { - show_authentication_error_dialog (self, &error); - return; - } - oauth_accounts_save_to_file (self->priv->conn->consumer->name, - self->priv->accounts, - self->priv->account); - g_signal_emit (self, oauth_authentication_signals[READY], 0); -} - - -static void -connect_to_server_step2 (OAuthAuthentication *self) -{ - if (self->priv->account->token == NULL) { - start_authorization_process (self); - return; - } - - oauth_connection_set_token (self->priv->conn, - self->priv->account->token, - self->priv->account->token_secret); - oauth_connection_check_token (self->priv->conn, - self->priv->account, - self->priv->cancellable, - check_token_ready_cb, - self); -} - - -#ifdef HAVE_GNOME_KEYRING -static void -find_password_cb (GnomeKeyringResult result, - const char *string, - gpointer user_data) -{ - OAuthAuthentication *self = user_data; - - if (string != NULL) { - char **values; - - values = g_strsplit (string, TOKEN_SECRET_SEPARATOR, 2); - if ((values[0] != NULL) && (values[1] != NULL)) { - self->priv->account->token = g_strdup (values[0]); - self->priv->account->token_secret = g_strdup (values[1]); - } - - g_strfreev (values); - } - - connect_to_server_step2 (self); -} -#endif - - -static void -connect_to_server (OAuthAuthentication *self) -{ - g_return_if_fail (self->priv->account != NULL); - -#ifdef HAVE_GNOME_KEYRING - if (((self->priv->account->token == NULL) || (self->priv->account->token_secret == NULL)) && gnome_keyring_is_available ()) { - gnome_keyring_find_password (GNOME_KEYRING_NETWORK_PASSWORD, - find_password_cb, - self, - NULL, - "user", self->priv->account->username, - "server", self->priv->conn->consumer->url, - "protocol", self->priv->conn->consumer->protocol, - NULL); - return; - } -#endif - - connect_to_server_step2 (self); -} - - -static void -set_account (OAuthAuthentication *self, - OAuthAccount *account) -{ - GList *link; - - link = g_list_find_custom (self->priv->accounts, self->priv->account, (GCompareFunc) oauth_account_cmp); - if (link != NULL) { - self->priv->accounts = g_list_remove_link (self->priv->accounts, link); - _g_object_list_unref (link); - } - - _g_object_unref (self->priv->account); - self->priv->account = NULL; - - if (account != NULL) { - self->priv->account = g_object_ref (account); - self->priv->accounts = g_list_prepend (self->priv->accounts, g_object_ref (self->priv->account)); - } -} - - -#ifdef HAVE_GNOME_KEYRING -static void -store_password_done_cb (GnomeKeyringResult result, - gpointer user_data) -{ - OAuthAuthentication *self = user_data; - connect_to_server (self); -} -#endif - - -static void -get_access_token_ready_cb (GObject *source_object, - GAsyncResult *res, - gpointer user_data) -{ - OAuthAuthentication *self = user_data; - GError *error = NULL; - OAuthAccount *account; - - account = oauth_connection_get_access_token_finish (self->priv->conn, res, &error); - if (error != NULL) { - show_authentication_error_dialog (self, &error); - return; - } - - set_account (self, account); - -#ifdef HAVE_GNOME_KEYRING - if (gnome_keyring_is_available ()) { - char *secret; - - secret = g_strconcat (account->token, - TOKEN_SECRET_SEPARATOR, - account->token_secret, - NULL); - gnome_keyring_store_password (GNOME_KEYRING_NETWORK_PASSWORD, - NULL, - self->priv->conn->consumer->display_name, - secret, - store_password_done_cb, - self, - NULL, - "user", account->username, - "server", self->priv->conn->consumer->url, - "protocol", self->priv->conn->consumer->protocol, - NULL); - return; - } -#endif - - g_object_unref (account); - connect_to_server (self); -} - - -static void -complete_authorization_messagedialog_response_cb (GtkDialog *dialog, - int response_id, - gpointer user_data) -{ - OAuthAuthentication *self = user_data; - - switch (response_id) { - case GTK_RESPONSE_HELP: - show_help_dialog (GTK_WINDOW (dialog), "oauth-complete-authorization"); - break; - - case GTK_RESPONSE_DELETE_EVENT: - case GTK_RESPONSE_CANCEL: - gtk_widget_destroy (GTK_WIDGET (dialog)); - gtk_widget_destroy (self->priv->dialog); - break; - - case GTK_RESPONSE_OK: - gtk_widget_destroy (GTK_WIDGET (dialog)); - gth_task_dialog (GTH_TASK (self->priv->conn), FALSE, NULL); - oauth_connection_get_access_token (self->priv->conn, - self->priv->cancellable, - get_access_token_ready_cb, - self); - break; - - default: - break; - } -} - - -static void -complete_authorization (OAuthAuthentication *self) -{ - GtkBuilder *builder; - GtkWidget *dialog; - char *text; - char *secondary_text; - - gth_task_dialog (GTH_TASK (self->priv->conn), TRUE, NULL); - - builder = _gtk_builder_new_from_file ("oauth-complete-authorization.ui", "oauth"); - dialog = _gtk_builder_get_widget (builder, "complete_authorization_messagedialog"); - text = g_strdup_printf (_("Return to this window when you have finished the authorization process on %s"), self->priv->conn->consumer->display_name); - secondary_text = g_strdup (_("Once you're done, click the 'Continue' button below.")); - g_object_set (dialog, "text", text, "secondary-text", secondary_text, NULL); - g_object_set_data_full (G_OBJECT (dialog), "builder", builder, g_object_unref); - g_signal_connect (dialog, - "delete-event", - G_CALLBACK (gtk_true), - NULL); - g_signal_connect (dialog, - "response", - G_CALLBACK (complete_authorization_messagedialog_response_cb), - self); - - if (gtk_widget_get_visible (self->priv->dialog)) - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self->priv->dialog)); - else - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self->priv->browser)); - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - gtk_window_present (GTK_WINDOW (dialog)); - - g_free (secondary_text); - g_free (text); -} - - -static void -ask_authorization_messagedialog_response_cb (GtkDialog *dialog, - int response_id, - gpointer user_data) -{ - OAuthAuthentication *self = user_data; - - switch (response_id) { - case GTK_RESPONSE_HELP: - show_help_dialog (GTK_WINDOW (dialog), "oauth-ask-authorization"); - break; - - case GTK_RESPONSE_DELETE_EVENT: - case GTK_RESPONSE_CANCEL: - gtk_widget_destroy (GTK_WIDGET (dialog)); - gtk_widget_destroy (self->priv->dialog); - break; - - case GTK_RESPONSE_OK: - { - GdkScreen *screen; - char *url; - GError *error = NULL; - - screen = gtk_widget_get_screen (GTK_WIDGET (dialog)); - gtk_widget_destroy (GTK_WIDGET (dialog)); - - url = oauth_connection_get_login_link (self->priv->conn); - if (gtk_show_uri (screen, url, 0, &error)) - complete_authorization (self); - else - show_authentication_error_dialog (self, &error); - - g_free (url); - } - break; - - default: - break; - } -} - - -static void -ask_authorization (OAuthAuthentication *self) -{ - GtkBuilder *builder; - GtkWidget *dialog; - char *text; - char *secondary_text; - - gth_task_dialog (GTH_TASK (self->priv->conn), TRUE, NULL); - - builder = _gtk_builder_new_from_file ("oauth-ask-authorization.ui", "oauth"); - dialog = _gtk_builder_get_widget (builder, "ask_authorization_messagedialog"); - text = g_strdup_printf (_("gthumb requires your authorization to upload the photos to %s"), self->priv->conn->consumer->display_name); - secondary_text = g_strdup_printf (_("Click 'Authorize' to open your web browser and authorize gthumb to upload photos to %s. When you're finished, return to this window to complete the authorization."), self->priv->conn->consumer->display_name); - g_object_set (dialog, "text", text, "secondary-text", secondary_text, NULL); - g_object_set_data_full (G_OBJECT (dialog), "builder", builder, g_object_unref); - g_signal_connect (dialog, - "delete-event", - G_CALLBACK (gtk_true), - NULL); - g_signal_connect (dialog, - "response", - G_CALLBACK (ask_authorization_messagedialog_response_cb), - self); - - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - if (gtk_widget_get_visible (self->priv->dialog)) - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self->priv->dialog)); - else - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self->priv->browser)); - gtk_window_present (GTK_WINDOW (dialog)); - - g_free (secondary_text); - g_free (text); -} - - -static void -get_request_token_ready_cb (GObject *source_object, - GAsyncResult *res, - gpointer user_data) -{ - OAuthAuthentication *self = user_data; - GError *error = NULL; - - if (! oauth_connection_get_request_token_finish (self->priv->conn, res, &error)) - show_authentication_error_dialog (self, &error); - else - ask_authorization (self); -} - - -static void -start_authorization_process (OAuthAuthentication *self) -{ - gtk_widget_hide (self->priv->dialog); - gth_task_dialog (GTH_TASK (self->priv->conn), FALSE, NULL); - - oauth_connection_get_request_token (self->priv->conn, - self->priv->cancellable, - get_request_token_ready_cb, - self); -} - - -static void -account_chooser_dialog_response_cb (GtkDialog *dialog, - int response_id, - gpointer user_data) -{ - OAuthAuthentication *self = user_data; - - switch (response_id) { - case GTK_RESPONSE_DELETE_EVENT: - case GTK_RESPONSE_CANCEL: - gtk_widget_destroy (GTK_WIDGET (dialog)); - gtk_widget_destroy (self->priv->dialog); - break; - - case GTK_RESPONSE_OK: - _g_object_unref (self->priv->account); - self->priv->account = oauth_account_chooser_dialog_get_active (OAUTH_ACCOUNT_CHOOSER_DIALOG (dialog)); - if (self->priv->account != NULL) { - gtk_widget_destroy (GTK_WIDGET (dialog)); - connect_to_server (self); - } - break; - - case OAUTH_ACCOUNT_CHOOSER_RESPONSE_NEW: - gtk_widget_destroy (GTK_WIDGET (dialog)); - start_authorization_process (self); - break; - - default: - break; - } -} - - -static void -show_choose_account_dialog (OAuthAuthentication *self) -{ - GtkWidget *dialog; - - gth_task_dialog (GTH_TASK (self->priv->conn), TRUE, NULL); - dialog = oauth_account_chooser_dialog_new (self->priv->accounts, self->priv->account); - g_signal_connect (dialog, - "delete-event", - G_CALLBACK (gtk_true), - NULL); - g_signal_connect (dialog, - "response", - G_CALLBACK (account_chooser_dialog_response_cb), - self); - - gtk_window_set_title (GTK_WINDOW (dialog), _("Choose Account")); - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self->priv->browser)); - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - gtk_window_present (GTK_WINDOW (dialog)); -} - - -void -oauth_authentication_auto_connect (OAuthAuthentication *self) -{ - gtk_widget_hide (self->priv->dialog); - gth_task_dialog (GTH_TASK (self->priv->conn), FALSE, NULL); - - if (self->priv->accounts != NULL) { - if (self->priv->account != NULL) { - connect_to_server (self); - } - else if (self->priv->accounts->next == NULL) { - self->priv->account = g_object_ref (self->priv->accounts->data); - connect_to_server (self); - } - else - show_choose_account_dialog (self); - } - else - start_authorization_process (self); -} - - -void -oauth_authentication_connect (OAuthAuthentication *self, - OAuthAccount *account) -{ - set_account (self, account); - oauth_authentication_auto_connect (self); -} - - -OAuthAccount * -oauth_authentication_get_account (OAuthAuthentication *self) -{ - return self->priv->account; -} - - -GList * -oauth_authentication_get_accounts (OAuthAuthentication *self) -{ - return self->priv->accounts; -} - - -/* -- oauth_authentication_edit_accounts -- */ - - -static void -account_manager_dialog_response_cb (GtkDialog *dialog, - int response_id, - gpointer user_data) -{ - OAuthAuthentication *self = user_data; - - switch (response_id) { - case GTK_RESPONSE_DELETE_EVENT: - case GTK_RESPONSE_CANCEL: - gtk_widget_destroy (GTK_WIDGET (dialog)); - break; - - case GTK_RESPONSE_OK: - _g_object_list_unref (self->priv->accounts); - self->priv->accounts = oauth_account_manager_dialog_get_accounts (OAUTH_ACCOUNT_MANAGER_DIALOG (dialog)); - if (! g_list_find_custom (self->priv->accounts, self->priv->account, (GCompareFunc) oauth_account_cmp)) { - _g_object_unref (self->priv->account); - self->priv->account = NULL; - oauth_authentication_auto_connect (self); - } - else - g_signal_emit (self, oauth_authentication_signals[ACCOUNTS_CHANGED], 0); - oauth_accounts_save_to_file (self->priv->conn->consumer->name, self->priv->accounts, self->priv->account); - gtk_widget_destroy (GTK_WIDGET (dialog)); - break; - - case OAUTH_ACCOUNT_MANAGER_RESPONSE_NEW: - gtk_widget_destroy (GTK_WIDGET (dialog)); - start_authorization_process (self); - break; - - default: - break; - } -} - - -void -oauth_authentication_edit_accounts (OAuthAuthentication *self, - GtkWindow *parent) -{ - GtkWidget *dialog; - - dialog = oauth_account_manager_dialog_new (self->priv->accounts); - g_signal_connect (dialog, - "delete-event", - G_CALLBACK (gtk_true), - NULL); - g_signal_connect (dialog, - "response", - G_CALLBACK (account_manager_dialog_response_cb), - self); - - gtk_window_set_title (GTK_WINDOW (dialog), _("Edit Accounts")); - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self->priv->dialog)); - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - gtk_window_present (GTK_WINDOW (dialog)); -} - - -/* utilities */ - - -GList * -oauth_accounts_load_from_file (const char *service_name, - GType account_type) -{ - GList *accounts = NULL; - char *filename; - char *path; - char *buffer; - gsize len; - GError *error = NULL; - DomDocument *doc; - - filename = g_strconcat (service_name, ".xml", NULL); - path = gth_user_dir_get_file (GTH_DIR_CONFIG, GTHUMB_DIR, "accounts", filename, NULL); - if (! g_file_get_contents (path, &buffer, &len, &error)) { - g_warning ("%s\n", error->message); - g_error_free (error); - g_free (path); - g_free (filename); - return NULL; - } - - doc = dom_document_new (); - if (dom_document_load (doc, buffer, len, NULL)) { - DomElement *node; - - node = DOM_ELEMENT (doc)->first_child; - if ((node != NULL) && (g_strcmp0 (node->tag_name, "accounts") == 0)) { - DomElement *child; - - for (child = node->first_child; - child != NULL; - child = child->next_sibling) - { - if (strcmp (child->tag_name, "account") == 0) { - OAuthAccount *account; - - account = g_object_new (account_type, NULL); - dom_domizable_load_from_element (DOM_DOMIZABLE (account), child); - - accounts = g_list_prepend (accounts, account); - } - } - - accounts = g_list_reverse (accounts); - } - } - - g_object_unref (doc); - g_free (buffer); - g_free (path); - g_free (filename); - - return accounts; -} - - -OAuthAccount * -oauth_accounts_find_default (GList *accounts) -{ - GList *scan; - - for (scan = accounts; scan; scan = scan->next) { - OAuthAccount *account = scan->data; - - if (account->is_default) - return g_object_ref (account); - } - - return NULL; -} - - -void -oauth_accounts_save_to_file (const char *service_name, - GList *accounts, - OAuthAccount *default_account) -{ - DomDocument *doc; - DomElement *root; - GList *scan; - char *buffer; - gsize len; - char *filename; - char *path; - GFile *file; - - doc = dom_document_new (); - root = dom_document_create_element (doc, "accounts", NULL); - dom_element_append_child (DOM_ELEMENT (doc), root); - for (scan = accounts; scan; scan = scan->next) { - OAuthAccount *account = scan->data; - DomElement *node; - - if ((default_account != NULL) && g_strcmp0 (account->username, default_account->username) == 0) - account->is_default = TRUE; - else - account->is_default = FALSE; - node = dom_domizable_create_element (DOM_DOMIZABLE (account), doc); - dom_element_append_child (root, node); - } - - filename = g_strconcat (service_name, ".xml", NULL); - gth_user_dir_make_dir_for_file (GTH_DIR_CONFIG, GTHUMB_DIR, "accounts", filename, NULL); - path = gth_user_dir_get_file (GTH_DIR_CONFIG, GTHUMB_DIR, "accounts", filename, NULL); - file = g_file_new_for_path (path); - buffer = dom_document_dump (doc, &len); - g_write_file (file, FALSE, G_FILE_CREATE_PRIVATE | G_FILE_CREATE_REPLACE_DESTINATION, buffer, len, NULL, NULL); - - g_free (buffer); - g_object_unref (file); - g_free (path); - g_free (filename); - g_object_unref (doc); -} diff -Nru gthumb-3.0.2/extensions/oauth/oauth-authentication.h gthumb-3.2.3/extensions/oauth/oauth-authentication.h --- gthumb-3.0.2/extensions/oauth/oauth-authentication.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/oauth/oauth-authentication.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,82 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef OAUTH_AUTHENTICATION_H -#define OAUTH_AUTHENTICATION_H - -#include -#include -#include "oauth-account.h" -#include "oauth-connection.h" - -G_BEGIN_DECLS - -#define OAUTH_TYPE_AUTHENTICATION (oauth_authentication_get_type ()) -#define OAUTH_AUTHENTICATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), OAUTH_TYPE_AUTHENTICATION, OAuthAuthentication)) -#define OAUTH_AUTHENTICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), OAUTH_TYPE_AUTHENTICATION, OAuthAuthenticationClass)) -#define OAUTH_IS_AUTHENTICATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), OAUTH_TYPE_AUTHENTICATION)) -#define OAUTH_IS_AUTHENTICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), OAUTH_TYPE_AUTHENTICATION)) -#define OAUTH_AUTHENTICATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), OAUTH_TYPE_AUTHENTICATION, OAuthAuthenticationClass)) - -typedef struct _OAuthAuthentication OAuthAuthentication; -typedef struct _OAuthAuthenticationClass OAuthAuthenticationClass; -typedef struct _OAuthAuthenticationPrivate OAuthAuthenticationPrivate; - -struct _OAuthAuthentication { - GObject parent_instance; - OAuthAuthenticationPrivate *priv; -}; - -struct _OAuthAuthenticationClass { - GObjectClass parent_class; - - /*< signals >*/ - - void (*ready) (OAuthAuthentication *auth); - void (*accounts_changed) (OAuthAuthentication *auth); -}; - -GType oauth_authentication_get_type (void); -OAuthAuthentication * oauth_authentication_new (OAuthConnection *conn, - GType account_type, - GCancellable *cancellable, - GtkWidget *browser, - GtkWidget *dialog); -void oauth_authentication_auto_connect (OAuthAuthentication *auth); -void oauth_authentication_connect (OAuthAuthentication *auth, - OAuthAccount *account); -OAuthAccount * oauth_authentication_get_account (OAuthAuthentication *auth); -GList * oauth_authentication_get_accounts (OAuthAuthentication *auth); -void oauth_authentication_edit_accounts (OAuthAuthentication *auth, - GtkWindow *parent); - -/* utilities */ - -GList * oauth_accounts_load_from_file (const char *service_name, - GType account_type); -OAuthAccount * oauth_accounts_find_default (GList *accounts); -void oauth_accounts_save_to_file (const char *service_name, - GList *accounts, - OAuthAccount *default_account); - -G_END_DECLS - -#endif /* OAUTH_AUTHENTICATION_H */ diff -Nru gthumb-3.0.2/extensions/oauth/oauth-connection.c gthumb-3.2.3/extensions/oauth/oauth-connection.c --- gthumb-3.0.2/extensions/oauth/oauth-connection.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/oauth/oauth-connection.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,568 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include -#include "oauth-connection.h" - - -#undef DEBUG_OAUTH_CONNECTION -#define OAUTH_VERSION "1.0" -#define OAUTH_SIGNATURE_METHOD "HMAC-SHA1" - - -G_DEFINE_TYPE (OAuthConnection, oauth_connection, GTH_TYPE_TASK) - - -GQuark -oauth_connection_error_quark (void) -{ - static GQuark quark; - - if (!quark) - quark = g_quark_from_static_string ("oauth_connection"); - - return quark; -} - - -/* -- OAuthConnection -- */ - - -struct _OAuthConnectionPrivate -{ - SoupSession *session; - SoupMessage *msg; - char *timestamp; - char *nonce; - char *signature; - char *token; - char *token_secret; - GCancellable *cancellable; - GSimpleAsyncResult *result; -}; - - -static void -oauth_connection_finalize (GObject *object) -{ - OAuthConnection *self; - - self = OAUTH_CONNECTION (object); - - _g_object_unref (self->priv->result); - _g_object_unref (self->priv->cancellable); - g_free (self->priv->token); - g_free (self->priv->token_secret); - g_free (self->priv->signature); - g_free (self->priv->nonce); - g_free (self->priv->timestamp); - _g_object_unref (self->priv->session); - - G_OBJECT_CLASS (oauth_connection_parent_class)->finalize (object); -} - - -static void -oauth_connection_exec (GthTask *base) -{ - /* void */ -} - - -static void -oauth_connection_cancelled (GthTask *base) -{ - OAuthConnection *self = OAUTH_CONNECTION (base); - - if ((self->priv->session == NULL) || (self->priv->msg == NULL)) - return; - - soup_session_cancel_message (self->priv->session, self->priv->msg, SOUP_STATUS_CANCELLED); -} - - -static void -oauth_connection_class_init (OAuthConnectionClass *klass) -{ - GObjectClass *object_class; - GthTaskClass *task_class; - - g_type_class_add_private (klass, sizeof (OAuthConnectionPrivate)); - - object_class = (GObjectClass*) klass; - object_class->finalize = oauth_connection_finalize; - - task_class = (GthTaskClass*) klass; - task_class->exec = oauth_connection_exec; - task_class->cancelled = oauth_connection_cancelled; -} - - -static void -oauth_connection_init (OAuthConnection *self) -{ - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, OAUTH_TYPE_CONNECTION, OAuthConnectionPrivate); - self->priv->session = NULL; - self->priv->msg = NULL; - self->priv->timestamp = NULL; - self->priv->nonce = NULL; - self->priv->signature = NULL; - self->priv->token = NULL; - self->priv->token_secret = NULL; - self->priv->cancellable = NULL; - self->priv->result = NULL; -} - - -OAuthConnection * -oauth_connection_new (OAuthConsumer *consumer) -{ - OAuthConnection *self; - - self = (OAuthConnection *) g_object_new (OAUTH_TYPE_CONNECTION, NULL); - self->consumer = consumer; - - return self; -} - - -void -oauth_connection_send_message (OAuthConnection *self, - SoupMessage *msg, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data, - gpointer source_tag, - SoupSessionCallback soup_session_cb, - gpointer soup_session_cb_data) -{ - if (self->priv->session == NULL) { - self->priv->session = soup_session_async_new_with_options ( -#ifdef HAVE_LIBSOUP_GNOME - SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_PROXY_RESOLVER_GNOME, -#endif - NULL); - -#ifdef DEBUG_OAUTH_CONNECTION - { - SoupLogger *logger; - - logger = soup_logger_new (SOUP_LOGGER_LOG_BODY, -1); - soup_session_add_feature (self->priv->session, SOUP_SESSION_FEATURE (logger)); - - g_object_unref (logger); - } -#endif - } - - _g_object_unref (self->priv->cancellable); - self->priv->cancellable = _g_object_ref (cancellable); - - _g_object_unref (self->priv->result); - self->priv->result = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - source_tag); - - self->priv->msg = msg; - g_object_add_weak_pointer (G_OBJECT (msg), (gpointer *) &self->priv->msg); - - soup_session_queue_message (self->priv->session, - msg, - soup_session_cb, - soup_session_cb_data); -} - - -GSimpleAsyncResult * -oauth_connection_get_result (OAuthConnection *self) -{ - return self->priv->result; -} - - -void -oauth_connection_reset_result (OAuthConnection *self) -{ - _g_object_unref (self->priv->result); - self->priv->result = NULL; -} - - -/* -- oauth_connection_add_signature -- */ - - -static char * -oauth_create_timestamp (GTimeVal *t) -{ - return g_strdup_printf ("%ld", t->tv_sec); -} - - -static char * -oauth_create_nonce (GTimeVal *t) -{ - char *s; - char *v; - - s = g_strdup_printf ("%ld%u", t->tv_usec, g_random_int ()); - v = g_compute_checksum_for_string (G_CHECKSUM_MD5, s, -1); - - g_free (s); - - return v; -} - - -void -oauth_connection_add_signature (OAuthConnection *self, - const char *method, - const char *url, - GHashTable *parameters) -{ - GTimeVal t; - GString *param_string; - GList *keys; - GList *scan; - GString *base_string; - GString *signature_key; - - /* Add the OAuth specific parameters */ - - g_get_current_time (&t); - - g_free (self->priv->timestamp); - self->priv->timestamp = oauth_create_timestamp (&t); - g_hash_table_insert (parameters, "oauth_timestamp", self->priv->timestamp); - - g_free (self->priv->nonce); - self->priv->nonce = oauth_create_nonce (&t); - g_hash_table_insert (parameters, "oauth_nonce", self->priv->nonce); - - g_hash_table_insert (parameters, "format", "xml"); - g_hash_table_insert (parameters, "oauth_version", OAUTH_VERSION); - g_hash_table_insert (parameters, "oauth_signature_method", OAUTH_SIGNATURE_METHOD); - g_hash_table_insert (parameters, "oauth_consumer_key", (gpointer) self->consumer->consumer_key); - if (self->priv->token != NULL) - g_hash_table_insert (parameters, "oauth_token", self->priv->token); - - /* Create the parameter string */ - - param_string = g_string_new (""); - keys = g_hash_table_get_keys (parameters); - keys = g_list_sort (keys, (GCompareFunc) strcmp); - for (scan = keys; scan; scan = scan->next) { - char *key = scan->data; - char *value = g_hash_table_lookup (parameters, key); - - g_string_append_uri_escaped (param_string, key, NULL, FALSE); - g_string_append (param_string, "="); - g_string_append_uri_escaped (param_string, value, NULL, FALSE); - if (scan->next != NULL) - g_string_append (param_string, "&"); - } - - /* Create the Base String */ - - base_string = g_string_new (""); - g_string_append_uri_escaped (base_string, method, NULL, FALSE); - g_string_append (base_string, "&"); - g_string_append_uri_escaped (base_string, url, NULL, FALSE); - g_string_append (base_string, "&"); - g_string_append_uri_escaped (base_string, param_string->str, NULL, FALSE); - - /* Calculate the signature value */ - - signature_key = g_string_new (""); - g_string_append_uri_escaped (signature_key, self->consumer->consumer_secret, NULL, FALSE); - g_string_append (signature_key, "&"); - if (self->priv->token_secret != NULL) - g_string_append_uri_escaped (signature_key, self->priv->token_secret, NULL, FALSE); - g_free (self->priv->signature); - self->priv->signature = g_compute_signature_for_string (G_CHECKSUM_SHA1, - G_SIGNATURE_ENC_BASE64, - signature_key->str, - signature_key->len, - base_string->str, - base_string->len); - g_hash_table_insert (parameters, "oauth_signature", self->priv->signature); - - g_string_free (signature_key, TRUE); - g_string_free (base_string, TRUE); - g_list_free (keys); - g_string_free (param_string, TRUE); -} - - -/* -- oauth_connection_get_request_token -- */ - - -static void -get_request_token_ready_cb (SoupSession *session, - SoupMessage *msg, - gpointer user_data) -{ - OAuthConnection *self = user_data; - SoupBuffer *body; - - if (msg->status_code != 200) { - g_simple_async_result_set_error (self->priv->result, - SOUP_HTTP_ERROR, - msg->status_code, - "%s", - soup_status_get_phrase (msg->status_code)); - g_simple_async_result_complete_in_idle (self->priv->result); - return; - } - - body = soup_message_body_flatten (msg->response_body); - self->consumer->get_request_token_response (self, msg, body, self->priv->result); - g_simple_async_result_complete_in_idle (self->priv->result); - - soup_buffer_free (body); -} - - -void -oauth_connection_get_request_token (OAuthConnection *self, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - GHashTable *data_set; - SoupMessage *msg; - - gth_task_progress (GTH_TASK (self), _("Connecting to the server"), _("Getting account information"), TRUE, 0.0); - - data_set = g_hash_table_new (g_str_hash, g_str_equal); - oauth_connection_add_signature (self, "POST", self->consumer->request_token_url, data_set); - msg = soup_form_request_new_from_hash ("POST", self->consumer->request_token_url, data_set); - oauth_connection_send_message (self, - msg, - cancellable, - callback, - user_data, - oauth_connection_get_request_token, - get_request_token_ready_cb, - self); - - g_hash_table_destroy (data_set); -} - - -gboolean -oauth_connection_get_request_token_finish (OAuthConnection *self, - GAsyncResult *result, - GError **error) -{ - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return FALSE; - else - return TRUE; -} - - -char * -oauth_connection_get_login_link (OAuthConnection *self) -{ - return self->consumer->get_login_link (self); -} - - -/* -- oauth_connection_get_access_token -- */ - - -static void -get_access_token_ready_cb (SoupSession *session, - SoupMessage *msg, - gpointer user_data) -{ - OAuthConnection *self = user_data; - SoupBuffer *body; - - if (msg->status_code != 200) { - g_simple_async_result_set_error (self->priv->result, - SOUP_HTTP_ERROR, - msg->status_code, - "%s", - soup_status_get_phrase (msg->status_code)); - g_simple_async_result_complete_in_idle (self->priv->result); - return; - } - - body = soup_message_body_flatten (msg->response_body); - self->consumer->get_access_token_response (self, msg, body, self->priv->result); - g_simple_async_result_complete_in_idle (self->priv->result); - - soup_buffer_free (body); -} - - -void -oauth_connection_get_access_token (OAuthConnection *self, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - GHashTable *data_set; - SoupMessage *msg; - - gth_task_progress (GTH_TASK (self), _("Connecting to the server"), _("Getting account information"), TRUE, 0.0); - - data_set = g_hash_table_new (g_str_hash, g_str_equal); - oauth_connection_add_signature (self, "POST", self->consumer->access_token_url, data_set); - msg = soup_form_request_new_from_hash ("POST", self->consumer->access_token_url, data_set); - oauth_connection_send_message (self, - msg, - cancellable, - callback, - user_data, - oauth_connection_get_access_token, - get_access_token_ready_cb, - self); - - g_hash_table_destroy (data_set); -} - - -OAuthAccount * -oauth_connection_get_access_token_finish (OAuthConnection *self, - GAsyncResult *result, - GError **error) -{ - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return FALSE; - else - return g_object_ref (g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result))); -} - - -void -oauth_connection_set_token (OAuthConnection *self, - const char *token, - const char *token_secret) -{ - _g_strset (&self->priv->token, token); - _g_strset (&self->priv->token_secret, token_secret); -} - - -const char * -oauth_connection_get_token (OAuthConnection *self) -{ - return self->priv->token; -} - - -const char * -oauth_connection_get_token_secret (OAuthConnection *self) -{ - return self->priv->token_secret; -} - - -/* -- oauth_connection_check_token -- */ - - -typedef struct { - OAuthConnection *conn; - OAuthAccount *account; -} CheckTokenData; - - -static void -check_token_ready_cb (SoupSession *session, - SoupMessage *msg, - gpointer user_data) -{ - CheckTokenData *check_token_data = user_data; - OAuthConnection *self = check_token_data->conn; - - if (msg->status_code != 200) { - g_simple_async_result_set_error (self->priv->result, - SOUP_HTTP_ERROR, - msg->status_code, - "%s", - soup_status_get_phrase (msg->status_code)); - g_simple_async_result_complete_in_idle (self->priv->result); - return; - } - - self->consumer->check_token_response (self, msg, self->priv->result, check_token_data->account); - g_simple_async_result_complete_in_idle (self->priv->result); - - g_free (check_token_data); -} - - -void -oauth_connection_check_token (OAuthConnection *self, - OAuthAccount *account, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - CheckTokenData *check_token_data; - GHashTable *data_set; - char *url; - SoupMessage *msg; - - check_token_data = g_new0 (CheckTokenData, 1); - check_token_data->conn = self; - check_token_data->account = account; - - gth_task_progress (GTH_TASK (self), _("Connecting to the server"), _("Getting account information"), TRUE, 0.0); - - data_set = g_hash_table_new (g_str_hash, g_str_equal); - - url = self->consumer->get_check_token_url (self, account, TRUE); - oauth_connection_add_signature (self, "GET", url, data_set); - g_free (url); - - url = self->consumer->get_check_token_url (self, account, FALSE); - msg = soup_form_request_new_from_hash ("GET", url, data_set); - oauth_connection_send_message (self, - msg, - cancellable, - callback, - user_data, - oauth_connection_check_token, - check_token_ready_cb, - check_token_data); - - g_free (url); - g_hash_table_destroy (data_set); -} - - -gboolean -oauth_connection_check_token_finish (OAuthConnection *self, - GAsyncResult *result, - GError **error) -{ - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return FALSE; - else - return TRUE; -} diff -Nru gthumb-3.0.2/extensions/oauth/oauth-connection.h gthumb-3.2.3/extensions/oauth/oauth-connection.h --- gthumb-3.0.2/extensions/oauth/oauth-connection.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/oauth/oauth-connection.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,139 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef OAUTH_CONNECTION_H -#define OAUTH_CONNECTION_H - -#include -#ifdef HAVE_LIBSOUP_GNOME -#include -#else -#include -#endif /* HAVE_LIBSOUP_GNOME */ -#include -#include "oauth-account.h" - -#define OAUTH_CONNECTION_ERROR oauth_connection_error_quark () -GQuark oauth_connection_error_quark (void); - -#define OAUTH_CONNECTION_ERROR_INVALID_TOKEN 100 - -#define OAUTH_TYPE_CONNECTION (oauth_connection_get_type ()) -#define OAUTH_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), OAUTH_TYPE_CONNECTION, OAuthConnection)) -#define OAUTH_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), OAUTH_TYPE_CONNECTION, OAuthConnectionClass)) -#define OAUTH_IS_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), OAUTH_TYPE_CONNECTION)) -#define OAUTH_IS_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), OAUTH_TYPE_CONNECTION)) -#define OAUTH_CONNECTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), OAUTH_TYPE_CONNECTION, OAuthConnectionClass)) - -typedef struct _OAuthConnection OAuthConnection; -typedef struct _OAuthConnectionPrivate OAuthConnectionPrivate; -typedef struct _OAuthConnectionClass OAuthConnectionClass; -typedef struct _OAuthConsumer OAuthConsumer; - -struct _OAuthConnection -{ - GthTask __parent; - OAuthConsumer *consumer; - OAuthConnectionPrivate *priv; -}; - -struct _OAuthConnectionClass -{ - GthTaskClass __parent_class; -}; - -GType oauth_connection_get_type (void) G_GNUC_CONST; -OAuthConnection * oauth_connection_new (OAuthConsumer *consumer); -void oauth_connection_send_message (OAuthConnection *self, - SoupMessage *msg, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data, - gpointer source_tag, - SoupSessionCallback soup_session_cb, - gpointer soup_session_cb_data); -GSimpleAsyncResult * oauth_connection_get_result (OAuthConnection *self); -void oauth_connection_reset_result (OAuthConnection *self); -void oauth_connection_add_signature (OAuthConnection *self, - const char *method, - const char *url, - GHashTable *parameters); -void oauth_connection_get_request_token (OAuthConnection *self, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -gboolean oauth_connection_get_request_token_finish (OAuthConnection *self, - GAsyncResult *result, - GError **error); -char * oauth_connection_get_login_link (OAuthConnection *self); -void oauth_connection_get_access_token (OAuthConnection *self, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -OAuthAccount * oauth_connection_get_access_token_finish (OAuthConnection *self, - GAsyncResult *result, - GError **error); -void oauth_connection_set_token (OAuthConnection *self, - const char *token, - const char *token_secret); -const char * oauth_connection_get_token (OAuthConnection *self); -const char * oauth_connection_get_token_secret (OAuthConnection *self); -void oauth_connection_check_token (OAuthConnection *self, - OAuthAccount *account, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -gboolean oauth_connection_check_token_finish (OAuthConnection *self, - GAsyncResult *result, - GError **error); - -/* -- OAuthConsumer -- */ - -typedef void (*OAuthResponseFunc) (OAuthConnection *self, - SoupMessage *msg, - SoupBuffer *body, - GSimpleAsyncResult *result); -typedef void (*OAuthAccountResponseFunc) (OAuthConnection *self, - SoupMessage *msg, - GSimpleAsyncResult *result, - OAuthAccount *account); -typedef char * (*OAuthStringFunc) (OAuthConnection *self); -typedef char * (*OAuthUrlFunc) (OAuthConnection *self, - OAuthAccount *account, - gboolean for_signature); - -struct _OAuthConsumer { - const char *display_name; - const char *name; - const char *url; - const char *protocol; - const char *consumer_key; - const char *consumer_secret; - const char *request_token_url; - OAuthResponseFunc get_request_token_response; - OAuthStringFunc get_login_link; - const char *access_token_url; - OAuthResponseFunc get_access_token_response; - OAuthUrlFunc get_check_token_url; - OAuthAccountResponseFunc check_token_response; -}; - -#endif /* OAUTH_CONNECTION_H */ diff -Nru gthumb-3.0.2/extensions/oauth/oauth-consumer.c gthumb-3.2.3/extensions/oauth/oauth-consumer.c --- gthumb-3.0.2/extensions/oauth/oauth-consumer.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/oauth/oauth-consumer.c 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,51 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include "oauth-consumer.h" + + +OAuthConsumer * +oauth_consumer_copy (OAuthConsumer *consumer) +{ + OAuthConsumer *consumer_2; + + consumer_2 = g_new0 (OAuthConsumer, 1); + consumer_2->consumer_key = consumer->consumer_key; + consumer_2->consumer_secret = consumer->consumer_secret; + consumer_2->request_token_url = consumer->request_token_url; + consumer_2->get_authorization_url = consumer->get_authorization_url; + consumer_2->access_token_url = consumer->access_token_url; + consumer_2->access_token_response = consumer->access_token_response; + + return consumer_2; +} + + +void +oauth_consumer_free (OAuthConsumer *consumer) +{ + if (consumer == NULL) + return; + g_free (consumer); +} diff -Nru gthumb-3.0.2/extensions/oauth/oauth-consumer.h gthumb-3.2.3/extensions/oauth/oauth-consumer.h --- gthumb-3.0.2/extensions/oauth/oauth-consumer.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/oauth/oauth-consumer.h 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,57 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef OAUTH_CONSUMER_H +#define OAUTH_CONSUMER_H + + +#include +#ifdef HAVE_LIBSOUP_GNOME +#include +#else +#include +#endif /* HAVE_LIBSOUP_GNOME */ +#include "oauth-account.h" +#include "oauth-service.h" + + +typedef void (*OAuthResponseFunc) (OAuthService *self, + SoupMessage *msg, + SoupBuffer *body, + GSimpleAsyncResult *result); +typedef char * (*OAuthStringFunc) (OAuthService *self); + + +typedef struct { + const char *consumer_key; + const char *consumer_secret; + const char *request_token_url; + OAuthStringFunc get_authorization_url; + const char *access_token_url; + OAuthResponseFunc access_token_response; +} OAuthConsumer; + + +OAuthConsumer * oauth_consumer_copy (OAuthConsumer *consumer); +void oauth_consumer_free (OAuthConsumer *consumer); + + +#endif /* OAUTH_CONSUMER_H */ diff -Nru gthumb-3.0.2/extensions/oauth/oauth-service.c gthumb-3.2.3/extensions/oauth/oauth-service.c --- gthumb-3.0.2/extensions/oauth/oauth-service.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/oauth/oauth-service.c 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,558 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include +#include "oauth-ask-authorization-dialog.h" +#include "oauth-consumer.h" +#include "oauth-service.h" + + +#define OAUTH_VERSION "1.0" +#define OAUTH_SIGNATURE_METHOD "HMAC-SHA1" +#define OAUTH_CALLBACK "http://localhost/" + + +G_DEFINE_TYPE (OAuthService, oauth_service, WEB_TYPE_SERVICE) + + +enum { + PROP_0, + PROP_CONSUMER +}; + + +struct _OAuthServicePrivate { + OAuthConsumer *consumer; + char *timestamp; + char *nonce; + char *signature; + char *token; + char *token_secret; + char *verifier; +}; + + +static void +oauth_service_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + OAuthService *self; + + self = OAUTH_SERVICE (object); + + switch (property_id) { + case PROP_CONSUMER: + self->priv->consumer = g_value_get_pointer (value); + break; + default: + break; + } +} + + +static void +oauth_service_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) +{ + OAuthService *self; + + self = OAUTH_SERVICE (object); + + switch (property_id) { + case PROP_CONSUMER: + g_value_set_pointer (value, self->priv->consumer); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + + +static void +oauth_service_finalize (GObject *object) +{ + OAuthService *self; + + self = OAUTH_SERVICE (object); + + g_free (self->priv->verifier); + g_free (self->priv->token); + g_free (self->priv->token_secret); + g_free (self->priv->signature); + g_free (self->priv->nonce); + g_free (self->priv->timestamp); + + G_OBJECT_CLASS (oauth_service_parent_class)->finalize (object); +} + + +/* -- oauth_service_get_request_token -- */ + + +static void +_oauth_service_get_request_token_ready_cb (SoupSession *session, + SoupMessage *msg, + gpointer user_data) +{ + OAuthService *self = user_data; + GSimpleAsyncResult *result; + SoupBuffer *body; + GHashTable *values; + char *token; + char *token_secret; + + result = _web_service_get_result (WEB_SERVICE (self)); + + if (msg->status_code != 200) { + g_simple_async_result_set_error (result, + SOUP_HTTP_ERROR, + msg->status_code, + "%s", + soup_status_get_phrase (msg->status_code)); + g_simple_async_result_complete_in_idle (result); + return; + } + + body = soup_message_body_flatten (msg->response_body); + values = soup_form_decode (body->data); + token = g_hash_table_lookup (values, "oauth_token"); + token_secret = g_hash_table_lookup (values, "oauth_token_secret"); + if ((token != NULL) && (token_secret != NULL)) { + oauth_service_set_token (self, token); + oauth_service_set_token_secret (self, token_secret); + g_simple_async_result_set_op_res_gboolean (result, TRUE); + } + else { + GError *error; + + error = g_error_new_literal (WEB_SERVICE_ERROR, WEB_SERVICE_ERROR_GENERIC, _("Unknown error")); + g_simple_async_result_set_from_error (result, error); + } + + g_simple_async_result_complete_in_idle (result); + + g_hash_table_destroy (values); + soup_buffer_free (body); +} + + +static void +_oauth_service_get_request_token (OAuthService *self, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GHashTable *data_set; + SoupMessage *msg; + + data_set = g_hash_table_new (g_str_hash, g_str_equal); + g_hash_table_insert (data_set, "oauth_callback", OAUTH_CALLBACK); + oauth_service_add_signature (self, "POST", self->priv->consumer->request_token_url, data_set); + msg = soup_form_request_new_from_hash ("POST", self->priv->consumer->request_token_url, data_set); + _web_service_send_message (WEB_SERVICE (self), + msg, + cancellable, + callback, + user_data, + _oauth_service_get_request_token, + _oauth_service_get_request_token_ready_cb, + self); + + g_hash_table_destroy (data_set); +} + + +gboolean +oauth_service_get_request_token_finish (OAuthService *self, + GAsyncResult *result, + GError **error) +{ + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) + return FALSE; + else + return TRUE; +} + + +/* -- _oauth_service_get_access_token -- */ + + +static void +_oauth_service_get_access_token_ready_cb (SoupSession *session, + SoupMessage *msg, + gpointer user_data) +{ + OAuthService *self = user_data; + GSimpleAsyncResult *result; + SoupBuffer *body; + + result = _web_service_get_result (WEB_SERVICE (self)); + + if (msg->status_code != 200) { + g_simple_async_result_set_error (result, + SOUP_HTTP_ERROR, + msg->status_code, + "%s", + soup_status_get_phrase (msg->status_code)); + g_simple_async_result_complete_in_idle (result); + return; + } + + body = soup_message_body_flatten (msg->response_body); + self->priv->consumer->access_token_response (self, msg, body, result); + g_simple_async_result_complete_in_idle (result); + + soup_buffer_free (body); +} + + +static void +_oauth_service_get_access_token (OAuthService *self, + const char *verifier, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GHashTable *data_set; + SoupMessage *msg; + + data_set = g_hash_table_new (g_str_hash, g_str_equal); + if (verifier != NULL) + g_hash_table_insert (data_set, "oauth_verifier", (gpointer) verifier); + oauth_service_add_signature (self, "POST", self->priv->consumer->access_token_url, data_set); + msg = soup_form_request_new_from_hash ("POST", self->priv->consumer->access_token_url, data_set); + _web_service_send_message (WEB_SERVICE (self), + msg, + cancellable, + callback, + user_data, + _oauth_service_get_access_token, + _oauth_service_get_access_token_ready_cb, + self); + + g_hash_table_destroy (data_set); +} + + +static OAuthAccount * +_oauth_service_get_access_token_finish (OAuthService *self, + GAsyncResult *result, + GError **error) +{ + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) + return FALSE; + else + return g_object_ref (g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result))); +} + + +/* -- oauth_service_ask_authorization -- */ + + +static void +get_access_token_ready_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) +{ + OAuthService *self = user_data; + GError *error = NULL; + GtkWidget *dialog; + OAuthAccount *account; + + dialog = _web_service_get_auth_dialog (WEB_SERVICE (self)); + account = _oauth_service_get_access_token_finish (self, result, &error); + if (account == NULL) { + gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL); + gth_task_completed (GTH_TASK (self), error); + return; + } + + web_service_set_current_account (WEB_SERVICE (self), account); + gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); + + g_object_unref (account); +} + + +static void +ask_authorization_dialog_load_request_cb (OAuthAskAuthorizationDialog *dialog, + gpointer user_data) +{ + OAuthService *self = user_data; + const char *uri; + + uri = oauth_ask_authorization_dialog_get_uri (dialog); + if (uri == NULL) + return; + + if (g_str_has_prefix (uri, OAUTH_CALLBACK)) { + const char *uri_data; + GHashTable *data; + gboolean success = FALSE; + + uri_data = uri + strlen (OAUTH_CALLBACK "?"); + + data = soup_form_decode (uri_data); + _g_strset (&self->priv->token, g_hash_table_lookup (data, "oauth_token")); + + if (self->priv->token != NULL) { + gtk_widget_hide (GTK_WIDGET (dialog)); + gth_task_dialog (GTH_TASK (self), FALSE, NULL); + + success = TRUE; + _oauth_service_get_access_token (self, + g_hash_table_lookup (data, "oauth_verifier"), + gth_task_get_cancellable (GTH_TASK (self)), + get_access_token_ready_cb, + self); + } + + if (! success) + gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL); + + g_hash_table_destroy (data); + } +} + + +static void +get_request_token_ready_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) +{ + OAuthService *self = user_data; + GError *error = NULL; + char *url; + GtkWidget *dialog; + + if (! oauth_service_get_request_token_finish (self, result, &error)) { + gth_task_completed (GTH_TASK (self), error); + return; + } + + url = self->priv->consumer->get_authorization_url (self); + dialog = oauth_ask_authorization_dialog_new (url); + _gtk_window_resize_to_fit_screen_height (dialog, 1024); + _web_service_set_auth_dialog (WEB_SERVICE (self), GTK_DIALOG (dialog)); + g_signal_connect (OAUTH_ASK_AUTHORIZATION_DIALOG (dialog), + "load-request", + G_CALLBACK (ask_authorization_dialog_load_request_cb), + self); + gtk_widget_show (dialog); + + g_free (url); +} + + +static void +oauth_service_ask_authorization (WebService *base) +{ + OAuthService *self = OAUTH_SERVICE (base); + + oauth_service_set_token (self, NULL); + oauth_service_set_token_secret (self, NULL); + _oauth_service_get_request_token (self, + gth_task_get_cancellable (GTH_TASK (self)), + get_request_token_ready_cb, + self); +} + + +static void +oauth_service_class_init (OAuthServiceClass *klass) +{ + GObjectClass *object_class; + WebServiceClass *service_class; + + g_type_class_add_private (klass, sizeof (OAuthServicePrivate)); + + object_class = (GObjectClass*) klass; + object_class->set_property = oauth_service_set_property; + object_class->get_property = oauth_service_get_property; + object_class->finalize = oauth_service_finalize; + + service_class = (WebServiceClass*) klass; + service_class->ask_authorization = oauth_service_ask_authorization; + + /* properties */ + + g_object_class_install_property (object_class, + PROP_CONSUMER, + g_param_spec_pointer ("consumer", + "Consumer", + "", + G_PARAM_READWRITE)); +} + + +static void +oauth_service_init (OAuthService *self) +{ + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, OAUTH_TYPE_SERVICE, OAuthServicePrivate); + self->priv->consumer = NULL; + self->priv->timestamp = NULL; + self->priv->nonce = NULL; + self->priv->signature = NULL; + self->priv->token = NULL; + self->priv->token_secret = NULL; + self->priv->verifier = NULL; +} + + +/* -- oauth_service_add_signature -- */ + + +static char * +oauth_create_timestamp (GTimeVal *t) +{ + return g_strdup_printf ("%ld", t->tv_sec); +} + + +static char * +oauth_create_nonce (GTimeVal *t) +{ + char *s; + char *v; + + s = g_strdup_printf ("%ld%u", t->tv_usec, g_random_int ()); + v = g_compute_checksum_for_string (G_CHECKSUM_MD5, s, -1); + + g_free (s); + + return v; +} + + +void +oauth_service_add_signature (OAuthService *self, + const char *method, + const char *url, + GHashTable *parameters) +{ + GTimeVal t; + GString *param_string; + GList *keys; + GList *scan; + GString *base_string; + GString *signature_key; + + /* Add the OAuth specific parameters */ + + g_get_current_time (&t); + + g_free (self->priv->timestamp); + self->priv->timestamp = oauth_create_timestamp (&t); + g_hash_table_insert (parameters, "oauth_timestamp", self->priv->timestamp); + + g_free (self->priv->nonce); + self->priv->nonce = oauth_create_nonce (&t); + g_hash_table_insert (parameters, "oauth_nonce", self->priv->nonce); + g_hash_table_insert (parameters, "oauth_version", OAUTH_VERSION); + g_hash_table_insert (parameters, "oauth_signature_method", OAUTH_SIGNATURE_METHOD); + g_hash_table_insert (parameters, "oauth_consumer_key", (gpointer) self->priv->consumer->consumer_key); + if (self->priv->token != NULL) + g_hash_table_insert (parameters, "oauth_token", self->priv->token); + + /* Create the parameter string */ + + param_string = g_string_new (""); + keys = g_hash_table_get_keys (parameters); + keys = g_list_sort (keys, (GCompareFunc) strcmp); + for (scan = keys; scan; scan = scan->next) { + char *key = scan->data; + char *value = g_hash_table_lookup (parameters, key); + + g_string_append_uri_escaped (param_string, key, NULL, FALSE); + g_string_append (param_string, "="); + g_string_append_uri_escaped (param_string, value, NULL, FALSE); + if (scan->next != NULL) + g_string_append (param_string, "&"); + } + + /* Create the Base String */ + + base_string = g_string_new (""); + g_string_append_uri_escaped (base_string, method, NULL, FALSE); + g_string_append (base_string, "&"); + g_string_append_uri_escaped (base_string, url, NULL, FALSE); + g_string_append (base_string, "&"); + g_string_append_uri_escaped (base_string, param_string->str, NULL, FALSE); + + /* Calculate the signature value */ + + signature_key = g_string_new (""); + g_string_append_uri_escaped (signature_key, self->priv->consumer->consumer_secret, NULL, FALSE); + g_string_append (signature_key, "&"); + if (self->priv->token_secret != NULL) + g_string_append_uri_escaped (signature_key, self->priv->token_secret, NULL, FALSE); + g_free (self->priv->signature); + self->priv->signature = g_compute_signature_for_string (G_CHECKSUM_SHA1, + G_SIGNATURE_ENC_BASE64, + signature_key->str, + signature_key->len, + base_string->str, + base_string->len); + g_hash_table_insert (parameters, "oauth_signature", self->priv->signature); + + g_string_free (signature_key, TRUE); + g_string_free (base_string, TRUE); + g_list_free (keys); + g_string_free (param_string, TRUE); +} + + +void +oauth_service_set_token (OAuthService *self, + const char *token) +{ + _g_strset (&self->priv->token, token); +} + + +const char * +oauth_service_get_token (OAuthService *self) +{ + return self->priv->token; +} + + +void +oauth_service_set_token_secret (OAuthService *self, + const char *token_secret) +{ + _g_strset (&self->priv->token_secret, token_secret); +} + + +const char * +oauth_service_get_token_secret (OAuthService *self) +{ + return self->priv->token_secret; +} diff -Nru gthumb-3.0.2/extensions/oauth/oauth-service.h gthumb-3.2.3/extensions/oauth/oauth-service.h --- gthumb-3.0.2/extensions/oauth/oauth-service.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/oauth/oauth-service.h 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,60 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef OAUTH_SERVICE_H +#define OAUTH_SERVICE_H + +#include +#include "web-service.h" + +#define OAUTH_TYPE_SERVICE (oauth_service_get_type ()) +#define OAUTH_SERVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), OAUTH_TYPE_SERVICE, OAuthService)) +#define OAUTH_SERVICE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), OAUTH_TYPE_SERVICE, OAuthServiceClass)) +#define OAUTH_IS_SERVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), OAUTH_TYPE_SERVICE)) +#define OAUTH_IS_SERVICE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), OAUTH_TYPE_SERVICE)) +#define OAUTH_SERVICE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), OAUTH_TYPE_SERVICE, OAuthServiceClass)) + +typedef struct _OAuthService OAuthService; +typedef struct _OAuthServicePrivate OAuthServicePrivate; +typedef struct _OAuthServiceClass OAuthServiceClass; + +struct _OAuthService { + WebService __parent; + OAuthServicePrivate *priv; +}; + +struct _OAuthServiceClass { + WebServiceClass __parent_class; +}; + +GType oauth_service_get_type (void) G_GNUC_CONST; +void oauth_service_add_signature (OAuthService *self, + const char *method, + const char *url, + GHashTable *parameters); +void oauth_service_set_token (OAuthService *self, + const char *token); +const char * oauth_service_get_token (OAuthService *self); +void oauth_service_set_token_secret (OAuthService *self, + const char *token_secret); +const char * oauth_service_get_token_secret (OAuthService *self); + +#endif /* OAUTH_SERVICE_H */ diff -Nru gthumb-3.0.2/extensions/oauth/oauth.h gthumb-3.2.3/extensions/oauth/oauth.h --- gthumb-3.0.2/extensions/oauth/oauth.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/oauth/oauth.h 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,33 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef OAUTH_H +#define OAUTH_H + +#include +#include +#include +#include +#include +#include +#include + +#endif /* OAUTH_H */ diff -Nru gthumb-3.0.2/extensions/oauth/web-service.c gthumb-3.2.3/extensions/oauth/web-service.c --- gthumb-3.0.2/extensions/oauth/web-service.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/oauth/web-service.c 2013-07-07 11:32:04.000000000 +0000 @@ -0,0 +1,966 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#ifdef HAVE_LIBSOUP_GNOME +#include +#else +#include +#endif /* HAVE_LIBSOUP_GNOME */ +#ifdef HAVE_LIBSECRET +#include +#endif /* HAVE_LIBSECRET */ +#include "oauth-account-manager-dialog.h" +#include "oauth-account-chooser-dialog.h" +#include "web-service.h" + + +#undef DEBUG_WEB_CONNECTION +#define WEB_AUTHENTICATION_RESPONSE_CHOOSE_ACCOUNT 2 + + +GQuark +web_service_error_quark (void) +{ + static GQuark quark; + + if (! quark) + quark = g_quark_from_static_string ("web-service-error"); + + return quark; +} + + +G_DEFINE_TYPE (WebService, web_service, GTH_TYPE_TASK) + + +enum { + PROP_0, + PROP_SERVICE_NAME, + PROP_SERVICE_ADDRESS, + PROP_SERVICE_PROTOCOL, + PROP_ACCOUNT_TYPE, + PROP_CANCELLABLE, + PROP_BROWSER, + PROP_DIALOG +}; + + +/* Signals */ +enum { + ACCOUNT_READY, + ACCOUNTS_CHANGED, + LAST_SIGNAL +}; + + +static guint web_service_signals[LAST_SIGNAL] = { 0 }; + + +struct _WebServicePrivate +{ + char *service_name; + char *service_address; + char *service_protocol; + GType account_type; + SoupSession *session; + SoupMessage *msg; + GCancellable *cancellable; + GSimpleAsyncResult *result; + GList *accounts; + OAuthAccount *account; + GtkWidget *browser; + GtkWidget *dialog; + GtkWidget *auth_dialog; +}; + + +static void +web_service_finalize (GObject *object) +{ + WebService *self = WEB_SERVICE (object); + + _g_object_unref (self->priv->account); + _g_object_list_unref (self->priv->accounts); + _g_object_unref (self->priv->result); + _g_object_unref (self->priv->cancellable); + _g_object_unref (self->priv->session); + g_free (self->priv->service_protocol); + g_free (self->priv->service_address); + g_free (self->priv->service_name); + + G_OBJECT_CLASS (web_service_parent_class)->finalize (object); +} + + +static void +web_service_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + WebService *self = WEB_SERVICE (object); + + switch (property_id) { + case PROP_SERVICE_NAME: + _g_strset (&self->priv->service_name, g_value_get_string (value)); + break; + case PROP_SERVICE_ADDRESS: + _g_strset (&self->priv->service_address, g_value_get_string (value)); + break; + case PROP_SERVICE_PROTOCOL: + _g_strset (&self->priv->service_protocol, g_value_get_string (value)); + break; + case PROP_ACCOUNT_TYPE: + self->priv->account_type = g_value_get_gtype (value); + break; + case PROP_CANCELLABLE: + _g_object_unref (self->priv->cancellable); + self->priv->cancellable = g_value_dup_object (value); + break; + case PROP_BROWSER: + self->priv->browser = g_value_get_pointer (value); + break; + case PROP_DIALOG: + self->priv->dialog = g_value_get_pointer (value); + break; + default: + break; + } +} + + +static void +web_service_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) +{ + WebService *self = WEB_SERVICE (object); + + switch (property_id) { + case PROP_SERVICE_NAME: + g_value_set_string (value, self->priv->service_name); + break; + case PROP_SERVICE_ADDRESS: + g_value_set_string (value, self->priv->service_address); + break; + case PROP_SERVICE_PROTOCOL: + g_value_set_string (value, self->priv->service_protocol); + break; + case PROP_ACCOUNT_TYPE: + g_value_set_gtype (value, self->priv->account_type); + break; + case PROP_CANCELLABLE: + g_value_set_object (value, self->priv->cancellable); + break; + case PROP_BROWSER: + g_value_set_pointer (value, self->priv->browser); + break; + case PROP_DIALOG: + g_value_set_pointer (value, self->priv->dialog); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + + +static void +web_service_constructed (GObject *object) +{ + WebService *self = WEB_SERVICE (object); + + self->priv->accounts = oauth_accounts_load_from_file (self->priv->service_name, self->priv->account_type); + self->priv->account = oauth_accounts_find_default (self->priv->accounts); + + if (G_OBJECT_CLASS (web_service_parent_class)->constructed != NULL) + G_OBJECT_CLASS (web_service_parent_class)->constructed (object); +} + + +static void +web_service_exec (GthTask *base) +{ + /* void */ +} + + +static void +web_service_cancelled (GthTask *base) +{ + WebService *self = WEB_SERVICE (base); + + if ((self->priv->session == NULL) || (self->priv->msg == NULL)) + return; + + soup_session_cancel_message (self->priv->session, + self->priv->msg, + SOUP_STATUS_CANCELLED); +} + + +static void +web_service_class_init (WebServiceClass *klass) +{ + GObjectClass *object_class; + GthTaskClass *task_class; + + g_type_class_add_private (klass, sizeof (WebServicePrivate)); + + object_class = (GObjectClass*) klass; + object_class->finalize = web_service_finalize; + object_class->set_property = web_service_set_property; + object_class->get_property = web_service_get_property; + object_class->constructed = web_service_constructed; + + task_class = (GthTaskClass*) klass; + task_class->exec = web_service_exec; + task_class->cancelled = web_service_cancelled; + + /* properties */ + + g_object_class_install_property (object_class, + PROP_SERVICE_NAME, + g_param_spec_string ("service-name", + "Service Name", + "", + NULL, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + g_object_class_install_property (object_class, + PROP_SERVICE_ADDRESS, + g_param_spec_string ("service-address", + "Service Address", + "", + NULL, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + g_object_class_install_property (object_class, + PROP_SERVICE_PROTOCOL, + g_param_spec_string ("service-protocol", + "Service Protocol", + "", + NULL, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + g_object_class_install_property (object_class, + PROP_ACCOUNT_TYPE, + g_param_spec_gtype ("account-type", + "Account type", + "", + OAUTH_TYPE_ACCOUNT, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + g_object_class_install_property (object_class, + PROP_CANCELLABLE, + g_param_spec_object ("cancellable", + "Cancellable", + "", + G_TYPE_CANCELLABLE, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_BROWSER, + g_param_spec_pointer ("browser", + "Browser", + "", + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_DIALOG, + g_param_spec_pointer ("dialog", + "Dialog", + "", + G_PARAM_READWRITE)); + + /* signals */ + + web_service_signals[ACCOUNT_READY] = + g_signal_new ("account-ready", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (WebServiceClass, account_ready), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); + web_service_signals[ACCOUNTS_CHANGED] = + g_signal_new ("accounts-changed", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (WebServiceClass, accounts_changed), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); +} + + +static void +web_service_init (WebService *self) +{ + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, WEB_TYPE_SERVICE, WebServicePrivate); + self->priv->service_name = NULL; + self->priv->service_address = NULL; + self->priv->service_protocol = NULL; + self->priv->account_type = OAUTH_TYPE_ACCOUNT; + self->priv->session = NULL; + self->priv->msg = NULL; + self->priv->cancellable = NULL; + self->priv->result = NULL; + self->priv->accounts = NULL; + self->priv->account = NULL; + self->priv->browser = NULL; + self->priv->dialog = NULL; + self->priv->auth_dialog = NULL; +} + + +/* -- authentication error dialog -- */ + + +static void show_choose_account_dialog (WebService *self); + + +static void +authentication_error_dialog_response_cb (GtkDialog *dialog, + int response_id, + gpointer user_data) +{ + WebService *self = user_data; + + switch (response_id) { + case GTK_RESPONSE_DELETE_EVENT: + case GTK_RESPONSE_CANCEL: + gtk_widget_destroy (GTK_WIDGET (dialog)); + gtk_dialog_response (GTK_DIALOG (self->priv->dialog), GTK_RESPONSE_DELETE_EVENT); + break; + + case WEB_AUTHENTICATION_RESPONSE_CHOOSE_ACCOUNT: + gtk_widget_destroy (GTK_WIDGET (dialog)); + show_choose_account_dialog (self); + break; + + default: + break; + } +} + + +static void +show_authentication_error_dialog (WebService *self, + GError **error) +{ + GtkWidget *dialog; + + if (g_error_matches (*error, WEB_SERVICE_ERROR, WEB_SERVICE_ERROR_TOKEN_EXPIRED)) { + web_service_ask_authorization (self); + return; + } + + dialog = _gtk_message_dialog_new (GTK_WINDOW (self->priv->browser), + GTK_DIALOG_MODAL, + GTK_STOCK_DIALOG_ERROR, + _("Could not connect to the server"), + (*error)->message, + _("Choose _Account..."), WEB_AUTHENTICATION_RESPONSE_CHOOSE_ACCOUNT, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + NULL); + gth_task_dialog (GTH_TASK (self), TRUE, dialog); + + g_signal_connect (dialog, + "delete-event", + G_CALLBACK (gtk_true), + NULL); + g_signal_connect (dialog, + "response", + G_CALLBACK (authentication_error_dialog_response_cb), + self); + gtk_widget_show (dialog); + + g_clear_error (error); +} + + +/* -- web_service_autoconnect -- */ + + +static void +set_current_account (WebService *self, + OAuthAccount *account) +{ + GList *link; + + if (self->priv->account == account) + return; + + link = g_list_find_custom (self->priv->accounts, account, (GCompareFunc) oauth_account_cmp); + if (link != NULL) { + self->priv->accounts = g_list_remove_link (self->priv->accounts, link); + _g_object_list_unref (link); + } + + _g_object_unref (self->priv->account); + self->priv->account = NULL; + + if (account != NULL) { + self->priv->account = g_object_ref (account); + self->priv->accounts = g_list_prepend (self->priv->accounts, g_object_ref (self->priv->account)); + } +} + + +#ifdef HAVE_LIBSECRET + + +static char * +serialize_secret (const char *token, + const char *token_secret) +{ + GVariantBuilder *builder; + GVariant *variant; + char *secret; + + builder = g_variant_builder_new (G_VARIANT_TYPE_ARRAY); + g_variant_builder_add (builder, "ms", token); + g_variant_builder_add (builder, "ms", token_secret); + variant = g_variant_builder_end (builder); + secret = g_variant_print (variant, TRUE); + + g_variant_unref (variant); + + return secret; +} + + +static gboolean +deserialize_secret (const char *secret, + char **token, + char **token_secret) +{ + GVariant *variant; + + variant = g_variant_parse (NULL, secret, NULL, NULL, NULL); + if (variant == NULL) + return FALSE; + + if (token != NULL) + g_variant_get_child (variant, 0, "ms", token, NULL); + if (token_secret != NULL) + g_variant_get_child (variant, 1, "ms", token_secret, NULL); + + g_variant_unref (variant); + + return TRUE; +} + + +static void +password_store_ready_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) +{ + WebService *self = user_data; + + secret_password_store_finish (result, NULL); + web_service_account_ready (self); +} + + +#endif + + +static void +get_user_info_ready_cb (GObject *source_object, + GAsyncResult *res, + gpointer user_data) +{ + WebService *self = user_data; + GError *error = NULL; + OAuthAccount *account; + + account = web_service_get_user_info_finish (self, res, &error); + if (account == NULL) { + show_authentication_error_dialog (self, &error); + return; + } + + set_current_account (self, account); + oauth_accounts_save_to_file (self->priv->service_name, + self->priv->accounts, + self->priv->account); + +#ifdef HAVE_LIBSECRET + { + char *secret; + + secret = serialize_secret (account->token, account->token_secret); + secret_password_store (SECRET_SCHEMA_COMPAT_NETWORK, + NULL, + self->priv->service_name, + secret, + self->priv->cancellable, + password_store_ready_cb, + self, + "user", account->id, + "server", self->priv->service_address, + "protocol", self->priv->service_protocol, + NULL); + + g_free (secret); + } +#else + web_service_account_ready (self); +#endif + + g_object_unref (account); +} + + +static void +connect_to_server_step2 (WebService *self) +{ + if ((self->priv->account->token == NULL) && (self->priv->account->token_secret == NULL)) { + web_service_ask_authorization (self); + return; + } + web_service_get_user_info (self, + self->priv->cancellable, + get_user_info_ready_cb, + self); +} + + +#ifdef HAVE_LIBSECRET + + +static void +password_lookup_ready_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) +{ + WebService *self = user_data; + char *secret; + + secret = secret_password_lookup_finish (result, NULL); + if (secret != NULL) { + char *token; + char *token_secret; + + if (deserialize_secret (secret, &token, &token_secret)) { + g_object_set (G_OBJECT (self->priv->account), + "token", token, + "token-secret", token_secret, + NULL); + + g_free (token); + g_free (token_secret); + } + + g_free (secret); + } + + connect_to_server_step2 (self); +} + + +#endif + + +static void +connect_to_server (WebService *self) +{ + g_return_if_fail (self->priv->account != NULL); + g_return_if_fail (self->priv->account->id != NULL); + +#ifdef HAVE_LIBSECRET + if (self->priv->account->token_secret == NULL) { + secret_password_lookup (SECRET_SCHEMA_COMPAT_NETWORK, + self->priv->cancellable, + password_lookup_ready_cb, + self, + "user", self->priv->account->id, + "server", self->priv->service_address, + "protocol", self->priv->service_protocol, + NULL); + return; + } +#endif + + connect_to_server_step2 (self); +} + + +static void +account_chooser_dialog_response_cb (GtkDialog *dialog, + int response_id, + gpointer user_data) +{ + WebService *self = user_data; + + switch (response_id) { + case GTK_RESPONSE_DELETE_EVENT: + case GTK_RESPONSE_CANCEL: + gtk_widget_destroy (GTK_WIDGET (dialog)); + gtk_dialog_response (GTK_DIALOG (self->priv->dialog), GTK_RESPONSE_DELETE_EVENT); + break; + + case GTK_RESPONSE_OK: + _g_object_unref (self->priv->account); + self->priv->account = oauth_account_chooser_dialog_get_active (OAUTH_ACCOUNT_CHOOSER_DIALOG (dialog)); + if (self->priv->account != NULL) { + gtk_widget_destroy (GTK_WIDGET (dialog)); + connect_to_server (self); + } + break; + + case OAUTH_ACCOUNT_CHOOSER_RESPONSE_NEW: + gtk_widget_destroy (GTK_WIDGET (dialog)); + web_service_ask_authorization (self); + break; + + default: + break; + } +} + + +static void +show_choose_account_dialog (WebService *self) +{ + GtkWidget *dialog; + + gth_task_dialog (GTH_TASK (self), TRUE, NULL); + dialog = oauth_account_chooser_dialog_new (self->priv->accounts, self->priv->account); + g_signal_connect (dialog, + "delete-event", + G_CALLBACK (gtk_true), + NULL); + g_signal_connect (dialog, + "response", + G_CALLBACK (account_chooser_dialog_response_cb), + self); + + gtk_window_set_title (GTK_WINDOW (dialog), _("Choose Account")); + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self->priv->browser)); + gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); + gtk_window_present (GTK_WINDOW (dialog)); +} + + +void +web_service_autoconnect (WebService *self) +{ + gtk_widget_hide (self->priv->dialog); + gth_task_dialog (GTH_TASK (self), FALSE, NULL); + + if (self->priv->accounts != NULL) { + if (self->priv->account != NULL) { + connect_to_server (self); + } + else if (self->priv->accounts->next == NULL) { + self->priv->account = g_object_ref (self->priv->accounts->data); + connect_to_server (self); + } + else + show_choose_account_dialog (self); + } + else + web_service_ask_authorization (self); +} + + +void +web_service_connect (WebService *self, + OAuthAccount *account) +{ + set_current_account (self, account); + web_service_autoconnect (self); +} + + +void +web_service_set_current_account (WebService *self, + OAuthAccount *account) +{ + set_current_account (self, account); +} + + +OAuthAccount * +web_service_get_current_account (WebService *self) +{ + return self->priv->account; +} + + +GList * +web_service_get_accounts (WebService *self) +{ + return self->priv->accounts; +} + + +/* -- web_service_edit_accounts -- */ + + +static void +account_manager_dialog_response_cb (GtkDialog *dialog, + int response_id, + gpointer user_data) +{ + WebService *self = user_data; + + switch (response_id) { + case GTK_RESPONSE_DELETE_EVENT: + case GTK_RESPONSE_CANCEL: + gtk_widget_destroy (GTK_WIDGET (dialog)); + break; + + case GTK_RESPONSE_OK: + _g_object_list_unref (self->priv->accounts); + self->priv->accounts = oauth_account_manager_dialog_get_accounts (OAUTH_ACCOUNT_MANAGER_DIALOG (dialog)); + if (! g_list_find_custom (self->priv->accounts, self->priv->account, (GCompareFunc) oauth_account_cmp)) { + _g_object_unref (self->priv->account); + self->priv->account = NULL; + web_service_autoconnect (self); + } + else + g_signal_emit (self, web_service_signals[ACCOUNTS_CHANGED], 0); + oauth_accounts_save_to_file (self->priv->service_name, self->priv->accounts, self->priv->account); + gtk_widget_destroy (GTK_WIDGET (dialog)); + break; + + case OAUTH_ACCOUNT_CHOOSER_RESPONSE_NEW: + gtk_widget_destroy (GTK_WIDGET (dialog)); + web_service_ask_authorization (self); + break; + + default: + break; + } +} + + +void +web_service_edit_accounts (WebService *self, + GtkWindow *parent) +{ + GtkWidget *dialog; + + dialog = oauth_account_manager_dialog_new (self->priv->accounts); + g_signal_connect (dialog, + "delete-event", + G_CALLBACK (gtk_true), + NULL); + g_signal_connect (dialog, + "response", + G_CALLBACK (account_manager_dialog_response_cb), + self); + + gtk_window_set_title (GTK_WINDOW (dialog), _("Edit Accounts")); + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self->priv->dialog)); + gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); + gtk_window_present (GTK_WINDOW (dialog)); +} + + +void +web_service_account_ready (WebService *self) +{ + g_signal_emit (self, web_service_signals[ACCOUNT_READY], 0); +} + + +void +web_service_ask_authorization (WebService *self) +{ + gth_task_progress (GTH_TASK (self), + _("Connecting to the server"), + _("Asking authorization"), + TRUE, + 0.0); + + web_service_set_current_account (self, NULL); + WEB_SERVICE_GET_CLASS (self)->ask_authorization (self); +} + + +void +web_service_get_user_info (WebService *self, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + gth_task_progress (GTH_TASK (self), + _("Connecting to the server"), + _("Getting account information"), + TRUE, + 0.0); + + WEB_SERVICE_GET_CLASS (self)->get_user_info (self, cancellable, callback, user_data); +} + + +OAuthAccount * +web_service_get_user_info_finish (WebService *self, + GAsyncResult *result, + GError **error) +{ + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) + return NULL; + else + return g_object_ref (g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result))); +} + + +/* -- connection utilities -- */ + + +void +_web_service_send_message (WebService *self, + SoupMessage *msg, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data, + gpointer source_tag, + SoupSessionCallback soup_session_cb, + gpointer soup_session_cb_data) +{ + if (self->priv->session == NULL) { + self->priv->session = soup_session_async_new_with_options ( +#ifdef HAVE_LIBSOUP_GNOME + SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_PROXY_RESOLVER_GNOME, +#endif + NULL); + +#ifdef DEBUG_WEB_CONNECTION + { + SoupLogger *logger; + + logger = soup_logger_new (SOUP_LOGGER_LOG_BODY, -1); + soup_session_add_feature (self->priv->session, SOUP_SESSION_FEATURE (logger)); + + g_object_unref (logger); + } +#endif + } + + _g_object_unref (self->priv->cancellable); + self->priv->cancellable = _g_object_ref (cancellable); + + _g_object_unref (self->priv->result); + self->priv->result = g_simple_async_result_new (G_OBJECT (self), + callback, + user_data, + source_tag); + + self->priv->msg = msg; + g_object_add_weak_pointer (G_OBJECT (msg), (gpointer *) &self->priv->msg); + + soup_session_queue_message (self->priv->session, + msg, + soup_session_cb, + soup_session_cb_data); +} + + +GSimpleAsyncResult * +_web_service_get_result (WebService *self) +{ + return self->priv->result; +} + + +void +_web_service_reset_result (WebService *self) +{ + self->priv->result = NULL; +} + + +SoupMessage * +_web_service_get_message (WebService *self) +{ + return self->priv->msg; +} + + +/* -- _web_service_set_auth_dialog -- */ + + +static void +ask_authorization_dialog_response_cb (GtkDialog *dialog, + int response_id, + gpointer user_data) +{ + WebService *self = user_data; + + switch (response_id) { + case GTK_RESPONSE_DELETE_EVENT: + case GTK_RESPONSE_CANCEL: + gtk_widget_destroy (GTK_WIDGET (dialog)); + gtk_dialog_response (GTK_DIALOG (self->priv->dialog), GTK_RESPONSE_DELETE_EVENT); + break; + + case GTK_RESPONSE_OK: + gtk_widget_destroy (GTK_WIDGET (dialog)); + gth_task_dialog (GTH_TASK (self), FALSE, NULL); + web_service_get_user_info (self, + self->priv->cancellable, + get_user_info_ready_cb, + self); + break; + + default: + break; + } +} + + +void +_web_service_set_auth_dialog (WebService *self, + GtkDialog *dialog) +{ + self->priv->auth_dialog = GTK_WIDGET (dialog); + g_object_add_weak_pointer (G_OBJECT (dialog), (gpointer *) &self->priv->auth_dialog); + gth_task_dialog (GTH_TASK (self), TRUE, self->priv->auth_dialog); + + gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); + if (gtk_widget_get_visible (self->priv->dialog)) + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self->priv->dialog)); + else + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self->priv->browser)); + + g_signal_connect (dialog, + "delete-event", + G_CALLBACK (gtk_true), + NULL); + g_signal_connect (dialog, + "response", + G_CALLBACK (ask_authorization_dialog_response_cb), + self); +} + + +GtkWidget * +_web_service_get_auth_dialog (WebService *self) +{ + return self->priv->auth_dialog; +} diff -Nru gthumb-3.0.2/extensions/oauth/web-service.h gthumb-3.2.3/extensions/oauth/web-service.h --- gthumb-3.0.2/extensions/oauth/web-service.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/extensions/oauth/web-service.h 2013-04-30 16:56:12.000000000 +0000 @@ -0,0 +1,114 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef WEB_SERVICE_H +#define WEB_SERVICE_H + +#include +#include +#include "oauth-account.h" + +#define WEB_SERVICE_ERROR web_service_error_quark() +GQuark web_service_error_quark (void); + +typedef enum { + WEB_SERVICE_ERROR_GENERIC, + WEB_SERVICE_ERROR_TOKEN_EXPIRED +} WebSericeError; + +typedef enum { + WEB_AUTHORIZATION_READ, + WEB_AUTHORIZATION_WRITE +} WebAuthorization; + +#define WEB_TYPE_SERVICE (web_service_get_type ()) +#define WEB_SERVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), WEB_TYPE_SERVICE, WebService)) +#define WEB_SERVICE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), WEB_TYPE_SERVICE, WebServiceClass)) +#define WEB_IS_SERVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), WEB_TYPE_SERVICE)) +#define WEB_IS_SERVICE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), WEB_TYPE_SERVICE)) +#define WEB_SERVICE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), WEB_TYPE_SERVICE, WebServiceClass)) + +typedef struct _WebService WebService; +typedef struct _WebServicePrivate WebServicePrivate; +typedef struct _WebServiceClass WebServiceClass; + +struct _WebService { + GthTask __parent; + WebServicePrivate *priv; +}; + +struct _WebServiceClass { + GthTaskClass __parent_class; + + /*< signals >*/ + + void (*account_ready) (WebService *self); + void (*accounts_changed) (WebService *self); + + /*< virtual functions >*/ + + void (*ask_authorization) (WebService *self); + void (*get_user_info) (WebService *self, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +}; + +GType web_service_get_type (void) G_GNUC_CONST; +void web_service_autoconnect (WebService *self); +void web_service_connect (WebService *self, + OAuthAccount *account); +void web_service_set_current_account (WebService *self, + OAuthAccount *account); +OAuthAccount * web_service_get_current_account (WebService *self); +GList * web_service_get_accounts (WebService *self); +void web_service_edit_accounts (WebService *self, + GtkWindow *parent); +void web_service_account_ready (WebService *self); +void web_service_ask_authorization (WebService *self); +void web_service_get_user_info (WebService *self, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +OAuthAccount * web_service_get_user_info_finish(WebService *self, + GAsyncResult *result, + GError **error); + +/* -- utilities -- */ + +void _web_service_send_message (WebService *self, + SoupMessage *msg, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data, + gpointer source_tag, + SoupSessionCallback soup_session_cb, + gpointer soup_session_cb_data); +GSimpleAsyncResult * + _web_service_get_result (WebService *self); +void _web_service_reset_result (WebService *self); +SoupMessage * _web_service_get_message (WebService *self); +void _web_service_set_auth_dialog (WebService *self, + GtkDialog *dialog); +GtkWidget * _web_service_get_auth_dialog (WebService *self); + +#endif /* WEB_SERVICE_H */ + diff -Nru gthumb-3.0.2/extensions/photo_importer/Makefile.in gthumb-3.2.3/extensions/photo_importer/Makefile.in --- gthumb-3.0.2/extensions/photo_importer/Makefile.in 2012-08-20 19:54:16.000000000 +0000 +++ gthumb-3.2.3/extensions/photo_importer/Makefile.in 2013-07-10 13:33:49.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,17 +81,17 @@ host_triplet = @host@ @ENABLE_JPEG_TOOLS_TRUE@am__append_1 = ../image_rotation/libimage_rotation.la subdir = extensions/photo_importer -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -147,13 +175,14 @@ am__v_CCLD_1 = SOURCES = $(libphoto_importer_la_SOURCES) DIST_SOURCES = $(libphoto_importer_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -162,9 +191,29 @@ DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -223,9 +272,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -239,13 +286,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -274,7 +320,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -290,11 +339,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -311,7 +364,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -341,7 +393,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -456,6 +511,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -490,6 +546,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libphoto_importer.la: $(libphoto_importer_la_OBJECTS) $(libphoto_importer_la_DEPENDENCIES) $(EXTRA_libphoto_importer_la_DEPENDENCIES) $(AM_V_CCLD)$(libphoto_importer_la_LINK) -rpath $(extensiondir) $(libphoto_importer_la_OBJECTS) $(libphoto_importer_la_LIBADD) $(LIBS) @@ -509,14 +566,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -586,14 +643,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -614,31 +670,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -654,12 +692,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -671,15 +704,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -688,9 +717,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -875,25 +905,23 @@ uninstall-am: uninstall-extensionLTLIBRARIES \ uninstall-extensioniniDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-extensionLTLIBRARIES \ - clean-generic clean-libtool cscopelist cscopelist-recursive \ - ctags ctags-recursive dist-hook distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extensionLTLIBRARIES \ - install-extensioniniDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-extensionLTLIBRARIES clean-generic \ + clean-libtool cscopelist-am ctags ctags-am dist-hook distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-extensionLTLIBRARIES install-extensioniniDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA diff -Nru gthumb-3.0.2/extensions/photo_importer/data/Makefile.in gthumb-3.2.3/extensions/photo_importer/data/Makefile.in --- gthumb-3.0.2/extensions/photo_importer/data/Makefile.in 2012-08-20 19:54:16.000000000 +0000 +++ gthumb-3.2.3/extensions/photo_importer/data/Makefile.in 2013-07-10 13:33:49.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/photo_importer/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/photo_importer/data/ui/Makefile.in gthumb-3.2.3/extensions/photo_importer/data/ui/Makefile.in --- gthumb-3.0.2/extensions/photo_importer/data/ui/Makefile.in 2012-08-20 19:54:16.000000000 +0000 +++ gthumb-3.2.3/extensions/photo_importer/data/ui/Makefile.in 2013-07-10 13:33:49.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/photo_importer/data/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -381,11 +415,9 @@ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -526,16 +558,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-uiDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-uiDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/photo_importer/dlg-photo-importer.c gthumb-3.2.3/extensions/photo_importer/dlg-photo-importer.c --- gthumb-3.0.2/extensions/photo_importer/dlg-photo-importer.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/photo_importer/dlg-photo-importer.c 2013-04-30 16:56:12.000000000 +0000 @@ -625,7 +625,7 @@ gtk_box_pack_start (GTK_BOX (GET_WIDGET ("source_box")), data->folder_chooser, TRUE, TRUE, 0); } - data->file_list = gth_file_list_new (gth_grid_view_new (), GTH_FILE_LIST_TYPE_NORMAL, FALSE); + data->file_list = gth_file_list_new (gth_grid_view_new (), GTH_FILE_LIST_MODE_NORMAL, FALSE); sort_type = gth_main_get_sort_type ("file::mtime"); gth_file_list_set_sort_func (GTH_FILE_LIST (data->file_list), sort_type->cmp_func, FALSE); gth_file_list_enable_thumbs (GTH_FILE_LIST (data->file_list), TRUE); diff -Nru gthumb-3.0.2/extensions/photobucket/Makefile.am gthumb-3.2.3/extensions/photobucket/Makefile.am --- gthumb-3.0.2/extensions/photobucket/Makefile.am 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/photobucket/Makefile.am 2013-04-30 16:56:12.000000000 +0000 @@ -26,9 +26,9 @@ photobucket-service.c \ photobucket-service.h -libphotobucket_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(GNOME_KEYRING_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb +libphotobucket_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(LIBSECRET_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb libphotobucket_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -libphotobucket_la_LIBADD = $(GTHUMB_LIBS) $(LIBSOUP_LIBS) $(GNOME_KEYRING_LIBS) ../oauth/liboauth.la ../export_tools/libexport_tools.la +libphotobucket_la_LIBADD = $(GTHUMB_LIBS) $(LIBSOUP_LIBS) $(LIBSECRET_LIBS) ../oauth/liboauth.la ../export_tools/libexport_tools.la libphotobucket_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) extensioninidir = $(extensiondir) diff -Nru gthumb-3.0.2/extensions/photobucket/Makefile.in gthumb-3.2.3/extensions/photobucket/Makefile.in --- gthumb-3.0.2/extensions/photobucket/Makefile.in 2012-08-20 19:54:16.000000000 +0000 +++ gthumb-3.2.3/extensions/photobucket/Makefile.in 2013-07-10 13:33:49.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/photobucket -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -163,13 +191,14 @@ am__v_CCLD_1 = SOURCES = $(libphotobucket_la_SOURCES) DIST_SOURCES = $(am__libphotobucket_la_SOURCES_DIST) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -178,9 +207,29 @@ DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = data @@ -239,9 +288,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -255,13 +302,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -290,7 +336,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -306,11 +355,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -327,7 +380,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -357,7 +409,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -438,9 +493,9 @@ @ENABLE_WEB_SERVICES_TRUE@ photobucket-service.c \ @ENABLE_WEB_SERVICES_TRUE@ photobucket-service.h -@ENABLE_WEB_SERVICES_TRUE@libphotobucket_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(GNOME_KEYRING_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb +@ENABLE_WEB_SERVICES_TRUE@libphotobucket_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(LIBSECRET_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb @ENABLE_WEB_SERVICES_TRUE@libphotobucket_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -@ENABLE_WEB_SERVICES_TRUE@libphotobucket_la_LIBADD = $(GTHUMB_LIBS) $(LIBSOUP_LIBS) $(GNOME_KEYRING_LIBS) ../oauth/liboauth.la ../export_tools/libexport_tools.la +@ENABLE_WEB_SERVICES_TRUE@libphotobucket_la_LIBADD = $(GTHUMB_LIBS) $(LIBSOUP_LIBS) $(LIBSECRET_LIBS) ../oauth/liboauth.la ../export_tools/libexport_tools.la @ENABLE_WEB_SERVICES_TRUE@libphotobucket_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) @ENABLE_WEB_SERVICES_TRUE@extensioninidir = $(extensiondir) @ENABLE_WEB_SERVICES_TRUE@extensionini_in_files = photobucket.extension.in.in @@ -481,6 +536,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -515,6 +571,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libphotobucket.la: $(libphotobucket_la_OBJECTS) $(libphotobucket_la_DEPENDENCIES) $(EXTRA_libphotobucket_la_DEPENDENCIES) $(AM_V_CCLD)$(libphotobucket_la_LINK) $(am_libphotobucket_la_rpath) $(libphotobucket_la_OBJECTS) $(libphotobucket_la_LIBADD) $(LIBS) @@ -540,14 +597,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -659,14 +716,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -687,31 +743,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -727,12 +765,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -744,15 +777,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -761,9 +790,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -945,25 +975,23 @@ uninstall-am: uninstall-extensionLTLIBRARIES \ uninstall-extensioniniDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-extensionLTLIBRARIES \ - clean-generic clean-libtool cscopelist cscopelist-recursive \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extensionLTLIBRARIES \ - install-extensioniniDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-extensionLTLIBRARIES clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-extensionLTLIBRARIES install-extensioniniDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA diff -Nru gthumb-3.0.2/extensions/photobucket/data/Makefile.in gthumb-3.2.3/extensions/photobucket/data/Makefile.in --- gthumb-3.0.2/extensions/photobucket/data/Makefile.in 2012-08-20 19:54:16.000000000 +0000 +++ gthumb-3.2.3/extensions/photobucket/data/Makefile.in 2013-07-10 13:33:49.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/photobucket/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/photobucket/data/ui/Makefile.in gthumb-3.2.3/extensions/photobucket/data/ui/Makefile.in --- gthumb-3.0.2/extensions/photobucket/data/ui/Makefile.in 2012-08-20 19:54:16.000000000 +0000 +++ gthumb-3.2.3/extensions/photobucket/data/ui/Makefile.in 2013-07-10 13:33:49.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/photobucket/data/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -385,11 +419,9 @@ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -530,16 +562,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-uiDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-uiDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/photobucket/data/ui/export-to-photobucket.ui gthumb-3.2.3/extensions/photobucket/data/ui/export-to-photobucket.ui --- gthumb-3.0.2/extensions/photobucket/data/ui/export-to-photobucket.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/photobucket/data/ui/export-to-photobucket.ui 2013-04-30 16:56:12.000000000 +0000 @@ -1,6 +1,6 @@ - + @@ -21,49 +21,6 @@ - - - - - - - - - - Tiny ( 100 x 75 ) - 100 - - - Small ( 160 x 120 ) - 160 - - - Medium ( 320 x 240 ) - 320 - - - Large ( 640 x 480 ) - 640 - - - 15ʺ screen ( 800 x 600 ) - 800 - - - 17ʺ screen ( 1024 x 768 ) - 1024 - - - 1 megabyte file size - 0 - - - - - True - False - gtk-goto-top - False 5 @@ -83,11 +40,9 @@ gtk-cancel - False True True True - False True @@ -99,11 +54,9 @@ _Upload - False True True True - False upload_image True @@ -116,11 +69,9 @@ gtk-help - False True True True - False True @@ -179,7 +130,7 @@ True False - 4 + 2 2 6 5 @@ -236,17 +187,15 @@ - False True True True Edit accounts - False True False - gtk-edit + view-list-symbolic @@ -347,17 +296,15 @@ - False True True True Add a new album - False True False - gtk-add + list-add-symbolic @@ -376,19 +323,30 @@ GTK_FILL + + + False + True + 0 + + + + + True + False + 6 True False - _Resize to: + _Resize if larger than: True resize_combobox - 2 - 3 - GTK_FILL - GTK_FILL + False + True + 0 @@ -405,37 +363,32 @@ - 1 - 2 - 2 - 3 - GTK_FILL - - - - - _Scramble filenames - False - True - True - False - False - True - 0 - True - - - 2 - 3 - 4 - GTK_FILL + False + True + 1 False True - 0 + 1 + + + + + _Scramble filenames + True + True + False + True + 0 + True + + + False + True + 2 @@ -460,4 +413,47 @@ button1 + + + + + + + + + + Tiny ( 100 x 75 ) + 100 + + + Small ( 160 x 120 ) + 160 + + + Medium ( 320 x 240 ) + 320 + + + Large ( 640 x 480 ) + 640 + + + 15ʺ screen ( 800 x 600 ) + 800 + + + 17ʺ screen ( 1024 x 768 ) + 1024 + + + 1 megabyte file size + 0 + + + + + True + False + gtk-goto-top + diff -Nru gthumb-3.0.2/extensions/photobucket/dlg-export-to-photobucket.c gthumb-3.2.3/extensions/photobucket/dlg-export-to-photobucket.c --- gthumb-3.0.2/extensions/photobucket/dlg-export-to-photobucket.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/photobucket/dlg-export-to-photobucket.c 2013-04-30 16:56:12.000000000 +0000 @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include "dlg-export-to-photobucket.h" #include "photobucket-account.h" #include "photobucket-album-properties-dialog.h" @@ -62,10 +62,7 @@ GtkWidget *dialog; GtkWidget *progress_dialog; GtkWidget *list_view; - OAuthConnection *conn; - OAuthAuthentication *auth; PhotobucketService *service; - PhotobucketAccount *account; GList *albums; PhotobucketAlbum *album; GCancellable *cancellable; @@ -77,15 +74,13 @@ { if (data->dialog != NULL) gtk_widget_destroy (data->dialog); - if (data->conn != NULL) - gth_task_completed (GTH_TASK (data->conn), NULL); + if (data->service != NULL) + gth_task_completed (GTH_TASK (data->service), NULL); _g_object_unref (data->cancellable); _g_object_unref (data->album); _g_object_list_unref (data->albums); - _g_object_unref (data->account); - _g_object_unref (data->auth); - _g_object_unref (data->conn); _g_object_unref (data->builder); + gtk_widget_destroy (data->progress_dialog); _g_object_list_unref (data->file_list); _g_object_unref (data->location); g_free (data); @@ -108,28 +103,31 @@ case _OPEN_IN_BROWSER_RESPONSE: { - GdkScreen *screen; - char *url = NULL; - GError *error = NULL; + GdkScreen *screen; + OAuthAccount *account; + char *url = NULL; + GError *error = NULL; screen = gtk_widget_get_screen (GTK_WIDGET (dialog)); gtk_widget_destroy (GTK_WIDGET (dialog)); - if (data->account->album_url != NULL) { + account = web_service_get_current_account (WEB_SERVICE (data->service)); + + if (PHOTOBUCKET_ACCOUNT (account)->album_url != NULL) { char *username; - username = OAUTH_ACCOUNT (data->account)->username; + username = account->username; if (g_str_equal (data->album->name, username)) - url = g_strdup (data->account->album_url); + url = g_strdup (PHOTOBUCKET_ACCOUNT (account)->album_url); else - url = g_strconcat (data->account->album_url, + url = g_strconcat (PHOTOBUCKET_ACCOUNT (account)->album_url, data->album->name + strlen (username) + 1, NULL); } if ((url != NULL) && ! gtk_show_uri (screen, url, 0, &error)) { - if (data->conn != NULL) - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); + if (data->service != NULL) + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); _gtk_error_dialog_from_gerror_run (GTK_WINDOW (data->browser), _("Could not connect to the server"), error); g_clear_error (&error); } @@ -152,7 +150,7 @@ GtkBuilder *builder; GtkWidget *dialog; - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); builder = _gtk_builder_new_from_file ("photobucket-export-completed.ui", "photobucket"); dialog = _gtk_builder_get_widget (builder, "completed_messagedialog"); @@ -215,7 +213,7 @@ int size; gtk_widget_hide (data->dialog); - gth_task_dialog (GTH_TASK (data->conn), FALSE, NULL); + gth_task_dialog (GTH_TASK (data->service), FALSE, NULL); _g_clear_object (&data->album); if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (GET_WIDGET ("album_combobox")), &iter)) { @@ -235,7 +233,6 @@ file_list = gth_file_data_list_to_file_list (data->file_list); photobucket_service_upload_photos (data->service, - data->account, data->album, size, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("scramble_checkbutton"))), @@ -267,11 +264,11 @@ gtk_list_store_clear (GTK_LIST_STORE (GET_WIDGET ("account_liststore"))); current_account_idx = 0; - current_account = oauth_authentication_get_account (data->auth); - for (scan = oauth_authentication_get_accounts (data->auth), idx = 0; scan; scan = scan->next, idx++) { + current_account = web_service_get_current_account (WEB_SERVICE (data->service)); + for (scan = web_service_get_accounts (WEB_SERVICE (data->service)), idx = 0; scan; scan = scan->next, idx++) { OAuthAccount *account = scan->data; - if ((current_account != NULL) && (g_strcmp0 (current_account->username, account->username) == 0)) + if (oauth_account_cmp (current_account, account) == 0) current_account_idx = idx; gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter); @@ -282,11 +279,11 @@ } gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("account_combobox")), current_account_idx); - free_space = g_format_size ((data->account->megabytes_allowed - data->account->megabytes_used) * (1024 * 1024)); + free_space = g_format_size ((PHOTOBUCKET_ACCOUNT (current_account)->megabytes_allowed - PHOTOBUCKET_ACCOUNT (current_account)->megabytes_used) * (1024 * 1024)); gtk_label_set_text (GTK_LABEL (GET_WIDGET ("free_space_label")), free_space); g_free (free_space); - if (data->account != NULL) { + if (current_account != NULL) { struct { char *name; int size; @@ -307,7 +304,7 @@ int i; gtk_list_store_clear (GTK_LIST_STORE (GET_WIDGET ("resize_liststore"))); - for (i = 0; i <= (data->account->is_premium ? 13 : 6); i++) { + for (i = 0; i <= (PHOTOBUCKET_ACCOUNT (current_account)->is_premium ? 13 : 6); i++) { gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("resize_liststore")), &iter); gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("resize_liststore")), &iter, RESIZE_NAME_COLUMN, _(sizes[i].name), @@ -315,16 +312,16 @@ -1); } - gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("resize_combobox")), (data->account->is_premium ? 13 : 5)); + gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("resize_combobox")), (PHOTOBUCKET_ACCOUNT (current_account)->is_premium ? 13 : 5)); } } static void -authentication_accounts_changed_cb (OAuthAuthentication *auth, - gpointer user_data) +authentication_accounts_changed_cb (WebService *service, + DialogData *data) { - update_account_list ((DialogData *) user_data); + update_account_list (data); } @@ -373,8 +370,8 @@ _g_object_list_unref (data->albums); data->albums = photobucket_service_get_albums_finish (data->service, res, &error); if (error != NULL) { - if (data->conn != NULL) - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); + if (data->service != NULL) + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); _gtk_error_dialog_from_gerror_run (GTK_WINDOW (data->browser), _("Could not connect to the server"), error); g_clear_error (&error); gtk_widget_destroy (data->dialog); @@ -382,7 +379,7 @@ } update_album_list (data); - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); gtk_window_set_transient_for (GTK_WINDOW (data->dialog), GTK_WINDOW (data->browser)); gtk_window_set_modal (GTK_WINDOW (data->dialog), FALSE); @@ -391,15 +388,11 @@ static void -authentication_ready_cb (OAuthAuthentication *auth, - DialogData *data) +authentication_ready_cb (WebService *service, + DialogData *data) { - _g_object_unref (data->account); - data->account = g_object_ref (oauth_authentication_get_account (auth)); update_account_list (data); - photobucket_service_get_albums (data->service, - data->account, data->cancellable, album_list_ready_cb, data); @@ -410,7 +403,7 @@ edit_accounts_button_clicked_cb (GtkButton *button, DialogData *data) { - oauth_authentication_edit_accounts (data->auth, GTK_WINDOW (data->dialog)); + web_service_edit_accounts (WEB_SERVICE (data->service), GTK_WINDOW (data->dialog)); } @@ -430,8 +423,8 @@ ACCOUNT_DATA_COLUMN, &account, -1); - if (oauth_account_cmp (account, oauth_authentication_get_account (data->auth)) != 0) - oauth_authentication_connect (data->auth, account); + if (oauth_account_cmp (account, web_service_get_current_account (WEB_SERVICE (data->service))) != 0) + web_service_connect (WEB_SERVICE (data->service), account); g_object_unref (account); } @@ -459,8 +452,8 @@ _g_object_unref (data->album); data->album = photobucket_service_create_album_finish (data->service, result, &error); if (error != NULL) { - if (data->conn != NULL) - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); + if (data->service != NULL) + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); _gtk_error_dialog_from_gerror_show (GTK_WINDOW (data->browser), _("Could not create the album"), error); g_clear_error (&error); return; @@ -496,7 +489,6 @@ album = photobucket_album_new (); photobucket_album_set_name (album, photobucket_album_properties_dialog_get_name (PHOTOBUCKET_ALBUM_PROPERTIES_DIALOG (dialog))); photobucket_service_create_album (data->service, - data->account, parent_album, album, data->cancellable, @@ -628,7 +620,7 @@ /* Set the widget data */ - data->list_view = gth_file_list_new (gth_grid_view_new (), GTH_FILE_LIST_TYPE_NO_SELECTION, FALSE); + data->list_view = gth_file_list_new (gth_grid_view_new (), GTH_FILE_LIST_MODE_NO_SELECTION, FALSE); gth_file_list_set_thumb_size (GTH_FILE_LIST (data->list_view), 112); gth_file_list_enable_thumbs (GTH_FILE_LIST (data->list_view), TRUE); gth_file_list_set_ignore_hidden (GTH_FILE_LIST (data->list_view), TRUE); @@ -640,7 +632,7 @@ gtk_widget_set_sensitive (GET_WIDGET ("upload_button"), FALSE); - title = g_strdup_printf (_("Export to %s"), photobucket_consumer.display_name); + title = g_strdup_printf (_("Export to %s"), "Photobucket"); gtk_window_set_title (GTK_WINDOW (data->dialog), title); g_free (title); @@ -671,25 +663,21 @@ G_CALLBACK (album_combobox_changed_cb), data); - data->conn = oauth_connection_new (&photobucket_consumer); - data->auth = oauth_authentication_new (data->conn, - PHOTOBUCKET_TYPE_ACCOUNT, - data->cancellable, - GTK_WIDGET (data->browser), - data->dialog); - g_signal_connect (data->auth, - "ready", + + data->service = photobucket_service_new (data->cancellable, + GTK_WIDGET (data->browser), + data->dialog); + g_signal_connect (data->service, + "account-ready", G_CALLBACK (authentication_ready_cb), data); - g_signal_connect (data->auth, - "accounts_changed", + g_signal_connect (data->service, + "accounts-changed", G_CALLBACK (authentication_accounts_changed_cb), data); - data->service = photobucket_service_new (data->conn); - data->progress_dialog = gth_progress_dialog_new (GTK_WINDOW (data->browser)); - gth_progress_dialog_add_task (GTH_PROGRESS_DIALOG (data->progress_dialog), GTH_TASK (data->conn)); + gth_progress_dialog_add_task (GTH_PROGRESS_DIALOG (data->progress_dialog), GTH_TASK (data->service)); - oauth_authentication_auto_connect (data->auth); + web_service_autoconnect (WEB_SERVICE (data->service)); } diff -Nru gthumb-3.0.2/extensions/photobucket/photobucket-account.c gthumb-3.2.3/extensions/photobucket/photobucket-account.c --- gthumb-3.0.2/extensions/photobucket/photobucket-account.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/photobucket/photobucket-account.c 2013-04-30 16:56:12.000000000 +0000 @@ -26,6 +26,13 @@ #include "photobucket-account.h" +enum { + PROP_0, + PROP_SUBDOMAIN, + PROP_HOME_URL +}; + + static void photobucket_account_dom_domizable_interface_init (DomDomizableInterface *iface); @@ -52,9 +59,78 @@ static void +photobucket_account_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + PhotobucketAccount *self; + + self = PHOTOBUCKET_ACCOUNT (object); + + switch (property_id) { + case PROP_SUBDOMAIN: + _g_strset (&self->subdomain, g_value_get_string (value)); + break; + case PROP_HOME_URL: + _g_strset (&self->home_url, g_value_get_string (value)); + break; + default: + break; + } +} + + +static void +photobucket_account_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) +{ + PhotobucketAccount *self; + + self = PHOTOBUCKET_ACCOUNT (object); + + switch (property_id) { + case PROP_SUBDOMAIN: + g_value_set_string (value, self->subdomain); + break; + case PROP_HOME_URL: + g_value_set_string (value, self->home_url); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + + +static void photobucket_account_class_init (PhotobucketAccountClass *klass) { - G_OBJECT_CLASS (klass)->finalize = photobucket_account_finalize; + GObjectClass *object_class; + + object_class = G_OBJECT_CLASS (klass); + object_class->finalize = photobucket_account_finalize; + object_class->set_property = photobucket_account_set_property; + object_class->get_property = photobucket_account_get_property; + + /* properties */ + + g_object_class_install_property (object_class, + PROP_SUBDOMAIN, + g_param_spec_string ("subdomain", + "Subdomain", + "", + NULL, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_HOME_URL, + g_param_spec_string ("home-url", + "Home URL", + "", + NULL, + G_PARAM_READWRITE)); } @@ -62,11 +138,10 @@ photobucket_account_create_element (DomDomizable *base, DomDocument *doc) { - PhotobucketAccount *self; + PhotobucketAccount *self = PHOTOBUCKET_ACCOUNT (base); DomElement *element; - self = PHOTOBUCKET_ACCOUNT (base); - element = oauth_account_create_element (DOM_DOMIZABLE (self), doc); + element = oauth_account_create_element (base, doc); if (self->subdomain != NULL) dom_element_set_attribute (element, "subdomain", self->subdomain); @@ -78,9 +153,7 @@ photobucket_account_load_from_element (DomDomizable *base, DomElement *element) { - PhotobucketAccount *self; - - self = PHOTOBUCKET_ACCOUNT (base); + PhotobucketAccount *self = PHOTOBUCKET_ACCOUNT (base); if (g_str_equal (element->tag_name, "content")) { DomElement *node; @@ -104,7 +177,7 @@ } } else if (g_str_equal (element->tag_name, "account")) { - oauth_account_load_from_element (DOM_DOMIZABLE (self), element); + oauth_account_load_from_element (base, element); photobucket_account_set_subdomain (self, dom_element_get_attribute (element, "subdomain")); } } diff -Nru gthumb-3.0.2/extensions/photobucket/photobucket-consumer.c gthumb-3.2.3/extensions/photobucket/photobucket-consumer.c --- gthumb-3.0.2/extensions/photobucket/photobucket-consumer.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/photobucket/photobucket-consumer.c 2013-04-30 16:56:12.000000000 +0000 @@ -71,11 +71,14 @@ } if (status == NULL) { - *error = g_error_new_literal (OAUTH_CONNECTION_ERROR, 999, _("Unknown error")); + *error = g_error_new_literal (WEB_SERVICE_ERROR, 999, _("Unknown error")); } else if (strcmp (status, "Exception") == 0) { - *error = g_error_new_literal (OAUTH_CONNECTION_ERROR, - (code != NULL) ? atoi (code) : 999, + int error_code = (code != NULL) ? atoi (code) : 999; + if (error_code == 7) + error_code = WEB_SERVICE_ERROR_TOKEN_EXPIRED; + *error = g_error_new_literal (WEB_SERVICE_ERROR, + error_code, (message != NULL) ? message : _("Unknown error")); } @@ -92,82 +95,58 @@ } -static void -photobucket_login_request_response (OAuthConnection *self, - SoupMessage *msg, - SoupBuffer *body, - GSimpleAsyncResult *result) -{ - GHashTable *values; - char *token; - char *token_secret; - - values = soup_form_decode (body->data); - token = g_hash_table_lookup (values, "oauth_token"); - token_secret = g_hash_table_lookup (values, "oauth_token_secret"); - if ((token != NULL) && (token_secret != NULL)) { - oauth_connection_set_token (self, token, token_secret); - g_simple_async_result_set_op_res_gboolean (result, TRUE); - } - else { - GError *error; - - error = g_error_new_literal (OAUTH_CONNECTION_ERROR, 0, _("Unknown error")); - g_simple_async_result_set_from_error (result, error); - } - - g_hash_table_destroy (values); -} - - static char * -photobucket_get_login_link (OAuthConnection *self) +photobucket_get_authorization_url (OAuthService *self) { - char *token; + char *escaped_token; char *uri; - token = soup_uri_encode (oauth_connection_get_token (self), NULL); - uri = g_strconcat ("http://photobucket.com/apilogin/login?oauth_token=", token, NULL); + escaped_token = soup_uri_encode (oauth_service_get_token (self), NULL); + uri = g_strconcat ("http://photobucket.com/apilogin/login?oauth_token=", + escaped_token, + NULL); - g_free (token); + g_free (escaped_token); return uri; } static void -photobucket_get_access_token_response (OAuthConnection *self, - SoupMessage *msg, - SoupBuffer *body, - GSimpleAsyncResult *result) +photobucket_access_token_response (OAuthService *self, + SoupMessage *msg, + SoupBuffer *body, + GSimpleAsyncResult *result) { GHashTable *values; - char *username; char *token; char *token_secret; values = soup_form_decode (body->data); - username = g_hash_table_lookup (values, "username"); token = g_hash_table_lookup (values, "oauth_token"); token_secret = g_hash_table_lookup (values, "oauth_token_secret"); - if ((username != NULL) && (token != NULL) && (token_secret != NULL)) { + if ((token != NULL) && (token_secret != NULL)) { OAuthAccount *account; - oauth_connection_set_token (self, token, token_secret); + oauth_service_set_token (self, token); + oauth_service_set_token_secret (self, token_secret); - account = photobucket_account_new (); - oauth_account_set_username (account, username); - oauth_account_set_token (account, token); - oauth_account_set_token_secret (account, token_secret); - photobucket_account_set_subdomain (PHOTOBUCKET_ACCOUNT (account), g_hash_table_lookup (values, "subdomain")); - photobucket_account_set_home_url (PHOTOBUCKET_ACCOUNT (account), g_hash_table_lookup (values, "homeurl")); + account = g_object_new (PHOTOBUCKET_TYPE_ACCOUNT, + "id", g_hash_table_lookup (values, "username"), + "name", g_hash_table_lookup (values, "username"), + "username", g_hash_table_lookup (values, "username"), + "token", token, + "token-secret", token_secret, + "subdomain", g_hash_table_lookup (values, "subdomain"), + "home-url", g_hash_table_lookup (values, "homeurl"), + NULL); g_simple_async_result_set_op_res_gpointer (result, account, g_object_unref); } else { GError *error; - error = g_error_new_literal (OAUTH_CONNECTION_ERROR, 0, _("Unknown error")); + error = g_error_new_literal (WEB_SERVICE_ERROR, WEB_SERVICE_ERROR_GENERIC, _("Unknown error")); g_simple_async_result_set_from_error (result, error); } @@ -175,64 +154,11 @@ } -static char * -photobucket_get_check_token_url (OAuthConnection *self, - OAuthAccount *account, - gboolean for_signature) -{ - if (for_signature) - return g_strconcat ("http://api.photobucket.com/user/", account->username, NULL); - else - return g_strconcat ("http://", PHOTOBUCKET_ACCOUNT (account)->subdomain, "/user/", account->username, NULL); -} - - -static void -photobucket_check_token_response (OAuthConnection *self, - SoupMessage *msg, - GSimpleAsyncResult *result, - OAuthAccount *account) -{ - DomDocument *doc = NULL; - GError *error = NULL; - - if (photobucket_utils_parse_response (msg, &doc, &error)) { - DomElement *node; - - for (node = DOM_ELEMENT (doc)->first_child; node; node = node->next_sibling) { - if (g_strcmp0 (node->tag_name, "response") == 0) { - DomElement *child; - - for (child = DOM_ELEMENT (node)->first_child; child; child = child->next_sibling) { - if (g_strcmp0 (child->tag_name, "content") == 0) { - dom_domizable_load_from_element (DOM_DOMIZABLE (account), child); - break; - } - } - break; - } - } - - g_simple_async_result_set_op_res_gboolean (result, TRUE); - g_object_unref (doc); - } - else - g_simple_async_result_set_from_error (result, error); -} - - OAuthConsumer photobucket_consumer = { - "Photobucket", - "photobucket", - "http://www.photobucket.com", - "http", "149829931", "b4e542229836cc59b66489c6d2d8ca04", "http://api.photobucket.com/login/request", - photobucket_login_request_response, - photobucket_get_login_link, + photobucket_get_authorization_url, "http://api.photobucket.com/login/access", - photobucket_get_access_token_response, - photobucket_get_check_token_url, - photobucket_check_token_response + photobucket_access_token_response }; diff -Nru gthumb-3.0.2/extensions/photobucket/photobucket-consumer.h gthumb-3.2.3/extensions/photobucket/photobucket-consumer.h --- gthumb-3.0.2/extensions/photobucket/photobucket-consumer.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/photobucket/photobucket-consumer.h 2013-04-30 16:56:12.000000000 +0000 @@ -23,7 +23,7 @@ #define PHOTOBUCKET_CONSUMER_H #include -#include +#include extern OAuthConsumer photobucket_consumer; diff -Nru gthumb-3.0.2/extensions/photobucket/photobucket-service.c gthumb-3.2.3/extensions/photobucket/photobucket-service.c --- gthumb-3.0.2/extensions/photobucket/photobucket-service.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/photobucket/photobucket-service.c 2013-04-30 16:56:12.000000000 +0000 @@ -3,7 +3,7 @@ /* * GThumb * - * Copyright (C) 2010 Free Software Foundation, Inc. + * Copyright (C) 2010-2012 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,11 +29,10 @@ #include "photobucket-service.h" -G_DEFINE_TYPE (PhotobucketService, photobucket_service, G_TYPE_OBJECT) +G_DEFINE_TYPE (PhotobucketService, photobucket_service, OAUTH_TYPE_SERVICE) typedef struct { - PhotobucketAccount *account; PhotobucketAlbum *album; int size; gboolean scramble; @@ -58,14 +57,11 @@ _g_object_unref (post_photos->cancellable); _g_object_list_unref (post_photos->file_list); _g_object_unref (post_photos->album); - g_object_unref (post_photos->account); g_free (post_photos); } -struct _PhotobucketServicePrivate -{ - OAuthConnection *conn; +struct _PhotobucketServicePrivate { PostPhotosData *post_photos; }; @@ -77,22 +73,122 @@ self = PHOTOBUCKET_SERVICE (object); - _g_object_unref (self->priv->conn); post_photos_data_free (self->priv->post_photos); G_OBJECT_CLASS (photobucket_service_parent_class)->finalize (object); } +/* -- flickr_service_get_user_info -- */ + + +static void +get_user_info_ready_cb (SoupSession *session, + SoupMessage *msg, + gpointer user_data) +{ + PhotobucketService *self = user_data; + GSimpleAsyncResult *result; + DomDocument *doc = NULL; + GError *error = NULL; + + result = _web_service_get_result (WEB_SERVICE (self)); + + if (msg->status_code != 200) { + g_simple_async_result_set_error (result, + SOUP_HTTP_ERROR, + msg->status_code, + "%s", + soup_status_get_phrase (msg->status_code)); + g_simple_async_result_complete_in_idle (result); + return; + } + + if (photobucket_utils_parse_response (msg, &doc, &error)) { + OAuthAccount *account; + gboolean success; + DomElement *node; + + account = web_service_get_current_account (WEB_SERVICE (self)); + success = FALSE; + + for (node = DOM_ELEMENT (doc)->first_child; node; node = node->next_sibling) { + if (g_strcmp0 (node->tag_name, "response") == 0) { + DomElement *child; + + for (child = DOM_ELEMENT (node)->first_child; child; child = child->next_sibling) { + if (g_strcmp0 (child->tag_name, "content") == 0) { + success = TRUE; + dom_domizable_load_from_element (DOM_DOMIZABLE (account), child); + g_simple_async_result_set_op_res_gpointer (result, account, (GDestroyNotify) g_object_unref); + break; + } + } + break; + } + } + + if (! success) { + error = g_error_new_literal (WEB_SERVICE_ERROR, WEB_SERVICE_ERROR_GENERIC, _("Unknown error")); + g_simple_async_result_set_from_error (result, error); + } + + g_object_unref (doc); + } + else + g_simple_async_result_set_from_error (result, error); + + g_simple_async_result_complete_in_idle (result); +} + + +static void +photobucket_service_get_user_info (WebService *base, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + PhotobucketService *self = PHOTOBUCKET_SERVICE (base); + OAuthAccount *account; + char *url; + GHashTable *data_set; + SoupMessage *msg; + + account = web_service_get_current_account (WEB_SERVICE (self)); + g_return_if_fail (account != NULL); + + url = g_strconcat ("http://api.photobucket.com/user/", account->username, NULL); + + data_set = g_hash_table_new (g_str_hash, g_str_equal); + oauth_service_add_signature (OAUTH_SERVICE (self), "GET", url, data_set); + msg = soup_form_request_new_from_hash ("GET", url, data_set); + _web_service_send_message (WEB_SERVICE (self), + msg, + cancellable, + callback, + user_data, + photobucket_service_get_user_info, + get_user_info_ready_cb, + self); + + g_hash_table_destroy (data_set); + g_free (url); +} + + static void photobucket_service_class_init (PhotobucketServiceClass *klass) { - GObjectClass *object_class; + GObjectClass *object_class; + WebServiceClass *service_class; g_type_class_add_private (klass, sizeof (PhotobucketServicePrivate)); object_class = (GObjectClass*) klass; object_class->finalize = photobucket_service_finalize; + + service_class = (WebServiceClass*) klass; + service_class->get_user_info = photobucket_service_get_user_info; } @@ -100,20 +196,25 @@ photobucket_service_init (PhotobucketService *self) { self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOBUCKET_TYPE_SERVICE, PhotobucketServicePrivate); - self->priv->conn = NULL; self->priv->post_photos = NULL; } PhotobucketService * -photobucket_service_new (OAuthConnection *conn) -{ - PhotobucketService *self; - - self = (PhotobucketService *) g_object_new (PHOTOBUCKET_TYPE_SERVICE, NULL); - self->priv->conn = g_object_ref (conn); - - return self; +photobucket_service_new (GCancellable *cancellable, + GtkWidget *browser, + GtkWidget *dialog) +{ + return g_object_new (PHOTOBUCKET_TYPE_SERVICE, + "service-name", "photobucket", + "service-address", "www.photobucket.com", + "service-protocol", "http", + "account-type", PHOTOBUCKET_TYPE_ACCOUNT, + "consumer", &photobucket_consumer, + "cancellable", cancellable, + "browser", browser, + "dialog", dialog, + NULL); } @@ -172,7 +273,7 @@ DomDocument *doc = NULL; GError *error = NULL; - result = oauth_connection_get_result (self->priv->conn); + result = _web_service_get_result (WEB_SERVICE (self)); if (photobucket_utils_parse_response (msg, &doc, &error)) { GList *albums = NULL; @@ -192,38 +293,43 @@ void photobucket_service_get_albums (PhotobucketService *self, - PhotobucketAccount *account, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data) { - GHashTable *data_set; - char *url; - SoupMessage *msg; + OAuthAccount *account; + GHashTable *data_set; + char *url; + SoupMessage *msg; + account = web_service_get_current_account (WEB_SERVICE (self)); g_return_if_fail (account != NULL); - g_return_if_fail (account->subdomain != NULL); + g_return_if_fail (PHOTOBUCKET_ACCOUNT (account)->subdomain != NULL); - gth_task_progress (GTH_TASK (self->priv->conn), _("Getting the album list"), NULL, TRUE, 0.0); + gth_task_progress (GTH_TASK (self), + _("Getting the album list"), + NULL, + TRUE, + 0.0); data_set = g_hash_table_new (g_str_hash, g_str_equal); g_hash_table_insert (data_set, "recurse", "true"); g_hash_table_insert (data_set, "view", "nested"); g_hash_table_insert (data_set, "media", "none"); - url = g_strconcat ("http://api.photobucket.com/album/", OAUTH_ACCOUNT (account)->username, NULL); - oauth_connection_add_signature (self->priv->conn, "GET", url, data_set); + url = g_strconcat ("http://api.photobucket.com/album/", account->username, NULL); + oauth_service_add_signature (OAUTH_SERVICE (self), "GET", url, data_set); g_free (url); - url = g_strconcat ("http://", account->subdomain, "/album/", OAUTH_ACCOUNT (account)->username, NULL); + url = g_strconcat ("http://", PHOTOBUCKET_ACCOUNT (account)->subdomain, "/album/", account->username, NULL); msg = soup_form_request_new_from_hash ("GET", url, data_set); - oauth_connection_send_message (self->priv->conn, - msg, - cancellable, - callback, - user_data, - photobucket_service_get_albums, - get_albums_ready_cb, - self); + _web_service_send_message (WEB_SERVICE (self), + msg, + cancellable, + callback, + user_data, + photobucket_service_get_albums, + get_albums_ready_cb, + self); g_free (url); g_hash_table_destroy (data_set); @@ -271,7 +377,7 @@ DomDocument *doc = NULL; GError *error = NULL; - result = oauth_connection_get_result (self->priv->conn); + result = _web_service_get_result (WEB_SERVICE (self)); if (photobucket_utils_parse_response (msg, &doc, &error)) { g_simple_async_result_set_op_res_gpointer (result, g_object_ref (create_album_data->album), g_object_unref); @@ -288,7 +394,6 @@ void photobucket_service_create_album (PhotobucketService *self, - PhotobucketAccount *account, const char *parent_album, PhotobucketAlbum *album, GCancellable *cancellable, @@ -299,6 +404,7 @@ char *path; GHashTable *data_set; char *identifier; + OAuthAccount *account; char *url; SoupMessage *msg; @@ -313,27 +419,33 @@ photobucket_album_set_name (create_album_data->album, path); g_free (path); - gth_task_progress (GTH_TASK (self->priv->conn), _("Creating the new album"), NULL, TRUE, 0.0); + gth_task_progress (GTH_TASK (self), + _("Creating the new album"), + NULL, + TRUE, + 0.0); data_set = g_hash_table_new (g_str_hash, g_str_equal); g_hash_table_insert (data_set, "name", album->name); identifier = soup_uri_encode (parent_album, NULL); url = g_strconcat ("http://api.photobucket.com/album/", identifier, NULL); - oauth_connection_add_signature (self->priv->conn, "POST", url, data_set); + oauth_service_add_signature (OAUTH_SERVICE (self), "POST", url, data_set); g_free (identifier); g_free (url); - url = g_strconcat ("http://", account->subdomain, "/album/", parent_album, NULL); + account = web_service_get_current_account (WEB_SERVICE (self)); + + url = g_strconcat ("http://", PHOTOBUCKET_ACCOUNT (account)->subdomain, "/album/", parent_album, NULL); msg = soup_form_request_new_from_hash ("POST", url, data_set); - oauth_connection_send_message (self->priv->conn, - msg, - cancellable, - callback, - user_data, - photobucket_service_create_album, - create_album_ready_cb, - create_album_data); + _web_service_send_message (WEB_SERVICE (self), + msg, + cancellable, + callback, + user_data, + photobucket_service_create_album, + create_album_ready_cb, + create_album_data); g_free (url); g_hash_table_destroy (data_set); @@ -361,7 +473,7 @@ { GSimpleAsyncResult *result; - result = oauth_connection_get_result (self->priv->conn); + result = _web_service_get_result (WEB_SERVICE (self)); if (error == NULL) { g_simple_async_result_set_op_res_gboolean (result, TRUE); } @@ -429,7 +541,7 @@ /* Translators: %s is a filename */ details = g_strdup_printf (_("Uploading '%s'"), g_file_info_get_display_name (file_data->info)); current_file_fraction = (double) self->priv->post_photos->wrote_body_data_size / msg->request_body->length; - gth_task_progress (GTH_TASK (self->priv->conn), + gth_task_progress (GTH_TASK (self), NULL, details, FALSE, @@ -449,6 +561,7 @@ GthFileData *file_data; SoupMultipart *multipart; char *identifier; + OAuthAccount *account; char *uri; SoupBuffer *body; char *url; @@ -489,7 +602,7 @@ if (self->priv->post_photos->scramble) g_hash_table_insert (data_set, "scramble", "true"); url = g_strconcat ("http://api.photobucket.com", "/album/", identifier, "/upload", NULL); - oauth_connection_add_signature (self->priv->conn, "POST", url, data_set); + oauth_service_add_signature (OAUTH_SERVICE (self), "POST", url, data_set); keys = g_hash_table_get_keys (data_set); for (scan = keys; scan; scan = scan->next) { @@ -518,22 +631,24 @@ /* send the file */ + account = web_service_get_current_account (WEB_SERVICE (self)); + self->priv->post_photos->wrote_body_data_size = 0; - url = g_strconcat ("http://", self->priv->post_photos->account->subdomain, "/album/", identifier, "/upload", NULL); + url = g_strconcat ("http://", PHOTOBUCKET_ACCOUNT (account)->subdomain, "/album/", identifier, "/upload", NULL); msg = soup_form_request_new_from_multipart (url, multipart); g_signal_connect (msg, "wrote-body-data", (GCallback) upload_photo_wrote_body_data_cb, self); - oauth_connection_send_message (self->priv->conn, - msg, - self->priv->post_photos->cancellable, - self->priv->post_photos->callback, - self->priv->post_photos->user_data, - photobucket_service_upload_photos, - upload_photo_ready_cb, - self); + _web_service_send_message (WEB_SERVICE (self), + msg, + self->priv->post_photos->cancellable, + self->priv->post_photos->callback, + self->priv->post_photos->user_data, + photobucket_service_upload_photos, + upload_photo_ready_cb, + self); g_free (url); soup_multipart_free (multipart); @@ -551,11 +666,11 @@ } file_data = self->priv->post_photos->current->data; - g_load_file_async (file_data->file, - G_PRIORITY_DEFAULT, - self->priv->post_photos->cancellable, - upload_photo_file_buffer_ready_cb, - self); + _g_file_load_async (file_data->file, + G_PRIORITY_DEFAULT, + self->priv->post_photos->cancellable, + upload_photo_file_buffer_ready_cb, + self); } @@ -587,7 +702,6 @@ void photobucket_service_upload_photos (PhotobucketService *self, - PhotobucketAccount *account, PhotobucketAlbum *album, int size, gboolean scramble, @@ -596,11 +710,14 @@ GAsyncReadyCallback callback, gpointer user_data) { - gth_task_progress (GTH_TASK (self->priv->conn), _("Uploading the files to the server"), NULL, TRUE, 0.0); + gth_task_progress (GTH_TASK (self), + _("Uploading the files to the server"), + "", + TRUE, + 0.0); post_photos_data_free (self->priv->post_photos); self->priv->post_photos = g_new0 (PostPhotosData, 1); - self->priv->post_photos->account = g_object_ref (account); self->priv->post_photos->album = _g_object_ref (album); self->priv->post_photos->size = size; self->priv->post_photos->scramble = scramble; diff -Nru gthumb-3.0.2/extensions/photobucket/photobucket-service.h gthumb-3.2.3/extensions/photobucket/photobucket-service.h --- gthumb-3.0.2/extensions/photobucket/photobucket-service.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/photobucket/photobucket-service.h 2013-04-30 16:56:12.000000000 +0000 @@ -23,7 +23,7 @@ #define PHOTOBUCKET_SERVICE_H #include -#include +#include #include "photobucket-album.h" #include "photobucket-account.h" @@ -40,19 +40,20 @@ struct _PhotobucketService { - GObject __parent; + OAuthService __parent; PhotobucketServicePrivate *priv; }; struct _PhotobucketServiceClass { - GObjectClass __parent_class; + OAuthServiceClass __parent_class; }; GType photobucket_service_get_type (void) G_GNUC_CONST; -PhotobucketService * photobucket_service_new (OAuthConnection *conn); +PhotobucketService * photobucket_service_new (GCancellable *cancellable, + GtkWidget *browser, + GtkWidget *dialog); void photobucket_service_get_albums (PhotobucketService *self, - PhotobucketAccount *account, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); @@ -60,7 +61,6 @@ GAsyncResult *result, GError **error); void photobucket_service_create_album (PhotobucketService *self, - PhotobucketAccount *account, const char *parent_album, PhotobucketAlbum *album, GCancellable *cancellable, @@ -70,7 +70,6 @@ GAsyncResult *result, GError **error); void photobucket_service_upload_photos (PhotobucketService *self, - PhotobucketAccount *account, PhotobucketAlbum *album, int size, gboolean scramble, diff -Nru gthumb-3.0.2/extensions/picasaweb/Makefile.am gthumb-3.2.3/extensions/picasaweb/Makefile.am --- gthumb-3.0.2/extensions/picasaweb/Makefile.am 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/picasaweb/Makefile.am 2013-04-30 16:56:12.000000000 +0000 @@ -14,15 +14,7 @@ dlg-export-to-picasaweb.h \ dlg-import-from-picasaweb.c \ dlg-import-from-picasaweb.h \ - google-connection.c \ - google-connection.h \ main.c \ - picasa-account-chooser-dialog.c \ - picasa-account-chooser-dialog.h \ - picasa-account-manager-dialog.c \ - picasa-account-manager-dialog.h \ - picasa-account-properties-dialog.c \ - picasa-account-properties-dialog.h \ picasa-album-properties-dialog.c \ picasa-album-properties-dialog.h \ picasa-web-album.c \ @@ -32,13 +24,11 @@ picasa-web-service.c \ picasa-web-service.h \ picasa-web-types.h \ - picasa-web-user.c \ - picasa-web-user.h \ preferences.h -libpicasaweb_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(GNOME_KEYRING_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb +libpicasaweb_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(LIBSECRET_CFLAGS) $(JSON_GLIB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb libpicasaweb_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -libpicasaweb_la_LIBADD = $(GTHUMB_LIBS) $(LIBSOUP_LIBS) $(GNOME_KEYRING_LIBS) ../importer/libimporter.la ../export_tools/libexport_tools.la +libpicasaweb_la_LIBADD = $(GTHUMB_LIBS) $(LIBSOUP_LIBS) $(LIBSECRET_LIBS) $(JSON_GLIB_LIBS) ../importer/libimporter.la ../export_tools/libexport_tools.la ../oauth/liboauth.la libpicasaweb_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) extensioninidir = $(extensiondir) diff -Nru gthumb-3.0.2/extensions/picasaweb/Makefile.in gthumb-3.2.3/extensions/picasaweb/Makefile.in --- gthumb-3.0.2/extensions/picasaweb/Makefile.in 2012-08-20 19:54:16.000000000 +0000 +++ gthumb-3.2.3/extensions/picasaweb/Makefile.in 2013-07-10 13:33:49.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/picasaweb -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -100,33 +128,22 @@ am__libpicasaweb_la_SOURCES_DIST = actions.c actions.h callbacks.c \ callbacks.h dlg-export-to-picasaweb.c \ dlg-export-to-picasaweb.h dlg-import-from-picasaweb.c \ - dlg-import-from-picasaweb.h google-connection.c \ - google-connection.h main.c picasa-account-chooser-dialog.c \ - picasa-account-chooser-dialog.h \ - picasa-account-manager-dialog.c \ - picasa-account-manager-dialog.h \ - picasa-account-properties-dialog.c \ - picasa-account-properties-dialog.h \ + dlg-import-from-picasaweb.h main.c \ picasa-album-properties-dialog.c \ picasa-album-properties-dialog.h picasa-web-album.c \ picasa-web-album.h picasa-web-photo.c picasa-web-photo.h \ picasa-web-service.c picasa-web-service.h picasa-web-types.h \ - picasa-web-user.c picasa-web-user.h preferences.h + preferences.h @ENABLE_WEB_SERVICES_TRUE@am_libpicasaweb_la_OBJECTS = \ @ENABLE_WEB_SERVICES_TRUE@ libpicasaweb_la-actions.lo \ @ENABLE_WEB_SERVICES_TRUE@ libpicasaweb_la-callbacks.lo \ @ENABLE_WEB_SERVICES_TRUE@ libpicasaweb_la-dlg-export-to-picasaweb.lo \ @ENABLE_WEB_SERVICES_TRUE@ libpicasaweb_la-dlg-import-from-picasaweb.lo \ -@ENABLE_WEB_SERVICES_TRUE@ libpicasaweb_la-google-connection.lo \ @ENABLE_WEB_SERVICES_TRUE@ libpicasaweb_la-main.lo \ -@ENABLE_WEB_SERVICES_TRUE@ libpicasaweb_la-picasa-account-chooser-dialog.lo \ -@ENABLE_WEB_SERVICES_TRUE@ libpicasaweb_la-picasa-account-manager-dialog.lo \ -@ENABLE_WEB_SERVICES_TRUE@ libpicasaweb_la-picasa-account-properties-dialog.lo \ @ENABLE_WEB_SERVICES_TRUE@ libpicasaweb_la-picasa-album-properties-dialog.lo \ @ENABLE_WEB_SERVICES_TRUE@ libpicasaweb_la-picasa-web-album.lo \ @ENABLE_WEB_SERVICES_TRUE@ libpicasaweb_la-picasa-web-photo.lo \ -@ENABLE_WEB_SERVICES_TRUE@ libpicasaweb_la-picasa-web-service.lo \ -@ENABLE_WEB_SERVICES_TRUE@ libpicasaweb_la-picasa-web-user.lo +@ENABLE_WEB_SERVICES_TRUE@ libpicasaweb_la-picasa-web-service.lo libpicasaweb_la_OBJECTS = $(am_libpicasaweb_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -174,13 +191,14 @@ am__v_CCLD_1 = SOURCES = $(libpicasaweb_la_SOURCES) DIST_SOURCES = $(am__libpicasaweb_la_SOURCES_DIST) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -189,9 +207,29 @@ DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = data @@ -250,9 +288,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -266,13 +302,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -301,7 +336,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -317,11 +355,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -338,7 +380,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -368,7 +409,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -437,15 +481,7 @@ @ENABLE_WEB_SERVICES_TRUE@ dlg-export-to-picasaweb.h \ @ENABLE_WEB_SERVICES_TRUE@ dlg-import-from-picasaweb.c \ @ENABLE_WEB_SERVICES_TRUE@ dlg-import-from-picasaweb.h \ -@ENABLE_WEB_SERVICES_TRUE@ google-connection.c \ -@ENABLE_WEB_SERVICES_TRUE@ google-connection.h \ @ENABLE_WEB_SERVICES_TRUE@ main.c \ -@ENABLE_WEB_SERVICES_TRUE@ picasa-account-chooser-dialog.c \ -@ENABLE_WEB_SERVICES_TRUE@ picasa-account-chooser-dialog.h \ -@ENABLE_WEB_SERVICES_TRUE@ picasa-account-manager-dialog.c \ -@ENABLE_WEB_SERVICES_TRUE@ picasa-account-manager-dialog.h \ -@ENABLE_WEB_SERVICES_TRUE@ picasa-account-properties-dialog.c \ -@ENABLE_WEB_SERVICES_TRUE@ picasa-account-properties-dialog.h \ @ENABLE_WEB_SERVICES_TRUE@ picasa-album-properties-dialog.c \ @ENABLE_WEB_SERVICES_TRUE@ picasa-album-properties-dialog.h \ @ENABLE_WEB_SERVICES_TRUE@ picasa-web-album.c \ @@ -455,13 +491,11 @@ @ENABLE_WEB_SERVICES_TRUE@ picasa-web-service.c \ @ENABLE_WEB_SERVICES_TRUE@ picasa-web-service.h \ @ENABLE_WEB_SERVICES_TRUE@ picasa-web-types.h \ -@ENABLE_WEB_SERVICES_TRUE@ picasa-web-user.c \ -@ENABLE_WEB_SERVICES_TRUE@ picasa-web-user.h \ @ENABLE_WEB_SERVICES_TRUE@ preferences.h -@ENABLE_WEB_SERVICES_TRUE@libpicasaweb_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(GNOME_KEYRING_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb +@ENABLE_WEB_SERVICES_TRUE@libpicasaweb_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(LIBSECRET_CFLAGS) $(JSON_GLIB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb @ENABLE_WEB_SERVICES_TRUE@libpicasaweb_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -@ENABLE_WEB_SERVICES_TRUE@libpicasaweb_la_LIBADD = $(GTHUMB_LIBS) $(LIBSOUP_LIBS) $(GNOME_KEYRING_LIBS) ../importer/libimporter.la ../export_tools/libexport_tools.la +@ENABLE_WEB_SERVICES_TRUE@libpicasaweb_la_LIBADD = $(GTHUMB_LIBS) $(LIBSOUP_LIBS) $(LIBSECRET_LIBS) $(JSON_GLIB_LIBS) ../importer/libimporter.la ../export_tools/libexport_tools.la ../oauth/liboauth.la @ENABLE_WEB_SERVICES_TRUE@libpicasaweb_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) @ENABLE_WEB_SERVICES_TRUE@extensioninidir = $(extensiondir) @ENABLE_WEB_SERVICES_TRUE@extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension) @@ -502,6 +536,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -536,6 +571,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libpicasaweb.la: $(libpicasaweb_la_OBJECTS) $(libpicasaweb_la_DEPENDENCIES) $(EXTRA_libpicasaweb_la_DEPENDENCIES) $(AM_V_CCLD)$(libpicasaweb_la_LINK) $(am_libpicasaweb_la_rpath) $(libpicasaweb_la_OBJECTS) $(libpicasaweb_la_LIBADD) $(LIBS) @@ -549,30 +585,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpicasaweb_la-callbacks.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpicasaweb_la-dlg-export-to-picasaweb.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpicasaweb_la-dlg-import-from-picasaweb.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpicasaweb_la-google-connection.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpicasaweb_la-main.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpicasaweb_la-picasa-account-chooser-dialog.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpicasaweb_la-picasa-account-manager-dialog.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpicasaweb_la-picasa-account-properties-dialog.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpicasaweb_la-picasa-album-properties-dialog.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpicasaweb_la-picasa-web-album.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpicasaweb_la-picasa-web-photo.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpicasaweb_la-picasa-web-service.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpicasaweb_la-picasa-web-user.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -609,13 +640,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpicasaweb_la_CFLAGS) $(CFLAGS) -c -o libpicasaweb_la-dlg-import-from-picasaweb.lo `test -f 'dlg-import-from-picasaweb.c' || echo '$(srcdir)/'`dlg-import-from-picasaweb.c -libpicasaweb_la-google-connection.lo: google-connection.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpicasaweb_la_CFLAGS) $(CFLAGS) -MT libpicasaweb_la-google-connection.lo -MD -MP -MF $(DEPDIR)/libpicasaweb_la-google-connection.Tpo -c -o libpicasaweb_la-google-connection.lo `test -f 'google-connection.c' || echo '$(srcdir)/'`google-connection.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpicasaweb_la-google-connection.Tpo $(DEPDIR)/libpicasaweb_la-google-connection.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='google-connection.c' object='libpicasaweb_la-google-connection.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpicasaweb_la_CFLAGS) $(CFLAGS) -c -o libpicasaweb_la-google-connection.lo `test -f 'google-connection.c' || echo '$(srcdir)/'`google-connection.c - libpicasaweb_la-main.lo: main.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpicasaweb_la_CFLAGS) $(CFLAGS) -MT libpicasaweb_la-main.lo -MD -MP -MF $(DEPDIR)/libpicasaweb_la-main.Tpo -c -o libpicasaweb_la-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpicasaweb_la-main.Tpo $(DEPDIR)/libpicasaweb_la-main.Plo @@ -623,27 +647,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpicasaweb_la_CFLAGS) $(CFLAGS) -c -o libpicasaweb_la-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c -libpicasaweb_la-picasa-account-chooser-dialog.lo: picasa-account-chooser-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpicasaweb_la_CFLAGS) $(CFLAGS) -MT libpicasaweb_la-picasa-account-chooser-dialog.lo -MD -MP -MF $(DEPDIR)/libpicasaweb_la-picasa-account-chooser-dialog.Tpo -c -o libpicasaweb_la-picasa-account-chooser-dialog.lo `test -f 'picasa-account-chooser-dialog.c' || echo '$(srcdir)/'`picasa-account-chooser-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpicasaweb_la-picasa-account-chooser-dialog.Tpo $(DEPDIR)/libpicasaweb_la-picasa-account-chooser-dialog.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='picasa-account-chooser-dialog.c' object='libpicasaweb_la-picasa-account-chooser-dialog.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpicasaweb_la_CFLAGS) $(CFLAGS) -c -o libpicasaweb_la-picasa-account-chooser-dialog.lo `test -f 'picasa-account-chooser-dialog.c' || echo '$(srcdir)/'`picasa-account-chooser-dialog.c - -libpicasaweb_la-picasa-account-manager-dialog.lo: picasa-account-manager-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpicasaweb_la_CFLAGS) $(CFLAGS) -MT libpicasaweb_la-picasa-account-manager-dialog.lo -MD -MP -MF $(DEPDIR)/libpicasaweb_la-picasa-account-manager-dialog.Tpo -c -o libpicasaweb_la-picasa-account-manager-dialog.lo `test -f 'picasa-account-manager-dialog.c' || echo '$(srcdir)/'`picasa-account-manager-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpicasaweb_la-picasa-account-manager-dialog.Tpo $(DEPDIR)/libpicasaweb_la-picasa-account-manager-dialog.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='picasa-account-manager-dialog.c' object='libpicasaweb_la-picasa-account-manager-dialog.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpicasaweb_la_CFLAGS) $(CFLAGS) -c -o libpicasaweb_la-picasa-account-manager-dialog.lo `test -f 'picasa-account-manager-dialog.c' || echo '$(srcdir)/'`picasa-account-manager-dialog.c - -libpicasaweb_la-picasa-account-properties-dialog.lo: picasa-account-properties-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpicasaweb_la_CFLAGS) $(CFLAGS) -MT libpicasaweb_la-picasa-account-properties-dialog.lo -MD -MP -MF $(DEPDIR)/libpicasaweb_la-picasa-account-properties-dialog.Tpo -c -o libpicasaweb_la-picasa-account-properties-dialog.lo `test -f 'picasa-account-properties-dialog.c' || echo '$(srcdir)/'`picasa-account-properties-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpicasaweb_la-picasa-account-properties-dialog.Tpo $(DEPDIR)/libpicasaweb_la-picasa-account-properties-dialog.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='picasa-account-properties-dialog.c' object='libpicasaweb_la-picasa-account-properties-dialog.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpicasaweb_la_CFLAGS) $(CFLAGS) -c -o libpicasaweb_la-picasa-account-properties-dialog.lo `test -f 'picasa-account-properties-dialog.c' || echo '$(srcdir)/'`picasa-account-properties-dialog.c - libpicasaweb_la-picasa-album-properties-dialog.lo: picasa-album-properties-dialog.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpicasaweb_la_CFLAGS) $(CFLAGS) -MT libpicasaweb_la-picasa-album-properties-dialog.lo -MD -MP -MF $(DEPDIR)/libpicasaweb_la-picasa-album-properties-dialog.Tpo -c -o libpicasaweb_la-picasa-album-properties-dialog.lo `test -f 'picasa-album-properties-dialog.c' || echo '$(srcdir)/'`picasa-album-properties-dialog.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpicasaweb_la-picasa-album-properties-dialog.Tpo $(DEPDIR)/libpicasaweb_la-picasa-album-properties-dialog.Plo @@ -672,13 +675,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpicasaweb_la_CFLAGS) $(CFLAGS) -c -o libpicasaweb_la-picasa-web-service.lo `test -f 'picasa-web-service.c' || echo '$(srcdir)/'`picasa-web-service.c -libpicasaweb_la-picasa-web-user.lo: picasa-web-user.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpicasaweb_la_CFLAGS) $(CFLAGS) -MT libpicasaweb_la-picasa-web-user.lo -MD -MP -MF $(DEPDIR)/libpicasaweb_la-picasa-web-user.Tpo -c -o libpicasaweb_la-picasa-web-user.lo `test -f 'picasa-web-user.c' || echo '$(srcdir)/'`picasa-web-user.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpicasaweb_la-picasa-web-user.Tpo $(DEPDIR)/libpicasaweb_la-picasa-web-user.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='picasa-web-user.c' object='libpicasaweb_la-picasa-web-user.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpicasaweb_la_CFLAGS) $(CFLAGS) -c -o libpicasaweb_la-picasa-web-user.lo `test -f 'picasa-web-user.c' || echo '$(srcdir)/'`picasa-web-user.c - mostlyclean-libtool: -rm -f *.lo @@ -712,14 +708,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -740,31 +735,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -780,12 +757,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -797,15 +769,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -814,9 +782,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -998,25 +967,23 @@ uninstall-am: uninstall-extensionLTLIBRARIES \ uninstall-extensioniniDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-extensionLTLIBRARIES \ - clean-generic clean-libtool cscopelist cscopelist-recursive \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extensionLTLIBRARIES \ - install-extensioniniDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-extensionLTLIBRARIES clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-extensionLTLIBRARIES install-extensioniniDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA diff -Nru gthumb-3.0.2/extensions/picasaweb/data/Makefile.in gthumb-3.2.3/extensions/picasaweb/data/Makefile.in --- gthumb-3.0.2/extensions/picasaweb/data/Makefile.in 2012-08-20 19:54:16.000000000 +0000 +++ gthumb-3.2.3/extensions/picasaweb/data/Makefile.in 2013-07-10 13:33:49.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/picasaweb/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/picasaweb/data/ui/Makefile.am gthumb-3.2.3/extensions/picasaweb/data/ui/Makefile.am --- gthumb-3.0.2/extensions/picasaweb/data/ui/Makefile.am 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/picasaweb/data/ui/Makefile.am 2013-04-30 16:56:12.000000000 +0000 @@ -2,9 +2,6 @@ ui_DATA = \ export-to-picasaweb.ui \ import-from-picasaweb.ui \ - picasa-web-account-chooser.ui \ - picasa-web-account-manager.ui \ - picasa-web-account-properties.ui \ picasa-web-album-properties.ui \ picasa-web-export-completed.ui EXTRA_DIST = $(ui_DATA) diff -Nru gthumb-3.0.2/extensions/picasaweb/data/ui/Makefile.in gthumb-3.2.3/extensions/picasaweb/data/ui/Makefile.in --- gthumb-3.0.2/extensions/picasaweb/data/ui/Makefile.in 2012-08-20 19:54:16.000000000 +0000 +++ gthumb-3.2.3/extensions/picasaweb/data/ui/Makefile.in 2013-07-10 13:33:49.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/picasaweb/data/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -322,9 +356,6 @@ ui_DATA = \ export-to-picasaweb.ui \ import-from-picasaweb.ui \ - picasa-web-account-chooser.ui \ - picasa-web-account-manager.ui \ - picasa-web-account-properties.ui \ picasa-web-album-properties.ui \ picasa-web-export-completed.ui @@ -389,11 +420,9 @@ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -534,16 +563,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-uiDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-uiDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/picasaweb/data/ui/export-to-picasaweb.ui gthumb-3.2.3/extensions/picasaweb/data/ui/export-to-picasaweb.ui --- gthumb-3.0.2/extensions/picasaweb/data/ui/export-to-picasaweb.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/picasaweb/data/ui/export-to-picasaweb.ui 2013-04-30 16:56:12.000000000 +0000 @@ -3,12 +3,10 @@ - - + + - - @@ -37,6 +35,7 @@ True False vertical + 5 True @@ -45,11 +44,9 @@ gtk-cancel - False True True True - False True @@ -61,11 +58,9 @@ _Upload - False True True True - False upload_image True @@ -78,11 +73,9 @@ gtk-help - False True True True - False True @@ -178,12 +171,6 @@ False account_liststore - - - 2 - - - 1 @@ -198,16 +185,14 @@ - False True True True - False True False - gtk-edit + view-list-symbolic @@ -368,16 +353,14 @@ 6 - False True True True - False True False - gtk-add + list-add-symbolic @@ -408,6 +391,65 @@ 1 + + + True + False + 6 + + + _Resize if larger than: + True + True + False + True + 0 + True + + + False + False + 0 + + + + + True + False + 6 + + + True + False + resize_liststore + 0 + + + + 0 + + + + + False + True + 0 + + + + + True + True + 1 + + + + + False + True + 2 + + False @@ -429,6 +471,14 @@ button1 + + + + + + + + True False diff -Nru gthumb-3.0.2/extensions/picasaweb/data/ui/import-from-picasaweb.ui gthumb-3.2.3/extensions/picasaweb/data/ui/import-from-picasaweb.ui --- gthumb-3.0.2/extensions/picasaweb/data/ui/import-from-picasaweb.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/picasaweb/data/ui/import-from-picasaweb.ui 2013-04-30 16:56:12.000000000 +0000 @@ -1,14 +1,12 @@ - + - - + + - - @@ -38,36 +36,18 @@ True False vertical + 5 True False end - - gtk-help - False - True - True - True - False - True - - - False - False - 0 - True - - - gtk-cancel - False True True True - False True @@ -79,11 +59,9 @@ _Import - False True True True - False download_image True @@ -151,17 +129,15 @@ - False True True True Edit accounts - False True False - gtk-edit + view-list-symbolic @@ -317,7 +293,6 @@ - button1 close_button download_button diff -Nru gthumb-3.0.2/extensions/picasaweb/data/ui/picasa-web-account-chooser.ui gthumb-3.2.3/extensions/picasaweb/data/ui/picasa-web-account-chooser.ui --- gthumb-3.0.2/extensions/picasaweb/data/ui/picasa-web-account-chooser.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/picasaweb/data/ui/picasa-web-account-chooser.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - True - False - 5 - 6 - - - True - False - 6 - - - True - False - 0 - A_ccount: - True - - - False - True - 0 - - - - - 300 - True - False - account_liststore - - - - 4 - 3 - - - - - - 4 - 2 - - - - - True - True - 1 - - - - - False - True - 0 - - - - diff -Nru gthumb-3.0.2/extensions/picasaweb/data/ui/picasa-web-account-manager.ui gthumb-3.2.3/extensions/picasaweb/data/ui/picasa-web-account-manager.ui --- gthumb-3.0.2/extensions/picasaweb/data/ui/picasa-web-account-manager.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/picasaweb/data/ui/picasa-web-account-manager.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,136 +0,0 @@ - - - - - - - - - - - - - True - False - 5 - - - True - False - 0 - A_ccounts: - True - account_treeview - - - False - True - 0 - - - - - True - False - 6 - - - 300 - 150 - True - True - in - - - True - True - accounts_liststore - False - False - True - 1 - - - - - - - - - 1 - - - - - - - - - True - True - 0 - - - - - True - False - 6 - - - False - True - True - True - False - - - True - False - gtk-add - - - - - False - True - 0 - - - - - False - True - True - True - False - - - True - False - gtk-delete - - - - - False - True - 1 - - - - - False - True - 1 - - - - - True - True - 1 - - - - diff -Nru gthumb-3.0.2/extensions/picasaweb/data/ui/picasa-web-account-properties.ui gthumb-3.2.3/extensions/picasaweb/data/ui/picasa-web-account-properties.ui --- gthumb-3.0.2/extensions/picasaweb/data/ui/picasa-web-account-properties.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/picasaweb/data/ui/picasa-web-account-properties.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,202 +0,0 @@ - - - - - True - False - 6 - - - True - False - 12 - 24 - - - True - False - 0 - 48 - dialog-warning - - - False - True - 0 - - - - - True - False - 0 - - - True - True - 1 - - - - - False - True - 0 - - - - - True - False - 5 - 2 - 2 - 6 - 6 - - - True - False - 0 - _E-Mail: - True - email_entry - - - GTK_FILL - GTK_FILL - - - - - 300 - True - True - ● - True - - - 1 - 2 - GTK_FILL - - - - - True - False - 6 - - - True - True - ● - True - True - - - False - True - 0 - - - - - False - 6 - - - True - False - 0 - Type the characters you see in the picture below. Letters are not case-sensitive. - True - - - False - True - 0 - - - - - True - False - 12 - gtk-missing-image - - - False - True - 1 - - - - - True - True - ● - True - - - False - True - 2 - - - - - False - True - 1 - - - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - False - 5 - - - True - False - 0 - 0 - _Password: - True - - - - - 1 - 2 - GTK_FILL - GTK_FILL - - - - - False - False - 1 - - - - - - - - - - - - diff -Nru gthumb-3.0.2/extensions/picasaweb/dlg-export-to-picasaweb.c gthumb-3.2.3/extensions/picasaweb/dlg-export-to-picasaweb.c --- gthumb-3.0.2/extensions/picasaweb/dlg-export-to-picasaweb.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/picasaweb/dlg-export-to-picasaweb.c 2013-04-30 16:56:12.000000000 +0000 @@ -21,18 +21,13 @@ #include #include -#ifdef HAVE_GNOME_KEYRING -#include -#endif /* HAVE_GNOME_KEYRING */ #include +#include #include "dlg-export-to-picasaweb.h" -#include "picasa-account-chooser-dialog.h" -#include "picasa-account-manager-dialog.h" -#include "picasa-account-properties-dialog.h" #include "picasa-album-properties-dialog.h" #include "picasa-web-album.h" #include "picasa-web-service.h" -#include "picasa-web-user.h" +#include "preferences.h" #define GET_WIDGET(x) (_gtk_builder_get_widget (data->builder, (x))) @@ -40,9 +35,8 @@ enum { - ACCOUNT_EMAIL_COLUMN, - ACCOUNT_NAME_COLUMN, - ACCOUNT_ICON_COLUMN + ACCOUNT_DATA_COLUMN, + ACCOUNT_NAME_COLUMN }; @@ -58,20 +52,15 @@ typedef struct { GthBrowser *browser; + GSettings *settings; GthFileData *location; GList *file_list; GtkBuilder *builder; GtkWidget *dialog; GtkWidget *list_view; GtkWidget *progress_dialog; - GList *accounts; - PicasaWebUser *user; - char *email; - char *password; - char *challange; + PicasaWebService *service; GList *albums; - GoogleConnection *conn; - PicasaWebService *picasaweb; PicasaWebAlbum *album; GCancellable *cancellable; } DialogData; @@ -82,21 +71,16 @@ { if (data->dialog != NULL) gtk_widget_destroy (data->dialog); - if (data->conn != NULL) - gth_task_completed (GTH_TASK (data->conn), NULL); + gth_task_completed (GTH_TASK (data->service), NULL); _g_object_unref (data->cancellable); _g_object_unref (data->album); - _g_object_unref (data->picasaweb); - _g_object_unref (data->conn); + _g_object_unref (data->service); _g_object_list_unref (data->albums); - g_free (data->challange); - g_free (data->password); - g_free (data->email); - _g_object_unref (data->user); - _g_string_list_free (data->accounts); + gtk_widget_destroy (data->progress_dialog); _g_object_unref (data->builder); _g_object_list_unref (data->file_list); _g_object_unref (data->location); + g_object_unref (data->settings); g_free (data); } @@ -117,10 +101,12 @@ case _OPEN_IN_BROWSER_RESPONSE: { - GdkScreen *screen; - char *url = NULL; - GError *error = NULL; + OAuthAccount *account; + GdkScreen *screen; + char *url = NULL; + GError *error = NULL; + account = web_service_get_current_account (WEB_SERVICE (data->service)); screen = gtk_widget_get_screen (GTK_WIDGET (dialog)); gtk_widget_destroy (GTK_WIDGET (dialog)); @@ -128,14 +114,13 @@ if (data->album->alternate_url != NULL) url = g_strdup (data->album->alternate_url); else - url = g_strconcat ("http://picasaweb.google.com/", data->user->id, "/", data->album->id, NULL); + url = g_strconcat ("http://picasaweb.google.com/", account->id, "/", data->album->id, NULL); } else - url = g_strconcat ("http://picasaweb.google.com/", data->user->id, NULL); + url = g_strconcat ("http://picasaweb.google.com/", account->id, NULL); if ((url != NULL) && ! gtk_show_uri (screen, url, 0, &error)) { - if (data->conn != NULL) - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); _gtk_error_dialog_from_gerror_run (GTK_WINDOW (data->browser), _("Could not connect to the server"), error); g_clear_error (&error); } @@ -157,7 +142,7 @@ GtkBuilder *builder; GtkWidget *dialog; - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); builder = _gtk_builder_new_from_file ("picasa-web-export-completed.ui", "picasaweb"); dialog = _gtk_builder_get_widget (builder, "completed_messagedialog"); @@ -187,8 +172,7 @@ GError *error = NULL; if (! picasa_web_service_post_photos_finish (picasaweb, result, &error)) { - if (data->conn != NULL) - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); _gtk_error_dialog_from_gerror_show (GTK_WINDOW (data->browser), _("Could not upload the files"), error); g_clear_error (&error); return; @@ -206,13 +190,8 @@ DialogData *data = user_data; switch (response_id) { - case GTK_RESPONSE_HELP: - show_help_dialog (GTK_WINDOW (data->browser), "gthumb-export-social"); - break; - case GTK_RESPONSE_DELETE_EVENT: case GTK_RESPONSE_CANCEL: - picasa_web_accounts_save_to_file (data->accounts, data->email); gth_file_list_cancel (GTH_FILE_LIST (data->list_view), (DataFunc) destroy_dialog, data); break; @@ -221,9 +200,13 @@ GtkTreeModel *tree_model; GtkTreeIter iter; GList *file_list; + int max_width; + int max_height; if (! gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (GET_WIDGET ("albums_treeview"))), &tree_model, &iter)) { - gtk_widget_set_sensitive (GET_WIDGET ("upload_button"), FALSE); + gtk_dialog_set_response_sensitive (GTK_DIALOG (data->dialog), + GTK_RESPONSE_OK, + FALSE); return; } @@ -233,12 +216,25 @@ -1); gtk_widget_hide (data->dialog); - gth_task_dialog (GTH_TASK (data->conn), FALSE, NULL); + gth_task_dialog (GTH_TASK (data->service), FALSE, NULL); file_list = gth_file_data_list_to_file_list (data->file_list); - picasa_web_service_post_photos (data->picasaweb, + + max_width = -1; + max_height = -1; + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("resize_checkbutton")))) { + int idx = gtk_combo_box_get_active (GTK_COMBO_BOX (GET_WIDGET ("resize_combobox"))); + max_width = ImageSizeValues[idx].width; + max_height = ImageSizeValues[idx].height; + } + g_settings_set_int (data->settings, PREF_PICASAWEB_RESIZE_WIDTH, max_width); + g_settings_set_int (data->settings, PREF_PICASAWEB_RESIZE_HEIGHT, max_height); + + picasa_web_service_post_photos (data->service, data->album, file_list, + max_width, + max_height, data->cancellable, post_photos_ready_cb, data); @@ -254,42 +250,13 @@ static void -update_account_list (DialogData *data) -{ - GtkTreeIter iter; - int current_account; - int idx; - GList *scan; - - current_account = 0; - gtk_list_store_clear (GTK_LIST_STORE (GET_WIDGET ("account_liststore"))); - for (scan = data->accounts, idx = 0; scan; scan = scan->next, idx++) { - char *account = scan->data; - - if (g_strcmp0 (account, data->email) == 0) - current_account = idx; - - gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter); - gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter, - ACCOUNT_EMAIL_COLUMN, account, - ACCOUNT_NAME_COLUMN, account, - -1); - } - - gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("account_combobox")), current_account); -} - - -static void update_album_list (DialogData *data) { GtkTreeIter iter; GList *scan; char *free_space; - g_return_if_fail (data->user != NULL); - - free_space = g_format_size (data->user->quota_limit - data->user->quota_current); + free_space = g_format_size (picasa_web_service_get_free_space (PICASA_WEB_SERVICE (data->service))); gtk_label_set_text (GTK_LABEL (GET_WIDGET ("free_space_label")), free_space); g_free (free_space); @@ -320,383 +287,9 @@ g_free (n_photos_remaining); } - gtk_widget_set_sensitive (GET_WIDGET ("upload_button"), FALSE); -} - - -static void -show_export_dialog (DialogData *data) -{ - update_account_list (data); - update_album_list (data); - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); - - gtk_window_set_transient_for (GTK_WINDOW (data->dialog), GTK_WINDOW (data->browser)); - gtk_window_set_modal (GTK_WINDOW (data->dialog), FALSE); - gtk_window_present (GTK_WINDOW (data->dialog)); -} - - -static void -list_albums_ready_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) -{ - DialogData *data = user_data; - PicasaWebService *picasaweb = PICASA_WEB_SERVICE (source_object); - GError *error = NULL; - - _g_object_list_unref (data->albums); - data->albums = picasa_web_service_list_albums_finish (picasaweb, result, &error); - if (error != NULL) { - if (data->conn != NULL) - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); - _gtk_error_dialog_from_gerror_show (GTK_WINDOW (data->browser), _("Could not get the album list"), error); - g_clear_error (&error); - gtk_dialog_response (GTK_DIALOG (data->dialog), GTK_RESPONSE_DELETE_EVENT); - return; - } - - _g_object_unref (data->user); - data->user = g_object_ref (picasa_web_service_get_user (picasaweb)); - show_export_dialog (data); -} - - -static void -get_album_list (DialogData *data) -{ - char *user_id; - - gth_task_dialog (GTH_TASK (data->conn), FALSE, NULL); - - if (data->picasaweb == NULL) - data->picasaweb = picasa_web_service_new (data->conn); - user_id = google_utils_get_user_id_from_email (data->email); - picasa_web_service_list_albums (data->picasaweb, - user_id, - data->cancellable, - list_albums_ready_cb, - data); - - g_free (user_id); -} - - -#ifdef HAVE_GNOME_KEYRING -static void -store_password_done_cb (GnomeKeyringResult result, - gpointer user_data) -{ - get_album_list ((DialogData *) user_data); -} -#endif - - -static void account_properties_dialog (DialogData *data, - const char *email, - GError *error); -static void challange_account_dialog (DialogData *data, - GError *error); - - -static void -connection_ready_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) -{ - DialogData *data = user_data; - GoogleConnection *conn = GOOGLE_CONNECTION (source_object); - GError *error = NULL; - - if (! google_connection_connect_finish (conn, result, &error)) { - if (g_error_matches (error, GOOGLE_CONNECTION_ERROR, GOOGLE_CONNECTION_ERROR_CAPTCHA_REQUIRED)) { - challange_account_dialog (data, error); - g_clear_error (&error); - } - else if (g_error_matches (error, GOOGLE_CONNECTION_ERROR, GOOGLE_CONNECTION_ERROR_BAD_AUTHENTICATION)) { - account_properties_dialog (data, data->email, error); - g_clear_error (&error); - } - else { - if (data->conn != NULL) - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); - _gtk_error_dialog_from_gerror_show (GTK_WINDOW (data->browser), _("Could not connect to the server"), error); - g_clear_error (&error); - gtk_dialog_response (GTK_DIALOG (data->dialog), GTK_RESPONSE_DELETE_EVENT); - } - return; - } - - if (! g_list_find_custom (data->accounts, data->email, (GCompareFunc) strcmp)) - data->accounts = g_list_append (data->accounts, g_strdup (data->email)); - -#ifdef HAVE_GNOME_KEYRING - if (gnome_keyring_is_available ()) { - gnome_keyring_store_password (GNOME_KEYRING_NETWORK_PASSWORD, - NULL, - _("Picasa Web Album"), - data->password, - store_password_done_cb, - data, - NULL, - "user", data->email, - "server", "picasaweb.google.com", - "protocol", "http", - NULL); - return; - } -#endif - - get_album_list (data); -} - - -static void connect_to_server (DialogData *data); -static void auto_select_account (DialogData *data); - - -static void -account_properties_dialog_response_cb (GtkDialog *dialog, - int response_id, - gpointer user_data) -{ - DialogData *data = user_data; - - switch (response_id) { - case GTK_RESPONSE_HELP: - show_help_dialog (GTK_WINDOW (dialog), "picasaweb-account-properties"); - break; - - case GTK_RESPONSE_DELETE_EVENT: - case GTK_RESPONSE_CANCEL: - gtk_widget_destroy (GTK_WIDGET (dialog)); - gtk_dialog_response (GTK_DIALOG (data->dialog), GTK_RESPONSE_DELETE_EVENT); - break; - - case GTK_RESPONSE_OK: - g_free (data->email); - g_free (data->password); - g_free (data->challange); - data->email = g_strdup (picasa_account_properties_dialog_get_email (PICASA_ACCOUNT_PROPERTIES_DIALOG (dialog))); - data->password = g_strdup (picasa_account_properties_dialog_get_password (PICASA_ACCOUNT_PROPERTIES_DIALOG (dialog))); - data->challange = NULL; - gtk_widget_destroy (GTK_WIDGET (dialog)); - connect_to_server (data); - break; - - case PICASA_ACCOUNT_PROPERTIES_RESPONSE_CHOOSE: - gtk_widget_destroy (GTK_WIDGET (dialog)); - g_free (data->email); - data->email = NULL; - auto_select_account (data); - break; - - default: - break; - } -} - - -static void -account_properties_dialog (DialogData *data, - const char *email, - GError *error) -{ - GtkWidget *dialog; - - if (data->conn != NULL) - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); - - dialog = picasa_account_properties_dialog_new (email, NULL, NULL); - picasa_account_properties_dialog_set_error (PICASA_ACCOUNT_PROPERTIES_DIALOG (dialog), error); - if ((error != NULL) && (data->accounts != NULL) && (data->accounts->next != NULL)) - picasa_account_properties_dialog_can_choose (PICASA_ACCOUNT_PROPERTIES_DIALOG (dialog), TRUE); - - g_signal_connect (dialog, - "delete-event", - G_CALLBACK (gtk_true), - NULL); - g_signal_connect (dialog, - "response", - G_CALLBACK (account_properties_dialog_response_cb), - data); - - gtk_window_set_title (GTK_WINDOW (dialog), _("Account")); - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (data->browser)); - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - gtk_window_present (GTK_WINDOW (dialog)); -} - - -static void -connect_to_server_step2 (DialogData *data) -{ - if ((data->password == NULL) || g_str_equal (data->password, "")) { - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); - account_properties_dialog (data, data->email, NULL); - } - else { - gth_task_dialog (GTH_TASK (data->conn), FALSE, NULL); - google_connection_connect (data->conn, - data->email, - data->password, - data->challange, - data->cancellable, - connection_ready_cb, - data); - } -} - - -#ifdef HAVE_GNOME_KEYRING -static void -find_password_cb (GnomeKeyringResult result, - const char *string, - gpointer user_data) -{ - DialogData *data = user_data; - - if (string != NULL) - data->password = g_strdup (string); - connect_to_server_step2 (data); -} -#endif - - -static void -connect_to_server (DialogData *data) -{ - if (data->conn == NULL) { - data->conn = google_connection_new (GOOGLE_SERVICE_PICASA_WEB_ALBUM); - data->progress_dialog = gth_progress_dialog_new (GTK_WINDOW (data->browser)); - gth_progress_dialog_add_task (GTH_PROGRESS_DIALOG (data->progress_dialog), GTH_TASK (data->conn)); - } - -#ifdef HAVE_GNOME_KEYRING - if ((data->password == NULL) && gnome_keyring_is_available ()) { - gnome_keyring_find_password (GNOME_KEYRING_NETWORK_PASSWORD, - find_password_cb, - data, - NULL, - "user", data->email, - "server", "picasaweb.google.com", - "protocol", "http", - NULL); - return; - } -#endif - - connect_to_server_step2 (data); -} - - -static void -challange_account_dialog_response_cb (GtkDialog *dialog, - int response_id, - gpointer user_data) -{ - DialogData *data = user_data; - - switch (response_id) { - case GTK_RESPONSE_HELP: - show_help_dialog (GTK_WINDOW (dialog), "picasaweb-account-challange"); - break; - - case GTK_RESPONSE_DELETE_EVENT: - case GTK_RESPONSE_CANCEL: - gtk_widget_destroy (GTK_WIDGET (dialog)); - gtk_dialog_response (GTK_DIALOG (data->dialog), GTK_RESPONSE_DELETE_EVENT); - break; - - case GTK_RESPONSE_OK: - g_free (data->email); - g_free (data->password); - data->email = g_strdup (picasa_account_properties_dialog_get_email (PICASA_ACCOUNT_PROPERTIES_DIALOG (dialog))); - data->password = g_strdup (picasa_account_properties_dialog_get_password (PICASA_ACCOUNT_PROPERTIES_DIALOG (dialog))); - data->challange = g_strdup (picasa_account_properties_dialog_get_challange (PICASA_ACCOUNT_PROPERTIES_DIALOG (dialog))); - gtk_widget_destroy (GTK_WIDGET (dialog)); - connect_to_server (data); - break; - - case PICASA_ACCOUNT_PROPERTIES_RESPONSE_CHOOSE: - gtk_widget_destroy (GTK_WIDGET (dialog)); - g_free (data->email); - data->email = NULL; - auto_select_account (data); - break; - - default: - break; - } -} - - -static void -challange_account_dialog (DialogData *data, - GError *error) -{ - GtkWidget *dialog; - - if (data->conn != NULL) - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); - - dialog = picasa_account_properties_dialog_new (data->email, data->password, google_connection_get_challange_url (data->conn)); - picasa_account_properties_dialog_set_error (PICASA_ACCOUNT_PROPERTIES_DIALOG (dialog), error); - if ((error != NULL) && (data->accounts != NULL) && (data->accounts->next != NULL)) - picasa_account_properties_dialog_can_choose (PICASA_ACCOUNT_PROPERTIES_DIALOG (dialog), TRUE); - - g_signal_connect (dialog, - "delete-event", - G_CALLBACK (gtk_true), - NULL); - g_signal_connect (dialog, - "response", - G_CALLBACK (challange_account_dialog_response_cb), - data); - - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (data->browser)); - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - gtk_window_present (GTK_WINDOW (dialog)); -} - - -static void -account_chooser_dialog_response_cb (GtkDialog *dialog, - int response_id, - gpointer user_data) -{ - DialogData *data = user_data; - - switch (response_id) { - case GTK_RESPONSE_DELETE_EVENT: - case GTK_RESPONSE_CANCEL: - gtk_widget_destroy (GTK_WIDGET (dialog)); - gtk_dialog_response (GTK_DIALOG (data->dialog), GTK_RESPONSE_DELETE_EVENT); - break; - - case GTK_RESPONSE_OK: - g_free (data->password); - data->password = NULL; - g_free (data->challange); - data->challange = NULL; - g_free (data->email); - data->email = picasa_account_chooser_dialog_get_active (PICASA_ACCOUNT_CHOOSER_DIALOG (dialog)); - if (data->email != NULL) { - gtk_widget_destroy (GTK_WIDGET (dialog)); - connect_to_server (data); - } - - break; - - case PICASA_ACCOUNT_CHOOSER_RESPONSE_NEW: - gtk_widget_destroy (GTK_WIDGET (dialog)); - account_properties_dialog (data, NULL, NULL); - break; - - default: - break; - } + gtk_dialog_set_response_sensitive (GTK_DIALOG (data->dialog), + GTK_RESPONSE_OK, + FALSE); } @@ -712,8 +305,7 @@ album = picasa_web_service_create_album_finish (picasaweb, result, &error); if (error != NULL) { - if (data->conn != NULL) - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); _gtk_error_dialog_from_gerror_show (GTK_WINDOW (data->browser), _("Could not create the album"), error); g_clear_error (&error); return; @@ -744,7 +336,7 @@ album = picasa_web_album_new (); picasa_web_album_set_title (album, picasa_album_properties_dialog_get_name (PICASA_ALBUM_PROPERTIES_DIALOG (dialog))); album->access = picasa_album_properties_dialog_get_access (PICASA_ALBUM_PROPERTIES_DIALOG (dialog)); - picasa_web_service_create_album (data->picasaweb, + picasa_web_service_create_album (data->service, album, data->cancellable, create_album_ready_cb, @@ -788,142 +380,145 @@ static void -auto_select_account (DialogData *data) +edit_accounts_button_clicked_cb (GtkButton *button, + gpointer user_data) { - gtk_widget_hide (data->dialog); - if (data->conn != NULL) - gth_task_dialog (GTH_TASK (data->conn), FALSE, NULL); - - if (data->accounts != NULL) { - if (data->email != NULL) { - connect_to_server (data); - } - else if (data->accounts->next == NULL) { - data->email = g_strdup ((char *)data->accounts->data); - connect_to_server (data); - } - else { - GtkWidget *dialog; + DialogData *data = user_data; - if (data->conn != NULL) - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); - dialog = picasa_account_chooser_dialog_new (data->accounts, data->email); - g_signal_connect (dialog, - "delete-event", - G_CALLBACK (gtk_true), - NULL); - g_signal_connect (dialog, - "response", - G_CALLBACK (account_chooser_dialog_response_cb), - data); - - gtk_window_set_title (GTK_WINDOW (dialog), _("Choose Account")); - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (data->browser)); - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - gtk_window_present (GTK_WINDOW (dialog)); - } - } - else - account_properties_dialog (data, NULL, NULL); + web_service_edit_accounts (WEB_SERVICE (data->service), GTK_WINDOW (data->dialog)); } static void -account_manager_dialog_response_cb (GtkDialog *dialog, - int response_id, - gpointer user_data) +account_combobox_changed_cb (GtkComboBox *widget, + gpointer user_data) { - DialogData *data = user_data; + DialogData *data = user_data; + GtkTreeIter iter; + OAuthAccount *account; - switch (response_id) { - case GTK_RESPONSE_DELETE_EVENT: - case GTK_RESPONSE_CANCEL: - gtk_widget_destroy (GTK_WIDGET (dialog)); - break; + if (! gtk_combo_box_get_active_iter (widget, &iter)) + return; - case GTK_RESPONSE_OK: - _g_string_list_free (data->accounts); - data->accounts = picasa_account_manager_dialog_get_accounts (PICASA_ACCOUNT_MANAGER_DIALOG (dialog)); - if (! g_list_find_custom (data->accounts, data->email, (GCompareFunc) strcmp)) { - g_free (data->email); - data->email = NULL; - auto_select_account (data); - } - else - update_account_list (data); - picasa_web_accounts_save_to_file (data->accounts, data->email); - gtk_widget_destroy (GTK_WIDGET (dialog)); - break; + gtk_tree_model_get (gtk_combo_box_get_model (widget), + &iter, + ACCOUNT_DATA_COLUMN, &account, + -1); - default: - break; - } + if (oauth_account_cmp (account, web_service_get_current_account (WEB_SERVICE (data->service))) != 0) + web_service_connect (WEB_SERVICE (data->service), account); + + g_object_unref (account); } static void -edit_accounts_button_clicked_cb (GtkButton *button, - gpointer user_data) +albums_treeview_selection_changed_cb (GtkTreeSelection *treeselection, + gpointer user_data) { DialogData *data = user_data; - GtkWidget *dialog; + gboolean selected; - dialog = picasa_account_manager_dialog_new (data->accounts); - g_signal_connect (dialog, - "delete-event", - G_CALLBACK (gtk_true), - NULL); - g_signal_connect (dialog, - "response", - G_CALLBACK (account_manager_dialog_response_cb), - data); + selected = gtk_tree_selection_get_selected (treeselection, NULL, NULL); + gtk_dialog_set_response_sensitive (GTK_DIALOG (data->dialog), + GTK_RESPONSE_OK, + selected); +} - gtk_window_set_title (GTK_WINDOW (dialog), _("Edit Accounts")); - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (data->dialog)); - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - gtk_window_present (GTK_WINDOW (dialog)); + +static void +update_sensitivity (DialogData *data) +{ + gtk_widget_set_sensitive (GET_WIDGET ("resize_combobox"), + gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("resize_checkbutton")))); } static void -account_combobox_changed_cb (GtkComboBox *widget, - gpointer user_data) +resize_checkbutton_toggled_cb (GtkToggleButton *button, + gpointer user_data) { - DialogData *data = user_data; - GtkTreeIter iter; - char *email; + update_sensitivity (user_data); +} - if (! gtk_combo_box_get_active_iter (widget, &iter)) + +static void +list_albums_ready_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) +{ + DialogData *data = user_data; + PicasaWebService *picasaweb = PICASA_WEB_SERVICE (source_object); + GError *error = NULL; + + _g_object_list_unref (data->albums); + data->albums = picasa_web_service_list_albums_finish (picasaweb, result, &error); + if (error != NULL) { + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); + _gtk_error_dialog_from_gerror_show (GTK_WINDOW (data->browser), _("Could not get the album list"), error); + g_clear_error (&error); + gtk_dialog_response (GTK_DIALOG (data->dialog), GTK_RESPONSE_DELETE_EVENT); return; + } - gtk_tree_model_get (gtk_combo_box_get_model (widget), - &iter, - ACCOUNT_EMAIL_COLUMN, &email, - -1); + update_album_list (data); + + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); + gtk_window_set_transient_for (GTK_WINDOW (data->dialog), GTK_WINDOW (data->browser)); + gtk_window_set_modal (GTK_WINDOW (data->dialog), FALSE); + gtk_window_present (GTK_WINDOW (data->dialog)); +} + + +static void +update_account_list (DialogData *data) +{ + int current_account_idx; + OAuthAccount *current_account; + int idx; + GList *scan; + GtkTreeIter iter; + + gtk_list_store_clear (GTK_LIST_STORE (GET_WIDGET ("account_liststore"))); + + current_account_idx = 0; + current_account = web_service_get_current_account (WEB_SERVICE (data->service)); + for (scan = web_service_get_accounts (WEB_SERVICE (data->service)), idx = 0; scan; scan = scan->next, idx++) { + OAuthAccount *account = scan->data; + + if ((current_account != NULL) && (g_strcmp0 (current_account->id, account->id) == 0)) + current_account_idx = idx; - if (g_strcmp0 (email, data->email) != 0) { - g_free (data->email); - g_free (data->password); - g_free (data->challange); - data->email = email; - data->password = NULL; - data->challange = NULL; - auto_select_account (data); + gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter); + gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter, + ACCOUNT_DATA_COLUMN, account, + ACCOUNT_NAME_COLUMN, account->name, + -1); } - else - g_free (email); + gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("account_combobox")), current_account_idx); } static void -albums_treeview_selection_changed_cb (GtkTreeSelection *treeselection, - gpointer user_data) +service_account_ready_cb (WebService *service, + gpointer user_data) { DialogData *data = user_data; - gboolean selected; - selected = gtk_tree_selection_get_selected (treeselection, NULL, NULL); - gtk_widget_set_sensitive (GET_WIDGET ("upload_button"), selected); + update_account_list (data); + picasa_web_service_list_albums (data->service, + data->cancellable, + list_albums_ready_cb, + data); +} + + +static void +service_accounts_changed_cb (WebService *service, + gpointer user_data) +{ + DialogData *data = user_data; + update_account_list (data); } @@ -941,6 +536,7 @@ data = g_new0 (DialogData, 1); data->browser = browser; + data->settings = g_settings_new (GTHUMB_PICASAWEB_SCHEMA); data->location = gth_file_data_dup (gth_browser_get_location_data (browser)); data->builder = _gtk_builder_new_from_file ("export-to-picasaweb.ui", "picasaweb"); data->dialog = _gtk_builder_get_widget (data->builder, "export_dialog"); @@ -996,8 +592,7 @@ if (data->file_list == NULL) { GError *error; - if (data->conn != NULL) - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); error = g_error_new_literal (GTH_ERROR, GTH_ERROR_GENERIC, _("No valid file selected.")); _gtk_error_dialog_from_gerror_show (GTK_WINDOW (browser), _("Could not export the files"), error); @@ -1014,7 +609,7 @@ /* Set the widget data */ - data->list_view = gth_file_list_new (gth_grid_view_new (), GTH_FILE_LIST_TYPE_NO_SELECTION, FALSE); + data->list_view = gth_file_list_new (gth_grid_view_new (), GTH_FILE_LIST_MODE_NO_SELECTION, FALSE); gth_file_list_set_thumb_size (GTH_FILE_LIST (data->list_view), 112); gth_file_list_enable_thumbs (GTH_FILE_LIST (data->list_view), TRUE); gth_file_list_set_ignore_hidden (GTH_FILE_LIST (data->list_view), TRUE); @@ -1028,6 +623,13 @@ gtk_widget_set_sensitive (GET_WIDGET ("upload_button"), FALSE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("resize_checkbutton")), + g_settings_get_int (data->settings, PREF_PICASAWEB_RESIZE_WIDTH) != -1); + + _gtk_combo_box_add_image_sizes (GTK_COMBO_BOX (GET_WIDGET ("resize_combobox")), + g_settings_get_int (data->settings, PREF_PICASAWEB_RESIZE_WIDTH), + g_settings_get_int (data->settings, PREF_PICASAWEB_RESIZE_HEIGHT)); + /* Set the signals handlers. */ g_signal_connect (data->dialog, @@ -1050,6 +652,10 @@ "changed", G_CALLBACK (account_combobox_changed_cb), data); + g_signal_connect (GET_WIDGET ("resize_checkbutton"), + "toggled", + G_CALLBACK (resize_checkbutton_toggled_cb), + data); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (GET_WIDGET ("albums_treeview"))); gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); @@ -1058,6 +664,22 @@ G_CALLBACK (albums_treeview_selection_changed_cb), data); - data->accounts = picasa_web_accounts_load_from_file (&data->email); - auto_select_account (data); + update_sensitivity (data); + + data->service = picasa_web_service_new (data->cancellable, + GTK_WIDGET (data->browser), + data->dialog); + g_signal_connect (data->service, + "account-ready", + G_CALLBACK (service_account_ready_cb), + data); + g_signal_connect (data->service, + "accounts-changed", + G_CALLBACK (service_accounts_changed_cb), + data); + + data->progress_dialog = gth_progress_dialog_new (GTK_WINDOW (data->browser)); + gth_progress_dialog_add_task (GTH_PROGRESS_DIALOG (data->progress_dialog), GTH_TASK (data->service)); + + web_service_autoconnect (WEB_SERVICE (data->service)); } diff -Nru gthumb-3.0.2/extensions/picasaweb/dlg-import-from-picasaweb.c gthumb-3.2.3/extensions/picasaweb/dlg-import-from-picasaweb.c --- gthumb-3.0.2/extensions/picasaweb/dlg-import-from-picasaweb.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/picasaweb/dlg-import-from-picasaweb.c 2013-04-30 16:56:12.000000000 +0000 @@ -20,29 +20,21 @@ */ #include -#define GDK_PIXBUF_ENABLE_BACKEND -#include -#ifdef HAVE_GNOME_KEYRING -#include -#endif /* HAVE_GNOME_KEYRING */ #include +#include #include #include "dlg-import-from-picasaweb.h" -#include "picasa-account-chooser-dialog.h" -#include "picasa-account-manager-dialog.h" -#include "picasa-account-properties-dialog.h" #include "picasa-album-properties-dialog.h" #include "picasa-web-album.h" #include "picasa-web-photo.h" #include "picasa-web-service.h" -#include "picasa-web-user.h" #define GET_WIDGET(x) (_gtk_builder_get_widget (data->builder, (x))) enum { - ACCOUNT_EMAIL_COLUMN, + ACCOUNT_DATA_COLUMN, ACCOUNT_NAME_COLUMN, ACCOUNT_ICON_COLUMN }; @@ -58,22 +50,15 @@ typedef struct { GthBrowser *browser; - GthFileData *location; GtkBuilder *builder; GtkWidget *dialog; GtkWidget *preferences_dialog; GtkWidget *progress_dialog; GtkWidget *file_list; - GList *accounts; - PicasaWebUser *user; - char *email; - char *password; - char *challange; GList *albums; PicasaWebAlbum *album; GList *photos; - GoogleConnection *conn; - PicasaWebService *picasaweb; + PicasaWebService *service; GCancellable *cancellable; } DialogData; @@ -82,21 +67,14 @@ import_dialog_destroy_cb (GtkWidget *widget, DialogData *data) { - if (data->conn != NULL) - gth_task_completed (GTH_TASK (data->conn), NULL); + gth_task_completed (GTH_TASK (data->service), NULL); _g_object_unref (data->cancellable); - _g_object_unref (data->picasaweb); - _g_object_unref (data->conn); + _g_object_unref (data->service); _g_object_list_unref (data->albums); _g_object_unref (data->album); _g_object_list_unref (data->photos); - g_free (data->challange); - g_free (data->password); - g_free (data->email); - _g_object_unref (data->user); - _g_string_list_free (data->accounts); _g_object_unref (data->builder); - _g_object_unref (data->location); + gtk_widget_destroy (data->progress_dialog); g_free (data); } @@ -129,13 +107,8 @@ DialogData *data = user_data; switch (response_id) { - case GTK_RESPONSE_HELP: - show_help_dialog (GTK_WINDOW (data->browser), "export-to-picasaweb"); - break; - case GTK_RESPONSE_DELETE_EVENT: case GTK_RESPONSE_CANCEL: - picasa_web_accounts_save_to_file (data->accounts, data->email); gth_file_list_cancel (GTH_FILE_LIST (data->file_list), (DataFunc) gtk_widget_destroy, data->dialog); break; @@ -146,7 +119,9 @@ GList *file_list; if (! gtk_combo_box_get_active_iter (GTK_COMBO_BOX (GET_WIDGET ("album_combobox")), &iter)) { - gtk_widget_set_sensitive (GET_WIDGET ("download_button"), FALSE); + gtk_dialog_set_response_sensitive (GTK_DIALOG (data->dialog), + GTK_RESPONSE_OK, + FALSE); return; } @@ -223,529 +198,12 @@ static void -update_account_list (DialogData *data) -{ - GtkTreeIter iter; - int current_account; - int idx; - GList *scan; - - current_account = 0; - gtk_list_store_clear (GTK_LIST_STORE (GET_WIDGET ("account_liststore"))); - for (scan = data->accounts, idx = 0; scan; scan = scan->next, idx++) { - char *account = scan->data; - - if (g_strcmp0 (account, data->email) == 0) - current_account = idx; - - gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter); - gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter, - ACCOUNT_EMAIL_COLUMN, account, - ACCOUNT_NAME_COLUMN, account, - -1); - } - - gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("account_combobox")), current_account); -} - - -static void -update_album_list (DialogData *data) -{ - GtkTreeIter iter; - GList *scan; - - g_return_if_fail (data->user != NULL); - - gtk_list_store_clear (GTK_LIST_STORE (GET_WIDGET ("album_liststore"))); - for (scan = data->albums; scan; scan = scan->next) { - PicasaWebAlbum *album = scan->data; - char *used_bytes; - - used_bytes = g_format_size (album->used_bytes); - - gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("album_liststore")), &iter); - gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("album_liststore")), &iter, - ALBUM_DATA_COLUMN, album, - ALBUM_ICON_COLUMN, "file-catalog", - ALBUM_NAME_COLUMN, album->title, - ALBUM_SIZE_COLUMN, used_bytes, - -1); - - g_free (used_bytes); - } - - gtk_widget_set_sensitive (GET_WIDGET ("download_button"), FALSE); - gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("album_combobox")), -1); -} - - -static void -show_import_dialog (DialogData *data) -{ - update_account_list (data); - update_album_list (data); - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); - - gtk_window_set_transient_for (GTK_WINDOW (data->dialog), GTK_WINDOW (data->browser)); - gtk_window_set_modal (GTK_WINDOW (data->dialog), FALSE); - gtk_window_present (GTK_WINDOW (data->dialog)); -} - - -static void -list_albums_ready_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) -{ - DialogData *data = user_data; - PicasaWebService *picasaweb = PICASA_WEB_SERVICE (source_object); - GError *error = NULL; - - _g_object_list_unref (data->albums); - data->albums = picasa_web_service_list_albums_finish (picasaweb, result, &error); - if (error != NULL) { - if (data->conn != NULL) - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); - _gtk_error_dialog_from_gerror_show (GTK_WINDOW (data->browser), _("Could not get the album list"), error); - g_clear_error (&error); - gtk_widget_destroy (data->dialog); - return; - } - - _g_object_unref (data->user); - data->user = g_object_ref (picasa_web_service_get_user (picasaweb)); - show_import_dialog (data); -} - - -static void -get_album_list (DialogData *data) -{ - char *user_id; - - gth_task_dialog (GTH_TASK (data->conn), FALSE, NULL); - - if (data->picasaweb == NULL) - data->picasaweb = picasa_web_service_new (data->conn); - user_id = google_utils_get_user_id_from_email (data->email); - picasa_web_service_list_albums (data->picasaweb, - user_id, - data->cancellable, - list_albums_ready_cb, - data); - - g_free (user_id); -} - - -#ifdef HAVE_GNOME_KEYRING -static void -store_password_done_cb (GnomeKeyringResult result, - gpointer user_data) -{ - get_album_list ((DialogData *) user_data); -} -#endif - - -static void account_properties_dialog (DialogData *data, - const char *email, - GError *error); -static void challange_account_dialog (DialogData *data, - GError *error); - - -static void -connection_ready_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) -{ - DialogData *data = user_data; - GoogleConnection *conn = GOOGLE_CONNECTION (source_object); - GError *error = NULL; - - if (! google_connection_connect_finish (conn, result, &error)) { - if (g_error_matches (error, GOOGLE_CONNECTION_ERROR, GOOGLE_CONNECTION_ERROR_CAPTCHA_REQUIRED)) { - challange_account_dialog (data, error); - g_clear_error (&error); - } - else if (g_error_matches (error, GOOGLE_CONNECTION_ERROR, GOOGLE_CONNECTION_ERROR_BAD_AUTHENTICATION)) { - account_properties_dialog (data, data->email, error); - g_clear_error (&error); - } - else { - if (data->conn != NULL) - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); - _gtk_error_dialog_from_gerror_show (GTK_WINDOW (data->browser), _("Could not connect to the server"), error); - g_clear_error (&error); - gtk_widget_destroy (data->dialog); - } - return; - } - - if (! g_list_find_custom (data->accounts, data->email, (GCompareFunc) strcmp)) - data->accounts = g_list_append (data->accounts, g_strdup (data->email)); - -#ifdef HAVE_GNOME_KEYRING - if (gnome_keyring_is_available ()) { - gnome_keyring_store_password (GNOME_KEYRING_NETWORK_PASSWORD, - NULL, - _("Picasa Web Album"), - data->password, - store_password_done_cb, - data, - NULL, - "user", data->email, - "server", "picasaweb.google.com", - "protocol", "http", - NULL); - return; - } -#endif - - get_album_list (data); -} - - -static void connect_to_server (DialogData *data); -static void auto_select_account (DialogData *data); - - -static void -account_properties_dialog_response_cb (GtkDialog *dialog, - int response_id, - gpointer user_data) -{ - DialogData *data = user_data; - - switch (response_id) { - case GTK_RESPONSE_HELP: - show_help_dialog (GTK_WINDOW (dialog), "picasaweb-account-properties"); - break; - - case GTK_RESPONSE_DELETE_EVENT: - case GTK_RESPONSE_CANCEL: - gtk_widget_destroy (GTK_WIDGET (dialog)); - gtk_widget_destroy (data->dialog); - break; - - case GTK_RESPONSE_OK: - g_free (data->email); - g_free (data->password); - g_free (data->challange); - data->email = g_strdup (picasa_account_properties_dialog_get_email (PICASA_ACCOUNT_PROPERTIES_DIALOG (dialog))); - data->password = g_strdup (picasa_account_properties_dialog_get_password (PICASA_ACCOUNT_PROPERTIES_DIALOG (dialog))); - data->challange = NULL; - gtk_widget_destroy (GTK_WIDGET (dialog)); - connect_to_server (data); - break; - - case PICASA_ACCOUNT_PROPERTIES_RESPONSE_CHOOSE: - gtk_widget_destroy (GTK_WIDGET (dialog)); - g_free (data->email); - data->email = NULL; - auto_select_account (data); - break; - - default: - break; - } -} - - -static void -account_properties_dialog (DialogData *data, - const char *email, - GError *error) -{ - GtkWidget *dialog; - - if (data->conn != NULL) - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); - - dialog = picasa_account_properties_dialog_new (email, NULL, NULL); - picasa_account_properties_dialog_set_error (PICASA_ACCOUNT_PROPERTIES_DIALOG (dialog), error); - if ((error != NULL) && (data->accounts != NULL) && (data->accounts->next != NULL)) - picasa_account_properties_dialog_can_choose (PICASA_ACCOUNT_PROPERTIES_DIALOG (dialog), TRUE); - - g_signal_connect (dialog, - "delete-event", - G_CALLBACK (gtk_true), - NULL); - g_signal_connect (dialog, - "response", - G_CALLBACK (account_properties_dialog_response_cb), - data); - - gtk_window_set_title (GTK_WINDOW (dialog), _("Account")); - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (data->browser)); - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - gtk_window_present (GTK_WINDOW (dialog)); -} - - -static void -connect_to_server_step2 (DialogData *data) -{ - if ((data->password == NULL) || g_str_equal (data->password, "")) { - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); - account_properties_dialog (data, data->email, NULL); - } - else { - gth_task_dialog (GTH_TASK (data->conn), FALSE, NULL); - google_connection_connect (data->conn, - data->email, - data->password, - data->challange, - data->cancellable, - connection_ready_cb, - data); - } -} - - -#ifdef HAVE_GNOME_KEYRING -static void -find_password_cb (GnomeKeyringResult result, - const char *string, - gpointer user_data) -{ - DialogData *data = user_data; - - if (string != NULL) - data->password = g_strdup (string); - connect_to_server_step2 (data); -} -#endif - - -static void -connect_to_server (DialogData *data) -{ - if (data->conn == NULL) { - data->conn = google_connection_new (GOOGLE_SERVICE_PICASA_WEB_ALBUM); - data->progress_dialog = gth_progress_dialog_new (GTK_WINDOW (data->browser)); - gth_progress_dialog_add_task (GTH_PROGRESS_DIALOG (data->progress_dialog), GTH_TASK (data->conn)); - } - -#ifdef HAVE_GNOME_KEYRING - if ((data->password == NULL) && gnome_keyring_is_available ()) { - gnome_keyring_find_password (GNOME_KEYRING_NETWORK_PASSWORD, - find_password_cb, - data, - NULL, - "user", data->email, - "server", "picasaweb.google.com", - "protocol", "http", - NULL); - return; - } -#endif - - connect_to_server_step2 (data); -} - - -static void -challange_account_dialog_response_cb (GtkDialog *dialog, - int response_id, - gpointer user_data) -{ - DialogData *data = user_data; - - switch (response_id) { - case GTK_RESPONSE_HELP: - show_help_dialog (GTK_WINDOW (dialog), "picasaweb-account-challange"); - break; - - case GTK_RESPONSE_DELETE_EVENT: - case GTK_RESPONSE_CANCEL: - gtk_widget_destroy (GTK_WIDGET (dialog)); - gtk_widget_destroy (data->dialog); - break; - - case GTK_RESPONSE_OK: - g_free (data->email); - g_free (data->password); - data->email = g_strdup (picasa_account_properties_dialog_get_email (PICASA_ACCOUNT_PROPERTIES_DIALOG (dialog))); - data->password = g_strdup (picasa_account_properties_dialog_get_password (PICASA_ACCOUNT_PROPERTIES_DIALOG (dialog))); - data->challange = g_strdup (picasa_account_properties_dialog_get_challange (PICASA_ACCOUNT_PROPERTIES_DIALOG (dialog))); - gtk_widget_destroy (GTK_WIDGET (dialog)); - connect_to_server (data); - break; - - case PICASA_ACCOUNT_PROPERTIES_RESPONSE_CHOOSE: - gtk_widget_destroy (GTK_WIDGET (dialog)); - g_free (data->email); - data->email = NULL; - auto_select_account (data); - break; - - default: - break; - } -} - - -static void -challange_account_dialog (DialogData *data, - GError *error) -{ - GtkWidget *dialog; - - dialog = picasa_account_properties_dialog_new (data->email, data->password, google_connection_get_challange_url (data->conn)); - picasa_account_properties_dialog_set_error (PICASA_ACCOUNT_PROPERTIES_DIALOG (dialog), error); - if ((error != NULL) && (data->accounts != NULL) && (data->accounts->next != NULL)) - picasa_account_properties_dialog_can_choose (PICASA_ACCOUNT_PROPERTIES_DIALOG (dialog), TRUE); - - g_signal_connect (dialog, - "delete-event", - G_CALLBACK (gtk_true), - NULL); - g_signal_connect (dialog, - "response", - G_CALLBACK (challange_account_dialog_response_cb), - data); - - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (data->browser)); - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - gtk_window_present (GTK_WINDOW (dialog)); -} - - -static void -account_chooser_dialog_response_cb (GtkDialog *dialog, - int response_id, - gpointer user_data) -{ - DialogData *data = user_data; - - switch (response_id) { - case GTK_RESPONSE_DELETE_EVENT: - case GTK_RESPONSE_CANCEL: - gtk_widget_destroy (GTK_WIDGET (dialog)); - gtk_widget_destroy (data->dialog); - break; - - case GTK_RESPONSE_OK: - g_free (data->password); - data->password = NULL; - g_free (data->challange); - data->challange = NULL; - g_free (data->email); - data->email = picasa_account_chooser_dialog_get_active (PICASA_ACCOUNT_CHOOSER_DIALOG (dialog)); - if (data->email != NULL) { - gtk_widget_destroy (GTK_WIDGET (dialog)); - connect_to_server (data); - } - - break; - - case PICASA_ACCOUNT_CHOOSER_RESPONSE_NEW: - gtk_widget_destroy (GTK_WIDGET (dialog)); - account_properties_dialog (data, NULL, NULL); - break; - - default: - break; - } -} - - -static void -auto_select_account (DialogData *data) -{ - gtk_widget_hide (data->dialog); - - if (data->accounts != NULL) { - if (data->email != NULL) { - connect_to_server (data); - } - else if (data->accounts->next == NULL) { - data->email = g_strdup ((char *)data->accounts->data); - connect_to_server (data); - } - else { - GtkWidget *dialog; - - if (data->conn != NULL) - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); - dialog = picasa_account_chooser_dialog_new (data->accounts, data->email); - g_signal_connect (dialog, - "delete-event", - G_CALLBACK (gtk_true), - NULL); - g_signal_connect (dialog, - "response", - G_CALLBACK (account_chooser_dialog_response_cb), - data); - - gtk_window_set_title (GTK_WINDOW (dialog), _("Choose Account")); - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (data->browser)); - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - gtk_window_present (GTK_WINDOW (dialog)); - } - } - else - account_properties_dialog (data, NULL, NULL); -} - - -static void -account_manager_dialog_response_cb (GtkDialog *dialog, - int response_id, - gpointer user_data) -{ - DialogData *data = user_data; - - switch (response_id) { - case GTK_RESPONSE_DELETE_EVENT: - case GTK_RESPONSE_CANCEL: - gtk_widget_destroy (GTK_WIDGET (dialog)); - break; - - case GTK_RESPONSE_OK: - _g_string_list_free (data->accounts); - data->accounts = picasa_account_manager_dialog_get_accounts (PICASA_ACCOUNT_MANAGER_DIALOG (dialog)); - if (! g_list_find_custom (data->accounts, data->email, (GCompareFunc) strcmp)) { - g_free (data->email); - data->email = NULL; - auto_select_account (data); - } - else - update_account_list (data); - picasa_web_accounts_save_to_file (data->accounts, data->email); - gtk_widget_destroy (GTK_WIDGET (dialog)); - break; - - default: - break; - } -} - - -static void edit_accounts_button_clicked_cb (GtkButton *button, gpointer user_data) { DialogData *data = user_data; - GtkWidget *dialog; - dialog = picasa_account_manager_dialog_new (data->accounts); - g_signal_connect (dialog, - "delete-event", - G_CALLBACK (gtk_true), - NULL); - g_signal_connect (dialog, - "response", - G_CALLBACK (account_manager_dialog_response_cb), - data); - - gtk_window_set_title (GTK_WINDOW (dialog), _("Edit Accounts")); - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (data->dialog)); - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - gtk_window_present (GTK_WINDOW (dialog)); + web_service_edit_accounts (WEB_SERVICE (data->service), GTK_WINDOW (data->dialog)); } @@ -753,29 +211,22 @@ account_combobox_changed_cb (GtkComboBox *widget, gpointer user_data) { - DialogData *data = user_data; - GtkTreeIter iter; - char *email; + DialogData *data = user_data; + GtkTreeIter iter; + OAuthAccount *account; if (! gtk_combo_box_get_active_iter (widget, &iter)) return; gtk_tree_model_get (gtk_combo_box_get_model (widget), &iter, - ACCOUNT_EMAIL_COLUMN, &email, + ACCOUNT_DATA_COLUMN, &account, -1); - if (g_strcmp0 (email, data->email) != 0) { - g_free (data->email); - g_free (data->password); - g_free (data->challange); - data->email = email; - data->password = NULL; - data->challange = NULL; - auto_select_account (data); - } - else - g_free (email); + if (oauth_account_cmp (account, web_service_get_current_account (WEB_SERVICE (data->service))) != 0) + web_service_connect (WEB_SERVICE (data->service), account); + + g_object_unref (account); } @@ -820,13 +271,11 @@ GList *list; GList *scan; - if (data->conn != NULL) - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); _g_object_list_unref (data->photos); data->photos = picasa_web_service_list_albums_finish (picasaweb, result, &error); if (error != NULL) { - if (data->conn != NULL) - gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL); + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); _gtk_error_dialog_from_gerror_show (GTK_WINDOW (data->browser), _("Could not get the photo list"), error); g_clear_error (&error); gtk_widget_destroy (data->dialog); @@ -873,8 +322,8 @@ gth_import_preferences_dialog_set_event (GTH_IMPORT_PREFERENCES_DIALOG (data->preferences_dialog), data->album->title); - gth_task_dialog (GTH_TASK (data->conn), FALSE, NULL); - picasa_web_service_list_photos (data->picasaweb, + gth_task_dialog (GTH_TASK (data->service), FALSE, NULL); + picasa_web_service_list_photos (data->service, data->album, data->cancellable, list_photos_ready_cb, @@ -883,7 +332,8 @@ GthImage * -picasa_web_thumbnail_loader (GthFileData *file_data, +picasa_web_thumbnail_loader (GInputStream *istream, + GthFileData *file_data, int requested_size, int *original_width, int *original_height, @@ -916,7 +366,7 @@ gsize size; file = g_file_new_for_uri (uri); - if (g_load_file_in_buffer (file, &buffer, &size, cancellable, error)) { + if (_g_file_load_in_buffer (file, &buffer, &size, cancellable, error)) { GInputStream *stream; GdkPixbuf *pixbuf; @@ -972,6 +422,117 @@ } +static void +update_album_list (DialogData *data) +{ + GtkTreeIter iter; + GList *scan; + + gtk_list_store_clear (GTK_LIST_STORE (GET_WIDGET ("album_liststore"))); + for (scan = data->albums; scan; scan = scan->next) { + PicasaWebAlbum *album = scan->data; + char *used_bytes; + + used_bytes = g_format_size (album->used_bytes); + + gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("album_liststore")), &iter); + gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("album_liststore")), &iter, + ALBUM_DATA_COLUMN, album, + ALBUM_ICON_COLUMN, "file-catalog", + ALBUM_NAME_COLUMN, album->title, + ALBUM_SIZE_COLUMN, used_bytes, + -1); + + g_free (used_bytes); + } + + gtk_dialog_set_response_sensitive (GTK_DIALOG (data->dialog), + GTK_RESPONSE_OK, + FALSE); + gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("album_combobox")), -1); +} + + +static void +list_albums_ready_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) +{ + DialogData *data = user_data; + PicasaWebService *picasaweb = PICASA_WEB_SERVICE (source_object); + GError *error = NULL; + + _g_object_list_unref (data->albums); + data->albums = picasa_web_service_list_albums_finish (picasaweb, result, &error); + if (error != NULL) { + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); + _gtk_error_dialog_from_gerror_show (GTK_WINDOW (data->browser), _("Could not get the album list"), error); + g_clear_error (&error); + gtk_widget_destroy (data->dialog); + return; + } + + update_album_list (data); + gth_task_dialog (GTH_TASK (data->service), TRUE, NULL); + + gtk_window_set_transient_for (GTK_WINDOW (data->dialog), GTK_WINDOW (data->browser)); + gtk_window_set_modal (GTK_WINDOW (data->dialog), FALSE); + gtk_window_present (GTK_WINDOW (data->dialog)); +} + + +static void +update_account_list (DialogData *data) +{ + int current_account_idx; + OAuthAccount *current_account; + int idx; + GList *scan; + GtkTreeIter iter; + + gtk_list_store_clear (GTK_LIST_STORE (GET_WIDGET ("account_liststore"))); + + current_account_idx = 0; + current_account = web_service_get_current_account (WEB_SERVICE (data->service)); + for (scan = web_service_get_accounts (WEB_SERVICE (data->service)), idx = 0; scan; scan = scan->next, idx++) { + OAuthAccount *account = scan->data; + + if ((current_account != NULL) && (g_strcmp0 (current_account->id, account->id) == 0)) + current_account_idx = idx; + + gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter); + gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter, + ACCOUNT_DATA_COLUMN, account, + ACCOUNT_NAME_COLUMN, account->name, + -1); + } + gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("account_combobox")), current_account_idx); +} + + +static void +service_account_ready_cb (WebService *service, + gpointer user_data) +{ + DialogData *data = user_data; + + update_account_list (data); + picasa_web_service_list_albums (data->service, + data->cancellable, + list_albums_ready_cb, + data); +} + + +static void +service_accounts_changed_cb (WebService *service, + gpointer user_data) +{ + DialogData *data = user_data; + update_account_list (data); +} + + void dlg_import_from_picasaweb (GthBrowser *browser) { @@ -980,7 +541,6 @@ data = g_new0 (DialogData, 1); data->browser = browser; - data->location = gth_file_data_dup (gth_browser_get_location_data (browser)); data->builder = _gtk_builder_new_from_file ("import-from-picasaweb.ui", "picasaweb"); data->dialog = _gtk_builder_get_widget (data->builder, "import_dialog"); data->cancellable = g_cancellable_new (); @@ -1014,7 +574,7 @@ /* Set the widget data */ - data->file_list = gth_file_list_new (gth_grid_view_new (), GTH_FILE_LIST_TYPE_NORMAL, FALSE); + data->file_list = gth_file_list_new (gth_grid_view_new (), GTH_FILE_LIST_MODE_NORMAL, FALSE); thumb_loader = gth_file_list_get_thumb_loader (GTH_FILE_LIST (data->file_list)); gth_thumb_loader_set_use_cache (thumb_loader, FALSE); gth_thumb_loader_set_loader_func (thumb_loader, picasa_web_thumbnail_loader); @@ -1075,6 +635,20 @@ update_selection_status (data); gth_import_preferences_dialog_set_event (GTH_IMPORT_PREFERENCES_DIALOG (data->preferences_dialog), ""); - data->accounts = picasa_web_accounts_load_from_file (&data->email); - auto_select_account (data); + data->service = picasa_web_service_new (data->cancellable, + GTK_WIDGET (data->browser), + data->dialog); + g_signal_connect (data->service, + "account-ready", + G_CALLBACK (service_account_ready_cb), + data); + g_signal_connect (data->service, + "accounts-changed", + G_CALLBACK (service_accounts_changed_cb), + data); + + data->progress_dialog = gth_progress_dialog_new (GTK_WINDOW (data->browser)); + gth_progress_dialog_add_task (GTH_PROGRESS_DIALOG (data->progress_dialog), GTH_TASK (data->service)); + + web_service_autoconnect (WEB_SERVICE (data->service)); } diff -Nru gthumb-3.0.2/extensions/picasaweb/google-connection.c gthumb-3.2.3/extensions/picasaweb/google-connection.c --- gthumb-3.0.2/extensions/picasaweb/google-connection.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/picasaweb/google-connection.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,392 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include -#include "google-connection.h" - -#undef DEBUG_GOOGLE_CONNECTION -#define SOUP_LOG_LEVEL SOUP_LOGGER_LOG_BODY -#define GTHUMB_SOURCE ("GNOME-" PACKAGE "-" VERSION) - - -G_DEFINE_TYPE (GoogleConnection, google_connection, GTH_TYPE_TASK) - - -GQuark -google_connection_error_quark (void) -{ - static GQuark quark; - - if (!quark) - quark = g_quark_from_static_string ("google_connection"); - - return quark; -} - - -/* -- GoogleConnection -- */ - - -struct _GoogleConnectionPrivate -{ - char *service; - SoupSession *session; - SoupMessage *msg; - char *token; - char *challange_url; - GCancellable *cancellable; - GSimpleAsyncResult *result; -}; - - -static void -google_connection_finalize (GObject *object) -{ - GoogleConnection *self; - - self = GOOGLE_CONNECTION (object); - - _g_object_unref (self->priv->result); - _g_object_unref (self->priv->cancellable); - g_free (self->priv->challange_url); - g_free (self->priv->token); - _g_object_unref (self->priv->session); - g_free (self->priv->service); - - G_OBJECT_CLASS (google_connection_parent_class)->finalize (object); -} - - -static void -google_connection_exec (GthTask *base) -{ - /* void */ -} - - -static void -google_connection_cancelled (GthTask *base) -{ - GoogleConnection *self = GOOGLE_CONNECTION (base); - - if ((self->priv->session == NULL) || (self->priv->msg == NULL)) - return; - - soup_session_cancel_message (self->priv->session, self->priv->msg, SOUP_STATUS_CANCELLED); -} - - -static void -google_connection_class_init (GoogleConnectionClass *klass) -{ - GObjectClass *object_class; - GthTaskClass *task_class; - - g_type_class_add_private (klass, sizeof (GoogleConnectionPrivate)); - - object_class = (GObjectClass*) klass; - object_class->finalize = google_connection_finalize; - - task_class = (GthTaskClass*) klass; - task_class->exec = google_connection_exec; - task_class->cancelled = google_connection_cancelled; -} - - -static void -google_connection_init (GoogleConnection *self) -{ - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GOOGLE_TYPE_CONNECTION, GoogleConnectionPrivate); - self->priv->service = NULL; - self->priv->session = NULL; - self->priv->msg = NULL; - self->priv->token = NULL; - self->priv->challange_url = NULL; - self->priv->cancellable = NULL; - self->priv->result = NULL; -} - - -GoogleConnection * -google_connection_new (const char *service) -{ - GoogleConnection *self; - - self = (GoogleConnection *) g_object_new (GOOGLE_TYPE_CONNECTION, NULL); - self->priv->service = g_strdup (service); - - return self; -} - - -void -google_connection_send_message (GoogleConnection *self, - SoupMessage *msg, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data, - gpointer source_tag, - SoupSessionCallback soup_session_cb, - gpointer soup_session_cb_data) -{ - char *value; - - _g_object_unref (self->priv->cancellable); - self->priv->cancellable = _g_object_ref (cancellable); - - _g_object_unref (self->priv->result); - self->priv->result = g_simple_async_result_new (G_OBJECT (soup_session_cb_data), - callback, - user_data, - source_tag); - - self->priv->msg = msg; - g_object_add_weak_pointer (G_OBJECT (msg), (gpointer *) &self->priv->msg); - - value = g_strconcat ("GoogleLogin auth=", self->priv->token, NULL); - soup_message_headers_replace (msg->request_headers, "Authorization", value); - g_free (value); - - soup_message_headers_replace (msg->request_headers, "GData-Version", "2"); - - soup_session_queue_message (self->priv->session, - msg, - soup_session_cb, - soup_session_cb_data); -} - - -GSimpleAsyncResult * -google_connection_get_result (GoogleConnection *self) -{ - return self->priv->result; -} - - -static GHashTable * -get_keys_from_message_body (SoupBuffer *body) -{ - GHashTable *keys; - char **lines; - int i; - - keys = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); - lines = g_strsplit (body->data, "\n", -1); - for (i = 0; lines[i] != NULL; i++) { - char **pair; - - pair = g_strsplit (lines[i], "=", 2); - if ((pair[0] != NULL) && (pair[1] != NULL)) - g_hash_table_insert (keys, g_strdup (pair[0]), g_strdup (pair[1])); - - g_strfreev (pair); - } - - g_strfreev (lines); - - return keys; -} - - -static void -connect_ready_cb (SoupSession *session, - SoupMessage *msg, - gpointer user_data) -{ - GoogleConnection *self = user_data; - SoupBuffer *body; - GHashTable *keys; - - body = soup_message_body_flatten (msg->response_body); - keys = get_keys_from_message_body (body); - - g_free (self->priv->token); - self->priv->token = NULL; - - if (msg->status_code == 403) { - char *error_name; - GError *error; - int error_code; - char *error_message; - - error_name = g_hash_table_lookup (keys, "Error"); - error_code = GOOGLE_CONNECTION_ERROR_UNKNOWN; - error_message = "The error is unknown or unspecified; the request contained invalid input or was malformed."; - - if (error_name == NULL) { - /* void */ - } - else if (strcmp (error_name, "BadAuthentication") == 0) { - error_code = GOOGLE_CONNECTION_ERROR_BAD_AUTHENTICATION; - error_message = "The login request used a username or password that is not recognized."; - } - else if (strcmp (error_name, "NotVerified") == 0) { - error_code = GOOGLE_CONNECTION_ERROR_NOT_VERIFIED; - error_message = "The account email address has not been verified. The user will need to access their Google account directly to resolve the issue before logging in using a non-Google application."; - } - else if (strcmp (error_name, "TermsNotAgreed") == 0) { - error_code = GOOGLE_CONNECTION_ERROR_TERMS_NOT_AGREED; - error_message = "The user has not agreed to terms. The user will need to access their Google account directly to resolve the issue before logging in using a non-Google application."; - } - else if (strcmp (error_name, "CaptchaRequired") == 0) { - error_code = GOOGLE_CONNECTION_ERROR_CAPTCHA_REQUIRED; - error_message = "A CAPTCHA is required."; - } - else if (strcmp (error_name, "AccountDeleted") == 0) { - error_code = GOOGLE_CONNECTION_ERROR_ACCOUNT_DELETED; - error_message = "The user account has been deleted."; - } - else if (strcmp (error_name, "AccountDisabled") == 0) { - error_code = GOOGLE_CONNECTION_ERROR_ACCOUNT_DISABLED; - error_message = "The user account has been disabled."; - } - else if (strcmp (error_name, "ServiceDisabled") == 0) { - error_code = GOOGLE_CONNECTION_ERROR_SERVICE_DISABLED; - error_message = "The user's access to the specified service has been disabled."; - } - else if (strcmp (error_name, "ServiceUnavailable") == 0) { - error_code = GOOGLE_CONNECTION_ERROR_SERVICE_UNAVAILABLE; - error_message = "The service is not available; try again later."; - } - - error = g_error_new_literal (GOOGLE_CONNECTION_ERROR, error_code, error_message); - if (error_code == GOOGLE_CONNECTION_ERROR_CAPTCHA_REQUIRED) { - g_free (self->priv->challange_url); - self->priv->token = g_strdup (g_hash_table_lookup (keys, "CaptchaToken")); - self->priv->challange_url = g_strdup (g_hash_table_lookup (keys, "CaptchaUrl")); - } - - g_simple_async_result_set_from_error (self->priv->result, error); - g_error_free (error); - } - else if (msg->status_code == 200) { - self->priv->token = g_strdup (g_hash_table_lookup (keys, "Auth")); - g_simple_async_result_set_op_res_gboolean (self->priv->result, TRUE); - } - else - g_simple_async_result_set_error (self->priv->result, - SOUP_HTTP_ERROR, - msg->status_code, - "%s", - soup_status_get_phrase (msg->status_code)); - - g_simple_async_result_complete_in_idle (self->priv->result); - - g_hash_table_destroy (keys); - soup_buffer_free (body); -} - - -void -google_connection_connect (GoogleConnection *self, - const char *email, - const char *password, - const char *challange, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - SoupMessage *msg; - GHashTable *data_set; - - g_return_if_fail (email != NULL); - g_return_if_fail (password != NULL); - - if (self->priv->session == NULL) { - self->priv->session = soup_session_async_new_with_options ( -#ifdef HAVE_LIBSOUP_GNOME - SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_PROXY_RESOLVER_GNOME, -#endif - NULL); - -#ifdef DEBUG_GOOGLE_CONNECTION - { - SoupLogger *logger; - - logger = soup_logger_new (SOUP_LOG_LEVEL, -1); - soup_session_add_feature (self->priv->session, SOUP_SESSION_FEATURE (logger)); - - g_object_unref (logger); - } -#endif - } - - _g_object_unref (self->priv->cancellable); - self->priv->cancellable = _g_object_ref (cancellable); - - _g_object_unref (self->priv->result); - self->priv->result = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - google_connection_connect); - - gth_task_progress (GTH_TASK (self), _("Connecting to the server"), NULL, TRUE, 0.0); - - data_set = g_hash_table_new (g_str_hash, g_str_equal); - g_hash_table_insert (data_set, "accountType", "HOSTED_OR_GOOGLE"); - g_hash_table_insert (data_set, "service", self->priv->service); - g_hash_table_insert (data_set, "Email", (char *) email); - g_hash_table_insert (data_set, "Passwd", (char *) password); - g_hash_table_insert (data_set, "source", GTHUMB_SOURCE); - if (self->priv->token != NULL) - g_hash_table_insert (data_set, "logintoken", self->priv->token); - if (challange != NULL) - g_hash_table_insert (data_set, "logincaptcha", (char *) challange); - - msg = soup_form_request_new_from_hash ("POST", - "https://www.google.com/accounts/ClientLogin", - data_set); - self->priv->msg = msg; - g_object_add_weak_pointer (G_OBJECT (msg), (gpointer *) &self->priv->msg); - - soup_session_queue_message (self->priv->session, msg, connect_ready_cb, self); - - g_hash_table_destroy (data_set); -} - - -gboolean -google_connection_connect_finish (GoogleConnection *conn, - GAsyncResult *result, - GError **error) -{ - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return FALSE; - else - return TRUE; -} - - -const char * -google_connection_get_challange_url (GoogleConnection *self) -{ - return self->priv->challange_url; -} - - -char * -google_utils_get_user_id_from_email (const char *email) -{ - return g_strdup ((email != NULL) ? email : "default"); -} diff -Nru gthumb-3.0.2/extensions/picasaweb/google-connection.h gthumb-3.2.3/extensions/picasaweb/google-connection.h --- gthumb-3.0.2/extensions/picasaweb/google-connection.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/picasaweb/google-connection.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,97 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef GOOGLE_CONNECTION_H -#define GOOGLE_CONNECTION_H - -#include -#ifdef HAVE_LIBSOUP_GNOME -#include -#else -#include -#endif /* HAVE_LIBSOUP_GNOME */ -#include - -#define GOOGLE_SERVICE_PICASA_WEB_ALBUM "lh2" -#define ATOM_ENTRY_MIME_TYPE "application/atom+xml; charset=UTF-8; type=entry" - -typedef enum { - GOOGLE_CONNECTION_ERROR_BAD_AUTHENTICATION, - GOOGLE_CONNECTION_ERROR_NOT_VERIFIED, - GOOGLE_CONNECTION_ERROR_TERMS_NOT_AGREED, - GOOGLE_CONNECTION_ERROR_CAPTCHA_REQUIRED, - GOOGLE_CONNECTION_ERROR_UNKNOWN, - GOOGLE_CONNECTION_ERROR_ACCOUNT_DELETED, - GOOGLE_CONNECTION_ERROR_ACCOUNT_DISABLED, - GOOGLE_CONNECTION_ERROR_SERVICE_DISABLED, - GOOGLE_CONNECTION_ERROR_SERVICE_UNAVAILABLE -} GoogleConnectionError; - -#define GOOGLE_CONNECTION_ERROR google_connection_error_quark () -GQuark google_connection_error_quark (void); - -#define GOOGLE_TYPE_CONNECTION (google_connection_get_type ()) -#define GOOGLE_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOOGLE_TYPE_CONNECTION, GoogleConnection)) -#define GOOGLE_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOOGLE_TYPE_CONNECTION, GoogleConnectionClass)) -#define GOOGLE_IS_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOOGLE_TYPE_CONNECTION)) -#define GOOGLE_IS_CONNECTION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOOGLE_TYPE_CONNECTION)) -#define GOOGLE_CONNECTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GOOGLE_TYPE_CONNECTION, GoogleConnectionClass)) - -typedef struct _GoogleConnection GoogleConnection; -typedef struct _GoogleConnectionPrivate GoogleConnectionPrivate; -typedef struct _GoogleConnectionClass GoogleConnectionClass; - -struct _GoogleConnection -{ - GthTask __parent; - GoogleConnectionPrivate *priv; -}; - -struct _GoogleConnectionClass -{ - GthTaskClass __parent_class; -}; - -GType google_connection_get_type (void) G_GNUC_CONST; -GoogleConnection * google_connection_new (const char *service); -void google_connection_send_message (GoogleConnection *self, - SoupMessage *msg, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data, - gpointer source_tag, - SoupSessionCallback soup_session_cb, - gpointer soup_session_cb_data); -GSimpleAsyncResult * google_connection_get_result (GoogleConnection *self); -void google_connection_connect (GoogleConnection *self, - const char *email, - const char *password, - const char *challange, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -gboolean google_connection_connect_finish (GoogleConnection *self, - GAsyncResult *result, - GError **error); -const char * google_connection_get_challange_url (GoogleConnection *self); -char * google_utils_get_user_id_from_email (const char *email); - -#endif /* GOOGLE_CONNECTION_H */ diff -Nru gthumb-3.0.2/extensions/picasaweb/picasa-account-chooser-dialog.c gthumb-3.2.3/extensions/picasaweb/picasa-account-chooser-dialog.c --- gthumb-3.0.2/extensions/picasaweb/picasa-account-chooser-dialog.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/picasaweb/picasa-account-chooser-dialog.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,165 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include "picasa-account-chooser-dialog.h" - -#define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x))) - - -G_DEFINE_TYPE (PicasaAccountChooserDialog, picasa_account_chooser_dialog, GTK_TYPE_DIALOG) - - -typedef enum { - ITEM_TYPE_COMMAND, - ITEM_TYPE_ENTRY, - ITEM_TYPE_SEPARATOR -} ItemType; - - -enum { - ACCOUNT_DATA_COLUMN, - ACCOUNT_TYPE_COLUMN, - ACCOUNT_NAME_COLUMN, - ACCOUNT_ICON_COLUMN, - ACCOUNT_SENSITIVE_COLUMN -}; - - -struct _PicasaAccountChooserDialogPrivate { - GtkBuilder *builder; -}; - - -static void -picasa_account_chooser_dialog_finalize (GObject *object) -{ - PicasaAccountChooserDialog *self; - - self = PICASA_ACCOUNT_CHOOSER_DIALOG (object); - - _g_object_unref (self->priv->builder); - - G_OBJECT_CLASS (picasa_account_chooser_dialog_parent_class)->finalize (object); -} - - -static void -picasa_account_chooser_dialog_class_init (PicasaAccountChooserDialogClass *klass) -{ - GObjectClass *object_class; - - g_type_class_add_private (klass, sizeof (PicasaAccountChooserDialogPrivate)); - - object_class = (GObjectClass*) klass; - object_class->finalize = picasa_account_chooser_dialog_finalize; -} - - -static void -picasa_account_chooser_dialog_init (PicasaAccountChooserDialog *self) -{ - GtkWidget *content; - - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PICASA_TYPE_ACCOUNT_CHOOSER_DIALOG, PicasaAccountChooserDialogPrivate); - self->priv->builder = _gtk_builder_new_from_file ("picasa-web-account-chooser.ui", "picasaweb"); - - gtk_window_set_resizable (GTK_WINDOW (self), FALSE); - gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), 5); - gtk_container_set_border_width (GTK_CONTAINER (self), 5); - - content = _gtk_builder_get_widget (self->priv->builder, "account_chooser"); - gtk_container_set_border_width (GTK_CONTAINER (content), 5); - gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), content, TRUE, TRUE, 0); - - gtk_dialog_add_button (GTK_DIALOG (self), - GTK_STOCK_NEW, - PICASA_ACCOUNT_CHOOSER_RESPONSE_NEW); - gtk_dialog_add_button (GTK_DIALOG (self), - GTK_STOCK_CANCEL, - GTK_RESPONSE_CANCEL); - gtk_dialog_add_button (GTK_DIALOG (self), - GTK_STOCK_OK, - GTK_RESPONSE_OK); - gtk_dialog_set_default_response (GTK_DIALOG (self), GTK_RESPONSE_OK); -} - - -static void -picasa_account_chooser_dialog_construct (PicasaAccountChooserDialog *self, - GList *accounts, - const char *_default) -{ - GtkTreeIter iter; - GList *scan; - int active = 0; - int idx; - - gtk_list_store_clear (GTK_LIST_STORE (GET_WIDGET ("account_liststore"))); - - for (scan = accounts, idx = 0; scan; scan = scan->next, idx++) { - char *account = scan->data; - - if (g_strcmp0 (account, _default) == 0) - active = idx; - - gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter); - gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter, - ACCOUNT_DATA_COLUMN, account, - ACCOUNT_TYPE_COLUMN, ITEM_TYPE_ENTRY, - ACCOUNT_NAME_COLUMN, account, - ACCOUNT_SENSITIVE_COLUMN, TRUE, - -1); - } - - gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("account_combobox")), active); -} - - -GtkWidget * -picasa_account_chooser_dialog_new (GList *accounts, - const char *_default) -{ - PicasaAccountChooserDialog *self; - - self = g_object_new (PICASA_TYPE_ACCOUNT_CHOOSER_DIALOG, NULL); - picasa_account_chooser_dialog_construct (self, accounts, _default); - - return (GtkWidget *) self; -} - - -char * -picasa_account_chooser_dialog_get_active (PicasaAccountChooserDialog *self) -{ - GtkTreeIter iter; - char *email; - - if (! gtk_combo_box_get_active_iter (GTK_COMBO_BOX (GET_WIDGET ("account_combobox")), &iter)) - return NULL; - - gtk_tree_model_get (GTK_TREE_MODEL (GET_WIDGET ("account_liststore")), &iter, - ACCOUNT_DATA_COLUMN, &email, - -1); - - return email; -} diff -Nru gthumb-3.0.2/extensions/picasaweb/picasa-account-chooser-dialog.h gthumb-3.2.3/extensions/picasaweb/picasa-account-chooser-dialog.h --- gthumb-3.0.2/extensions/picasaweb/picasa-account-chooser-dialog.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/picasaweb/picasa-account-chooser-dialog.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,59 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef PICASA_ACCOUNT_CHOOSER_DIALOG_H -#define PICASA_ACCOUNT_CHOOSER_DIALOG_H - -#include -#include - -G_BEGIN_DECLS - -#define PICASA_ACCOUNT_CHOOSER_RESPONSE_NEW 1 - -#define PICASA_TYPE_ACCOUNT_CHOOSER_DIALOG (picasa_account_chooser_dialog_get_type ()) -#define PICASA_ACCOUNT_CHOOSER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PICASA_TYPE_ACCOUNT_CHOOSER_DIALOG, PicasaAccountChooserDialog)) -#define PICASA_ACCOUNT_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PICASA_TYPE_ACCOUNT_CHOOSER_DIALOG, PicasaAccountChooserDialogClass)) -#define PICASA_IS_ACCOUNT_CHOOSER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PICASA_TYPE_ACCOUNT_CHOOSER_DIALOG)) -#define PICASA_IS_ACCOUNT_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PICASA_TYPE_ACCOUNT_CHOOSER_DIALOG)) -#define PICASA_ACCOUNT_CHOOSER_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PICASA_TYPE_ACCOUNT_CHOOSER_DIALOG, PicasaAccountChooserDialogClass)) - -typedef struct _PicasaAccountChooserDialog PicasaAccountChooserDialog; -typedef struct _PicasaAccountChooserDialogClass PicasaAccountChooserDialogClass; -typedef struct _PicasaAccountChooserDialogPrivate PicasaAccountChooserDialogPrivate; - -struct _PicasaAccountChooserDialog { - GtkDialog parent_instance; - PicasaAccountChooserDialogPrivate *priv; -}; - -struct _PicasaAccountChooserDialogClass { - GtkDialogClass parent_class; -}; - -GType picasa_account_chooser_dialog_get_type (void); -GtkWidget * picasa_account_chooser_dialog_new (GList *accounts, - const char *_default); -char * picasa_account_chooser_dialog_get_active (PicasaAccountChooserDialog *self); - -G_END_DECLS - -#endif /* PICASA_ACCOUNT_CHOOSER_DIALOG_H */ diff -Nru gthumb-3.0.2/extensions/picasaweb/picasa-account-manager-dialog.c gthumb-3.2.3/extensions/picasaweb/picasa-account-manager-dialog.c --- gthumb-3.0.2/extensions/picasaweb/picasa-account-manager-dialog.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/picasaweb/picasa-account-manager-dialog.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,240 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include "picasa-account-manager-dialog.h" -#include "picasa-account-properties-dialog.h" - - -#define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x))) - - -G_DEFINE_TYPE (PicasaAccountManagerDialog, picasa_account_manager_dialog, GTK_TYPE_DIALOG) - - -enum { - ACCOUNT_DATA_COLUMN, - ACCOUNT_NAME_COLUMN, -}; - - -struct _PicasaAccountManagerDialogPrivate { - GtkBuilder *builder; -}; - - -static void -picasa_account_manager_dialog_finalize (GObject *object) -{ - PicasaAccountManagerDialog *self; - - self = PICASA_ACCOUNT_MANAGER_DIALOG (object); - - _g_object_unref (self->priv->builder); - - G_OBJECT_CLASS (picasa_account_manager_dialog_parent_class)->finalize (object); -} - - -static void -picasa_account_manager_dialog_class_init (PicasaAccountManagerDialogClass *klass) -{ - GObjectClass *object_class; - - g_type_class_add_private (klass, sizeof (PicasaAccountManagerDialogPrivate)); - - object_class = (GObjectClass*) klass; - object_class->finalize = picasa_account_manager_dialog_finalize; -} - - -static void -text_renderer_edited_cb (GtkCellRendererText *renderer, - char *path, - char *new_text, - gpointer user_data) -{ - PicasaAccountManagerDialog *self = user_data; - GtkTreePath *tree_path; - GtkTreeIter iter; - - tree_path = gtk_tree_path_new_from_string (path); - tree_path = gtk_tree_path_new_from_string (path); - if (! gtk_tree_model_get_iter (GTK_TREE_MODEL (GET_WIDGET ("accounts_liststore")), - &iter, - tree_path)) - { - gtk_tree_path_free (tree_path); - return; - } - gtk_tree_path_free (tree_path); - - gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("accounts_liststore")), &iter, - ACCOUNT_DATA_COLUMN, new_text, - ACCOUNT_NAME_COLUMN, new_text, - -1); -} - - -static void -add_button_clicked_cb (GtkWidget *button, - gpointer user_data) -{ - PicasaAccountManagerDialog *self = user_data; - GtkListStore *list_store; - GtkTreeIter iter; - GtkTreePath *tree_path; - GtkTreeViewColumn *tree_column; - - list_store = GTK_LIST_STORE (GET_WIDGET ("accounts_liststore")); - gtk_list_store_append (list_store, &iter); - gtk_list_store_set (list_store, &iter, - ACCOUNT_DATA_COLUMN, "", - ACCOUNT_NAME_COLUMN, "", - -1); - - tree_path = gtk_tree_model_get_path (GTK_TREE_MODEL (list_store), &iter); - tree_column = gtk_tree_view_get_column (GTK_TREE_VIEW (GET_WIDGET ("account_treeview")), 0); - gtk_tree_view_set_cursor (GTK_TREE_VIEW (GET_WIDGET ("account_treeview")), - tree_path, - tree_column, - TRUE); - - gtk_tree_path_free (tree_path); -} - - -static void -delete_button_clicked_cb (GtkWidget *button, - gpointer user_data) -{ - PicasaAccountManagerDialog *self = user_data; - GtkTreeModel *tree_model; - GtkTreeIter iter; - - if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (GET_WIDGET ("account_treeview"))), - &tree_model, - &iter)) - { - gtk_list_store_remove (GTK_LIST_STORE (tree_model), &iter); - } -} - - -static void -picasa_account_manager_dialog_init (PicasaAccountManagerDialog *self) -{ - GtkWidget *content; - - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PICASA_TYPE_ACCOUNT_MANAGER_DIALOG, PicasaAccountManagerDialogPrivate); - self->priv->builder = _gtk_builder_new_from_file ("picasa-web-account-manager.ui", "picasaweb"); - - gtk_window_set_resizable (GTK_WINDOW (self), FALSE); - gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), 5); - gtk_container_set_border_width (GTK_CONTAINER (self), 5); - - content = _gtk_builder_get_widget (self->priv->builder, "account_manager"); - gtk_container_set_border_width (GTK_CONTAINER (content), 5); - gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), content, TRUE, TRUE, 0); - - gtk_dialog_add_button (GTK_DIALOG (self), - GTK_STOCK_CANCEL, - GTK_RESPONSE_CANCEL); - gtk_dialog_add_button (GTK_DIALOG (self), - GTK_STOCK_OK, - GTK_RESPONSE_OK); - - g_object_set (GET_WIDGET ("account_cellrenderertext"), "editable", TRUE, NULL); - g_signal_connect (GET_WIDGET ("account_cellrenderertext"), - "edited", - G_CALLBACK (text_renderer_edited_cb), - self); - - g_signal_connect (GET_WIDGET ("add_button"), - "clicked", - G_CALLBACK (add_button_clicked_cb), - self); - g_signal_connect (GET_WIDGET ("delete_button"), - "clicked", - G_CALLBACK (delete_button_clicked_cb), - self); -} - - -static void -picasa_account_manager_dialog_construct (PicasaAccountManagerDialog *self, - GList *accounts) -{ - GtkListStore *list_store; - GtkTreeIter iter; - GList *scan; - - list_store = GTK_LIST_STORE (GET_WIDGET ("accounts_liststore")); - gtk_list_store_clear (list_store); - for (scan = accounts; scan; scan = scan->next) { - char *account = scan->data; - - gtk_list_store_append (list_store, &iter); - gtk_list_store_set (list_store, &iter, - ACCOUNT_DATA_COLUMN, account, - ACCOUNT_NAME_COLUMN, account, - -1); - } -} - - -GtkWidget * -picasa_account_manager_dialog_new (GList *accounts) -{ - PicasaAccountManagerDialog *self; - - self = g_object_new (PICASA_TYPE_ACCOUNT_MANAGER_DIALOG, NULL); - picasa_account_manager_dialog_construct (self, accounts); - - return (GtkWidget *) self; -} - - -GList * -picasa_account_manager_dialog_get_accounts (PicasaAccountManagerDialog *self) -{ - GList *accounts; - GtkTreeModel *tree_model; - GtkTreeIter iter; - - tree_model = (GtkTreeModel *) GET_WIDGET ("accounts_liststore"); - if (! gtk_tree_model_get_iter_first (tree_model, &iter)) - return NULL; - - accounts = NULL; - do { - char *account; - - gtk_tree_model_get (tree_model, &iter, - ACCOUNT_DATA_COLUMN, &account, - -1); - accounts = g_list_prepend (accounts, account); - } - while (gtk_tree_model_iter_next (tree_model, &iter)); - - return g_list_reverse (accounts); -} diff -Nru gthumb-3.0.2/extensions/picasaweb/picasa-account-manager-dialog.h gthumb-3.2.3/extensions/picasaweb/picasa-account-manager-dialog.h --- gthumb-3.0.2/extensions/picasaweb/picasa-account-manager-dialog.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/picasaweb/picasa-account-manager-dialog.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef PICASA_ACCOUNT_MANAGER_DIALOG_H -#define PICASA_ACCOUNT_MANAGER_DIALOG_H - -#include -#include - -G_BEGIN_DECLS - -#define PICASA_ACCOUNT_MANAGER_RESPONSE_NEW 1 - -#define PICASA_TYPE_ACCOUNT_MANAGER_DIALOG (picasa_account_manager_dialog_get_type ()) -#define PICASA_ACCOUNT_MANAGER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PICASA_TYPE_ACCOUNT_MANAGER_DIALOG, PicasaAccountManagerDialog)) -#define PICASA_ACCOUNT_MANAGER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PICASA_TYPE_ACCOUNT_MANAGER_DIALOG, PicasaAccountManagerDialogClass)) -#define PICASA_IS_ACCOUNT_MANAGER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PICASA_TYPE_ACCOUNT_MANAGER_DIALOG)) -#define PICASA_IS_ACCOUNT_MANAGER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PICASA_TYPE_ACCOUNT_MANAGER_DIALOG)) -#define PICASA_ACCOUNT_MANAGER_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PICASA_TYPE_ACCOUNT_MANAGER_DIALOG, PicasaAccountManagerDialogClass)) - -typedef struct _PicasaAccountManagerDialog PicasaAccountManagerDialog; -typedef struct _PicasaAccountManagerDialogClass PicasaAccountManagerDialogClass; -typedef struct _PicasaAccountManagerDialogPrivate PicasaAccountManagerDialogPrivate; - -struct _PicasaAccountManagerDialog { - GtkDialog parent_instance; - PicasaAccountManagerDialogPrivate *priv; -}; - -struct _PicasaAccountManagerDialogClass { - GtkDialogClass parent_class; -}; - -GType picasa_account_manager_dialog_get_type (void); -GtkWidget * picasa_account_manager_dialog_new (GList *accounts); -GList * picasa_account_manager_dialog_get_accounts (PicasaAccountManagerDialog *dialog); - -G_END_DECLS - -#endif /* PICASA_ACCOUNT_MANAGER_DIALOG_H */ diff -Nru gthumb-3.0.2/extensions/picasaweb/picasa-account-properties-dialog.c gthumb-3.2.3/extensions/picasaweb/picasa-account-properties-dialog.c --- gthumb-3.0.2/extensions/picasaweb/picasa-account-properties-dialog.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/picasaweb/picasa-account-properties-dialog.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,221 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include "picasa-account-properties-dialog.h" - - -#define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x))) - - -G_DEFINE_TYPE (PicasaAccountPropertiesDialog, picasa_account_properties_dialog, GTK_TYPE_DIALOG) - - -struct _PicasaAccountPropertiesDialogPrivate { - GtkBuilder *builder; - GCancellable *cancellable; -}; - - -static void -picasa_account_properties_dialog_finalize (GObject *object) -{ - PicasaAccountPropertiesDialog *self; - - self = PICASA_ACCOUNT_PROPERTIES_DIALOG (object); - _g_object_unref (self->priv->builder); - g_object_unref (self->priv->cancellable); - - G_OBJECT_CLASS (picasa_account_properties_dialog_parent_class)->finalize (object); -} - - -static void -picasa_account_properties_dialog_class_init (PicasaAccountPropertiesDialogClass *klass) -{ - GObjectClass *object_class; - - g_type_class_add_private (klass, sizeof (PicasaAccountPropertiesDialogPrivate)); - - object_class = (GObjectClass*) klass; - object_class->finalize = picasa_account_properties_dialog_finalize; -} - - -static void -picasa_account_properties_dialog_init (PicasaAccountPropertiesDialog *self) -{ - GtkWidget *content; - - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PICASA_TYPE_ACCOUNT_PROPERTIES_DIALOG, PicasaAccountPropertiesDialogPrivate); - self->priv->cancellable = g_cancellable_new (); - self->priv->builder = _gtk_builder_new_from_file ("picasa-web-account-properties.ui", "picasaweb"); - - gtk_window_set_resizable (GTK_WINDOW (self), FALSE); - gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), 5); - gtk_container_set_border_width (GTK_CONTAINER (self), 5); - - content = _gtk_builder_get_widget (self->priv->builder, "account_properties"); - gtk_container_set_border_width (GTK_CONTAINER (content), 0); - gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), content, TRUE, TRUE, 0); - - gtk_entry_set_visibility (GTK_ENTRY (GET_WIDGET ("password_entry")), FALSE); - - gtk_dialog_add_buttons (GTK_DIALOG (self), - GTK_STOCK_HELP, GTK_RESPONSE_HELP, - _("Other..."), PICASA_ACCOUNT_PROPERTIES_RESPONSE_CHOOSE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_OK, - NULL); - gtk_dialog_set_default_response (GTK_DIALOG (self), GTK_RESPONSE_OK); -} - - -static void -image_buffer_ready_cb (void **buffer, - gsize count, - GError *error, - gpointer user_data) -{ - PicasaAccountPropertiesDialog *self = user_data; - GInputStream *stream; - GdkPixbuf *pixbuf; - - if (error != NULL) { - _gtk_error_dialog_from_gerror_show (GTK_WINDOW (self), _("Could not load the file"), error); - return; - } - - stream = g_memory_input_stream_new_from_data (*buffer, count, NULL); - pixbuf = gdk_pixbuf_new_from_stream (stream, NULL, NULL); - if (pixbuf != NULL) { - gtk_widget_show (GET_WIDGET ("challange_box")); - gtk_image_set_from_pixbuf (GTK_IMAGE (GET_WIDGET ("challenge_image")), pixbuf); - g_object_unref (pixbuf); - } - - g_object_unref (stream); -} - - -static void -picasa_account_properties_dialog_construct (PicasaAccountPropertiesDialog *self, - const char *email, - const char *password, - const char *challange_url) -{ - if (email != NULL) - gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("email_entry")), email); - - if (password != NULL) - gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("password_entry")), password); - - if (challange_url != NULL) { - char *url; - GFile *file; - - url = g_strconcat ("http://www.google.com/accounts/", challange_url, NULL); - file = g_file_new_for_uri (url); - g_load_file_async (file, - G_PRIORITY_DEFAULT, - self->priv->cancellable, - image_buffer_ready_cb, - self); - - g_object_unref (file); - g_free (url); - } - - if (email == NULL) - gtk_widget_grab_focus (GET_WIDGET ("email_entry")); - else if (password == NULL) - gtk_widget_grab_focus (GET_WIDGET ("password_entry")); - else - gtk_widget_grab_focus (GET_WIDGET ("challenge_entry")); - - gtk_widget_hide (GET_WIDGET ("error_box")); - picasa_account_properties_dialog_can_choose (PICASA_ACCOUNT_PROPERTIES_DIALOG (self), FALSE); -} - - -GtkWidget * -picasa_account_properties_dialog_new (const char *email, - const char *password, - const char *challange_url) -{ - PicasaAccountPropertiesDialog *self; - - self = g_object_new (PICASA_TYPE_ACCOUNT_PROPERTIES_DIALOG, NULL); - picasa_account_properties_dialog_construct (self, email, password, challange_url); - - return (GtkWidget *) self; -} - - -void -picasa_account_properties_dialog_can_choose (PicasaAccountPropertiesDialog *self, - gboolean can_choose) -{ - GtkWidget *button; - - button = gtk_dialog_get_widget_for_response (GTK_DIALOG (self), PICASA_ACCOUNT_PROPERTIES_RESPONSE_CHOOSE); - if (can_choose) - gtk_widget_show (button); - else - gtk_widget_hide (button); -} - - -void -picasa_account_properties_dialog_set_error (PicasaAccountPropertiesDialog *self, - GError *error) -{ - if (error == NULL) { - gtk_widget_hide (GET_WIDGET ("error_box")); - return; - } - - gtk_label_set_text (GTK_LABEL (GET_WIDGET ("error_label")), error->message); - gtk_widget_show (GET_WIDGET ("error_box")); -} - - - -const char * -picasa_account_properties_dialog_get_email (PicasaAccountPropertiesDialog *self) -{ - return gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("email_entry"))); -} - - -const char * -picasa_account_properties_dialog_get_password (PicasaAccountPropertiesDialog *self) -{ - return gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("password_entry"))); -} - - -const char * -picasa_account_properties_dialog_get_challange (PicasaAccountPropertiesDialog *self) -{ - return gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("challenge_entry"))); -} diff -Nru gthumb-3.0.2/extensions/picasaweb/picasa-account-properties-dialog.h gthumb-3.2.3/extensions/picasaweb/picasa-account-properties-dialog.h --- gthumb-3.0.2/extensions/picasaweb/picasa-account-properties-dialog.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/picasaweb/picasa-account-properties-dialog.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef PICASA_ACCOUNT_PROPERTIES_DIALOG_H -#define PICASA_ACCOUNT_PROPERTIES_DIALOG_H - -#include -#include - -G_BEGIN_DECLS - -#define PICASA_ACCOUNT_PROPERTIES_RESPONSE_CHOOSE 1 - -#define PICASA_TYPE_ACCOUNT_PROPERTIES_DIALOG (picasa_account_properties_dialog_get_type ()) -#define PICASA_ACCOUNT_PROPERTIES_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PICASA_TYPE_ACCOUNT_PROPERTIES_DIALOG, PicasaAccountPropertiesDialog)) -#define PICASA_ACCOUNT_PROPERTIES_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PICASA_TYPE_ACCOUNT_PROPERTIES_DIALOG, PicasaAccountPropertiesDialogClass)) -#define PICASA_IS_ACCOUNT_PROPERTIES_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PICASA_TYPE_ACCOUNT_PROPERTIES_DIALOG)) -#define PICASA_IS_ACCOUNT_PROPERTIES_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PICASA_TYPE_ACCOUNT_PROPERTIES_DIALOG)) -#define PICASA_ACCOUNT_PROPERTIES_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PICASA_TYPE_ACCOUNT_PROPERTIES_DIALOG, PicasaAccountPropertiesDialogClass)) - -typedef struct _PicasaAccountPropertiesDialog PicasaAccountPropertiesDialog; -typedef struct _PicasaAccountPropertiesDialogClass PicasaAccountPropertiesDialogClass; -typedef struct _PicasaAccountPropertiesDialogPrivate PicasaAccountPropertiesDialogPrivate; - -struct _PicasaAccountPropertiesDialog { - GtkDialog parent_instance; - PicasaAccountPropertiesDialogPrivate *priv; -}; - -struct _PicasaAccountPropertiesDialogClass { - GtkDialogClass parent_class; -}; - -GType picasa_account_properties_dialog_get_type (void); -GtkWidget * picasa_account_properties_dialog_new (const char *email, - const char *password, - const char *challange); -void picasa_account_properties_dialog_can_choose (PicasaAccountPropertiesDialog *self, - gboolean can_choose); -void picasa_account_properties_dialog_set_error (PicasaAccountPropertiesDialog *self, - GError *error); -const char * picasa_account_properties_dialog_get_email (PicasaAccountPropertiesDialog *self); -const char * picasa_account_properties_dialog_get_password (PicasaAccountPropertiesDialog *self); -const char * picasa_account_properties_dialog_get_challange (PicasaAccountPropertiesDialog *self); - -G_END_DECLS - -#endif /* PICASA_ACCOUNT_PROPERTIES_DIALOG_H */ diff -Nru gthumb-3.0.2/extensions/picasaweb/picasa-web-service.c gthumb-3.2.3/extensions/picasaweb/picasa-web-service.c --- gthumb-3.0.2/extensions/picasaweb/picasa-web-service.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/picasaweb/picasa-web-service.c 2013-04-30 16:56:12.000000000 +0000 @@ -3,7 +3,7 @@ /* * GThumb * - * Copyright (C) 2010 Free Software Foundation, Inc. + * Copyright (C) 2010-2012 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,25 +22,42 @@ #include #include #include +#include #include +#include #include "picasa-web-album.h" #include "picasa-web-photo.h" #include "picasa-web-service.h" -G_DEFINE_TYPE (PicasaWebService, picasa_web_service, G_TYPE_OBJECT) +#define ATOM_ENTRY_MIME_TYPE "application/atom+xml; charset=UTF-8; type=entry" +/*#define PICASA_WEB_API_VERSION "1.0" +#define PICASA_WEB_AUTHENTICATION_RESPONSE_CHOOSE_ACCOUNT 2 +#define PICASA_WEB_HTTP_SERVER "https://www.picasa_web.com" +#define PICASA_WEB_MAX_IMAGE_SIZE 2048 +#define PICASA_WEB_MIN_IMAGE_SIZE 720 FIXME */ +#define PICASA_WEB_REDIRECT_URI "urn:ietf:wg:oauth:2.0:oob" +#define PICASA_WEB_REDIRECT_TITLE "Success code=" +#define PICASA_WEB_SERVICE_ERROR_TOKEN_EXPIRED 190 +#define GTHUMB_PICASA_WEB_CLIENT_ID "499958842898.apps.googleusercontent.com" +#define GTHUMB_PICASA_WEB_CLIENT_SECRET "-DdIqzDxVRc_Wkobuf-2g-of" + + +/* -- post_photos_data -- */ typedef struct { PicasaWebAlbum *album; GList *file_list; + int max_width; + int max_height; GCancellable *cancellable; GAsyncReadyCallback callback; gpointer user_data; GList *current; - goffset total_size; - goffset uploaded_size; - goffset wrote_body_data_size; + guint64 total_size; + guint64 uploaded_size; + guint64 wrote_body_data_size; int n_files; int uploaded_files; } PostPhotosData; @@ -58,38 +75,510 @@ } -struct _PicasaWebServicePrivate -{ - GoogleConnection *conn; - PicasaWebUser *user; - PostPhotosData *post_photos; +/* -- picasa_web_service -- */ + + +G_DEFINE_TYPE (PicasaWebService, picasa_web_service, WEB_TYPE_SERVICE) + + +struct _PicasaWebServicePrivate { + char *access_token; + char *refresh_token; + guint64 quota_limit; + guint64 quota_used; + PostPhotosData *post_photos; }; static void picasa_web_service_finalize (GObject *object) { - PicasaWebService *self; - - self = PICASA_WEB_SERVICE (object); + PicasaWebService *self = PICASA_WEB_SERVICE (object); - _g_object_unref (self->priv->conn); - _g_object_unref (self->priv->user); post_photos_data_free (self->priv->post_photos); + g_free (self->priv->access_token); + g_free (self->priv->refresh_token); G_OBJECT_CLASS (picasa_web_service_parent_class)->finalize (object); } +/* -- connection utilities -- */ + + +static void +_picasa_web_service_add_headers (PicasaWebService *self, + SoupMessage *msg) +{ + if (self->priv->access_token != NULL) { + char *value; + + value = g_strconcat ("Bearer ", self->priv->access_token, NULL); + soup_message_headers_replace (msg->request_headers, "Authorization", value); + g_free (value); + } + + soup_message_headers_replace (msg->request_headers, "GData-Version", "2"); +} + + +static gboolean +picasa_web_utils_parse_json_response (SoupMessage *msg, + JsonNode **node, + GError **error) +{ + JsonParser *parser; + SoupBuffer *body; + + g_return_val_if_fail (msg != NULL, FALSE); + g_return_val_if_fail (node != NULL, FALSE); + + *node = NULL; + + if ((msg->status_code != 200) && (msg->status_code != 400)) { + *error = g_error_new (SOUP_HTTP_ERROR, + msg->status_code, + "%s", + soup_status_get_phrase (msg->status_code)); + return FALSE; + } + + body = soup_message_body_flatten (msg->response_body); + parser = json_parser_new (); + if (json_parser_load_from_data (parser, body->data, body->length, error)) { + JsonObject *obj; + + *node = json_node_copy (json_parser_get_root (parser)); + + obj = json_node_get_object (*node); + if (json_object_has_member (obj, "error")) { + JsonObject *error_obj; + + error_obj = json_object_get_object_member (obj, "error"); + *error = g_error_new (WEB_SERVICE_ERROR, + json_object_get_int_member (error_obj, "code"), + "%s", + json_object_get_string_member (error_obj, "message")); + + json_node_free (*node); + *node = NULL; + } + } + + g_object_unref (parser); + soup_buffer_free (body); + + return *node != NULL; +} + + +/* -- _picasa_web_service_get_refresh_token -- */ + +static void +_picasa_web_service_get_refresh_token_ready_cb (SoupSession *session, + SoupMessage *msg, + gpointer user_data) +{ + PicasaWebService *self = user_data; + GSimpleAsyncResult *result; + GError *error = NULL; + JsonNode *node; + + result = _web_service_get_result (WEB_SERVICE (self)); + + if (picasa_web_utils_parse_json_response (msg, &node, &error)) { + JsonObject *obj; + + obj = json_node_get_object (node); + _g_strset (&self->priv->access_token, json_object_get_string_member (obj, "access_token")); + _g_strset (&self->priv->refresh_token, json_object_get_string_member (obj, "refresh_token")); + } + else + g_simple_async_result_set_from_error (result, error); + + g_simple_async_result_complete_in_idle (result); +} + + +static void +_picasa_web_service_get_refresh_token (PicasaWebService *self, + const char *authorization_code, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GHashTable *data_set; + SoupMessage *msg; + + data_set = g_hash_table_new (g_str_hash, g_str_equal); + g_hash_table_insert (data_set, "code", (gpointer) authorization_code); + g_hash_table_insert (data_set, "client_id", GTHUMB_PICASA_WEB_CLIENT_ID); + g_hash_table_insert (data_set, "client_secret", GTHUMB_PICASA_WEB_CLIENT_SECRET); + g_hash_table_insert (data_set, "redirect_uri", PICASA_WEB_REDIRECT_URI); + g_hash_table_insert (data_set, "grant_type", "authorization_code"); + msg = soup_form_request_new_from_hash ("POST", "https://accounts.google.com/o/oauth2/token", data_set); + _picasa_web_service_add_headers (self, msg); + _web_service_send_message (WEB_SERVICE (self), + msg, + cancellable, + callback, + user_data, + _picasa_web_service_get_refresh_token, + _picasa_web_service_get_refresh_token_ready_cb, + self); + + g_hash_table_destroy (data_set); +} + + +static gboolean +_picasa_web_service_get_refresh_token_finish (PicasaWebService *service, + GAsyncResult *result, + GError **error) +{ + return ! g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error); +} + + +/* -- picasa_web_service_ask_authorization -- */ + + +static void +refresh_token_ready_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) +{ + PicasaWebService *self = user_data; + GError *error = NULL; + GtkWidget *dialog; + gboolean success; + + dialog = _web_service_get_auth_dialog (WEB_SERVICE (self)); + success = _picasa_web_service_get_refresh_token_finish (self, result, &error); + gtk_dialog_response (GTK_DIALOG (dialog), success ? GTK_RESPONSE_OK : GTK_RESPONSE_CANCEL); +} + + +static void +ask_authorization_dialog_loaded_cb (OAuthAskAuthorizationDialog *dialog, + gpointer user_data) +{ + PicasaWebService *self = user_data; + const char *title; + + title = oauth_ask_authorization_dialog_get_title (dialog); + if (title == NULL) + return; + + if (g_str_has_prefix (title, PICASA_WEB_REDIRECT_TITLE)) { + const char *authorization_code; + + gtk_widget_hide (GTK_WIDGET (dialog)); + gth_task_dialog (GTH_TASK (self), FALSE, NULL); + + authorization_code = title + strlen (PICASA_WEB_REDIRECT_TITLE); + _picasa_web_service_get_refresh_token (self, + authorization_code, + gth_task_get_cancellable (GTH_TASK (self)), + refresh_token_ready_cb, + self); + } +} + + +static char * +picasa_web_service_get_authorization_url (PicasaWebService *self) +{ + GHashTable *data_set; + GString *link; + GList *keys; + GList *scan; + + data_set = g_hash_table_new (g_str_hash, g_str_equal); + g_hash_table_insert (data_set, "response_type", "code"); + g_hash_table_insert (data_set, "client_id", GTHUMB_PICASA_WEB_CLIENT_ID); + g_hash_table_insert (data_set, "redirect_uri", PICASA_WEB_REDIRECT_URI); + g_hash_table_insert (data_set, "scope", "https://picasaweb.google.com/data/ https://www.googleapis.com/auth/userinfo.profile"); + + link = g_string_new ("https://accounts.google.com/o/oauth2/auth?"); + keys = g_hash_table_get_keys (data_set); + for (scan = keys; scan; scan = scan->next) { + char *key = scan->data; + char *encoded; + + if (scan != keys) + g_string_append (link, "&"); + g_string_append (link, key); + g_string_append (link, "="); + encoded = soup_uri_encode (g_hash_table_lookup (data_set, key), NULL); + g_string_append (link, encoded); + + g_free (encoded); + } + + g_list_free (keys); + g_hash_table_destroy (data_set); + + return g_string_free (link, FALSE); +} + + +static void +picasa_web_service_ask_authorization (WebService *base) +{ + PicasaWebService *self = PICASA_WEB_SERVICE (base); + GtkWidget *dialog; + + _g_strset (&self->priv->refresh_token, NULL); + _g_strset (&self->priv->access_token, NULL); + + dialog = oauth_ask_authorization_dialog_new (picasa_web_service_get_authorization_url (self)); + gtk_window_set_default_size (GTK_WINDOW (dialog), 680, 580); + _web_service_set_auth_dialog (WEB_SERVICE (self), GTK_DIALOG (dialog)); + + g_signal_connect (OAUTH_ASK_AUTHORIZATION_DIALOG (dialog), + "loaded", + G_CALLBACK (ask_authorization_dialog_loaded_cb), + self); + + gtk_widget_show (dialog); +} + + +/* -- _picasa_web_service_get_access_token -- */ + + +static void +_picasa_web_service_get_access_token_ready_cb (SoupSession *session, + SoupMessage *msg, + gpointer user_data) +{ + PicasaWebService *self = user_data; + GSimpleAsyncResult *result; + GError *error = NULL; + JsonNode *node; + + result = _web_service_get_result (WEB_SERVICE (self)); + + if (picasa_web_utils_parse_json_response (msg, &node, &error)) { + JsonObject *obj; + OAuthAccount *account; + + obj = json_node_get_object (node); + account = web_service_get_current_account (WEB_SERVICE (self)); + if (account != NULL) + g_object_set (account, + "token", json_object_get_string_member (obj, "access_token"), + NULL); + else + _g_strset (&self->priv->access_token, json_object_get_string_member (obj, "access_token")); + } + else + g_simple_async_result_set_from_error (result, error); + + g_simple_async_result_complete_in_idle (result); +} + + +static void +_picasa_web_service_get_access_token (PicasaWebService *self, + const char *refresh_token, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GHashTable *data_set; + SoupMessage *msg; + + _g_strset (&self->priv->access_token, NULL); + + data_set = g_hash_table_new (g_str_hash, g_str_equal); + g_hash_table_insert (data_set, "refresh_token", (gpointer) refresh_token); + g_hash_table_insert (data_set, "client_id", GTHUMB_PICASA_WEB_CLIENT_ID); + g_hash_table_insert (data_set, "client_secret", GTHUMB_PICASA_WEB_CLIENT_SECRET); + g_hash_table_insert (data_set, "grant_type", "refresh_token"); + msg = soup_form_request_new_from_hash ("POST", "https://accounts.google.com/o/oauth2/token", data_set); + _picasa_web_service_add_headers (self, msg); + _web_service_send_message (WEB_SERVICE (self), + msg, + cancellable, + callback, + user_data, + _picasa_web_service_get_access_token, + _picasa_web_service_get_access_token_ready_cb, + self); + + g_hash_table_destroy (data_set); +} + + +static gboolean +_picasa_web_service_get_access_token_finish (PicasaWebService *service, + GAsyncResult *result, + GError **error) +{ + return ! g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error); +} + + +/* -- picasa_web_service_get_user_info -- */ + + +static void +picasa_web_service_get_user_info_ready_cb (SoupSession *session, + SoupMessage *msg, + gpointer user_data) +{ + PicasaWebService *self = user_data; + GSimpleAsyncResult *result; + GError *error = NULL; + JsonNode *node; + + result = _web_service_get_result (WEB_SERVICE (self)); + + if (picasa_web_utils_parse_json_response (msg, &node, &error)) { + OAuthAccount *account; + + account = (OAuthAccount *) json_gobject_deserialize (OAUTH_TYPE_ACCOUNT, node); + g_object_set (account, + "token", self->priv->access_token, + "token-secret", self->priv->refresh_token, + NULL); + g_simple_async_result_set_op_res_gpointer (result, + g_object_ref (account), + (GDestroyNotify) g_object_unref); + + _g_object_unref (account); + json_node_free (node); + } + else + g_simple_async_result_set_from_error (result, error); + + g_simple_async_result_complete_in_idle (result); +} + + +typedef struct { + PicasaWebService *service; + GCancellable *cancellable; + GAsyncReadyCallback callback; + gpointer user_data; +} AccessTokenData; + + +static void +access_token_data_free (AccessTokenData *data) +{ + _g_object_unref (data->cancellable); + g_free (data); +} + + +static void +picasa_web_service_get_user_info (WebService *base, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + + +static void +access_token_ready_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) +{ + AccessTokenData *data = user_data; + PicasaWebService *self = data->service; + GError *error = NULL; + + if (! _picasa_web_service_get_access_token_finish (self, result, &error)) { + GSimpleAsyncResult *result; + + result = g_simple_async_result_new (G_OBJECT (self), + data->callback, + data->user_data, + picasa_web_service_get_user_info); + g_simple_async_result_take_error (result, error); + g_simple_async_result_complete_in_idle (result); + + access_token_data_free (data); + return; + } + + /* call get_user_info again, now that we have the access token */ + picasa_web_service_get_user_info (WEB_SERVICE (self), + data->cancellable, + data->callback, + data->user_data); + + access_token_data_free (data); +} + + +static void +picasa_web_service_get_user_info (WebService *base, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + PicasaWebService *self = PICASA_WEB_SERVICE (base); + OAuthAccount *account; + GHashTable *data_set; + SoupMessage *msg; + + account = web_service_get_current_account (WEB_SERVICE (self)); + if (account != NULL) { + _g_strset (&self->priv->refresh_token, account->token_secret); + _g_strset (&self->priv->access_token, account->token); + } + + data_set = g_hash_table_new (g_str_hash, g_str_equal); + if (self->priv->access_token != NULL) { + msg = soup_form_request_new_from_hash ("GET", "https://www.googleapis.com/oauth2/v2/userinfo", data_set); + _picasa_web_service_add_headers (self, msg); + _web_service_send_message (WEB_SERVICE (self), + msg, + cancellable, + callback, + user_data, + picasa_web_service_get_user_info, + picasa_web_service_get_user_info_ready_cb, + self); + } + else { + /* Get the access token from the refresh token */ + + AccessTokenData *data; + + data = g_new0 (AccessTokenData, 1); + data->service = self; + data->cancellable = _g_object_ref (cancellable); + data->callback = callback; + data->user_data = user_data; + _picasa_web_service_get_access_token (self, + self->priv->refresh_token, + cancellable, + access_token_ready_cb, + data); + } + + g_hash_table_destroy (data_set); +} + + static void picasa_web_service_class_init (PicasaWebServiceClass *klass) { - GObjectClass *object_class; + GObjectClass *object_class; + WebServiceClass *service_class; g_type_class_add_private (klass, sizeof (PicasaWebServicePrivate)); object_class = (GObjectClass*) klass; object_class->finalize = picasa_web_service_finalize; + + service_class = (WebServiceClass*) klass; + service_class->ask_authorization = picasa_web_service_ask_authorization; + service_class->get_user_info = picasa_web_service_get_user_info; } @@ -97,28 +586,37 @@ picasa_web_service_init (PicasaWebService *self) { self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PICASA_TYPE_WEB_SERVICE, PicasaWebServicePrivate); - self->priv->conn = NULL; - self->priv->user = NULL; + self->priv->refresh_token = NULL; + self->priv->access_token = NULL; + self->priv->quota_limit = 0; + self->priv->quota_used = 0; self->priv->post_photos = NULL; } PicasaWebService * -picasa_web_service_new (GoogleConnection *conn) -{ - PicasaWebService *self; - - self = (PicasaWebService *) g_object_new (PICASA_TYPE_WEB_SERVICE, NULL); - self->priv->conn = g_object_ref (conn); - - return self; +picasa_web_service_new (GCancellable *cancellable, + GtkWidget *browser, + GtkWidget *dialog) +{ + return g_object_new (PICASA_TYPE_WEB_SERVICE, + "service-name", "picasaweb", + "service-address", "picasaweb.google.com", + "service-protocol", "https", + "cancellable", cancellable, + "browser", browser, + "dialog", dialog, + NULL); } -PicasaWebUser * -picasa_web_service_get_user (PicasaWebService *self) +guint64 +picasa_web_service_get_free_space (PicasaWebService *self) { - return self->priv->user; + if (self->priv->quota_limit >= self->priv->quota_used) + return (guint64) (self->priv->quota_limit - self->priv->quota_used); + else + return 0; } @@ -136,7 +634,7 @@ DomDocument *doc; GError *error = NULL; - result = google_connection_get_result (self->priv->conn); + result = _web_service_get_result (WEB_SERVICE (self)); if (msg->status_code != 200) { g_simple_async_result_set_error (result, @@ -162,9 +660,6 @@ DomElement *node; PicasaWebAlbum *album; - self->priv->user = picasa_web_user_new (); - dom_domizable_load_from_element (DOM_DOMIZABLE (self->priv->user), feed_node); - album = NULL; for (node = feed_node->first_child; node != NULL; @@ -176,6 +671,12 @@ album = picasa_web_album_new (); dom_domizable_load_from_element (DOM_DOMIZABLE (album), node); } + else if (g_strcmp0 (node->tag_name, "gphoto:quotalimit") == 0) { + self->priv->quota_limit = g_ascii_strtoull (dom_element_get_inner_text (node), NULL, 10); + } + else if (g_strcmp0 (node->tag_name, "gphoto:quotacurrent") == 0) { + self->priv->quota_used = g_ascii_strtoull (dom_element_get_inner_text (node), NULL, 10); + } } if (album != NULL) albums = g_list_prepend (albums, album); @@ -196,28 +697,30 @@ void picasa_web_service_list_albums (PicasaWebService *self, - const char *user_id, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data) { - char *url; - SoupMessage *msg; + OAuthAccount *account; + SoupMessage *msg; + char *url; - g_return_if_fail (user_id != NULL); + account = web_service_get_current_account (WEB_SERVICE (self)); + g_return_if_fail (account != NULL); - gth_task_progress (GTH_TASK (self->priv->conn), _("Getting the album list"), NULL, TRUE, 0.0); + gth_task_progress (GTH_TASK (self), _("Getting the album list"), NULL, TRUE, 0.0); - url = g_strconcat ("http://picasaweb.google.com/data/feed/api/user/", user_id, NULL); + url = g_strconcat ("https://picasaweb.google.com/data/feed/api/user/", account->id, NULL); msg = soup_message_new ("GET", url); - google_connection_send_message (self->priv->conn, - msg, - cancellable, - callback, - user_data, - picasa_web_service_list_albums, - list_albums_ready_cb, - self); + _picasa_web_service_add_headers (self, msg); + _web_service_send_message (WEB_SERVICE (self), + msg, + cancellable, + callback, + user_data, + picasa_web_service_list_albums, + list_albums_ready_cb, + self); g_free (url); } @@ -249,7 +752,7 @@ DomDocument *doc; GError *error = NULL; - result = google_connection_get_result (self->priv->conn); + result = _web_service_get_result (WEB_SERVICE (self)); if (msg->status_code != 201) { g_simple_async_result_set_error (result, @@ -288,36 +791,36 @@ GAsyncReadyCallback callback, gpointer user_data) { - DomDocument *doc; - DomElement *entry; - char *buffer; - gsize len; - char *url; - SoupMessage *msg; + OAuthAccount *account; + DomDocument *doc; + DomElement *entry; + char *buffer; + gsize len; + char *url; + SoupMessage *msg; - g_return_if_fail (self->priv->user != NULL); + account = web_service_get_current_account (WEB_SERVICE (self)); + g_return_if_fail (account != NULL); - gth_task_progress (GTH_TASK (self->priv->conn), _("Creating the new album"), NULL, TRUE, 0.0); + gth_task_progress (GTH_TASK (self), _("Creating the new album"), NULL, TRUE, 0.0); doc = dom_document_new (); entry = dom_domizable_create_element (DOM_DOMIZABLE (album), doc); - dom_element_set_attribute (entry, "xmlns", "http://www.w3.org/2005/Atom"); - dom_element_set_attribute (entry, "xmlns:media", "http://search.yahoo.com/mrss/"); - dom_element_set_attribute (entry, "xmlns:gphoto", "http://schemas.google.com/photos/2007"); dom_element_append_child (DOM_ELEMENT (doc), entry); buffer = dom_document_dump (doc, &len); - url = g_strconcat ("http://picasaweb.google.com/data/feed/api/user/", self->priv->user->id, NULL); + url = g_strconcat ("https://picasaweb.google.com/data/feed/api/user/", account->id, NULL); msg = soup_message_new ("POST", url); soup_message_set_request (msg, ATOM_ENTRY_MIME_TYPE, SOUP_MEMORY_TAKE, buffer, len); - google_connection_send_message (self->priv->conn, - msg, - cancellable, - callback, - user_data, - picasa_web_service_create_album, - create_album_ready_cb, - self); + _picasa_web_service_add_headers (self, msg); + _web_service_send_message (WEB_SERVICE (self), + msg, + cancellable, + callback, + user_data, + picasa_web_service_create_album, + create_album_ready_cb, + self); g_free (url); g_object_unref (doc); @@ -345,7 +848,7 @@ { GSimpleAsyncResult *result; - result = google_connection_get_result (self->priv->conn); + result = _web_service_get_result (WEB_SERVICE (self)); if (error == NULL) { g_simple_async_result_set_op_res_gboolean (result, TRUE); } @@ -378,7 +881,9 @@ if (msg->status_code != 201) { GError *error; - error = g_error_new_literal (SOUP_HTTP_ERROR, msg->status_code, soup_status_get_phrase (msg->status_code)); + error = g_error_new_literal (SOUP_HTTP_ERROR, + msg->status_code, + soup_status_get_phrase (msg->status_code)); post_photos_done (self, error); g_error_free (error); @@ -411,7 +916,7 @@ /* Translators: %s is a filename */ details = g_strdup_printf (_("Uploading '%s'"), g_file_info_get_display_name (file_data->info)); current_file_fraction = (double) self->priv->post_photos->wrote_body_data_size / msg->request_body->length; - gth_task_progress (GTH_TASK (self->priv->conn), + gth_task_progress (GTH_TASK (self), NULL, details, FALSE, @@ -428,6 +933,7 @@ gpointer user_data) { PicasaWebService *self = user_data; + OAuthAccount *account; GthFileData *file_data; SoupMultipart *multipart; const char *filename; @@ -439,6 +945,8 @@ gsize entry_len; SoupMessageHeaders *headers; SoupBuffer *body; + void *resized_buffer; + gsize resized_count; char *url; SoupMessage *msg; @@ -447,6 +955,7 @@ return; } + account = web_service_get_current_account (WEB_SERVICE (self)); file_data = self->priv->post_photos->current->data; multipart = soup_multipart_new ("multipart/related"); @@ -507,7 +1016,27 @@ /* the file part */ - body = soup_buffer_new (SOUP_MEMORY_TEMPORARY, *buffer, count); + if (_g_buffer_resize_image (*buffer, + count, + file_data, + self->priv->post_photos->max_width, + self->priv->post_photos->max_height, + &resized_buffer, + &resized_count, + self->priv->post_photos->cancellable, + &error)) + { + body = soup_buffer_new (SOUP_MEMORY_TAKE, resized_buffer, resized_count); + } + else if (error == NULL) { + body = soup_buffer_new (SOUP_MEMORY_TEMPORARY, *buffer, count); + } + else { + soup_multipart_free (multipart); + post_photos_done (self, error); + return; + } + soup_multipart_append_form_file (multipart, "file", NULL, @@ -519,8 +1048,8 @@ /* send the file */ self->priv->post_photos->wrote_body_data_size = 0; - url = g_strconcat ("http://picasaweb.google.com/data/feed/api/user/", - self->priv->user->id, + url = g_strconcat ("https://picasaweb.google.com/data/feed/api/user/", + account->id, "/albumid/", self->priv->post_photos->album->id, NULL); @@ -530,14 +1059,15 @@ (GCallback) upload_photo_wrote_body_data_cb, self); - google_connection_send_message (self->priv->conn, - msg, - self->priv->post_photos->cancellable, - self->priv->post_photos->callback, - self->priv->post_photos->user_data, - picasa_web_service_post_photos, - post_photo_ready_cb, - self); + _picasa_web_service_add_headers (self, msg); + _web_service_send_message (WEB_SERVICE (self), + msg, + self->priv->post_photos->cancellable, + self->priv->post_photos->callback, + self->priv->post_photos->user_data, + picasa_web_service_post_photos, + post_photo_ready_cb, + self); g_free (url); soup_multipart_free (multipart); @@ -555,11 +1085,11 @@ } file_data = self->priv->post_photos->current->data; - g_load_file_async (file_data->file, - G_PRIORITY_DEFAULT, - self->priv->post_photos->cancellable, - post_photo_file_buffer_ready_cb, - self); + _g_file_load_async (file_data->file, + G_PRIORITY_DEFAULT, + self->priv->post_photos->cancellable, + post_photo_file_buffer_ready_cb, + self); } @@ -595,6 +1125,8 @@ picasa_web_service_post_photos (PicasaWebService *self, PicasaWebAlbum *album, GList *file_list, /* GFile list */ + int max_width, + int max_height, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data) @@ -602,10 +1134,16 @@ g_return_if_fail (album != NULL); g_return_if_fail (self->priv->post_photos == NULL); - gth_task_progress (GTH_TASK (self->priv->conn), _("Uploading the files to the server"), NULL, TRUE, 0.0); + gth_task_progress (GTH_TASK (self), + _("Uploading the files to the server"), + "", + TRUE, + 0.0); self->priv->post_photos = g_new0 (PostPhotosData, 1); self->priv->post_photos->album = g_object_ref (album); + self->priv->post_photos->max_width = max_width; + self->priv->post_photos->max_height = max_height; self->priv->post_photos->cancellable = _g_object_ref (cancellable); self->priv->post_photos->callback = callback; self->priv->post_photos->user_data = user_data; @@ -645,7 +1183,7 @@ DomDocument *doc; GError *error = NULL; - result = google_connection_get_result (self->priv->conn); + result = _web_service_get_result (WEB_SERVICE (self)); if (msg->status_code != 200) { g_simple_async_result_set_error (result, @@ -671,9 +1209,6 @@ DomElement *node; PicasaWebPhoto *photo; - self->priv->user = picasa_web_user_new (); - dom_domizable_load_from_element (DOM_DOMIZABLE (self->priv->user), feed_node); - photo = NULL; for (node = feed_node->first_child; node != NULL; @@ -710,27 +1245,35 @@ GAsyncReadyCallback callback, gpointer user_data) { - char *url; - SoupMessage *msg; + OAuthAccount *account; + char *url; + SoupMessage *msg; + account = web_service_get_current_account (WEB_SERVICE (self)); + g_return_if_fail (account != NULL); g_return_if_fail (album != NULL); - gth_task_progress (GTH_TASK (self->priv->conn), _("Getting the photo list"), NULL, TRUE, 0.0); + gth_task_progress (GTH_TASK (self), + _("Getting the photo list"), + NULL, + TRUE, + 0.0); - url = g_strconcat ("http://picasaweb.google.com/data/feed/api/user/", - self->priv->user->id, + url = g_strconcat ("https://picasaweb.google.com/data/feed/api/user/", + account->id, "/albumid/", album->id, NULL); msg = soup_message_new ("GET", url); - google_connection_send_message (self->priv->conn, - msg, - cancellable, - callback, - user_data, - picasa_web_service_list_photos, - list_photos_ready_cb, - self); + _picasa_web_service_add_headers (self, msg); + _web_service_send_message (WEB_SERVICE (self), + msg, + cancellable, + callback, + user_data, + picasa_web_service_list_photos, + list_photos_ready_cb, + self); g_free (url); } @@ -746,96 +1289,3 @@ else return _g_object_list_ref (g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result))); } - - -/* utilities */ - - -GList * -picasa_web_accounts_load_from_file (char **_default) -{ - GList *accounts = NULL; - char *filename; - char *buffer; - gsize len; - DomDocument *doc; - - filename = gth_user_dir_get_file (GTH_DIR_CONFIG, GTHUMB_DIR, "accounts", "picasaweb.xml", NULL); - if (! g_file_get_contents (filename, &buffer, &len, NULL)) { - g_free (filename); - return NULL; - } - - doc = dom_document_new (); - if (dom_document_load (doc, buffer, len, NULL)) { - DomElement *node; - - node = DOM_ELEMENT (doc)->first_child; - if ((node != NULL) && (g_strcmp0 (node->tag_name, "accounts") == 0)) { - DomElement *child; - - for (child = node->first_child; - child != NULL; - child = child->next_sibling) - { - if (strcmp (child->tag_name, "account") == 0) { - const char *value; - - value = dom_element_get_attribute (child, "email"); - if (value != NULL) - accounts = g_list_prepend (accounts, g_strdup (value)); - if ((_default != NULL) && (g_strcmp0 (dom_element_get_attribute (child, "default"), "1") == 0)) - *_default = g_strdup (value); - } - } - - accounts = g_list_reverse (accounts); - } - } - - g_object_unref (doc); - g_free (buffer); - g_free (filename); - - return accounts; -} - - -void -picasa_web_accounts_save_to_file (GList *accounts, - const char *_default) -{ - DomDocument *doc; - DomElement *root; - GList *scan; - char *buffer; - gsize len; - char *filename; - GFile *file; - - doc = dom_document_new (); - root = dom_document_create_element (doc, "accounts", NULL); - dom_element_append_child (DOM_ELEMENT (doc), root); - for (scan = accounts; scan; scan = scan->next) { - const char *email = scan->data; - DomElement *node; - - node = dom_document_create_element (doc, "account", - "email", email, - NULL); - if (g_strcmp0 (email, _default) == 0) - dom_element_set_attribute (node, "default", "1"); - dom_element_append_child (root, node); - } - - gth_user_dir_make_dir_for_file (GTH_DIR_CONFIG, GTHUMB_DIR, "accounts", "picasaweb.xml", NULL); - filename = gth_user_dir_get_file (GTH_DIR_CONFIG, GTHUMB_DIR, "accounts", "picasaweb.xml", NULL); - file = g_file_new_for_path (filename); - buffer = dom_document_dump (doc, &len); - g_write_file (file, FALSE, G_FILE_CREATE_PRIVATE | G_FILE_CREATE_REPLACE_DESTINATION, buffer, len, NULL, NULL); - - g_free (buffer); - g_object_unref (file); - g_free (filename); - g_object_unref (doc); -} diff -Nru gthumb-3.0.2/extensions/picasaweb/picasa-web-service.h gthumb-3.2.3/extensions/picasaweb/picasa-web-service.h --- gthumb-3.0.2/extensions/picasaweb/picasa-web-service.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/picasaweb/picasa-web-service.h 2013-04-30 16:56:12.000000000 +0000 @@ -3,7 +3,7 @@ /* * GThumb * - * Copyright (C) 2010 Free Software Foundation, Inc. + * Copyright (C) 2010-2012 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,10 +22,11 @@ #ifndef PICASA_WEB_SERVICE_H #define PICASA_WEB_SERVICE_H -#include -#include "google-connection.h" +#include +#include +#include #include "picasa-web-album.h" -#include "picasa-web-user.h" +#include "picasa-web-types.h" #define PICASA_TYPE_WEB_SERVICE (picasa_web_service_get_type ()) #define PICASA_WEB_SERVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), PICASA_TYPE_WEB_SERVICE, PicasaWebService)) @@ -40,20 +41,21 @@ struct _PicasaWebService { - GObject __parent; + WebService __parent; PicasaWebServicePrivate *priv; }; struct _PicasaWebServiceClass { - GObjectClass __parent_class; + WebServiceClass __parent_class; }; GType picasa_web_service_get_type (void) G_GNUC_CONST; -PicasaWebService * picasa_web_service_new (GoogleConnection *conn); -PicasaWebUser * picasa_web_service_get_user (PicasaWebService *self); +PicasaWebService * picasa_web_service_new (GCancellable *cancellable, + GtkWidget *browser, + GtkWidget *dialog); +guint64 picasa_web_service_get_free_space (PicasaWebService *self); void picasa_web_service_list_albums (PicasaWebService *self, - const char *user_id, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); @@ -71,6 +73,8 @@ void picasa_web_service_post_photos (PicasaWebService *self, PicasaWebAlbum *album, GList *file_list, /* GFile list */ + int max_width, + int max_height, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); @@ -86,10 +90,4 @@ GAsyncResult *result, GError **error); -/* utilities */ - -GList * picasa_web_accounts_load_from_file (char **_default); -void picasa_web_accounts_save_to_file (GList *accounts, - const char *_default); - #endif /* PICASA_WEB_SERVICE_H */ diff -Nru gthumb-3.0.2/extensions/picasaweb/picasa-web-user.c gthumb-3.2.3/extensions/picasaweb/picasa-web-user.c --- gthumb-3.0.2/extensions/picasaweb/picasa-web-user.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/picasaweb/picasa-web-user.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,201 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include -#include "picasa-web-user.h" - - -static void picasa_web_user_dom_domizable_interface_init (DomDomizableInterface *iface); - - -G_DEFINE_TYPE_WITH_CODE (PicasaWebUser, - picasa_web_user, - G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (DOM_TYPE_DOMIZABLE, - picasa_web_user_dom_domizable_interface_init)) - - -static void -picasa_web_user_finalize (GObject *obj) -{ - PicasaWebUser *self; - - self = PICASA_WEB_USER (obj); - - g_free (self->id); - g_free (self->nickname); - g_free (self->icon); - - G_OBJECT_CLASS (picasa_web_user_parent_class)->finalize (obj); -} - - -static void -picasa_web_user_class_init (PicasaWebUserClass *klass) -{ - G_OBJECT_CLASS (klass)->finalize = picasa_web_user_finalize; -} - - -static DomElement* -picasa_web_user_create_element (DomDomizable *base, - DomDocument *doc) -{ - PicasaWebUser *self; - DomElement *element; - - self = PICASA_WEB_USER (base); - - element = dom_document_create_element (doc, "entry", - "xmlns", "http://www.w3.org/2005/Atom", - "xmlns:media", "http://search.yahoo.com/mrss/", - "xmlns:gphoto", "http://schemas.google.com/photos/2007", - NULL); - if (self->id != NULL) - dom_element_append_child (element, dom_document_create_element_with_text (doc, self->id, "gphoto:user", NULL)); - if (self->nickname != NULL) - dom_element_append_child (element, dom_document_create_element_with_text (doc, self->nickname, "gphoto:nickname", NULL)); - if (self->icon != NULL) - dom_element_append_child (element, dom_document_create_element_with_text (doc, self->icon, "icon", NULL)); - - dom_element_append_child (element, - dom_document_create_element (doc, "category", - "scheme", "http://schemas.google.com/g/2005#kind", - "term", "http://schemas.google.com/photos/2007#user", - NULL)); - - return element; -} - - -static void -picasa_web_user_load_from_element (DomDomizable *base, - DomElement *element) -{ - PicasaWebUser *self; - DomElement *node; - - self = PICASA_WEB_USER (base); - - picasa_web_user_set_id (self, NULL); - picasa_web_user_set_nickname (self, NULL); - picasa_web_user_set_icon (self, NULL); - self->quota_limit = 0; - self->quota_current = 0; - self->max_photos_per_album = 0; - - for (node = element->first_child; node; node = node->next_sibling) { - if (g_strcmp0 (node->tag_name, "gphoto:user") == 0) { - picasa_web_user_set_id (self, dom_element_get_inner_text (node)); - } - else if (g_strcmp0 (node->tag_name, "gphoto:nickname") == 0) { - picasa_web_user_set_nickname (self, dom_element_get_inner_text (node)); - } - else if (g_strcmp0 (node->tag_name, "icon") == 0) { - picasa_web_user_set_icon (self, dom_element_get_inner_text (node)); - } - else if (g_strcmp0 (node->tag_name, "gphoto:quotalimit") == 0) { - picasa_web_user_set_quota_limit (self, dom_element_get_inner_text (node)); - } - else if (g_strcmp0 (node->tag_name, "gphoto:quotacurrent") == 0) { - picasa_web_user_set_quota_current (self, dom_element_get_inner_text (node)); - } - else if (g_strcmp0 (node->tag_name, "gphoto:maxPhotosPerAlbum") == 0) { - picasa_web_user_set_max_photos (self, dom_element_get_inner_text (node)); - } - } -} - - -static void -picasa_web_user_dom_domizable_interface_init (DomDomizableInterface *iface) -{ - iface->create_element = picasa_web_user_create_element; - iface->load_from_element = picasa_web_user_load_from_element; -} - - -static void -picasa_web_user_init (PicasaWebUser *self) -{ - /* void */ -} - - -PicasaWebUser * -picasa_web_user_new (void) -{ - return g_object_new (PICASA_WEB_TYPE_USER, NULL); -} - - -void -picasa_web_user_set_id (PicasaWebUser *self, - const char *value) -{ - _g_strset (&self->id, value); -} - - -void -picasa_web_user_set_nickname (PicasaWebUser *self, - const char *value) -{ - _g_strset (&self->nickname, value); -} - - -void -picasa_web_user_set_icon (PicasaWebUser *self, - const char *value) -{ - _g_strset (&self->icon, value); -} - - -void -picasa_web_user_set_quota_limit (PicasaWebUser *self, - const char *value) -{ - self->quota_limit = g_ascii_strtoull (value, NULL, 10); -} - - -void -picasa_web_user_set_quota_current (PicasaWebUser *self, - const char *value) -{ - self->quota_current = g_ascii_strtoull (value, NULL, 10); -} - - -void -picasa_web_user_set_max_photos (PicasaWebUser *self, - const char *value) -{ - if (value != NULL) - self->max_photos_per_album = atoi (value); - else - self->max_photos_per_album = 0; -} diff -Nru gthumb-3.0.2/extensions/picasaweb/picasa-web-user.h gthumb-3.2.3/extensions/picasaweb/picasa-web-user.h --- gthumb-3.0.2/extensions/picasaweb/picasa-web-user.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/picasaweb/picasa-web-user.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef PICASA_WEB_USER_H -#define PICASA_WEB_USER_H - -#include -#include - -G_BEGIN_DECLS - -#define PICASA_WEB_TYPE_USER (picasa_web_user_get_type ()) -#define PICASA_WEB_USER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PICASA_WEB_TYPE_USER, PicasaWebUser)) -#define PICASA_WEB_USER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PICASA_WEB_TYPE_USER, PicasaWebUserClass)) -#define PICASA_WEB_IS_USER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PICASA_WEB_TYPE_USER)) -#define PICASA_WEB_IS_USER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PICASA_WEB_TYPE_USER)) -#define PICASA_WEB_USER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PICASA_WEB_TYPE_USER, PicasaWebUserClass)) - -typedef struct _PicasaWebUser PicasaWebUser; -typedef struct _PicasaWebUserClass PicasaWebUserClass; -typedef struct _PicasaWebUserPrivate PicasaWebUserPrivate; - -struct _PicasaWebUser { - GObject parent_instance; - PicasaWebUserPrivate *priv; - - char *id; - char *nickname; - char *icon; - goffset quota_limit; - goffset quota_current; - goffset max_photos_per_album; -}; - -struct _PicasaWebUserClass { - GObjectClass parent_class; -}; - -GType picasa_web_user_get_type (void); -PicasaWebUser * picasa_web_user_new (void); -void picasa_web_user_set_id (PicasaWebUser *self, - const char *value); -void picasa_web_user_set_nickname (PicasaWebUser *self, - const char *value); -void picasa_web_user_set_icon (PicasaWebUser *self, - const char *value); -void picasa_web_user_set_quota_limit (PicasaWebUser *self, - const char *value); -void picasa_web_user_set_quota_current (PicasaWebUser *self, - const char *value); -void picasa_web_user_set_max_photos (PicasaWebUser *self, - const char *value); - -G_END_DECLS - -#endif /* PICASA_WEB_USER_H */ diff -Nru gthumb-3.0.2/extensions/picasaweb/picasaweb.extension.in.in gthumb-3.2.3/extensions/picasaweb/picasaweb.extension.in.in --- gthumb-3.0.2/extensions/picasaweb/picasaweb.extension.in.in 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/picasaweb/picasaweb.extension.in.in 2013-04-30 16:56:12.000000000 +0000 @@ -11,4 +11,4 @@ Type=module File=%LIBRARY% API=%GTHUMB_API_VERSION% -Requires=importer;export_tools +Requires=importer;export_tools;oauth diff -Nru gthumb-3.0.2/extensions/picasaweb/preferences.h gthumb-3.2.3/extensions/picasaweb/preferences.h --- gthumb-3.0.2/extensions/picasaweb/preferences.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/picasaweb/preferences.h 2013-04-30 16:56:12.000000000 +0000 @@ -28,6 +28,7 @@ /* keys */ -#define PREF_PICASAWEB_SYNCHRONIZE "synchronize" +#define PREF_PICASAWEB_RESIZE_WIDTH "resize-width" +#define PREF_PICASAWEB_RESIZE_HEIGHT "resize-height" #endif /* PREFERENCES_H */ diff -Nru gthumb-3.0.2/extensions/pixbuf_savers/Makefile.am gthumb-3.2.3/extensions/pixbuf_savers/Makefile.am --- gthumb-3.0.2/extensions/pixbuf_savers/Makefile.am 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/pixbuf_savers/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ -if ENABLE_JPEG_TOOLS - -SUBDIRS = data - -extensiondir = $(pkglibdir)/extensions -extension_LTLIBRARIES = libpixbuf_savers.la - -ENUM_TYPES = \ - enum-types.h \ - enum-types.c - -HEADER_FILES = \ - preferences.h - -enum-types.h: $(HEADER_FILES) - $(AM_V_GEN)( $(GLIB_MKENUMS) \ - --fhead "#ifndef ENUM_TYPES_H\n#define ENUM_TYPES_H\n\n#include \n\nG_BEGIN_DECLS\n" \ - --fprod "/* enumerations from \"@filename@\" */\n" \ - --vhead "GType @enum_name@_get_type (void);\n#define GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ - --ftail "G_END_DECLS\n\n#endif /* ENUM_TYPES_H */" \ - $^> xgen-$(@F) \ - && mv -f xgen-$(@F) enum-types.h ) - -enum-types.c: $(HEADER_FILES) - $(AM_V_GEN)( $(GLIB_MKENUMS) \ - --fhead "#include \n" \ - --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \ - --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ - --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ - --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ - $^> xgen-$(@F) \ - && mv -f xgen-$(@F) enum-types.c ) - -libpixbuf_savers_la_SOURCES = \ - $(ENUM_TYPES) \ - $(HEADER_FILES) \ - gth-jpeg-saver.c \ - gth-jpeg-saver.h \ - gth-png-saver.c \ - gth-png-saver.h \ - gth-tga-saver.c \ - gth-tga-saver.h \ - gth-tiff-saver.c \ - gth-tiff-saver.h \ - main.c \ - preferences.c - -libpixbuf_savers_la_CFLAGS = $(GTHUMB_CFLAGS) $(TIFF_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb -libpixbuf_savers_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -libpixbuf_savers_la_LIBADD = $(GTHUMB_LIBS) $(TIFF_LIBS) ../jpeg_utils/libjpeg_utils.la -libpixbuf_savers_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) - -extensioninidir = $(extensiondir) -extensionini_in_files = pixbuf_savers.extension.in.in -extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension) -DISTCLEANFILES = $(extensionini_DATA) -BUILT_SOURCES = $(ENUM_TYPES) -CLEANFILES = $(BUILT_SOURCES) - -dist-hook: - cd $(distdir); rm -f $(CLEANFILES) - -endif - -@GTHUMB_EXTENSION_IN_RULE@ -@GTHUMB_EXTENSION_RULE@ - -EXTRA_DIST = $(extensionini_in_files) - --include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/pixbuf_savers/Makefile.in gthumb-3.2.3/extensions/pixbuf_savers/Makefile.in --- gthumb-3.0.2/extensions/pixbuf_savers/Makefile.in 2012-08-20 19:54:16.000000000 +0000 +++ gthumb-3.2.3/extensions/pixbuf_savers/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,983 +0,0 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2012 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - - -VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ - esac; \ - test $$am__dry = yes; \ - } -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = extensions/pixbuf_savers -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(extensiondir)" \ - "$(DESTDIR)$(extensioninidir)" -LTLIBRARIES = $(extension_LTLIBRARIES) -am__DEPENDENCIES_1 = -am__libpixbuf_savers_la_SOURCES_DIST = enum-types.h enum-types.c \ - preferences.h gth-jpeg-saver.c gth-jpeg-saver.h \ - gth-png-saver.c gth-png-saver.h gth-tga-saver.c \ - gth-tga-saver.h gth-tiff-saver.c gth-tiff-saver.h main.c \ - preferences.c -@ENABLE_JPEG_TOOLS_TRUE@am__objects_1 = \ -@ENABLE_JPEG_TOOLS_TRUE@ libpixbuf_savers_la-enum-types.lo -am__objects_2 = -@ENABLE_JPEG_TOOLS_TRUE@am_libpixbuf_savers_la_OBJECTS = \ -@ENABLE_JPEG_TOOLS_TRUE@ $(am__objects_1) $(am__objects_2) \ -@ENABLE_JPEG_TOOLS_TRUE@ libpixbuf_savers_la-gth-jpeg-saver.lo \ -@ENABLE_JPEG_TOOLS_TRUE@ libpixbuf_savers_la-gth-png-saver.lo \ -@ENABLE_JPEG_TOOLS_TRUE@ libpixbuf_savers_la-gth-tga-saver.lo \ -@ENABLE_JPEG_TOOLS_TRUE@ libpixbuf_savers_la-gth-tiff-saver.lo \ -@ENABLE_JPEG_TOOLS_TRUE@ libpixbuf_savers_la-main.lo \ -@ENABLE_JPEG_TOOLS_TRUE@ libpixbuf_savers_la-preferences.lo -libpixbuf_savers_la_OBJECTS = $(am_libpixbuf_savers_la_OBJECTS) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -libpixbuf_savers_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(libpixbuf_savers_la_CFLAGS) $(CFLAGS) \ - $(libpixbuf_savers_la_LDFLAGS) $(LDFLAGS) -o $@ -@ENABLE_JPEG_TOOLS_TRUE@am_libpixbuf_savers_la_rpath = -rpath \ -@ENABLE_JPEG_TOOLS_TRUE@ $(extensiondir) -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = -CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = -SOURCES = $(libpixbuf_savers_la_SOURCES) -DIST_SOURCES = $(am__libpixbuf_savers_la_SOURCES_DIST) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -DATA = $(extensionini_DATA) -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = data -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -ACLOCAL = @ACLOCAL@ -ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BISON = @BISON@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLUTTER_CFLAGS = @CLUTTER_CFLAGS@ -CLUTTER_LIBS = @CLUTTER_LIBS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ -DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -EXIV2_CFLAGS = @EXIV2_CFLAGS@ -EXIV2_LIBS = @EXIV2_LIBS@ -EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ -FGREP = @FGREP@ -FLEX = @FLEX@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ -GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GLIB_MKENUMS = @GLIB_MKENUMS@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ -GREP = @GREP@ -GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ -GSTREAMER_LIBS = @GSTREAMER_LIBS@ -GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ -GTHUMB_CFLAGS = @GTHUMB_CFLAGS@ -GTHUMB_EXTENSION_IN_RULE = @GTHUMB_EXTENSION_IN_RULE@ -GTHUMB_EXTENSION_RULE = @GTHUMB_EXTENSION_RULE@ -GTHUMB_IMPLIB = @GTHUMB_IMPLIB@ -GTHUMB_LIBS = @GTHUMB_LIBS@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -HELP_DIR = @HELP_DIR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -JPEG_LIBS = @JPEG_LIBS@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LEX = @LEX@ -LEXLIB = @LEXLIB@ -LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -LIBBRASERO_CFLAGS = @LIBBRASERO_CFLAGS@ -LIBBRASERO_LIBS = @LIBBRASERO_LIBS@ -LIBCHAMPLAIN_CFLAGS = @LIBCHAMPLAIN_CFLAGS@ -LIBCHAMPLAIN_LIBS = @LIBCHAMPLAIN_LIBS@ -LIBOBJS = @LIBOBJS@ -LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ -LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ -LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ -LIBRSVG_LIBS = @LIBRSVG_LIBS@ -LIBS = @LIBS@ -LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ -LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ -LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ -LIBSOUP_LIBS = @LIBSOUP_LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ -MSGMERGE = @MSGMERGE@ -M_LIBS = @M_LIBS@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ -POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@ -SMCLIENT_LIBS = @SMCLIENT_LIBS@ -STRIP = @STRIP@ -TIFF_LIBS = @TIFF_LIBS@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WARN_CFLAGS = @WARN_CFLAGS@ -WARN_CXXFLAGS = @WARN_CXXFLAGS@ -XGETTEXT = @XGETTEXT@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -gsettingsschemadir = @gsettingsschemadir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -@ENABLE_JPEG_TOOLS_TRUE@SUBDIRS = data -@ENABLE_JPEG_TOOLS_TRUE@extensiondir = $(pkglibdir)/extensions -@ENABLE_JPEG_TOOLS_TRUE@extension_LTLIBRARIES = libpixbuf_savers.la -@ENABLE_JPEG_TOOLS_TRUE@ENUM_TYPES = \ -@ENABLE_JPEG_TOOLS_TRUE@ enum-types.h \ -@ENABLE_JPEG_TOOLS_TRUE@ enum-types.c - -@ENABLE_JPEG_TOOLS_TRUE@HEADER_FILES = \ -@ENABLE_JPEG_TOOLS_TRUE@ preferences.h - -@ENABLE_JPEG_TOOLS_TRUE@libpixbuf_savers_la_SOURCES = \ -@ENABLE_JPEG_TOOLS_TRUE@ $(ENUM_TYPES) \ -@ENABLE_JPEG_TOOLS_TRUE@ $(HEADER_FILES) \ -@ENABLE_JPEG_TOOLS_TRUE@ gth-jpeg-saver.c \ -@ENABLE_JPEG_TOOLS_TRUE@ gth-jpeg-saver.h \ -@ENABLE_JPEG_TOOLS_TRUE@ gth-png-saver.c \ -@ENABLE_JPEG_TOOLS_TRUE@ gth-png-saver.h \ -@ENABLE_JPEG_TOOLS_TRUE@ gth-tga-saver.c \ -@ENABLE_JPEG_TOOLS_TRUE@ gth-tga-saver.h \ -@ENABLE_JPEG_TOOLS_TRUE@ gth-tiff-saver.c \ -@ENABLE_JPEG_TOOLS_TRUE@ gth-tiff-saver.h \ -@ENABLE_JPEG_TOOLS_TRUE@ main.c \ -@ENABLE_JPEG_TOOLS_TRUE@ preferences.c - -@ENABLE_JPEG_TOOLS_TRUE@libpixbuf_savers_la_CFLAGS = $(GTHUMB_CFLAGS) $(TIFF_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb -@ENABLE_JPEG_TOOLS_TRUE@libpixbuf_savers_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -@ENABLE_JPEG_TOOLS_TRUE@libpixbuf_savers_la_LIBADD = $(GTHUMB_LIBS) $(TIFF_LIBS) ../jpeg_utils/libjpeg_utils.la -@ENABLE_JPEG_TOOLS_TRUE@libpixbuf_savers_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) -@ENABLE_JPEG_TOOLS_TRUE@extensioninidir = $(extensiondir) -@ENABLE_JPEG_TOOLS_TRUE@extensionini_in_files = pixbuf_savers.extension.in.in -@ENABLE_JPEG_TOOLS_TRUE@extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension) -@ENABLE_JPEG_TOOLS_TRUE@DISTCLEANFILES = $(extensionini_DATA) -@ENABLE_JPEG_TOOLS_TRUE@BUILT_SOURCES = $(ENUM_TYPES) -@ENABLE_JPEG_TOOLS_TRUE@CLEANFILES = $(BUILT_SOURCES) -EXTRA_DIST = $(extensionini_in_files) -all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-recursive - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/pixbuf_savers/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign extensions/pixbuf_savers/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) - @$(NORMAL_INSTALL) - @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ - } - -uninstall-extensionLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(extensiondir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(extensiondir)/$$f"; \ - done - -clean-extensionLTLIBRARIES: - -test -z "$(extension_LTLIBRARIES)" || rm -f $(extension_LTLIBRARIES) - @list='$(extension_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } -libpixbuf_savers.la: $(libpixbuf_savers_la_OBJECTS) $(libpixbuf_savers_la_DEPENDENCIES) $(EXTRA_libpixbuf_savers_la_DEPENDENCIES) - $(AM_V_CCLD)$(libpixbuf_savers_la_LINK) $(am_libpixbuf_savers_la_rpath) $(libpixbuf_savers_la_OBJECTS) $(libpixbuf_savers_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpixbuf_savers_la-enum-types.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpixbuf_savers_la-gth-jpeg-saver.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpixbuf_savers_la-gth-png-saver.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpixbuf_savers_la-gth-tga-saver.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpixbuf_savers_la-gth-tiff-saver.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpixbuf_savers_la-main.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpixbuf_savers_la-preferences.Plo@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - -libpixbuf_savers_la-enum-types.lo: enum-types.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpixbuf_savers_la_CFLAGS) $(CFLAGS) -MT libpixbuf_savers_la-enum-types.lo -MD -MP -MF $(DEPDIR)/libpixbuf_savers_la-enum-types.Tpo -c -o libpixbuf_savers_la-enum-types.lo `test -f 'enum-types.c' || echo '$(srcdir)/'`enum-types.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpixbuf_savers_la-enum-types.Tpo $(DEPDIR)/libpixbuf_savers_la-enum-types.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='enum-types.c' object='libpixbuf_savers_la-enum-types.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpixbuf_savers_la_CFLAGS) $(CFLAGS) -c -o libpixbuf_savers_la-enum-types.lo `test -f 'enum-types.c' || echo '$(srcdir)/'`enum-types.c - -libpixbuf_savers_la-gth-jpeg-saver.lo: gth-jpeg-saver.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpixbuf_savers_la_CFLAGS) $(CFLAGS) -MT libpixbuf_savers_la-gth-jpeg-saver.lo -MD -MP -MF $(DEPDIR)/libpixbuf_savers_la-gth-jpeg-saver.Tpo -c -o libpixbuf_savers_la-gth-jpeg-saver.lo `test -f 'gth-jpeg-saver.c' || echo '$(srcdir)/'`gth-jpeg-saver.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpixbuf_savers_la-gth-jpeg-saver.Tpo $(DEPDIR)/libpixbuf_savers_la-gth-jpeg-saver.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-jpeg-saver.c' object='libpixbuf_savers_la-gth-jpeg-saver.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpixbuf_savers_la_CFLAGS) $(CFLAGS) -c -o libpixbuf_savers_la-gth-jpeg-saver.lo `test -f 'gth-jpeg-saver.c' || echo '$(srcdir)/'`gth-jpeg-saver.c - -libpixbuf_savers_la-gth-png-saver.lo: gth-png-saver.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpixbuf_savers_la_CFLAGS) $(CFLAGS) -MT libpixbuf_savers_la-gth-png-saver.lo -MD -MP -MF $(DEPDIR)/libpixbuf_savers_la-gth-png-saver.Tpo -c -o libpixbuf_savers_la-gth-png-saver.lo `test -f 'gth-png-saver.c' || echo '$(srcdir)/'`gth-png-saver.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpixbuf_savers_la-gth-png-saver.Tpo $(DEPDIR)/libpixbuf_savers_la-gth-png-saver.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-png-saver.c' object='libpixbuf_savers_la-gth-png-saver.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpixbuf_savers_la_CFLAGS) $(CFLAGS) -c -o libpixbuf_savers_la-gth-png-saver.lo `test -f 'gth-png-saver.c' || echo '$(srcdir)/'`gth-png-saver.c - -libpixbuf_savers_la-gth-tga-saver.lo: gth-tga-saver.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpixbuf_savers_la_CFLAGS) $(CFLAGS) -MT libpixbuf_savers_la-gth-tga-saver.lo -MD -MP -MF $(DEPDIR)/libpixbuf_savers_la-gth-tga-saver.Tpo -c -o libpixbuf_savers_la-gth-tga-saver.lo `test -f 'gth-tga-saver.c' || echo '$(srcdir)/'`gth-tga-saver.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpixbuf_savers_la-gth-tga-saver.Tpo $(DEPDIR)/libpixbuf_savers_la-gth-tga-saver.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-tga-saver.c' object='libpixbuf_savers_la-gth-tga-saver.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpixbuf_savers_la_CFLAGS) $(CFLAGS) -c -o libpixbuf_savers_la-gth-tga-saver.lo `test -f 'gth-tga-saver.c' || echo '$(srcdir)/'`gth-tga-saver.c - -libpixbuf_savers_la-gth-tiff-saver.lo: gth-tiff-saver.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpixbuf_savers_la_CFLAGS) $(CFLAGS) -MT libpixbuf_savers_la-gth-tiff-saver.lo -MD -MP -MF $(DEPDIR)/libpixbuf_savers_la-gth-tiff-saver.Tpo -c -o libpixbuf_savers_la-gth-tiff-saver.lo `test -f 'gth-tiff-saver.c' || echo '$(srcdir)/'`gth-tiff-saver.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpixbuf_savers_la-gth-tiff-saver.Tpo $(DEPDIR)/libpixbuf_savers_la-gth-tiff-saver.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-tiff-saver.c' object='libpixbuf_savers_la-gth-tiff-saver.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpixbuf_savers_la_CFLAGS) $(CFLAGS) -c -o libpixbuf_savers_la-gth-tiff-saver.lo `test -f 'gth-tiff-saver.c' || echo '$(srcdir)/'`gth-tiff-saver.c - -libpixbuf_savers_la-main.lo: main.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpixbuf_savers_la_CFLAGS) $(CFLAGS) -MT libpixbuf_savers_la-main.lo -MD -MP -MF $(DEPDIR)/libpixbuf_savers_la-main.Tpo -c -o libpixbuf_savers_la-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpixbuf_savers_la-main.Tpo $(DEPDIR)/libpixbuf_savers_la-main.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='main.c' object='libpixbuf_savers_la-main.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpixbuf_savers_la_CFLAGS) $(CFLAGS) -c -o libpixbuf_savers_la-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c - -libpixbuf_savers_la-preferences.lo: preferences.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpixbuf_savers_la_CFLAGS) $(CFLAGS) -MT libpixbuf_savers_la-preferences.lo -MD -MP -MF $(DEPDIR)/libpixbuf_savers_la-preferences.Tpo -c -o libpixbuf_savers_la-preferences.lo `test -f 'preferences.c' || echo '$(srcdir)/'`preferences.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpixbuf_savers_la-preferences.Tpo $(DEPDIR)/libpixbuf_savers_la-preferences.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='preferences.c' object='libpixbuf_savers_la-preferences.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpixbuf_savers_la_CFLAGS) $(CFLAGS) -c -o libpixbuf_savers_la-preferences.lo `test -f 'preferences.c' || echo '$(srcdir)/'`preferences.c - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-extensioniniDATA: $(extensionini_DATA) - @$(NORMAL_INSTALL) - @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(extensioninidir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(extensioninidir)" || exit $$?; \ - done - -uninstall-extensioniniDATA: - @$(NORMAL_UNINSTALL) - @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(extensioninidir)'; $(am__uninstall_files_from_dir) - -# This directory's subdirectories are mostly independent; you can cd -# into them and run 'make' without going through this Makefile. -# To change the values of 'make' variables: instead of editing Makefiles, -# (1) if the variable is set in 'config.status', edit 'config.status' -# (which will cause the Makefiles to be regenerated when you run 'make'); -# (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@ENABLE_JPEG_TOOLS_FALSE@dist-hook: - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - $(am__make_dryrun) \ - || test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-hook -check-am: all-am -check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-recursive -all-am: Makefile $(LTLIBRARIES) $(DATA) -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(extensiondir)" "$(DESTDIR)$(extensioninidir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -clean: clean-recursive - -clean-am: clean-extensionLTLIBRARIES clean-generic clean-libtool \ - mostlyclean-am - -distclean: distclean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -html-am: - -info: info-recursive - -info-am: - -install-data-am: install-extensionLTLIBRARIES install-extensioniniDATA - -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-extensionLTLIBRARIES \ - uninstall-extensioniniDATA - -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ - cscopelist-recursive ctags-recursive install install-am \ - install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-extensionLTLIBRARIES \ - clean-generic clean-libtool cscopelist cscopelist-recursive \ - ctags ctags-recursive dist-hook distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extensionLTLIBRARIES \ - install-extensioniniDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA - - -@ENABLE_JPEG_TOOLS_TRUE@enum-types.h: $(HEADER_FILES) -@ENABLE_JPEG_TOOLS_TRUE@ $(AM_V_GEN)( $(GLIB_MKENUMS) \ -@ENABLE_JPEG_TOOLS_TRUE@ --fhead "#ifndef ENUM_TYPES_H\n#define ENUM_TYPES_H\n\n#include \n\nG_BEGIN_DECLS\n" \ -@ENABLE_JPEG_TOOLS_TRUE@ --fprod "/* enumerations from \"@filename@\" */\n" \ -@ENABLE_JPEG_TOOLS_TRUE@ --vhead "GType @enum_name@_get_type (void);\n#define GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ -@ENABLE_JPEG_TOOLS_TRUE@ --ftail "G_END_DECLS\n\n#endif /* ENUM_TYPES_H */" \ -@ENABLE_JPEG_TOOLS_TRUE@ $^> xgen-$(@F) \ -@ENABLE_JPEG_TOOLS_TRUE@ && mv -f xgen-$(@F) enum-types.h ) - -@ENABLE_JPEG_TOOLS_TRUE@enum-types.c: $(HEADER_FILES) -@ENABLE_JPEG_TOOLS_TRUE@ $(AM_V_GEN)( $(GLIB_MKENUMS) \ -@ENABLE_JPEG_TOOLS_TRUE@ --fhead "#include \n" \ -@ENABLE_JPEG_TOOLS_TRUE@ --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \ -@ENABLE_JPEG_TOOLS_TRUE@ --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ -@ENABLE_JPEG_TOOLS_TRUE@ --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ -@ENABLE_JPEG_TOOLS_TRUE@ --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ -@ENABLE_JPEG_TOOLS_TRUE@ $^> xgen-$(@F) \ -@ENABLE_JPEG_TOOLS_TRUE@ && mv -f xgen-$(@F) enum-types.c ) - -@ENABLE_JPEG_TOOLS_TRUE@dist-hook: -@ENABLE_JPEG_TOOLS_TRUE@ cd $(distdir); rm -f $(CLEANFILES) - -@GTHUMB_EXTENSION_IN_RULE@ -@GTHUMB_EXTENSION_RULE@ - --include $(top_srcdir)/git.mk - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru gthumb-3.0.2/extensions/pixbuf_savers/data/Makefile.am gthumb-3.2.3/extensions/pixbuf_savers/data/Makefile.am --- gthumb-3.0.2/extensions/pixbuf_savers/data/Makefile.am 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/pixbuf_savers/data/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -SUBDIRS = ui - --include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/pixbuf_savers/data/Makefile.in gthumb-3.2.3/extensions/pixbuf_savers/data/Makefile.in --- gthumb-3.0.2/extensions/pixbuf_savers/data/Makefile.in 2012-08-20 19:54:16.000000000 +0000 +++ gthumb-3.2.3/extensions/pixbuf_savers/data/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,677 +0,0 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2012 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ - esac; \ - test $$am__dry = yes; \ - } -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = extensions/pixbuf_savers/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -ACLOCAL = @ACLOCAL@ -ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BISON = @BISON@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLUTTER_CFLAGS = @CLUTTER_CFLAGS@ -CLUTTER_LIBS = @CLUTTER_LIBS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ -DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -EXIV2_CFLAGS = @EXIV2_CFLAGS@ -EXIV2_LIBS = @EXIV2_LIBS@ -EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ -FGREP = @FGREP@ -FLEX = @FLEX@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ -GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GLIB_MKENUMS = @GLIB_MKENUMS@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ -GREP = @GREP@ -GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ -GSTREAMER_LIBS = @GSTREAMER_LIBS@ -GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ -GTHUMB_CFLAGS = @GTHUMB_CFLAGS@ -GTHUMB_EXTENSION_IN_RULE = @GTHUMB_EXTENSION_IN_RULE@ -GTHUMB_EXTENSION_RULE = @GTHUMB_EXTENSION_RULE@ -GTHUMB_IMPLIB = @GTHUMB_IMPLIB@ -GTHUMB_LIBS = @GTHUMB_LIBS@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -HELP_DIR = @HELP_DIR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -JPEG_LIBS = @JPEG_LIBS@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LEX = @LEX@ -LEXLIB = @LEXLIB@ -LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -LIBBRASERO_CFLAGS = @LIBBRASERO_CFLAGS@ -LIBBRASERO_LIBS = @LIBBRASERO_LIBS@ -LIBCHAMPLAIN_CFLAGS = @LIBCHAMPLAIN_CFLAGS@ -LIBCHAMPLAIN_LIBS = @LIBCHAMPLAIN_LIBS@ -LIBOBJS = @LIBOBJS@ -LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ -LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ -LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ -LIBRSVG_LIBS = @LIBRSVG_LIBS@ -LIBS = @LIBS@ -LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ -LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ -LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ -LIBSOUP_LIBS = @LIBSOUP_LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ -MSGMERGE = @MSGMERGE@ -M_LIBS = @M_LIBS@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ -POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@ -SMCLIENT_LIBS = @SMCLIENT_LIBS@ -STRIP = @STRIP@ -TIFF_LIBS = @TIFF_LIBS@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WARN_CFLAGS = @WARN_CFLAGS@ -WARN_CXXFLAGS = @WARN_CXXFLAGS@ -XGETTEXT = @XGETTEXT@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -gsettingsschemadir = @gsettingsschemadir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -SUBDIRS = ui -all: all-recursive - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/pixbuf_savers/data/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign extensions/pixbuf_savers/data/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -# This directory's subdirectories are mostly independent; you can cd -# into them and run 'make' without going through this Makefile. -# To change the values of 'make' variables: instead of editing Makefiles, -# (1) if the variable is set in 'config.status', edit 'config.status' -# (which will cause the Makefiles to be regenerated when you run 'make'); -# (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - $(am__make_dryrun) \ - || test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -html-am: - -info: info-recursive - -info-am: - -install-data-am: - -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: - -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am - - --include $(top_srcdir)/git.mk - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru gthumb-3.0.2/extensions/pixbuf_savers/data/ui/Makefile.am gthumb-3.2.3/extensions/pixbuf_savers/data/ui/Makefile.am --- gthumb-3.0.2/extensions/pixbuf_savers/data/ui/Makefile.am 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/pixbuf_savers/data/ui/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -uidir = $(pkgdatadir)/ui -ui_DATA = \ - jpeg-options.ui \ - png-options.ui \ - save-options-preferences.ui \ - tga-options.ui \ - tiff-options.ui -EXTRA_DIST = $(ui_DATA) - --include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/pixbuf_savers/data/ui/Makefile.in gthumb-3.2.3/extensions/pixbuf_savers/data/ui/Makefile.in --- gthumb-3.0.2/extensions/pixbuf_savers/data/ui/Makefile.in 2012-08-20 19:54:16.000000000 +0000 +++ gthumb-3.2.3/extensions/pixbuf_savers/data/ui/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,551 +0,0 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2012 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ - esac; \ - test $$am__dry = yes; \ - } -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = extensions/pixbuf_savers/data/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(uidir)" -DATA = $(ui_DATA) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BISON = @BISON@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLUTTER_CFLAGS = @CLUTTER_CFLAGS@ -CLUTTER_LIBS = @CLUTTER_LIBS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ -DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -EXIV2_CFLAGS = @EXIV2_CFLAGS@ -EXIV2_LIBS = @EXIV2_LIBS@ -EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ -FGREP = @FGREP@ -FLEX = @FLEX@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ -GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GLIB_MKENUMS = @GLIB_MKENUMS@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ -GREP = @GREP@ -GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ -GSTREAMER_LIBS = @GSTREAMER_LIBS@ -GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ -GTHUMB_CFLAGS = @GTHUMB_CFLAGS@ -GTHUMB_EXTENSION_IN_RULE = @GTHUMB_EXTENSION_IN_RULE@ -GTHUMB_EXTENSION_RULE = @GTHUMB_EXTENSION_RULE@ -GTHUMB_IMPLIB = @GTHUMB_IMPLIB@ -GTHUMB_LIBS = @GTHUMB_LIBS@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -HELP_DIR = @HELP_DIR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -JPEG_LIBS = @JPEG_LIBS@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LEX = @LEX@ -LEXLIB = @LEXLIB@ -LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -LIBBRASERO_CFLAGS = @LIBBRASERO_CFLAGS@ -LIBBRASERO_LIBS = @LIBBRASERO_LIBS@ -LIBCHAMPLAIN_CFLAGS = @LIBCHAMPLAIN_CFLAGS@ -LIBCHAMPLAIN_LIBS = @LIBCHAMPLAIN_LIBS@ -LIBOBJS = @LIBOBJS@ -LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ -LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ -LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ -LIBRSVG_LIBS = @LIBRSVG_LIBS@ -LIBS = @LIBS@ -LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ -LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ -LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ -LIBSOUP_LIBS = @LIBSOUP_LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ -MSGMERGE = @MSGMERGE@ -M_LIBS = @M_LIBS@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ -POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@ -SMCLIENT_LIBS = @SMCLIENT_LIBS@ -STRIP = @STRIP@ -TIFF_LIBS = @TIFF_LIBS@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WARN_CFLAGS = @WARN_CFLAGS@ -WARN_CXXFLAGS = @WARN_CXXFLAGS@ -XGETTEXT = @XGETTEXT@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -gsettingsschemadir = @gsettingsschemadir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -uidir = $(pkgdatadir)/ui -ui_DATA = \ - jpeg-options.ui \ - png-options.ui \ - save-options-preferences.ui \ - tga-options.ui \ - tiff-options.ui - -EXTRA_DIST = $(ui_DATA) -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign extensions/pixbuf_savers/data/ui/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign extensions/pixbuf_savers/data/ui/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-uiDATA: $(ui_DATA) - @$(NORMAL_INSTALL) - @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(uidir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(uidir)" || exit $$?; \ - done - -uninstall-uiDATA: - @$(NORMAL_UNINSTALL) - @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - -cscope cscopelist: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: - for dir in "$(DESTDIR)$(uidir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-uiDATA - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-uiDATA - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-uiDATA - - --include $(top_srcdir)/git.mk - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru gthumb-3.0.2/extensions/pixbuf_savers/data/ui/jpeg-options.ui gthumb-3.2.3/extensions/pixbuf_savers/data/ui/jpeg-options.ui --- gthumb-3.0.2/extensions/pixbuf_savers/data/ui/jpeg-options.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/pixbuf_savers/data/ui/jpeg-options.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,193 +0,0 @@ - - - - - - - - - - - True - False - 6 - vertical - 12 - - - True - False - 6 - - - True - False - _Default extension: - True - jpeg_default_extension_combobox - - - False - True - 0 - - - - - True - False - jpeg_default_ext_liststore - - - - 0 - - - - - False - True - 1 - - - - - False - True - 0 - - - - - True - False - 6 - 6 - 4 - 2 - - - - - - - - - True - False - 0 - _Quality: - True - jpeg_quality_hscale - - - 0 - 0 - 1 - 1 - - - - - True - False - 0 - _Smoothing: - True - jpeg_smooth_hscale - - - 0 - 1 - 1 - 1 - - - - - Opti_mize - True - True - False - False - True - 0 - True - - - 0 - 2 - 2 - 1 - - - - - _Progressive - True - True - False - False - True - 0 - True - - - 0 - 3 - 2 - 1 - - - - - True - True - True - jpeg_quality_adjustment - 1 - left - - - 1 - 0 - 1 - 1 - - - - - True - True - True - jpeg_smooth_adjustment - 1 - left - - - 1 - 1 - 1 - 1 - - - - - False - True - 1 - - - - - 100 - 75 - 0.5 - 1 - - - 100 - 0.5 - 1 - - diff -Nru gthumb-3.0.2/extensions/pixbuf_savers/data/ui/png-options.ui gthumb-3.2.3/extensions/pixbuf_savers/data/ui/png-options.ui --- gthumb-3.0.2/extensions/pixbuf_savers/data/ui/png-options.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/pixbuf_savers/data/ui/png-options.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ - - - - - 9 - 6 - 1 - 1 - - - True - False - 6 - vertical - - - True - False - 12 - - - True - False - Compression _level: - True - png_compression_hscale - - - False - True - 0 - - - - - True - True - png_compression_adjustment - 1 - 0 - left - - - True - True - 1 - - - - - False - True - 0 - - - - diff -Nru gthumb-3.0.2/extensions/pixbuf_savers/data/ui/save-options-preferences.ui gthumb-3.2.3/extensions/pixbuf_savers/data/ui/save-options-preferences.ui --- gthumb-3.0.2/extensions/pixbuf_savers/data/ui/save-options-preferences.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/pixbuf_savers/data/ui/save-options-preferences.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,137 +0,0 @@ - - - - - - - - - - - - - - - True - False - 12 - vertical - 6 - - - True - False - 0 - Default options: - - - - - - False - True - 0 - - - - - True - False - 12 - - - 120 - True - True - in - - - True - True - file_type_liststore - False - False - 0 - - - - - - - - - 2 - - - - - - - - - False - True - 0 - - - - - True - False - vertical - - - True - False - 0 - - - - - - False - True - 0 - - - - - True - False - - - False - True - 1 - - - - - True - False - 6 - False - False - - - True - True - 2 - - - - - False - True - 1 - - - - - True - True - 1 - - - - diff -Nru gthumb-3.0.2/extensions/pixbuf_savers/data/ui/tga-options.ui gthumb-3.2.3/extensions/pixbuf_savers/data/ui/tga-options.ui --- gthumb-3.0.2/extensions/pixbuf_savers/data/ui/tga-options.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/pixbuf_savers/data/ui/tga-options.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ - - - - - True - False - 6 - vertical - - - _RLE compression - True - True - False - False - True - 0 - True - - - False - True - 0 - - - - diff -Nru gthumb-3.0.2/extensions/pixbuf_savers/data/ui/tiff-options.ui gthumb-3.2.3/extensions/pixbuf_savers/data/ui/tiff-options.ui --- gthumb-3.0.2/extensions/pixbuf_savers/data/ui/tiff-options.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/pixbuf_savers/data/ui/tiff-options.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,321 +0,0 @@ - - - - - - - - - - - 1 - 10000 - 72 - 1 - 10 - - - True - False - 6 - vertical - 12 - - - True - False - 6 - - - True - False - _Default extension: - True - tiff_default_extension_combobox - - - False - True - 0 - - - - - True - False - tiff_default_ext_liststore - - - - 0 - - - - - False - True - 1 - - - - - False - True - 0 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - - - True - False - vertical - 6 - - - _No compression - True - True - False - False - True - 0 - True - True - - - False - True - 0 - - - - - No_rmal (Deflate) - True - True - False - False - True - 0 - True - True - tiff_comp_none_radiobutton - - - False - True - 1 - - - - - _Loss compression (JPEG) - True - True - False - False - True - 0 - True - True - tiff_comp_none_radiobutton - - - False - True - 2 - - - - - - - - - True - False - Compression - True - - - - - - - - False - True - 1 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - - - True - False - 6 - 6 - 2 - 2 - - - True - False - 0 - _Horizontal: - True - tiff_hdpi_spinbutton - - - 0 - 0 - 1 - 1 - - - - - True - False - 0 - _Vertical: - True - tiff_vdpi_spinbutton - - - 0 - 1 - 1 - 1 - - - - - True - False - 6 - - - True - True - ● - tiff_hdpi_adjustment - - - False - True - 0 - - - - - True - False - dpi - - - False - True - 1 - - - - - 1 - 0 - 1 - 1 - - - - - True - False - 6 - - - True - True - ● - tiff_vdpi_adjustment - - - False - True - 0 - - - - - True - False - dpi - - - False - True - 1 - - - - - 1 - 1 - 1 - 1 - - - - - - - - - True - False - Resolution - True - - - - - - - - False - True - 2 - - - - - 1 - 10000 - 72 - 1 - 10 - - diff -Nru gthumb-3.0.2/extensions/pixbuf_savers/gth-jpeg-saver.c gthumb-3.2.3/extensions/pixbuf_savers/gth-jpeg-saver.c --- gthumb-3.0.2/extensions/pixbuf_savers/gth-jpeg-saver.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/pixbuf_savers/gth-jpeg-saver.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,537 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2009 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#ifdef HAVE_LIBJPEG -#include -#include -#include -#include -#include -#include -#include -#endif /* HAVE_LIBJPEG */ -#include -#include -#include "gth-jpeg-saver.h" -#include "preferences.h" - - -G_DEFINE_TYPE (GthJpegSaver, gth_jpeg_saver, GTH_TYPE_PIXBUF_SAVER) - - -struct _GthJpegSaverPrivate { - GtkBuilder *builder; - GSettings *settings; - char *default_ext; -}; - - -static void -gth_jpeg_saver_finalize (GObject *object) -{ - GthJpegSaver *self = GTH_JPEG_SAVER (object); - - _g_object_unref (self->priv->settings); - _g_object_unref (self->priv->builder); - g_free (self->priv->default_ext); - - G_OBJECT_CLASS (gth_jpeg_saver_parent_class)->finalize (object); -} - - -static const char * -gth_jpeg_saver_get_default_ext (GthPixbufSaver *base) -{ - GthJpegSaver *self = GTH_JPEG_SAVER (base); - - if (self->priv->default_ext == NULL) - self->priv->default_ext = g_settings_get_string (self->priv->settings, PREF_JPEG_DEFAULT_EXT); - - return self->priv->default_ext; -} - - -static GtkWidget * -gth_jpeg_saver_get_control (GthPixbufSaver *base) -{ - GthJpegSaver *self = GTH_JPEG_SAVER (base); - char **extensions; - int i; - int active_idx; - - if (self->priv->builder == NULL) - self->priv->builder = _gtk_builder_new_from_file ("jpeg-options.ui", "pixbuf_savers"); - - active_idx = 0; - extensions = g_strsplit (gth_pixbuf_saver_get_extensions (base), " ", -1); - for (i = 0; extensions[i] != NULL; i++) { - GtkTreeIter iter; - - gtk_list_store_append (GTK_LIST_STORE (gtk_builder_get_object (self->priv->builder, "jpeg_default_ext_liststore")), &iter); - gtk_list_store_set (GTK_LIST_STORE (gtk_builder_get_object (self->priv->builder, "jpeg_default_ext_liststore")), - &iter, - 0, extensions[i], - -1); - if (g_str_equal (extensions[i], gth_pixbuf_saver_get_default_ext (base))) - active_idx = i; - } - gtk_combo_box_set_active (GTK_COMBO_BOX (_gtk_builder_get_widget (self->priv->builder, "jpeg_default_extension_combobox")), active_idx); - g_strfreev (extensions); - - gtk_adjustment_set_value (GTK_ADJUSTMENT (_gtk_builder_get_widget (self->priv->builder, "jpeg_quality_adjustment")), - g_settings_get_int (self->priv->settings, PREF_JPEG_QUALITY)); - gtk_adjustment_set_value (GTK_ADJUSTMENT (_gtk_builder_get_widget (self->priv->builder, "jpeg_smooth_adjustment")), - g_settings_get_int (self->priv->settings, PREF_JPEG_SMOOTHING)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "jpeg_optimize_checkbutton")), - g_settings_get_boolean (self->priv->settings, PREF_JPEG_OPTIMIZE)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "jpeg_progressive_checkbutton")), - g_settings_get_boolean (self->priv->settings, PREF_JPEG_PROGRESSIVE)); - - return _gtk_builder_get_widget (self->priv->builder, "jpeg_options"); -} - - -static void -gth_jpeg_saver_save_options (GthPixbufSaver *base) -{ - GthJpegSaver *self = GTH_JPEG_SAVER (base); - GtkTreeIter iter; - - if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (_gtk_builder_get_widget (self->priv->builder, "jpeg_default_extension_combobox")), &iter)) { - g_free (self->priv->default_ext); - gtk_tree_model_get (GTK_TREE_MODEL (gtk_builder_get_object (self->priv->builder, "jpeg_default_ext_liststore")), - &iter, - 0, &self->priv->default_ext, - -1); - g_settings_set_string (self->priv->settings, PREF_JPEG_DEFAULT_EXT, self->priv->default_ext); - } - g_settings_set_int (self->priv->settings, PREF_JPEG_QUALITY, (int) gtk_adjustment_get_value (GTK_ADJUSTMENT (_gtk_builder_get_widget (self->priv->builder, "jpeg_quality_adjustment")))); - g_settings_set_int (self->priv->settings, PREF_JPEG_SMOOTHING, (int) gtk_adjustment_get_value (GTK_ADJUSTMENT (_gtk_builder_get_widget (self->priv->builder, "jpeg_smooth_adjustment")))); - g_settings_set_boolean (self->priv->settings, PREF_JPEG_OPTIMIZE, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "jpeg_optimize_checkbutton")))); - g_settings_set_boolean (self->priv->settings, PREF_JPEG_PROGRESSIVE, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "jpeg_progressive_checkbutton")))); -} - - -static gboolean -gth_jpeg_saver_can_save (GthPixbufSaver *self, - const char *mime_type) -{ -#ifdef HAVE_LIBJPEG - - return g_content_type_equals (mime_type, "image/jpeg"); - -#else /* ! HAVE_LIBJPEG */ - - GSList *formats; - GSList *scan; - GdkPixbufFormat *jpeg_format; - - if (! g_content_type_equals (mime_type, "image/jpeg")) - return FALSE; - - formats = gdk_pixbuf_get_formats (); - jpeg_format = NULL; - for (scan = formats; (jpeg_format == NULL) && (scan != NULL); scan = g_slist_next (scan)) { - GdkPixbufFormat *format = scan->data; - char **mime_types; - int i; - - mime_types = gdk_pixbuf_format_get_mime_types (format); - for (i = 0; mime_types[i] != NULL; i++) - if (g_content_type_equals (mime_types[i], "image/jpeg")) - break; - - if (mime_types[i] == NULL) - continue; - - if (! gdk_pixbuf_format_is_writable (format)) - continue; - - jpeg_format = format; - } - - return jpeg_format != NULL; - -#endif /* HAVE_LIBJPEG */ -} - - -#ifdef HAVE_LIBJPEG - - -/* error handler data */ - -struct error_handler_data { - struct jpeg_error_mgr pub; - sigjmp_buf setjmp_buffer; - GError **error; -}; - - -static void -fatal_error_handler (j_common_ptr cinfo) -{ - struct error_handler_data *errmgr; - char buffer[JMSG_LENGTH_MAX]; - - errmgr = (struct error_handler_data *) cinfo->err; - - /* Create the message */ - (* cinfo->err->format_message) (cinfo, buffer); - - /* broken check for *error == NULL for robustness against - * crappy JPEG library - */ - if (errmgr->error && *errmgr->error == NULL) { - g_set_error (errmgr->error, - GDK_PIXBUF_ERROR, - GDK_PIXBUF_ERROR_CORRUPT_IMAGE, - "Error interpreting JPEG image file (%s)", - buffer); - } - - siglongjmp (errmgr->setjmp_buffer, 1); - - g_assert_not_reached (); -} - - -static void -output_message_handler (j_common_ptr cinfo) -{ - /* This method keeps libjpeg from dumping crap to stderr */ - /* do nothing */ -} - - -static gboolean -_gdk_pixbuf_save_as_jpeg (GdkPixbuf *pixbuf, - char **buffer, - gsize *buffer_size, - char **keys, - char **values, - GError **error) -{ - struct jpeg_compress_struct cinfo; - struct error_handler_data jerr; - guchar *buf = NULL; - guchar *ptr; - guchar *pixels = NULL; - volatile int quality = 85; /* default; must be between 0 and 100 */ - volatile int smoothing = 0; - volatile gboolean optimize = FALSE; -#ifdef HAVE_PROGRESSIVE_JPEG - volatile gboolean progressive = FALSE; -#endif - int i, j; - int w, h = 0; - int rowstride = 0; - volatile int bpp; - - if (keys && *keys) { - char **kiter = keys; - char **viter = values; - - while (*kiter) { - if (strcmp (*kiter, "quality") == 0) { - char *endptr = NULL; - quality = strtol (*viter, &endptr, 10); - - if (endptr == *viter) { - g_set_error (error, - GDK_PIXBUF_ERROR, - GDK_PIXBUF_ERROR_BAD_OPTION, - "JPEG quality must be a value between 0 and 100; value '%s' could not be parsed.", - *viter); - - return FALSE; - } - - if (quality < 0 || quality > 100) { - g_set_error (error, - GDK_PIXBUF_ERROR, - GDK_PIXBUF_ERROR_BAD_OPTION, - "JPEG quality must be a value between 0 and 100; value '%d' is not allowed.", - quality); - - return FALSE; - } - } - else if (strcmp (*kiter, "smooth") == 0) { - char *endptr = NULL; - smoothing = strtol (*viter, &endptr, 10); - - if (endptr == *viter) { - g_set_error (error, - GDK_PIXBUF_ERROR, - GDK_PIXBUF_ERROR_BAD_OPTION, - "JPEG smoothing must be a value between 0 and 100; value '%s' could not be parsed.", - *viter); - - return FALSE; - } - - if (smoothing < 0 || smoothing > 100) { - g_set_error (error, - GDK_PIXBUF_ERROR, - GDK_PIXBUF_ERROR_BAD_OPTION, - "JPEG smoothing must be a value between 0 and 100; value '%d' is not allowed.", - smoothing); - - return FALSE; - } - } - else if (strcmp (*kiter, "optimize") == 0) { - if (strcmp (*viter, "yes") == 0) - optimize = TRUE; - else if (strcmp (*viter, "no") == 0) - optimize = FALSE; - else { - g_set_error (error, - GDK_PIXBUF_ERROR, - GDK_PIXBUF_ERROR_BAD_OPTION, - "JPEG optimize option must be 'yes' or 'no', value is: %s", *viter); - - return FALSE; - } - } -#ifdef HAVE_PROGRESSIVE_JPEG - else if (strcmp (*kiter, "progressive") == 0) { - if (strcmp (*viter, "yes") == 0) - progressive = TRUE; - else if (strcmp (*viter, "no") == 0) - progressive = FALSE; - else { - g_set_error (error, - GDK_PIXBUF_ERROR, - GDK_PIXBUF_ERROR_BAD_OPTION, - "JPEG progressive option must be 'yes' or 'no', value is: %s", *viter); - - return FALSE; - } - } -#endif - else { - g_warning ("Bad option name '%s' passed to JPEG saver", *kiter); - return FALSE; - } - - ++kiter; - ++viter; - } - } - - rowstride = gdk_pixbuf_get_rowstride (pixbuf); - w = gdk_pixbuf_get_width (pixbuf); - h = gdk_pixbuf_get_height (pixbuf); - if (gdk_pixbuf_get_has_alpha (pixbuf)) - bpp = 4; - else - bpp = 3; - pixels = gdk_pixbuf_get_pixels (pixbuf); - g_return_val_if_fail (pixels != NULL, FALSE); - - /* allocate a small buffer to convert image data */ - - buf = g_try_malloc (w * bpp * sizeof (guchar)); - if (! buf) { - g_set_error (error, - GDK_PIXBUF_ERROR, - GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY, - "Couldn't allocate memory for loading JPEG file"); - return FALSE; - } - - /* set up error handling */ - - cinfo.err = jpeg_std_error (&(jerr.pub)); - jerr.pub.error_exit = fatal_error_handler; - jerr.pub.output_message = output_message_handler; - jerr.error = error; - if (sigsetjmp (jerr.setjmp_buffer, 1)) { - jpeg_destroy_compress (&cinfo); - g_free (buf); - return FALSE; - } - - /* setup compress params */ - - jpeg_create_compress (&cinfo); - _jpeg_memory_dest (&cinfo, (void **)buffer, buffer_size); - - cinfo.image_width = w; - cinfo.image_height = h; - cinfo.input_components = 3; - cinfo.in_color_space = JCS_RGB; - - /* set up jepg compression parameters */ - - jpeg_set_defaults (&cinfo); - jpeg_set_quality (&cinfo, quality, TRUE); - cinfo.smoothing_factor = smoothing; - cinfo.optimize_coding = optimize; - -#ifdef HAVE_PROGRESSIVE_JPEG - if (progressive) - jpeg_simple_progression (&cinfo); -#endif /* HAVE_PROGRESSIVE_JPEG */ - - jpeg_start_compress (&cinfo, TRUE); - /* get the start pointer */ - ptr = pixels; - /* go one scanline at a time... and save */ - i = 0; - while (cinfo.next_scanline < cinfo.image_height) { - JSAMPROW *jbuf; - - /* convert scanline from ARGB to RGB packed */ - for (j = 0; j < w; j++) - memcpy (&(buf[j * 3]), - &(ptr[i * rowstride + j * bpp]), - 3); - - /* write scanline */ - jbuf = (JSAMPROW *)(&buf); - jpeg_write_scanlines (&cinfo, jbuf, 1); - i++; - } - - /* finish off */ - - jpeg_finish_compress (&cinfo); - jpeg_destroy_compress(&cinfo); - g_free (buf); - - return TRUE; -} - - -#endif /* HAVE_LIBJPEG */ - - -static gboolean -gth_jpeg_saver_save_pixbuf (GthPixbufSaver *base, - GdkPixbuf *pixbuf, - char **buffer, - gsize *buffer_size, - const char *mime_type, - GError **error) -{ -#ifdef HAVE_LIBJPEG - GthJpegSaver *self = GTH_JPEG_SAVER (base); - char **option_keys; - char **option_values; - int i = -1; - int i_value; - gboolean result; - - option_keys = g_malloc (sizeof (char *) * 5); - option_values = g_malloc (sizeof (char *) * 5); - - i++; - i_value = g_settings_get_int (self->priv->settings, PREF_JPEG_QUALITY); - option_keys[i] = g_strdup ("quality"); - option_values[i] = g_strdup_printf ("%d", i_value); - - i++; - i_value = g_settings_get_int (self->priv->settings, PREF_JPEG_SMOOTHING); - option_keys[i] = g_strdup ("smooth"); - option_values[i] = g_strdup_printf ("%d", i_value); - - i++; - i_value = g_settings_get_boolean (self->priv->settings, PREF_JPEG_OPTIMIZE); - option_keys[i] = g_strdup ("optimize"); - option_values[i] = g_strdup (i_value != 0 ? "yes" : "no"); - - i++; - i_value = g_settings_get_boolean (self->priv->settings, PREF_JPEG_PROGRESSIVE); - option_keys[i] = g_strdup ("progressive"); - option_values[i] = g_strdup (i_value != 0 ? "yes" : "no"); - - i++; - option_keys[i] = NULL; - option_values[i] = NULL; - - result = _gdk_pixbuf_save_as_jpeg (pixbuf, - buffer, - buffer_size, - option_keys, - option_values, - error); - - g_strfreev (option_keys); - g_strfreev (option_values); - -#else /* ! HAVE_LIBJPEG */ - - char *pixbuf_type; - gboolean result; - - pixbuf_type = get_pixbuf_type_from_mime_type (mime_type); - result = gdk_pixbuf_save_to_bufferv (pixbuf, - buffer, - buffer_size, - pixbuf_type, - NULL, - NULL, - error); - - g_free (pixbuf_type); - -#endif /* HAVE_LIBJPEG */ - - return result; -} - - -static void -gth_jpeg_saver_class_init (GthJpegSaverClass *klass) -{ - GObjectClass *object_class; - GthPixbufSaverClass *pixbuf_saver_class; - - g_type_class_add_private (klass, sizeof (GthJpegSaverPrivate)); - - object_class = G_OBJECT_CLASS (klass); - object_class->finalize = gth_jpeg_saver_finalize; - - pixbuf_saver_class = GTH_PIXBUF_SAVER_CLASS (klass); - pixbuf_saver_class->id = "jpeg"; - pixbuf_saver_class->display_name = _("JPEG"); - pixbuf_saver_class->mime_type = "image/jpeg"; - pixbuf_saver_class->extensions = "jpeg jpg"; - pixbuf_saver_class->get_default_ext = gth_jpeg_saver_get_default_ext; - pixbuf_saver_class->get_control = gth_jpeg_saver_get_control; - pixbuf_saver_class->save_options = gth_jpeg_saver_save_options; - pixbuf_saver_class->can_save = gth_jpeg_saver_can_save; - pixbuf_saver_class->save_pixbuf = gth_jpeg_saver_save_pixbuf; -} - - -static void -gth_jpeg_saver_init (GthJpegSaver *self) -{ - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_JPEG_SAVER, GthJpegSaverPrivate); - self->priv->settings = g_settings_new (GTHUMB_PIXBUF_SAVERS_JPEG_SCHEMA); - self->priv->builder = NULL; - self->priv->default_ext = NULL; -} diff -Nru gthumb-3.0.2/extensions/pixbuf_savers/gth-jpeg-saver.h gthumb-3.2.3/extensions/pixbuf_savers/gth-jpeg-saver.h --- gthumb-3.0.2/extensions/pixbuf_savers/gth-jpeg-saver.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/pixbuf_savers/gth-jpeg-saver.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2009 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef GTH_JPEG_SAVER_H -#define GTH_JPEG_SAVER_H - -#include -#include - -G_BEGIN_DECLS - -#define GTH_TYPE_JPEG_SAVER (gth_jpeg_saver_get_type ()) -#define GTH_JPEG_SAVER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_JPEG_SAVER, GthJpegSaver)) -#define GTH_JPEG_SAVER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTH_JPEG_SAVER_TYPE, GthJpegSaverClass)) -#define GTH_IS_JPEG_SAVER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_JPEG_SAVER)) -#define GTH_IS_JPEG_SAVER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTH_TYPE_JPEG_SAVER)) -#define GTH_JPEG_SAVER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTH_TYPE_JPEG_SAVER, GthJpegSaverClass)) - -typedef struct _GthJpegSaver GthJpegSaver; -typedef struct _GthJpegSaverClass GthJpegSaverClass; -typedef struct _GthJpegSaverPrivate GthJpegSaverPrivate; - -struct _GthJpegSaver -{ - GthPixbufSaver __parent; - GthJpegSaverPrivate *priv; -}; - -struct _GthJpegSaverClass -{ - GthPixbufSaverClass __parent_class; -}; - -GType gth_jpeg_saver_get_type (void); - -G_END_DECLS - -#endif /* GTH_JPEG_SAVER_H */ diff -Nru gthumb-3.0.2/extensions/pixbuf_savers/gth-png-saver.c gthumb-3.2.3/extensions/pixbuf_savers/gth-png-saver.c --- gthumb-3.0.2/extensions/pixbuf_savers/gth-png-saver.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/pixbuf_savers/gth-png-saver.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,156 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2009 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include "gth-png-saver.h" -#include "preferences.h" - - -G_DEFINE_TYPE (GthPngSaver, gth_png_saver, GTH_TYPE_PIXBUF_SAVER) - - -struct _GthPngSaverPrivate { - GtkBuilder *builder; - GSettings *settings; -}; - - -static void -gth_png_saver_finalize (GObject *object) -{ - GthPngSaver *self = GTH_PNG_SAVER (object); - - _g_object_unref (self->priv->builder); - _g_object_unref (self->priv->settings); - G_OBJECT_CLASS (gth_png_saver_parent_class)->finalize (object); -} - - -static GtkWidget * -gth_png_saver_get_control (GthPixbufSaver *base) -{ - GthPngSaver *self = GTH_PNG_SAVER (base); - - if (self->priv->builder == NULL) - self->priv->builder = _gtk_builder_new_from_file ("png-options.ui", "pixbuf_savers"); - - gtk_adjustment_set_value (GTK_ADJUSTMENT (_gtk_builder_get_widget (self->priv->builder, "png_compression_adjustment")), - g_settings_get_int (self->priv->settings, PREF_PNG_COMPRESSION_LEVEL)); - - return _gtk_builder_get_widget (self->priv->builder, "png_options"); -} - - -static void -gth_png_saver_save_options (GthPixbufSaver *base) -{ - GthPngSaver *self = GTH_PNG_SAVER (base); - - g_settings_set_int (self->priv->settings, PREF_PNG_COMPRESSION_LEVEL, (int) gtk_adjustment_get_value (GTK_ADJUSTMENT (_gtk_builder_get_widget (self->priv->builder, "png_compression_adjustment")))); -} - - -static gboolean -gth_png_saver_can_save (GthPixbufSaver *self, - const char *mime_type) -{ - return g_content_type_equals (mime_type, "image/png"); -} - - -static gboolean -gth_png_saver_save_pixbuf (GthPixbufSaver *base, - GdkPixbuf *pixbuf, - char **buffer, - gsize *buffer_size, - const char *mime_type, - GError **error) -{ - GthPngSaver *self = GTH_PNG_SAVER (base); - char *pixbuf_type; - char **option_keys; - char **option_values; - int i = -1; - int i_value; - gboolean result; - - pixbuf_type = get_pixbuf_type_from_mime_type (mime_type); - - option_keys = g_malloc (sizeof (char *) * 2); - option_values = g_malloc (sizeof (char *) * 2); - - i++; - i_value = g_settings_get_int (self->priv->settings, PREF_PNG_COMPRESSION_LEVEL); - option_keys[i] = g_strdup ("compression");; - option_values[i] = g_strdup_printf ("%d", i_value); - - i++; - option_keys[i] = NULL; - option_values[i] = NULL; - - result = gdk_pixbuf_save_to_bufferv (pixbuf, - buffer, - buffer_size, - pixbuf_type, - option_keys, - option_values, - error); - - g_strfreev (option_keys); - g_strfreev (option_values); - g_free (pixbuf_type); - - return result; -} - - -static void -gth_png_saver_class_init (GthPngSaverClass *klass) -{ - GObjectClass *object_class; - GthPixbufSaverClass *pixbuf_saver_class; - - g_type_class_add_private (klass, sizeof (GthPngSaverPrivate)); - - object_class = G_OBJECT_CLASS (klass); - object_class->finalize = gth_png_saver_finalize; - - pixbuf_saver_class = GTH_PIXBUF_SAVER_CLASS (klass); - pixbuf_saver_class->id = "png"; - pixbuf_saver_class->display_name = _("PNG"); - pixbuf_saver_class->mime_type = "image/png"; - pixbuf_saver_class->extensions = "png"; - pixbuf_saver_class->get_default_ext = NULL; - pixbuf_saver_class->get_control = gth_png_saver_get_control; - pixbuf_saver_class->save_options = gth_png_saver_save_options; - pixbuf_saver_class->can_save = gth_png_saver_can_save; - pixbuf_saver_class->save_pixbuf = gth_png_saver_save_pixbuf; -} - - -static void -gth_png_saver_init (GthPngSaver *self) -{ - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_PNG_SAVER, GthPngSaverPrivate); - self->priv->settings = g_settings_new (GTHUMB_PIXBUF_SAVERS_PNG_SCHEMA); -} diff -Nru gthumb-3.0.2/extensions/pixbuf_savers/gth-png-saver.h gthumb-3.2.3/extensions/pixbuf_savers/gth-png-saver.h --- gthumb-3.0.2/extensions/pixbuf_savers/gth-png-saver.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/pixbuf_savers/gth-png-saver.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2009 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef GTH_PNG_SAVER_H -#define GTH_PNG_SAVER_H - -#include -#include - -G_BEGIN_DECLS - -#define GTH_TYPE_PNG_SAVER (gth_png_saver_get_type ()) -#define GTH_PNG_SAVER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_PNG_SAVER, GthPngSaver)) -#define GTH_PNG_SAVER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTH_PNG_SAVER_TYPE, GthPngSaverClass)) -#define GTH_IS_PNG_SAVER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_PNG_SAVER)) -#define GTH_IS_PNG_SAVER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTH_TYPE_PNG_SAVER)) -#define GTH_PNG_SAVER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTH_TYPE_PNG_SAVER, GthPngSaverClass)) - -typedef struct _GthPngSaver GthPngSaver; -typedef struct _GthPngSaverClass GthPngSaverClass; -typedef struct _GthPngSaverPrivate GthPngSaverPrivate; - -struct _GthPngSaver -{ - GthPixbufSaver __parent; - GthPngSaverPrivate *priv; -}; - -struct _GthPngSaverClass -{ - GthPixbufSaverClass __parent_class; -}; - -GType gth_png_saver_get_type (void); - -G_END_DECLS - -#endif /* GTH_PNG_SAVER_H */ diff -Nru gthumb-3.0.2/extensions/pixbuf_savers/gth-tga-saver.c gthumb-3.2.3/extensions/pixbuf_savers/gth-tga-saver.c --- gthumb-3.0.2/extensions/pixbuf_savers/gth-tga-saver.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/pixbuf_savers/gth-tga-saver.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,389 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2009 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include "gth-tga-saver.h" -#include "preferences.h" - - -G_DEFINE_TYPE (GthTgaSaver, gth_tga_saver, GTH_TYPE_PIXBUF_SAVER) - - -struct _GthTgaSaverPrivate { - GtkBuilder *builder; - GSettings *settings; -}; - - -static void -gth_tga_saver_finalize (GObject *object) -{ - GthTgaSaver *self = GTH_TGA_SAVER (object); - - _g_object_unref (self->priv->builder); - _g_object_unref (self->priv->settings); - G_OBJECT_CLASS (gth_tga_saver_parent_class)->finalize (object); -} - - -static GtkWidget * -gth_tga_saver_get_control (GthPixbufSaver *base) -{ - GthTgaSaver *self = GTH_TGA_SAVER (base); - - if (self->priv->builder == NULL) - self->priv->builder = _gtk_builder_new_from_file ("tga-options.ui", "pixbuf_savers"); - - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tga_rle_compression_checkbutton")), - g_settings_get_boolean (self->priv->settings, PREF_TGA_RLE_COMPRESSION)); - - return _gtk_builder_get_widget (self->priv->builder, "tga_options"); -} - - -static void -gth_tga_saver_save_options (GthPixbufSaver *base) -{ - GthTgaSaver *self = GTH_TGA_SAVER (base); - - g_settings_set_boolean (self->priv->settings, PREF_TGA_RLE_COMPRESSION, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tga_rle_compression_checkbutton")))); -} - - -static gboolean -gth_tga_saver_can_save (GthPixbufSaver *self, - const char *mime_type) -{ - return g_content_type_equals (mime_type, "image/tga") || g_content_type_equals (mime_type, "image/x-tga"); -} - - -/* -- _gdk_pixbuf_save_as_tga -- */ - - -/* TRUEVISION-XFILE magic signature string */ -static guchar magic[18] = { - 0x54, 0x52, 0x55, 0x45, 0x56, 0x49, 0x53, 0x49, 0x4f, - 0x4e, 0x2d, 0x58, 0x46, 0x49, 0x4c, 0x45, 0x2e, 0x0 -}; - - -static gboolean -rle_write (GthBufferData *buffer_data, - guchar *buffer, - guint width, - guint bytes, - GError **error) -{ - int repeat = 0; - int direct = 0; - guchar *from = buffer; - guint x; - - for (x = 1; x < width; ++x) { - if (memcmp (buffer, buffer + bytes, bytes)) { - /* next pixel is different */ - if (repeat) { - gth_buffer_data_putc (buffer_data, 128 + repeat, error); - gth_buffer_data_write (buffer_data, from, bytes, error); - from = buffer + bytes; /* point to first different pixel */ - repeat = 0; - direct = 0; - } - else - direct += 1; - } - else { - /* next pixel is the same */ - if (direct) { - gth_buffer_data_putc (buffer_data, direct - 1, error); - gth_buffer_data_write (buffer_data, from, bytes * direct, error); - from = buffer; /* point to first identical pixel */ - direct = 0; - repeat = 1; - } - else - repeat += 1; - } - - if (repeat == 128) { - gth_buffer_data_putc (buffer_data, 255, error); - gth_buffer_data_write (buffer_data, from, bytes, error); - from = buffer + bytes; - direct = 0; - repeat = 0; - } - else if (direct == 128) { - gth_buffer_data_putc (buffer_data, 127, error); - gth_buffer_data_write (buffer_data, from, bytes * direct, error); - from = buffer + bytes; - direct = 0; - repeat = 0; - } - - buffer += bytes; - } - - if (repeat > 0) { - gth_buffer_data_putc (buffer_data, 128 + repeat, error); - gth_buffer_data_write (buffer_data, from, bytes, error); - } - else { - gth_buffer_data_putc (buffer_data, direct, error); - gth_buffer_data_write (buffer_data, from, bytes * (direct + 1), error); - } - - return TRUE; -} - - -static void -bgr2rgb (guchar *dest, - guchar *src, - guint width, - guint bytes, - guint alpha) -{ - guint x; - - if (alpha) - for (x = 0; x < width; x++) { - *(dest++) = src[2]; - *(dest++) = src[1]; - *(dest++) = src[0]; - *(dest++) = src[3]; - - src += bytes; - } - else - for (x = 0; x < width; x++) { - *(dest++) = src[2]; - *(dest++) = src[1]; - *(dest++) = src[0]; - - src += bytes; - } -} - - -static gboolean -_gdk_pixbuf_save_as_tga (GdkPixbuf *pixbuf, - char **buffer, - gsize *buffer_size, - char **keys, - char **values, - GError **error) -{ - GthBufferData *buffer_data; - int out_bpp = 0; - int row; - guchar header[18]; - guchar footer[26]; - gboolean rle_compression; - gboolean alpha; - guchar *pixels, *ptr, *buf; - int width, height; - int rowstride; - - rle_compression = TRUE; - - if (keys && *keys) { - char **kiter = keys; - char **viter = values; - - while (*kiter) { - if (strcmp (*kiter, "compression") == 0) { - if (*viter == NULL) { - g_set_error (error, - GDK_PIXBUF_ERROR, - GDK_PIXBUF_ERROR_BAD_OPTION, - "Must specify a compression type"); - return FALSE; - } - - if (strcmp (*viter, "none") == 0) - rle_compression = FALSE; - - else if (strcmp (*viter, "rle") == 0) - rle_compression = TRUE; - - else { - g_set_error (error, - GDK_PIXBUF_ERROR, - GDK_PIXBUF_ERROR_BAD_OPTION, - "Unsupported compression type passed to the TGA saver"); - return FALSE; - } - } - else { - g_warning ("Bad option name '%s' passed to the TGA saver", *kiter); - return FALSE; - } - - ++kiter; - ++viter; - } - } - - width = gdk_pixbuf_get_width (pixbuf); - height = gdk_pixbuf_get_height (pixbuf); - alpha = gdk_pixbuf_get_has_alpha (pixbuf); - pixels = gdk_pixbuf_get_pixels (pixbuf); - rowstride = gdk_pixbuf_get_rowstride (pixbuf); - - buffer_data = gth_buffer_data_new (); - - /* write the header */ - - header[0] = 0; /* No image identifier / description */ - header[1] = 0; - header[2] = rle_compression ? 10 : 2; - header[3] = header[4] = header[5] = header[6] = header[7] = 0; - header[8] = header[9] = 0; /* xorigin */ - header[10] = header[11] = 0; /* yorigin */ - header[12] = width % 256; - header[13] = width / 256; - header[14] = height % 256; - header[15] = height / 256; - if (alpha) { - out_bpp = 4; - header[16] = 32; /* bpp */ - header[17] = 0x28; /* alpha + orientation */ - } - else { - out_bpp = 3; - header[16] = 24; /* bpp */ - header[17] = 0x20; /* alpha + orientation */ - } - gth_buffer_data_write (buffer_data, header, sizeof (header), error); - - /* allocate a small buffer to convert image data */ - buf = g_try_malloc (width * out_bpp * sizeof (guchar)); - if (! buf) { - g_set_error_literal (error, - GDK_PIXBUF_ERROR, - GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY, - _("Insufficient memory")); - return FALSE; - } - - ptr = pixels; - for (row = 0; row < height; ++row) { - bgr2rgb (buf, ptr, width, out_bpp, alpha); - - if (rle_compression) - rle_write (buffer_data, buf, width, out_bpp, error); - else - gth_buffer_data_write (buffer_data, buf, width * out_bpp, error); - - ptr += rowstride; - } - - g_free (buf); - - /* write the footer */ - - memset (footer, 0, 8); /* No extensions, no developer directory */ - memcpy (footer + 8, magic, sizeof (magic)); /* magic signature */ - gth_buffer_data_write (buffer_data, footer, sizeof (footer), error); - - gth_buffer_data_get (buffer_data, buffer, buffer_size); - gth_buffer_data_free (buffer_data, FALSE); - - return TRUE; -} - - -static gboolean -gth_tga_saver_save_pixbuf (GthPixbufSaver *base, - GdkPixbuf *pixbuf, - char **buffer, - gsize *buffer_size, - const char *mime_type, - GError **error) -{ - GthTgaSaver *self = GTH_TGA_SAVER (base); - char *pixbuf_type; - char **option_keys; - char **option_values; - int i = -1; - gboolean result; - - pixbuf_type = get_pixbuf_type_from_mime_type (mime_type); - - option_keys = g_malloc (sizeof (char *) * 2); - option_values = g_malloc (sizeof (char *) * 2); - - i++; - option_keys[i] = g_strdup ("compression"); - option_values[i] = g_strdup (g_settings_get_boolean (self->priv->settings, PREF_TGA_RLE_COMPRESSION) ? "rle" : "none"); - - i++; - option_keys[i] = NULL; - option_values[i] = NULL; - - result = _gdk_pixbuf_save_as_tga (pixbuf, - buffer, - buffer_size, - option_keys, - option_values, - error); - - g_strfreev (option_keys); - g_strfreev (option_values); - g_free (pixbuf_type); - - return result; -} - - -static void -gth_tga_saver_class_init (GthTgaSaverClass *klass) -{ - GObjectClass *object_class; - GthPixbufSaverClass *pixbuf_saver_class; - - g_type_class_add_private (klass, sizeof (GthTgaSaverPrivate)); - - object_class = G_OBJECT_CLASS (klass); - object_class->finalize = gth_tga_saver_finalize; - - pixbuf_saver_class = GTH_PIXBUF_SAVER_CLASS (klass); - pixbuf_saver_class->id = "tga"; - pixbuf_saver_class->display_name = _("TGA"); - pixbuf_saver_class->mime_type = "image/x-tga"; - pixbuf_saver_class->extensions = "tga"; - pixbuf_saver_class->get_default_ext = NULL; - pixbuf_saver_class->get_control = gth_tga_saver_get_control; - pixbuf_saver_class->save_options = gth_tga_saver_save_options; - pixbuf_saver_class->can_save = gth_tga_saver_can_save; - pixbuf_saver_class->save_pixbuf = gth_tga_saver_save_pixbuf; -} - - -static void -gth_tga_saver_init (GthTgaSaver *self) -{ - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_TGA_SAVER, GthTgaSaverPrivate); - self->priv->settings = g_settings_new (GTHUMB_PIXBUF_SAVERS_TGA_SCHEMA); -} diff -Nru gthumb-3.0.2/extensions/pixbuf_savers/gth-tga-saver.h gthumb-3.2.3/extensions/pixbuf_savers/gth-tga-saver.h --- gthumb-3.0.2/extensions/pixbuf_savers/gth-tga-saver.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/pixbuf_savers/gth-tga-saver.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2009 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef GTH_TGA_SAVER_H -#define GTH_TGA_SAVER_H - -#include -#include - -G_BEGIN_DECLS - -#define GTH_TYPE_TGA_SAVER (gth_tga_saver_get_type ()) -#define GTH_TGA_SAVER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_TGA_SAVER, GthTgaSaver)) -#define GTH_TGA_SAVER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTH_TYPE_TGA_SAVER, GthTgaSaverClass)) -#define GTH_IS_TGA_SAVER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_TGA_SAVER)) -#define GTH_IS_TGA_SAVER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTH_TYPE_TGA_SAVER)) -#define GTH_TGA_SAVER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTH_TYPE_TGA_SAVER, GthTgaSaverClass)) - -typedef struct _GthTgaSaver GthTgaSaver; -typedef struct _GthTgaSaverClass GthTgaSaverClass; -typedef struct _GthTgaSaverPrivate GthTgaSaverPrivate; - -struct _GthTgaSaver -{ - GthPixbufSaver __parent; - GthTgaSaverPrivate *priv; -}; - -struct _GthTgaSaverClass -{ - GthPixbufSaverClass __parent_class; -}; - -GType gth_tga_saver_get_type (void); - -G_END_DECLS - -#endif /* GTH_TGA_SAVER_H */ diff -Nru gthumb-3.0.2/extensions/pixbuf_savers/gth-tiff-saver.c gthumb-3.2.3/extensions/pixbuf_savers/gth-tiff-saver.c --- gthumb-3.0.2/extensions/pixbuf_savers/gth-tiff-saver.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/pixbuf_savers/gth-tiff-saver.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,555 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2009 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#ifdef HAVE_LIBTIFF -#include -#endif /* HAVE_LIBTIFF */ -#include -#include -#include "enum-types.h" -#include "gth-tiff-saver.h" -#include "preferences.h" - - -G_DEFINE_TYPE (GthTiffSaver, gth_tiff_saver, GTH_TYPE_PIXBUF_SAVER) - - -struct _GthTiffSaverPrivate { - GSettings *settings; - GtkBuilder *builder; - char *default_ext; -}; - - -static void -gth_tiff_saver_finalize (GObject *object) -{ - GthTiffSaver *self = GTH_TIFF_SAVER (object); - - _g_object_unref (self->priv->settings); - _g_object_unref (self->priv->builder); - g_free (self->priv->default_ext); - - G_OBJECT_CLASS (gth_tiff_saver_parent_class)->finalize (object); -} - - -static const char * -gth_tiff_saver_get_default_ext (GthPixbufSaver *base) -{ - GthTiffSaver *self = GTH_TIFF_SAVER (base); - - if (self->priv->default_ext == NULL) - self->priv->default_ext = g_settings_get_string (self->priv->settings, PREF_TIFF_DEFAULT_EXT); - - return self->priv->default_ext; -} - - -static GtkWidget * -gth_tiff_saver_get_control (GthPixbufSaver *base) -{ -#ifdef HAVE_LIBTIFF - - GthTiffSaver *self = GTH_TIFF_SAVER (base); - char **extensions; - int i; - int active_idx; - GthTiffCompression compression_type; - - if (self->priv->builder == NULL) - self->priv->builder = _gtk_builder_new_from_file ("tiff-options.ui", "pixbuf_savers"); - - active_idx = 0; - extensions = g_strsplit (gth_pixbuf_saver_get_extensions (base), " ", -1); - for (i = 0; extensions[i] != NULL; i++) { - GtkTreeIter iter; - - gtk_list_store_append (GTK_LIST_STORE (gtk_builder_get_object (self->priv->builder, "tiff_default_ext_liststore")), &iter); - gtk_list_store_set (GTK_LIST_STORE (gtk_builder_get_object (self->priv->builder, "tiff_default_ext_liststore")), - &iter, - 0, extensions[i], - -1); - if (g_str_equal (extensions[i], gth_pixbuf_saver_get_default_ext (base))) - active_idx = i; - } - gtk_combo_box_set_active (GTK_COMBO_BOX (_gtk_builder_get_widget (self->priv->builder, "tiff_default_extension_combobox")), active_idx); - g_strfreev (extensions); - - compression_type = g_settings_get_enum (self->priv->settings, PREF_TIFF_COMPRESSION); - switch (compression_type) { - case GTH_TIFF_COMPRESSION_NONE: - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tiff_comp_none_radiobutton")), TRUE); - break; - case GTH_TIFF_COMPRESSION_DEFLATE: - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tiff_comp_deflate_radiobutton")), TRUE); - break; - case GTH_TIFF_COMPRESSION_JPEG: - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tiff_comp_jpeg_radiobutton")), TRUE); - break; - } - - gtk_spin_button_set_value (GTK_SPIN_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tiff_hdpi_spinbutton")), - g_settings_get_int (self->priv->settings, PREF_TIFF_HORIZONTAL_RES)); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tiff_vdpi_spinbutton")), - g_settings_get_int (self->priv->settings, PREF_TIFF_VERTICAL_RES)); - - return _gtk_builder_get_widget (self->priv->builder, "tiff_options"); - -#else /* ! HAVE_LIBTIFF */ - - return GTH_PIXBUF_SAVER_CLASS (gth_tiff_saver_parent_class)->get_control (base); - -#endif /* HAVE_LIBTIFF */ -} - - -static void -gth_tiff_saver_save_options (GthPixbufSaver *base) -{ -#ifdef HAVE_LIBTIFF - - GthTiffSaver *self = GTH_TIFF_SAVER (base); - GtkTreeIter iter; - GthTiffCompression compression_type; - - if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (_gtk_builder_get_widget (self->priv->builder, "tiff_default_extension_combobox")), &iter)) { - g_free (self->priv->default_ext); - gtk_tree_model_get (GTK_TREE_MODEL (gtk_builder_get_object (self->priv->builder, "tiff_default_ext_liststore")), - &iter, - 0, &self->priv->default_ext, - -1); - g_settings_set_string (self->priv->settings, PREF_TIFF_DEFAULT_EXT, self->priv->default_ext); - } - - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tiff_comp_none_radiobutton")))) - compression_type = GTH_TIFF_COMPRESSION_NONE; - else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tiff_comp_deflate_radiobutton")))) - compression_type = GTH_TIFF_COMPRESSION_DEFLATE; - else - compression_type = GTH_TIFF_COMPRESSION_JPEG; - g_settings_set_enum (self->priv->settings, PREF_TIFF_COMPRESSION, compression_type); - - g_settings_set_int (self->priv->settings, PREF_TIFF_HORIZONTAL_RES, (int) gtk_spin_button_get_value (GTK_SPIN_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tiff_hdpi_spinbutton")))); - g_settings_set_int (self->priv->settings, PREF_TIFF_VERTICAL_RES, (int) gtk_spin_button_get_value (GTK_SPIN_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tiff_vdpi_spinbutton")))); - -#endif /* HAVE_LIBTIFF */ -} - - -static gboolean -gth_tiff_saver_can_save (GthPixbufSaver *self, - const char *mime_type) -{ -#ifdef HAVE_LIBTIFF - - return g_content_type_equals (mime_type, "image/tiff"); - -#else /* ! HAVE_LIBTIFF */ - - GSList *formats; - GSList *scan; - GdkPixbufFormat *tiff_format; - - if (! g_content_type_equals (mime_type, "image/tiff")) - return FALSE; - - formats = gdk_pixbuf_get_formats (); - tiff_format = NULL; - for (scan = formats; (tiff_format == NULL) && (scan != NULL); scan = g_slist_next (scan)) { - GdkPixbufFormat *format = scan->data; - char **mime_types; - int i; - - mime_types = gdk_pixbuf_format_get_mime_types (format); - for (i = 0; mime_types[i] != NULL; i++) - if (g_content_type_equals (mime_types[i], "image/tiff")) - break; - - if (mime_types[i] == NULL) - continue; - - if (! gdk_pixbuf_format_is_writable (format)) - continue; - - tiff_format = format; - } - - return tiff_format != NULL; - -#endif /* HAVE_LIBTIFF */ -} - - -#ifdef HAVE_LIBTIFF - - -/* -- gth_tiff_saver_save_pixbuf -- */ - - -#define TILE_HEIGHT 40 /* FIXME */ - - -static tsize_t -tiff_save_read (thandle_t handle, tdata_t buf, tsize_t size) -{ - return -1; -} - - -static tsize_t -tiff_save_write (thandle_t handle, tdata_t buf, tsize_t size) -{ - GthBufferData *buffer_data = (GthBufferData *)handle; - - gth_buffer_data_write (buffer_data, buf, size, NULL); - return size; -} - - -static toff_t -tiff_save_seek (thandle_t handle, toff_t offset, int whence) -{ - GthBufferData *buffer_data = (GthBufferData *)handle; - - return gth_buffer_data_seek (buffer_data, offset, whence); -} - - -static int -tiff_save_close (thandle_t context) -{ - return 0; -} - - -static toff_t -tiff_save_size (thandle_t handle) -{ - return -1; -} - - -static gboolean -_gdk_pixbuf_save_as_tiff (GdkPixbuf *pixbuf, - char **buffer, - gsize *buffer_size, - char **keys, - char **values, - GError **error) -{ - GthBufferData *buffer_data; - TIFF *tif; - int cols, rows, row; - glong rowsperstrip; - gushort compression; - int alpha; - gshort predictor; - gshort photometric; - gshort samplesperpixel; - gshort bitspersample; - gushort extra_samples[1]; - int rowstride; - guchar *pixels; - int horizontal_dpi = 72, vertical_dpi = 72; - gboolean save_resolution = FALSE; - - compression = COMPRESSION_DEFLATE; - - if (keys && *keys) { - char **kiter = keys; - char **viter = values; - - while (*kiter) { - if (strcmp (*kiter, "compression") == 0) { - if (*viter == NULL) { - g_set_error (error, - GDK_PIXBUF_ERROR, - GDK_PIXBUF_ERROR_BAD_OPTION, - "Must specify a compression type"); - return FALSE; - } - - if (strcmp (*viter, "none") == 0) - compression = COMPRESSION_NONE; - else if (strcmp (*viter, "pack bits") == 0) - compression = COMPRESSION_PACKBITS; - else if (strcmp (*viter, "lzw") == 0) - compression = COMPRESSION_LZW; - else if (strcmp (*viter, "deflate") == 0) - compression = COMPRESSION_DEFLATE; - else if (strcmp (*viter, "jpeg") == 0) - compression = COMPRESSION_JPEG; - else { - g_set_error (error, - GDK_PIXBUF_ERROR, - GDK_PIXBUF_ERROR_BAD_OPTION, - "Unsupported compression type passed to the TIFF saver"); - return FALSE; - } - } - else if (strcmp (*kiter, "vertical dpi") == 0) { - char *endptr = NULL; - vertical_dpi = strtol (*viter, &endptr, 10); - save_resolution = TRUE; - - if (endptr == *viter) { - g_set_error (error, - GDK_PIXBUF_ERROR, - GDK_PIXBUF_ERROR_BAD_OPTION, - "TIFF vertical dpi must be a value greater than 0; value '%s' could not be parsed.", - *viter); - return FALSE; - } - - if (vertical_dpi < 0) { - g_set_error (error, - GDK_PIXBUF_ERROR, - GDK_PIXBUF_ERROR_BAD_OPTION, - "TIFF vertical dpi must be a value greater than 0; value '%d' is not allowed.", - vertical_dpi); - return FALSE; - } - } - else if (strcmp (*kiter, "horizontal dpi") == 0) { - char *endptr = NULL; - horizontal_dpi = strtol (*viter, &endptr, 10); - save_resolution = TRUE; - - if (endptr == *viter) { - g_set_error (error, - GDK_PIXBUF_ERROR, - GDK_PIXBUF_ERROR_BAD_OPTION, - "TIFF horizontal dpi must be a value greater than 0; value '%s' could not be parsed.", - *viter); - return FALSE; - } - - if (horizontal_dpi < 0) { - g_set_error (error, - GDK_PIXBUF_ERROR, - GDK_PIXBUF_ERROR_BAD_OPTION, - "TIFF horizontal dpi must be a value greater than 0; value '%d' is not allowed.", - horizontal_dpi); - return FALSE; - } - } - else { - g_warning ("Bad option name '%s' passed to the TIFF saver", *kiter); - return FALSE; - } - - ++kiter; - ++viter; - } - } - - predictor = 0; - rowsperstrip = TILE_HEIGHT; - - buffer_data = gth_buffer_data_new (); - tif = TIFFClientOpen ("gth-tiff-writer", "w", buffer_data, - tiff_save_read, tiff_save_write, - tiff_save_seek, tiff_save_close, - tiff_save_size, - NULL, NULL); - if (tif == NULL) { - g_set_error_literal (error, - GDK_PIXBUF_ERROR, - GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY, - "Couldn't allocate memory for writing TIFF file"); - return FALSE; - } - - cols = gdk_pixbuf_get_width (pixbuf); - rows = gdk_pixbuf_get_height (pixbuf); - alpha = gdk_pixbuf_get_has_alpha (pixbuf); - pixels = gdk_pixbuf_get_pixels (pixbuf); - rowstride = gdk_pixbuf_get_rowstride (pixbuf); - - predictor = 2; - bitspersample = 8; - photometric = PHOTOMETRIC_RGB; - - if (alpha) - samplesperpixel = 4; - else - samplesperpixel = 3; - - /* Set TIFF parameters. */ - - TIFFSetField (tif, TIFFTAG_SUBFILETYPE, 0); - TIFFSetField (tif, TIFFTAG_IMAGEWIDTH, cols); - TIFFSetField (tif, TIFFTAG_IMAGELENGTH, rows); - TIFFSetField (tif, TIFFTAG_BITSPERSAMPLE, bitspersample); - TIFFSetField (tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT); - TIFFSetField (tif, TIFFTAG_COMPRESSION, compression); - - if ((compression == COMPRESSION_LZW || compression == COMPRESSION_DEFLATE) - && (predictor != 0)) - { - TIFFSetField (tif, TIFFTAG_PREDICTOR, predictor); - } - - if (alpha) { - extra_samples [0] = EXTRASAMPLE_ASSOCALPHA; - TIFFSetField (tif, TIFFTAG_EXTRASAMPLES, 1, extra_samples); - } - - TIFFSetField (tif, TIFFTAG_PHOTOMETRIC, photometric); - /*TIFFSetField (tif, TIFFTAG_DOCUMENTNAME, filename);*/ - TIFFSetField (tif, TIFFTAG_SAMPLESPERPIXEL, samplesperpixel); - TIFFSetField (tif, TIFFTAG_ROWSPERSTRIP, rowsperstrip); - TIFFSetField (tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); - - if (save_resolution) { - TIFFSetField (tif, TIFFTAG_XRESOLUTION, (double) horizontal_dpi); - TIFFSetField (tif, TIFFTAG_YRESOLUTION, (double) vertical_dpi); - TIFFSetField (tif, TIFFTAG_RESOLUTIONUNIT, RESUNIT_INCH); - } - - /* Now write the TIFF data. */ - for (row = 0; row < rows; row++) { - if (TIFFWriteScanline (tif, pixels + row * rowstride, row, 0) < 0) { - g_set_error (error, - GDK_PIXBUF_ERROR, - GDK_PIXBUF_ERROR_FAILED, - "TIFF Failed a scanline write on row %d", - row); - return FALSE; - } - } - - TIFFFlushData (tif); - TIFFClose (tif); - - gth_buffer_data_get (buffer_data, buffer, buffer_size); - gth_buffer_data_free (buffer_data, FALSE); - - return TRUE; -} - - -#endif /* HAVE_LIBTIFF */ - - -static gboolean -gth_tiff_saver_save_pixbuf (GthPixbufSaver *base, - GdkPixbuf *pixbuf, - char **buffer, - gsize *buffer_size, - const char *mime_type, - GError **error) -{ -#ifdef HAVE_LIBTIFF - GthTiffSaver *self = GTH_TIFF_SAVER (base); - char **option_keys; - char **option_values; - int i = -1; - int i_value; - gboolean result; - - option_keys = g_malloc (sizeof (char *) * 4); - option_values = g_malloc (sizeof (char *) * 4); - - i++; - option_keys[i] = g_strdup ("compression");; - option_values[i] = g_settings_get_string (self->priv->settings, PREF_TIFF_COMPRESSION); - - i++; - i_value = g_settings_get_int (self->priv->settings, PREF_TIFF_VERTICAL_RES); - option_keys[i] = g_strdup ("vertical dpi");; - option_values[i] = g_strdup_printf ("%d", i_value); - - i++; - i_value = g_settings_get_int (self->priv->settings, PREF_TIFF_HORIZONTAL_RES); - option_keys[i] = g_strdup ("horizontal dpi");; - option_values[i] = g_strdup_printf ("%d", i_value); - - i++; - option_keys[i] = NULL; - option_values[i] = NULL; - - result = _gdk_pixbuf_save_as_tiff (pixbuf, - buffer, - buffer_size, - option_keys, - option_values, - error); - - g_strfreev (option_keys); - g_strfreev (option_values); - -#else /* ! HAVE_LIBTIFF */ - - char *pixbuf_type; - gboolean result; - - pixbuf_type = get_pixbuf_type_from_mime_type (mime_type); - result = gdk_pixbuf_save_to_bufferv (pixbuf, - buffer, - buffer_size, - pixbuf_type, - NULL, - NULL, - error); - - g_free (pixbuf_type); - -#endif /* HAVE_LIBTIFF */ - - return result; -} - - -static void -gth_tiff_saver_class_init (GthTiffSaverClass *klass) -{ - GObjectClass *object_class; - GthPixbufSaverClass *pixbuf_saver_class; - - g_type_class_add_private (klass, sizeof (GthTiffSaverPrivate)); - - object_class = G_OBJECT_CLASS (klass); - object_class->finalize = gth_tiff_saver_finalize; - - pixbuf_saver_class = GTH_PIXBUF_SAVER_CLASS (klass); - pixbuf_saver_class->id = "tiff"; - pixbuf_saver_class->display_name = _("TIFF"); - pixbuf_saver_class->mime_type = "image/tiff"; - pixbuf_saver_class->extensions = "tiff tif"; - pixbuf_saver_class->get_default_ext = gth_tiff_saver_get_default_ext; - pixbuf_saver_class->get_control = gth_tiff_saver_get_control; - pixbuf_saver_class->save_options = gth_tiff_saver_save_options; - pixbuf_saver_class->can_save = gth_tiff_saver_can_save; - pixbuf_saver_class->save_pixbuf = gth_tiff_saver_save_pixbuf; -} - - -static void -gth_tiff_saver_init (GthTiffSaver *self) -{ - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_TIFF_SAVER, GthTiffSaverPrivate); - self->priv->settings = g_settings_new (GTHUMB_PIXBUF_SAVERS_TIFF_SCHEMA); - self->priv->builder = NULL; - self->priv->default_ext = NULL; -} diff -Nru gthumb-3.0.2/extensions/pixbuf_savers/gth-tiff-saver.h gthumb-3.2.3/extensions/pixbuf_savers/gth-tiff-saver.h --- gthumb-3.0.2/extensions/pixbuf_savers/gth-tiff-saver.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/pixbuf_savers/gth-tiff-saver.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2009 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef GTH_TIFF_SAVER_H -#define GTH_TIFF_SAVER_H - -#include -#include - -G_BEGIN_DECLS - -#define GTH_TYPE_TIFF_SAVER (gth_tiff_saver_get_type ()) -#define GTH_TIFF_SAVER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_TIFF_SAVER, GthTiffSaver)) -#define GTH_TIFF_SAVER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTH_TIFF_SAVER_TYPE, GthTiffSaverClass)) -#define GTH_IS_TIFF_SAVER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_TIFF_SAVER)) -#define GTH_IS_TIFF_SAVER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTH_TYPE_TIFF_SAVER)) -#define GTH_TIFF_SAVER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTH_TYPE_TIFF_SAVER, GthTiffSaverClass)) - -typedef struct _GthTiffSaver GthTiffSaver; -typedef struct _GthTiffSaverClass GthTiffSaverClass; -typedef struct _GthTiffSaverPrivate GthTiffSaverPrivate; - -struct _GthTiffSaver -{ - GthPixbufSaver __parent; - GthTiffSaverPrivate *priv; -}; - -struct _GthTiffSaverClass -{ - GthPixbufSaverClass __parent_class; -}; - -GType gth_tiff_saver_get_type (void); - -G_END_DECLS - -#endif /* GTH_TIFF_SAVER_H */ diff -Nru gthumb-3.0.2/extensions/pixbuf_savers/main.c gthumb-3.2.3/extensions/pixbuf_savers/main.c --- gthumb-3.0.2/extensions/pixbuf_savers/main.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/pixbuf_savers/main.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2009 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - - -#include -#include -#include "gth-jpeg-saver.h" -#include "gth-png-saver.h" -#include "gth-tga-saver.h" -#include "gth-tiff-saver.h" -#include "preferences.h" - - -G_MODULE_EXPORT void -gthumb_extension_activate (void) -{ - gth_main_register_type ("pixbuf-saver", GTH_TYPE_JPEG_SAVER); - gth_main_register_type ("pixbuf-saver", GTH_TYPE_PNG_SAVER); - gth_main_register_type ("pixbuf-saver", GTH_TYPE_TGA_SAVER); - gth_main_register_type ("pixbuf-saver", GTH_TYPE_TIFF_SAVER); - gth_hook_add_callback ("dlg-preferences-construct", 30, G_CALLBACK (so__dlg_preferences_construct_cb), NULL); - gth_hook_add_callback ("dlg-preferences-apply", 10, G_CALLBACK (so__dlg_preferences_apply_cb), NULL); -} - - -G_MODULE_EXPORT void -gthumb_extension_deactivate (void) -{ -} - - -G_MODULE_EXPORT gboolean -gthumb_extension_is_configurable (void) -{ - return FALSE; -} - - -G_MODULE_EXPORT void -gthumb_extension_configure (GtkWindow *parent) -{ -} diff -Nru gthumb-3.0.2/extensions/pixbuf_savers/pixbuf_savers.extension.in.in gthumb-3.2.3/extensions/pixbuf_savers/pixbuf_savers.extension.in.in --- gthumb-3.0.2/extensions/pixbuf_savers/pixbuf_savers.extension.in.in 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/pixbuf_savers/pixbuf_savers.extension.in.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -[Extension] -_Name=Save images -_Description=Save images in common file formats such as JPEG, PNG and TIFF -_Authors=gthumb development team -Copyright=Copyright © 2009 The Free Software Foundation, Inc. -Version=%VERSION% -Category=Browser - -[Loader] -Type=module -File=%LIBRARY% -API=%GTHUMB_API_VERSION% -Requires=jpeg_utils diff -Nru gthumb-3.0.2/extensions/pixbuf_savers/preferences.c gthumb-3.2.3/extensions/pixbuf_savers/preferences.c --- gthumb-3.0.2/extensions/pixbuf_savers/preferences.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/pixbuf_savers/preferences.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,161 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2009 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include "preferences.h" - - -#define GET_WIDGET(name) _gtk_builder_get_widget (data->builder, (name)) -#define BROWSER_DATA_KEY "save-options-preference-data" - - -enum { - FILE_TYPE_COLUMN_N, - FILE_TYPE_COLUMN_OBJ, - FILE_TYPE_COLUMN_DISPLAY_NAME -}; - - -typedef struct { - GtkBuilder *builder; - GList *pixbuf_saver; -} BrowserData; - - -static void -browser_data_free (BrowserData *data) -{ - _g_object_list_unref (data->pixbuf_saver); - g_object_unref (data->builder); - g_free (data); -} - - -static void -treeselection_changed_cb (GtkTreeSelection *treeselection, - gpointer user_data) -{ - GtkWidget *dialog = user_data; - BrowserData *data; - GtkTreeIter iter; - int page_n; - GthPixbufSaver *pixbuf_saver; - - data = g_object_get_data (G_OBJECT (dialog), BROWSER_DATA_KEY); - g_return_if_fail (data != NULL); - - if (! gtk_tree_selection_get_selected (treeselection, NULL, &iter)) - return; - - gtk_tree_model_get (GTK_TREE_MODEL (gtk_builder_get_object (data->builder, "file_type_liststore")), &iter, - FILE_TYPE_COLUMN_N, &page_n, - FILE_TYPE_COLUMN_OBJ, &pixbuf_saver, - -1); - gtk_notebook_set_current_page (GTK_NOTEBOOK (_gtk_builder_get_widget (data->builder, "options_notebook")), page_n); - gtk_label_set_text (GTK_LABEL (_gtk_builder_get_widget (data->builder, "file_type_label")), gth_pixbuf_saver_get_display_name (pixbuf_saver)); - - g_object_unref (pixbuf_saver); -} - - -void -so__dlg_preferences_construct_cb (GtkWidget *dialog, - GthBrowser *browser, - GtkBuilder *dialog_builder) -{ - BrowserData *data; - GtkWidget *notebook; - GtkWidget *page; - GtkListStore *model; - GArray *pixbuf_saver_types; - int i; - GtkTreeSelection *treeselection; - GtkTreePath *path; - GtkWidget *label; - - data = g_new0 (BrowserData, 1); - data->builder = _gtk_builder_new_from_file ("save-options-preferences.ui", "pixbuf_savers"); - - notebook = _gtk_builder_get_widget (dialog_builder, "notebook"); - - page = _gtk_builder_get_widget (data->builder, "preferences_page"); - gtk_widget_show (page); - - model = (GtkListStore *) gtk_builder_get_object (data->builder, "file_type_liststore"); - pixbuf_saver_types = gth_main_get_type_set ("pixbuf-saver"); - for (i = 0; (pixbuf_saver_types != NULL) && (i < pixbuf_saver_types->len); i++) { - GthPixbufSaver *pixbuf_saver; - GtkTreeIter iter; - GtkWidget *options; - - pixbuf_saver = g_object_new (g_array_index (pixbuf_saver_types, GType, i), NULL); - - gtk_list_store_append (model, &iter); - gtk_list_store_set (model, &iter, - FILE_TYPE_COLUMN_N, i, - FILE_TYPE_COLUMN_OBJ, pixbuf_saver, - FILE_TYPE_COLUMN_DISPLAY_NAME, gth_pixbuf_saver_get_display_name (pixbuf_saver), - -1); - - options = gth_pixbuf_saver_get_control (pixbuf_saver); - gtk_widget_show (options); - gtk_notebook_append_page (GTK_NOTEBOOK (_gtk_builder_get_widget (data->builder, "options_notebook")), options, NULL); - - data->pixbuf_saver = g_list_prepend (data->pixbuf_saver, pixbuf_saver); - } - - treeselection = gtk_tree_view_get_selection (GTK_TREE_VIEW (_gtk_builder_get_widget (data->builder, "file_type_treeview"))); - gtk_tree_selection_set_mode (treeselection, GTK_SELECTION_BROWSE); - g_signal_connect (treeselection, - "changed", - G_CALLBACK (treeselection_changed_cb), - dialog); - - label = gtk_label_new (_("Saving")); - gtk_widget_show (label); - - gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, label); - g_object_set_data_full (G_OBJECT (dialog), BROWSER_DATA_KEY, data, (GDestroyNotify) browser_data_free); - - path = gtk_tree_path_new_first (); - gtk_tree_selection_select_path (treeselection, path); - gtk_tree_path_free (path); -} - - -void -so__dlg_preferences_apply_cb (GtkWidget *dialog, - GthBrowser *browser, - GtkBuilder *builder) -{ - BrowserData *data; - GList *scan; - - data = g_object_get_data (G_OBJECT (dialog), BROWSER_DATA_KEY); - g_return_if_fail (data != NULL); - - for (scan = data->pixbuf_saver; scan; scan = scan->next) { - GthPixbufSaver *pixbuf_saver = scan->data; - gth_pixbuf_saver_save_options (pixbuf_saver); - } -} diff -Nru gthumb-3.0.2/extensions/pixbuf_savers/preferences.h gthumb-3.2.3/extensions/pixbuf_savers/preferences.h --- gthumb-3.0.2/extensions/pixbuf_savers/preferences.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/pixbuf_savers/preferences.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2009 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef PREFERENCES_H -#define PREFERENCES_H - -#include - - -typedef enum { - GTH_TIFF_COMPRESSION_NONE, - GTH_TIFF_COMPRESSION_DEFLATE, - GTH_TIFF_COMPRESSION_JPEG -} GthTiffCompression; - - -/* schemas */ - -#define GTHUMB_PIXBUF_SAVERS GTHUMB_SCHEMA ".pixbuf-savers" -#define GTHUMB_PIXBUF_SAVERS_JPEG_SCHEMA GTHUMB_PIXBUF_SAVERS ".jpeg" -#define GTHUMB_PIXBUF_SAVERS_PNG_SCHEMA GTHUMB_PIXBUF_SAVERS ".png" -#define GTHUMB_PIXBUF_SAVERS_TGA_SCHEMA GTHUMB_PIXBUF_SAVERS ".tga" -#define GTHUMB_PIXBUF_SAVERS_TIFF_SCHEMA GTHUMB_PIXBUF_SAVERS ".tiff" - -/* keys: jpeg */ - -#define PREF_JPEG_DEFAULT_EXT "default-ext" -#define PREF_JPEG_QUALITY "quality" -#define PREF_JPEG_SMOOTHING "smoothing" -#define PREF_JPEG_OPTIMIZE "optimize" -#define PREF_JPEG_PROGRESSIVE "progressive" - -/* keys: png */ - -#define PREF_PNG_COMPRESSION_LEVEL "compression-level" - -/* keys: tga */ - -#define PREF_TGA_RLE_COMPRESSION "rle-compression" - -/* keys: tiff */ - -#define PREF_TIFF_DEFAULT_EXT "default-ext" -#define PREF_TIFF_COMPRESSION "compression" -#define PREF_TIFF_HORIZONTAL_RES "horizontal-resolution" -#define PREF_TIFF_VERTICAL_RES "vertical-resolution" - - -void so__dlg_preferences_construct_cb (GtkWidget *dialog, - GthBrowser *browser, - GtkBuilder *builder); -void so__dlg_preferences_apply_cb (GtkWidget *dialog, - GthBrowser *browser, - GtkBuilder *builder); - -#endif /* PREFERENCES_H */ diff -Nru gthumb-3.0.2/extensions/raw_files/Makefile.in gthumb-3.2.3/extensions/raw_files/Makefile.in --- gthumb-3.0.2/extensions/raw_files/Makefile.in 2012-08-20 19:54:16.000000000 +0000 +++ gthumb-3.2.3/extensions/raw_files/Makefile.in 2013-07-10 13:33:49.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/raw_files -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -149,6 +177,23 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(extensionini_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -181,9 +226,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -197,13 +240,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -232,7 +274,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -248,11 +293,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -269,7 +318,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -299,7 +347,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -404,6 +455,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -438,6 +490,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libraw_files.la: $(libraw_files_la_OBJECTS) $(libraw_files_la_DEPENDENCIES) $(EXTRA_libraw_files_la_DEPENDENCIES) $(AM_V_CCLD)$(libraw_files_la_LINK) -rpath $(extensiondir) $(libraw_files_la_OBJECTS) $(libraw_files_la_LIBADD) $(LIBS) @@ -454,14 +507,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -504,26 +557,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(extensioninidir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -535,15 +577,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -552,9 +590,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -712,21 +751,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ clean-extensionLTLIBRARIES clean-generic clean-libtool \ - cscopelist ctags distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-extensionLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-extensionLTLIBRARIES \ install-extensioniniDATA install-html install-html-am \ install-info install-info-am install-man install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-extensionLTLIBRARIES \ - uninstall-extensioniniDATA + tags tags-am uninstall uninstall-am \ + uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA @GTHUMB_EXTENSION_IN_RULE@ diff -Nru gthumb-3.0.2/extensions/raw_files/main.c gthumb-3.2.3/extensions/raw_files/main.c --- gthumb-3.0.2/extensions/raw_files/main.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/raw_files/main.c 2013-04-30 16:56:12.000000000 +0000 @@ -236,16 +236,18 @@ get_cache_full_path (const char *filename, const char *extension) { - char *name; - char *cache_filename; + char *name; + GFile *file; + char *cache_filename; if (extension == NULL) name = g_strdup (filename); else name = g_strconcat (filename, ".", extension, NULL); - gth_user_dir_make_dir_for_file (GTH_DIR_CACHE, "gthumb", name, NULL); - cache_filename = gth_user_dir_get_file (GTH_DIR_CACHE, "gthumb", name, NULL); + file = gth_user_dir_get_file_for_write (GTH_DIR_CACHE, GTHUMB_DIR, name, NULL); + cache_filename = g_file_get_path (file); + g_object_unref (file); g_free (name); return cache_filename; @@ -267,7 +269,8 @@ static GthImage * -openraw_pixbuf_animation_new_from_file (GthFileData *file_data, +openraw_pixbuf_animation_new_from_file (GInputStream *istream, + GthFileData *file_data, int requested_size, int *original_width, int *original_height, @@ -287,6 +290,12 @@ char *local_file_esc; char *command = NULL; + if (file_data == NULL) { + if (error != NULL) + *error = g_error_new_literal (G_IO_ERROR, G_IO_ERROR_INVALID_FILENAME, "Could not load file"); + return NULL; + } + is_thumbnail = requested_size > 0; is_raw = _g_mime_type_is_raw (gth_file_data_get_mime_type (file_data)); is_hdr = _g_mime_type_is_hdr (gth_file_data_get_mime_type (file_data)); diff -Nru gthumb-3.0.2/extensions/red_eye_removal/Makefile.in gthumb-3.2.3/extensions/red_eye_removal/Makefile.in --- gthumb-3.0.2/extensions/red_eye_removal/Makefile.in 2012-08-20 19:54:17.000000000 +0000 +++ gthumb-3.2.3/extensions/red_eye_removal/Makefile.in 2013-07-10 13:33:49.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/red_eye_removal -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -145,13 +173,14 @@ am__v_CCLD_1 = SOURCES = $(libred_eye_removal_la_SOURCES) DIST_SOURCES = $(libred_eye_removal_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -160,9 +189,29 @@ DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -221,9 +270,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -237,13 +284,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -272,7 +318,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -288,11 +337,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -309,7 +362,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -339,7 +391,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -447,6 +502,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -481,6 +537,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libred_eye_removal.la: $(libred_eye_removal_la_OBJECTS) $(libred_eye_removal_la_DEPENDENCIES) $(EXTRA_libred_eye_removal_la_DEPENDENCIES) $(AM_V_CCLD)$(libred_eye_removal_la_LINK) -rpath $(extensiondir) $(libred_eye_removal_la_OBJECTS) $(libred_eye_removal_la_LIBADD) $(LIBS) @@ -498,14 +555,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -561,14 +618,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -589,31 +645,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -629,12 +667,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -646,15 +679,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -663,9 +692,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -847,25 +877,23 @@ uninstall-am: uninstall-extensionLTLIBRARIES \ uninstall-extensioniniDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-extensionLTLIBRARIES \ - clean-generic clean-libtool cscopelist cscopelist-recursive \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extensionLTLIBRARIES \ - install-extensioniniDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-extensionLTLIBRARIES clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-extensionLTLIBRARIES install-extensioniniDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA diff -Nru gthumb-3.0.2/extensions/red_eye_removal/data/Makefile.in gthumb-3.2.3/extensions/red_eye_removal/data/Makefile.in --- gthumb-3.0.2/extensions/red_eye_removal/data/Makefile.in 2012-08-20 19:54:17.000000000 +0000 +++ gthumb-3.2.3/extensions/red_eye_removal/data/Makefile.in 2013-07-10 13:33:49.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/red_eye_removal/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/red_eye_removal/data/ui/Makefile.in gthumb-3.2.3/extensions/red_eye_removal/data/ui/Makefile.in --- gthumb-3.0.2/extensions/red_eye_removal/data/ui/Makefile.in 2012-08-20 19:54:17.000000000 +0000 +++ gthumb-3.2.3/extensions/red_eye_removal/data/ui/Makefile.in 2013-07-10 13:33:49.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/red_eye_removal/data/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -381,11 +415,9 @@ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -526,16 +558,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-uiDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-uiDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/red_eye_removal/data/ui/red-eye-removal-options.ui gthumb-3.2.3/extensions/red_eye_removal/data/ui/red-eye-removal-options.ui --- gthumb-3.0.2/extensions/red_eye_removal/data/ui/red-eye-removal-options.ui 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/red_eye_removal/data/ui/red-eye-removal-options.ui 2013-04-30 16:56:12.000000000 +0000 @@ -1,14 +1,6 @@ - - - 10000 - 1 - - - 10000 - 1 - + True False @@ -21,115 +13,80 @@ True False + 12 12 - + True False - 0 - none + vertical + 12 - + True False - 6 - 12 + 0 + Selection + + + + + + False + True + 0 + + + + + True + False + 2 + 2 + 6 + 6 + + + True + False + 0 + _X: + True + x_spinbutton + + + GTK_FILL + + + - + + True + False + 0 + _Y: + True + y_spinbutton + + + 1 + 2 + GTK_FILL + + + + + True False - + True - False - 2 - 2 - 6 - 6 - - - True - False - 0 - _X: - True - x_spinbutton - - - GTK_FILL - - - - - - True - False - 0 - _Y: - True - y_spinbutton - - - 1 - 2 - GTK_FILL - - - - - - True - False - - - True - True - ● - x_adjustment - 1 - - - False - True - 0 - - - - - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - False - - - True - True - ● - y_adjustment - 1 - - - False - True - 0 - - - - - 1 - 2 - 1 - 2 - GTK_FILL - GTK_FILL - - + True + ● + True + x_adjustment + 1 False @@ -138,23 +95,53 @@ + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + False + + + True + True + ● + True + y_adjustment + 1 + + + False + True + 0 + + + + + 1 + 2 + 1 + 2 + GTK_FILL + GTK_FILL + - - - - True - False - Selection - - - - + + False + True + 1 + False - False + True 0 @@ -226,4 +213,12 @@ + + 10000 + 1 + + + 10000 + 1 + diff -Nru gthumb-3.0.2/extensions/red_eye_removal/gth-file-tool-red-eye.c gthumb-3.2.3/extensions/red_eye_removal/gth-file-tool-red-eye.c --- gthumb-3.0.2/extensions/red_eye_removal/gth-file-tool-red-eye.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/red_eye_removal/gth-file-tool-red-eye.c 2013-04-30 16:56:12.000000000 +0000 @@ -83,24 +83,6 @@ } -static void -cancel_button_clicked_cb (GtkButton *button, - GthFileToolRedEye *self) -{ - GtkWidget *window; - GtkWidget *viewer_page; - GtkWidget *viewer; - - window = gth_file_tool_get_window (GTH_FILE_TOOL (self)); - viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); - viewer = gth_image_viewer_page_get_image_viewer (GTH_IMAGE_VIEWER_PAGE (viewer_page)); - - gth_image_viewer_set_zoom_change (GTH_IMAGE_VIEWER (viewer), self->priv->original_zoom_change); - gth_image_viewer_page_reset (GTH_IMAGE_VIEWER_PAGE (viewer_page)); - gth_file_tool_hide_options (GTH_FILE_TOOL (self)); -} - - static int find_region (int row, int col, @@ -404,10 +386,10 @@ self->priv->builder = _gtk_builder_new_from_file ("red-eye-removal-options.ui", "red_eye_removal"); options = _gtk_builder_get_widget (self->priv->builder, "options"); gtk_widget_show (options); - g_signal_connect (GET_WIDGET ("cancel_button"), - "clicked", - G_CALLBACK (cancel_button_clicked_cb), - self); + g_signal_connect_swapped (GET_WIDGET ("cancel_button"), + "clicked", + G_CALLBACK (gth_file_tool_cancel), + self); g_signal_connect (GET_WIDGET ("ok_button"), "clicked", G_CALLBACK (ok_button_clicked_cb), @@ -463,6 +445,23 @@ static void +gth_file_tool_red_eye_cancel (GthFileTool *base) +{ + GthFileToolRedEye *self = (GthFileToolRedEye *) base; + GtkWidget *window; + GtkWidget *viewer_page; + GtkWidget *viewer; + + window = gth_file_tool_get_window (GTH_FILE_TOOL (self)); + viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); + viewer = gth_image_viewer_page_get_image_viewer (GTH_IMAGE_VIEWER_PAGE (viewer_page)); + + gth_image_viewer_set_zoom_change (GTH_IMAGE_VIEWER (viewer), self->priv->original_zoom_change); + gth_image_viewer_page_reset (GTH_IMAGE_VIEWER_PAGE (viewer_page)); +} + + +static void gth_file_tool_red_eye_finalize (GObject *object) { GthFileToolRedEye *self; @@ -496,6 +495,7 @@ file_tool_class = (GthFileToolClass *) class; file_tool_class->update_sensitivity = gth_file_tool_red_eye_update_sensitivity; file_tool_class->activate = gth_file_tool_red_eye_activate; + file_tool_class->cancel = gth_file_tool_red_eye_cancel; file_tool_class->get_options = gth_file_tool_red_eye_get_options; file_tool_class->destroy_options = gth_file_tool_red_eye_destroy_options; } diff -Nru gthumb-3.0.2/extensions/rename_series/Makefile.in gthumb-3.2.3/extensions/rename_series/Makefile.in --- gthumb-3.0.2/extensions/rename_series/Makefile.in 2012-08-20 19:54:17.000000000 +0000 +++ gthumb-3.2.3/extensions/rename_series/Makefile.in 2013-07-10 13:33:50.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/rename_series -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -148,13 +176,14 @@ am__v_CCLD_1 = SOURCES = $(librename_series_la_SOURCES) DIST_SOURCES = $(librename_series_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -163,9 +192,29 @@ DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -224,9 +273,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -240,13 +287,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -275,7 +321,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -291,11 +340,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -312,7 +365,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -342,7 +394,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -459,6 +514,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -493,6 +549,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + librename_series.la: $(librename_series_la_OBJECTS) $(librename_series_la_DEPENDENCIES) $(EXTRA_librename_series_la_DEPENDENCIES) $(AM_V_CCLD)$(librename_series_la_LINK) -rpath $(extensiondir) $(librename_series_la_OBJECTS) $(librename_series_la_LIBADD) $(LIBS) @@ -514,14 +571,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -605,14 +662,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -633,31 +689,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -673,12 +711,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -690,15 +723,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -707,9 +736,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -891,25 +921,23 @@ uninstall-am: uninstall-extensionLTLIBRARIES \ uninstall-extensioniniDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-extensionLTLIBRARIES \ - clean-generic clean-libtool cscopelist cscopelist-recursive \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extensionLTLIBRARIES \ - install-extensioniniDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-extensionLTLIBRARIES clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-extensionLTLIBRARIES install-extensioniniDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA diff -Nru gthumb-3.0.2/extensions/rename_series/data/Makefile.in gthumb-3.2.3/extensions/rename_series/data/Makefile.in --- gthumb-3.0.2/extensions/rename_series/data/Makefile.in 2012-08-20 19:54:17.000000000 +0000 +++ gthumb-3.2.3/extensions/rename_series/data/Makefile.in 2013-07-10 13:33:50.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/rename_series/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/rename_series/data/ui/Makefile.in gthumb-3.2.3/extensions/rename_series/data/ui/Makefile.in --- gthumb-3.0.2/extensions/rename_series/data/ui/Makefile.in 2012-08-20 19:54:17.000000000 +0000 +++ gthumb-3.2.3/extensions/rename_series/data/ui/Makefile.in 2013-07-10 13:33:50.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/rename_series/data/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -381,11 +415,9 @@ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -526,16 +558,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-uiDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-uiDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/rename_series/dlg-rename-series.c gthumb-3.2.3/extensions/rename_series/dlg-rename-series.c --- gthumb-3.0.2/extensions/rename_series/dlg-rename-series.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/rename_series/dlg-rename-series.c 2013-04-30 16:56:12.000000000 +0000 @@ -361,24 +361,30 @@ GList *scan; GError *error = NULL; - if (data->first_update && (data->file_data_list->next == NULL)) { - GthFileData *file_data = data->file_data_list->data; - const char *edit_name; - const char *end_pos; - - g_signal_handlers_block_by_func (GET_WIDGET ("template_entry"), update_preview_cb, data); - gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("template_entry")), g_file_info_get_attribute_string (file_data->info, G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME)); - g_signal_handlers_unblock_by_func (GET_WIDGET ("template_entry"), update_preview_cb, data); - - gtk_widget_grab_focus (GET_WIDGET ("template_entry")); - - edit_name = gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("template_entry"))); - end_pos = g_utf8_strrchr (edit_name, -1, '.'); - if (end_pos != NULL) { - glong nchars; - - nchars = g_utf8_strlen (edit_name, (gssize) (end_pos - edit_name)); - gtk_editable_select_region (GTK_EDITABLE (GET_WIDGET ("template_entry")), 0, nchars); + if (data->first_update) { + if (data->file_data_list->next == NULL) { + GthFileData *file_data = data->file_data_list->data; + const char *edit_name; + const char *end_pos; + + g_signal_handlers_block_by_func (GET_WIDGET ("template_entry"), update_preview_cb, data); + gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("template_entry")), g_file_info_get_attribute_string (file_data->info, G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME)); + g_signal_handlers_unblock_by_func (GET_WIDGET ("template_entry"), update_preview_cb, data); + + gtk_widget_grab_focus (GET_WIDGET ("template_entry")); + + edit_name = gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("template_entry"))); + end_pos = g_utf8_strrchr (edit_name, -1, '.'); + if (end_pos != NULL) { + glong nchars; + + nchars = g_utf8_strlen (edit_name, (gssize) (end_pos - edit_name)); + gtk_editable_select_region (GTK_EDITABLE (GET_WIDGET ("template_entry")), 0, nchars); + } + } + else { + gtk_widget_grab_focus (GET_WIDGET ("template_entry")); + gtk_editable_select_region (GTK_EDITABLE (GET_WIDGET ("template_entry")), 0, -1); } } diff -Nru gthumb-3.0.2/extensions/resize_images/Makefile.in gthumb-3.2.3/extensions/resize_images/Makefile.in --- gthumb-3.0.2/extensions/resize_images/Makefile.in 2012-08-20 19:54:17.000000000 +0000 +++ gthumb-3.2.3/extensions/resize_images/Makefile.in 2013-07-10 13:33:50.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/resize_images -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -146,13 +174,14 @@ am__v_CCLD_1 = SOURCES = $(libresize_images_la_SOURCES) DIST_SOURCES = $(libresize_images_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -161,9 +190,29 @@ DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -222,9 +271,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -238,13 +285,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -273,7 +319,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -289,11 +338,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -310,7 +363,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -340,7 +392,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -453,6 +508,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -487,6 +543,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libresize_images.la: $(libresize_images_la_OBJECTS) $(libresize_images_la_DEPENDENCIES) $(EXTRA_libresize_images_la_DEPENDENCIES) $(AM_V_CCLD)$(libresize_images_la_LINK) -rpath $(extensiondir) $(libresize_images_la_OBJECTS) $(libresize_images_la_LIBADD) $(LIBS) @@ -506,14 +563,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -583,14 +640,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -611,31 +667,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -651,12 +689,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -668,15 +701,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -685,9 +714,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -869,25 +899,23 @@ uninstall-am: uninstall-extensionLTLIBRARIES \ uninstall-extensioniniDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-extensionLTLIBRARIES \ - clean-generic clean-libtool cscopelist cscopelist-recursive \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extensionLTLIBRARIES \ - install-extensioniniDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-extensionLTLIBRARIES clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-extensionLTLIBRARIES install-extensioniniDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA diff -Nru gthumb-3.0.2/extensions/resize_images/data/Makefile.in gthumb-3.2.3/extensions/resize_images/data/Makefile.in --- gthumb-3.0.2/extensions/resize_images/data/Makefile.in 2012-08-20 19:54:17.000000000 +0000 +++ gthumb-3.2.3/extensions/resize_images/data/Makefile.in 2013-07-10 13:33:50.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/resize_images/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/resize_images/data/ui/Makefile.in gthumb-3.2.3/extensions/resize_images/data/ui/Makefile.in --- gthumb-3.0.2/extensions/resize_images/data/ui/Makefile.in 2012-08-20 19:54:17.000000000 +0000 +++ gthumb-3.2.3/extensions/resize_images/data/ui/Makefile.in 2013-07-10 13:33:50.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/resize_images/data/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -381,11 +415,9 @@ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -526,16 +558,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-uiDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-uiDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/resize_images/dlg-resize-images.c gthumb-3.2.3/extensions/resize_images/dlg-resize-images.c --- gthumb-3.0.2/extensions/resize_images/dlg-resize-images.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/resize_images/dlg-resize-images.c 2013-04-30 17:01:04.000000000 +0000 @@ -84,16 +84,21 @@ } -static void -resize_step (GthPixbufTask *pixbuf_task) +static gpointer +exec_resize (GthAsyncTask *task, + gpointer user_data) { - ResizeData *resize_data = pixbuf_task->data; - int w, h; - int new_w, new_h; - int max_w, max_h; - - w = gdk_pixbuf_get_width (pixbuf_task->src); - h = gdk_pixbuf_get_height (pixbuf_task->src); + ResizeData *resize_data = user_data; + cairo_surface_t *source; + cairo_surface_t *destination; + int w, h; + int new_w, new_h; + int max_w, max_h; + GthImage *destination_image; + + source = gth_image_get_cairo_surface (gth_image_task_get_source (GTH_IMAGE_TASK (task))); + w = cairo_image_surface_get_width (source); + h = cairo_image_surface_get_height (source); if (resize_data->allow_swap && (((h > w) && (resize_data->width > resize_data->height)) @@ -121,11 +126,18 @@ new_h = max_h; } - _g_object_unref (pixbuf_task->dest); if ((new_w > 1) && (new_h > 1)) - pixbuf_task->dest = _gdk_pixbuf_scale_simple_safe (pixbuf_task->src, new_w, new_h, GDK_INTERP_BILINEAR); + destination = _cairo_image_surface_scale (source, new_w, new_h, SCALE_FILTER_BEST, task); else - pixbuf_task->dest = NULL; + destination = NULL; + destination_image = gth_image_new_for_surface (destination); + gth_image_task_set_destination (GTH_IMAGE_TASK (task), destination_image); + + _g_object_unref (destination_image); + cairo_surface_destroy (destination); + cairo_surface_destroy (source); + + return NULL; } @@ -165,23 +177,22 @@ g_settings_set_boolean (data->settings, PREF_RESIZE_IMAGES_KEEP_RATIO, resize_data->keep_aspect_ratio); g_settings_set_string (data->settings, PREF_RESIZE_IMAGES_MIME_TYPE, mime_type ? mime_type : ""); - resize_task = gth_pixbuf_task_new (_("Resizing images"), - TRUE, - NULL, - resize_step, - NULL, - resize_data, - g_free); - list_task = gth_pixbuf_list_task_new (data->browser, - data->file_list, - GTH_PIXBUF_TASK (resize_task)); - gth_pixbuf_list_task_set_overwrite_mode (GTH_PIXBUF_LIST_TASK (list_task), GTH_OVERWRITE_ASK); - gth_pixbuf_list_task_set_output_mime_type (GTH_PIXBUF_LIST_TASK (list_task), mime_type); + resize_task = gth_image_task_new (_("Resizing images"), + NULL, + exec_resize, + NULL, + resize_data, + g_free); + list_task = gth_image_list_task_new (data->browser, + data->file_list, + GTH_IMAGE_TASK (resize_task)); + gth_image_list_task_set_overwrite_mode (GTH_IMAGE_LIST_TASK (list_task), GTH_OVERWRITE_ASK); + gth_image_list_task_set_output_mime_type (GTH_IMAGE_LIST_TASK (list_task), mime_type); if (data->use_destination) { GFile *destination; destination = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (GET_WIDGET ("destination_filechooserbutton"))); - gth_pixbuf_list_task_set_destination (GTH_PIXBUF_LIST_TASK (list_task), destination); + gth_image_list_task_set_destination (GTH_IMAGE_LIST_TASK (list_task), destination); g_object_unref (destination); } @@ -344,9 +355,9 @@ /* Set widgets data. */ first_file_data = (GthFileData *) data->file_list->data; - gtk_file_chooser_set_file (GTK_FILE_CHOOSER (GET_WIDGET ("destination_filechooserbutton")), - first_file_data->file, - NULL); + _gtk_file_chooser_set_file_parent (GTK_FILE_CHOOSER (GET_WIDGET ("destination_filechooserbutton")), + first_file_data->file, + NULL); unit = g_settings_get_enum (data->settings, PREF_RESIZE_IMAGES_UNIT); gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("unit_combobox")), unit); @@ -396,7 +407,7 @@ gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("height_spinbutton")), data->latest_height_in_pixel); } - savers = gth_main_get_type_set ("pixbuf-saver"); + savers = gth_main_get_type_set ("image-saver"); if (savers != NULL) { GtkListStore *list_store; GtkTreeIter iter; @@ -418,13 +429,13 @@ for (i = 0; i < savers->len; i++) { GType saver_type; - GthPixbufSaver *saver; + GthImageSaver *saver; const char *mime_type; GdkPixbuf *pixbuf; saver_type = g_array_index (savers, GType, i); saver = g_object_new (saver_type, NULL); - mime_type = gth_pixbuf_saver_get_mime_type (saver); + mime_type = gth_image_saver_get_mime_type (saver); pixbuf = gth_icon_cache_get_pixbuf (icon_cache, g_content_type_get_icon (mime_type)); gtk_list_store_append (list_store, &iter); gtk_list_store_set (list_store, &iter, diff -Nru gthumb-3.0.2/extensions/search/Makefile.in gthumb-3.2.3/extensions/search/Makefile.in --- gthumb-3.0.2/extensions/search/Makefile.in 2012-08-20 19:54:17.000000000 +0000 +++ gthumb-3.2.3/extensions/search/Makefile.in 2013-07-10 13:33:50.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/search -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -146,13 +174,14 @@ am__v_CCLD_1 = SOURCES = $(libsearch_la_SOURCES) DIST_SOURCES = $(libsearch_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -161,9 +190,29 @@ DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -222,9 +271,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -238,13 +285,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -273,7 +319,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -289,11 +338,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -310,7 +363,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -340,7 +392,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -458,6 +513,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -492,6 +548,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libsearch.la: $(libsearch_la_OBJECTS) $(libsearch_la_DEPENDENCIES) $(EXTRA_libsearch_la_DEPENDENCIES) $(AM_V_CCLD)$(libsearch_la_LINK) -rpath $(extensiondir) $(libsearch_la_OBJECTS) $(libsearch_la_LIBADD) $(LIBS) @@ -514,14 +571,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -612,14 +669,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -640,31 +696,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -680,12 +718,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -697,15 +730,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -714,9 +743,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -898,25 +928,23 @@ uninstall-am: uninstall-extensionLTLIBRARIES \ uninstall-extensioniniDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-extensionLTLIBRARIES \ - clean-generic clean-libtool cscopelist cscopelist-recursive \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extensionLTLIBRARIES \ - install-extensioniniDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-extensionLTLIBRARIES clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-extensionLTLIBRARIES install-extensioniniDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA diff -Nru gthumb-3.0.2/extensions/search/actions.c gthumb-3.2.3/extensions/search/actions.c --- gthumb-3.0.2/extensions/search/actions.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/search/actions.c 2013-04-30 16:56:12.000000000 +0000 @@ -149,11 +149,11 @@ search_data->file = g_file_dup (location); file = gth_main_get_gio_file (location); - g_load_file_async (file, - G_PRIORITY_DEFAULT, - NULL, - search_update_buffer_ready_cb, - search_data); + _g_file_load_async (file, + G_PRIORITY_DEFAULT, + NULL, + search_update_buffer_ready_cb, + search_data); g_object_unref (file); } diff -Nru gthumb-3.0.2/extensions/search/data/Makefile.in gthumb-3.2.3/extensions/search/data/Makefile.in --- gthumb-3.0.2/extensions/search/data/Makefile.in 2012-08-20 19:54:17.000000000 +0000 +++ gthumb-3.2.3/extensions/search/data/Makefile.in 2013-07-10 13:33:50.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/search/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/search/data/ui/Makefile.in gthumb-3.2.3/extensions/search/data/ui/Makefile.in --- gthumb-3.0.2/extensions/search/data/ui/Makefile.in 2012-08-20 19:54:17.000000000 +0000 +++ gthumb-3.2.3/extensions/search/data/ui/Makefile.in 2013-07-10 13:33:50.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/search/data/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -381,11 +415,9 @@ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -526,16 +558,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-uiDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-uiDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/search/gth-search-task.c gthumb-3.2.3/extensions/search/gth-search-task.c --- gthumb-3.0.2/extensions/search/gth-search-task.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/search/gth-search-task.c 2013-04-30 16:56:12.000000000 +0000 @@ -157,14 +157,14 @@ data = dom_document_dump (doc, &size); search_result_real_file = gth_catalog_file_to_gio_file (task->priv->search_catalog); - g_write_file_async (search_result_real_file, - data, - size, - TRUE, - G_PRIORITY_DEFAULT, - gth_task_get_cancellable (GTH_TASK (task)), - save_search_result_copy_done_cb, - task); + _g_file_write_async (search_result_real_file, + data, + size, + TRUE, + G_PRIORITY_DEFAULT, + gth_task_get_cancellable (GTH_TASK (task)), + save_search_result_copy_done_cb, + task); g_object_unref (search_result_real_file); g_object_unref (doc); @@ -395,14 +395,14 @@ data = dom_document_dump (doc, &size); search_result_real_file = gth_catalog_file_to_gio_file (task->priv->search_catalog); - g_write_file_async (search_result_real_file, - data, - size, - TRUE, - G_PRIORITY_DEFAULT, - gth_task_get_cancellable (GTH_TASK (task)), - clear_search_result_copy_done_cb, - task); + _g_file_write_async (search_result_real_file, + data, + size, + TRUE, + G_PRIORITY_DEFAULT, + gth_task_get_cancellable (GTH_TASK (task)), + clear_search_result_copy_done_cb, + task); g_object_unref (search_result_real_file); g_object_unref (doc); diff -Nru gthumb-3.0.2/extensions/selections/Makefile.in gthumb-3.2.3/extensions/selections/Makefile.in --- gthumb-3.0.2/extensions/selections/Makefile.in 2012-08-20 19:54:17.000000000 +0000 +++ gthumb-3.2.3/extensions/selections/Makefile.in 2013-07-10 13:33:50.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/selections -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -154,6 +182,23 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(extensionini_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -186,9 +231,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -202,13 +245,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -237,7 +279,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -253,11 +298,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -274,7 +323,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -304,7 +352,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -419,6 +470,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -453,6 +505,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libselections.la: $(libselections_la_OBJECTS) $(libselections_la_DEPENDENCIES) $(EXTRA_libselections_la_DEPENDENCIES) $(AM_V_CCLD)$(libselections_la_LINK) -rpath $(extensiondir) $(libselections_la_OBJECTS) $(libselections_la_LIBADD) $(LIBS) @@ -474,14 +527,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -559,26 +612,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(extensioninidir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -590,15 +632,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -607,9 +645,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -767,21 +806,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ clean-extensionLTLIBRARIES clean-generic clean-libtool \ - cscopelist ctags distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-extensionLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-extensionLTLIBRARIES \ install-extensioniniDATA install-html install-html-am \ install-info install-info-am install-man install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-extensionLTLIBRARIES \ - uninstall-extensioniniDATA + tags tags-am uninstall uninstall-am \ + uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA @GTHUMB_EXTENSION_IN_RULE@ diff -Nru gthumb-3.0.2/extensions/selections/actions.c gthumb-3.2.3/extensions/selections/actions.c --- gthumb-3.0.2/extensions/selections/actions.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/selections/actions.c 2013-04-30 16:56:12.000000000 +0000 @@ -34,10 +34,18 @@ uri = g_strdup_printf ("selection:///%d", n_selection); location = g_file_new_for_uri (uri); - gth_browser_load_location (browser, location); - g_free (uri); + if (_g_file_equal_uris (location, gth_browser_get_location (browser))) { + if (! gth_browser_restore_state (browser)) + gth_browser_load_location (browser, location); + } + else { + gth_browser_save_state (browser); + gth_browser_load_location (browser, location); + } + g_object_unref (location); + g_free (uri); } diff -Nru gthumb-3.0.2/extensions/selections/gth-file-source-selections.c gthumb-3.2.3/extensions/selections/gth-file-source-selections.c --- gthumb-3.0.2/extensions/selections/gth-file-source-selections.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/selections/gth-file-source-selections.c 2013-04-30 16:56:12.000000000 +0000 @@ -229,7 +229,7 @@ gth_file_source_selections_can_cut (GthFileSource *file_source, GFile *file) { - return FALSE; + return g_file_has_uri_scheme (file, "selection"); } diff -Nru gthumb-3.0.2/extensions/selections/gth-selections-manager.c gthumb-3.2.3/extensions/selections/gth-selections-manager.c --- gthumb-3.0.2/extensions/selections/gth-selections-manager.c 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/selections/gth-selections-manager.c 2013-04-30 16:56:12.000000000 +0000 @@ -32,7 +32,7 @@ GHashTable *files_hash[GTH_SELECTIONS_MANAGER_N_SELECTIONS]; char *order[GTH_SELECTIONS_MANAGER_N_SELECTIONS]; gboolean order_inverse[GTH_SELECTIONS_MANAGER_N_SELECTIONS]; - GMutex *mutex; + GMutex mutex; }; @@ -75,7 +75,7 @@ g_hash_table_unref (self->priv->files_hash[i]); g_free (self->priv->order[i]); } - g_mutex_free (self->priv->mutex); + g_mutex_clear (&self->priv->mutex); G_OBJECT_CLASS (gth_selections_manager_parent_class)->finalize (object); } @@ -99,7 +99,7 @@ int i; self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_SELECTIONS_MANAGER, GthSelectionsManagerPrivate); - self->priv->mutex = g_mutex_new (); + g_mutex_init (&self->priv->mutex); for (i = 0; i < GTH_SELECTIONS_MANAGER_N_SELECTIONS; i++) { self->priv->files[i] = NULL; self->priv->files_hash[i] = g_hash_table_new (g_file_hash, (GEqualFunc) g_file_equal); @@ -319,7 +319,7 @@ self = gth_selections_manager_get_default (); n_selection = _g_file_get_n_selection (folder); - g_mutex_lock (self->priv->mutex); + g_mutex_lock (&self->priv->mutex); data = g_new0 (ForEachChildData, 1); data->selections_manager = self; if (n_selection > 0) @@ -330,7 +330,7 @@ data->for_each_file_func = for_each_file_func; data->ready_callback = ready_callback; data->user_data = user_data; - g_mutex_unlock (self->priv->mutex); + g_mutex_unlock (&self->priv->mutex); if (n_selection == 0) { call_when_idle (_gth_selections_manager_for_each_selection, data); @@ -367,7 +367,7 @@ if (n_selection <= 0) return FALSE; - g_mutex_lock (self->priv->mutex); + g_mutex_lock (&self->priv->mutex); new_list = _g_file_list_dup (file_list); @@ -397,7 +397,7 @@ file_list, GTH_MONITOR_EVENT_CREATED); - g_mutex_unlock (self->priv->mutex); + g_mutex_unlock (&self->priv->mutex); return TRUE; } @@ -418,7 +418,7 @@ if (n_selection <= 0) return; - g_mutex_lock (self->priv->mutex); + g_mutex_lock (&self->priv->mutex); files_to_remove = g_hash_table_new (g_file_hash, (GEqualFunc) g_file_equal); for (scan = file_list; scan; scan = scan->next) { @@ -448,7 +448,7 @@ GTH_MONITOR_EVENT_REMOVED); gth_monitor_emblems_changed (gth_main_get_default_monitor (), file_list); - g_mutex_unlock (self->priv->mutex); + g_mutex_unlock (&self->priv->mutex); } @@ -471,7 +471,7 @@ /* reorder the file list */ - g_mutex_lock (self->priv->mutex); + g_mutex_lock (&self->priv->mutex); _g_list_reorder (self->priv->files[n_selection - 1], visible_files, files_to_move, @@ -480,7 +480,7 @@ &new_file_list); _g_object_list_unref (self->priv->files[n_selection - 1]); self->priv->files[n_selection - 1] = new_file_list; - g_mutex_unlock (self->priv->mutex); + g_mutex_unlock (&self->priv->mutex); gth_selections_manager_set_sort_type (folder, "general::unsorted", FALSE); @@ -505,13 +505,13 @@ return; self = gth_selections_manager_get_default (); - g_mutex_lock (self->priv->mutex); + g_mutex_lock (&self->priv->mutex); g_free (self->priv->order[n_selection - 1]); self->priv->order[n_selection - 1] = g_strdup (sort_type); self->priv->order_inverse[n_selection - 1] = sort_inverse; - g_mutex_unlock (self->priv->mutex); + g_mutex_unlock (&self->priv->mutex); } @@ -526,11 +526,11 @@ return FALSE; self = gth_selections_manager_get_default (); - g_mutex_lock (self->priv->mutex); + g_mutex_lock (&self->priv->mutex); result = (g_hash_table_lookup (self->priv->files_hash[n_selection - 1], file) != NULL); - g_mutex_unlock (self->priv->mutex); + g_mutex_unlock (&self->priv->mutex); return result; } diff -Nru gthumb-3.0.2/extensions/slideshow/Makefile.in gthumb-3.2.3/extensions/slideshow/Makefile.in --- gthumb-3.0.2/extensions/slideshow/Makefile.in 2012-08-20 19:54:18.000000000 +0000 +++ gthumb-3.2.3/extensions/slideshow/Makefile.in 2013-07-10 13:33:50.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,17 +81,17 @@ host_triplet = @host@ @ENABLE_GSTREAMER_TRUE@am__append_1 = ../gstreamer_utils/libgstreamer_utils.la subdir = extensions/slideshow -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -148,13 +176,14 @@ am__v_CCLD_1 = SOURCES = $(libslideshow_la_SOURCES) DIST_SOURCES = $(libslideshow_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -163,9 +192,29 @@ DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -224,9 +273,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -240,13 +287,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -275,7 +321,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -291,11 +340,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -312,7 +365,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -342,7 +394,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -461,6 +516,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -495,6 +551,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libslideshow.la: $(libslideshow_la_OBJECTS) $(libslideshow_la_DEPENDENCIES) $(EXTRA_libslideshow_la_DEPENDENCIES) $(AM_V_CCLD)$(libslideshow_la_LINK) -rpath $(extensiondir) $(libslideshow_la_OBJECTS) $(libslideshow_la_LIBADD) $(LIBS) @@ -517,14 +574,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -615,14 +672,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -643,31 +699,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -683,12 +721,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -700,15 +733,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -717,9 +746,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -901,25 +931,23 @@ uninstall-am: uninstall-extensionLTLIBRARIES \ uninstall-extensioniniDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-extensionLTLIBRARIES \ - clean-generic clean-libtool cscopelist cscopelist-recursive \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extensionLTLIBRARIES \ - install-extensioniniDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-extensionLTLIBRARIES clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-extensionLTLIBRARIES install-extensioniniDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA diff -Nru gthumb-3.0.2/extensions/slideshow/data/Makefile.in gthumb-3.2.3/extensions/slideshow/data/Makefile.in --- gthumb-3.0.2/extensions/slideshow/data/Makefile.in 2012-08-20 19:54:18.000000000 +0000 +++ gthumb-3.2.3/extensions/slideshow/data/Makefile.in 2013-07-10 13:33:50.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/slideshow/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/slideshow/data/ui/Makefile.in gthumb-3.2.3/extensions/slideshow/data/ui/Makefile.in --- gthumb-3.0.2/extensions/slideshow/data/ui/Makefile.in 2012-08-20 19:54:18.000000000 +0000 +++ gthumb-3.2.3/extensions/slideshow/data/ui/Makefile.in 2013-07-10 13:33:50.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/slideshow/data/ui -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(uidir)" DATA = $(ui_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -381,11 +415,9 @@ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -526,16 +558,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-uiDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-uiDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/slideshow/gth-slideshow.c gthumb-3.2.3/extensions/slideshow/gth-slideshow.c --- gthumb-3.0.2/extensions/slideshow/gth-slideshow.c 2012-08-14 16:26:33.000000000 +0000 +++ gthumb-3.2.3/extensions/slideshow/gth-slideshow.c 2013-07-03 09:08:00.000000000 +0000 @@ -36,6 +36,7 @@ #define HIDE_CURSOR_DELAY 1 #define HIDE_PAUSED_SIGN_DELAY 1 #define DEFAULT_DELAY 2000 +#define _GST_PLAY_FLAG_AUDIO (1 << 1) G_DEFINE_TYPE (GthSlideshow, gth_slideshow, GTK_TYPE_WINDOW) @@ -99,6 +100,7 @@ browser = self->priv->browser; close_browser = ! gtk_widget_get_visible (GTK_WIDGET (browser)); + self->priv->projector->show_cursor (self); self->priv->projector->finalize (self); gtk_widget_destroy (GTK_WIDGET (self)); @@ -226,7 +228,9 @@ view_next_image_automatically (GthSlideshow *self) { if (self->priv->automatic && ! self->priv->paused) - gth_screensaver_inhibit (self->priv->screensaver, GTK_WIDGET (self), _("Playing slideshow")); + gth_screensaver_inhibit (self->priv->screensaver, + GTK_WINDOW (self), + _("Playing slideshow")); else gth_screensaver_uninhibit (self->priv->screensaver); @@ -351,25 +355,36 @@ #if HAVE_GSTREAMER -static void -bus_message_cb (GstBus *bus, - GstMessage *message, - gpointer user_data) + + +static gboolean +player_done_cb (gpointer user_data) { GthSlideshow *self = user_data; - if (GST_MESSAGE_TYPE (message) == GST_MESSAGE_EOS) { - self->priv->current_audio_file++; - if ((self->priv->audio_files[self->priv->current_audio_file] == NULL) - && self->priv->audio_loop) - { - self->priv->current_audio_file = 0; - } - gst_element_set_state (self->priv->playbin, GST_STATE_NULL); - g_object_set (G_OBJECT (self->priv->playbin), "uri", self->priv->audio_files[self->priv->current_audio_file], NULL); - gst_element_set_state (self->priv->playbin, GST_STATE_PLAYING); + self->priv->current_audio_file++; + if ((self->priv->audio_files[self->priv->current_audio_file] == NULL) + && self->priv->audio_loop) + { + self->priv->current_audio_file = 0; } + gst_element_set_state (self->priv->playbin, GST_STATE_READY); + g_object_set (G_OBJECT (self->priv->playbin), "uri", self->priv->audio_files[self->priv->current_audio_file], NULL); + gst_element_set_state (self->priv->playbin, GST_STATE_PLAYING); + + return FALSE; } + + +static void +pipeline_eos_cb (GstBus *bus, + GstMessage *message, + gpointer user_data) +{ + g_idle_add (player_done_cb, user_data); +} + + #endif @@ -392,12 +407,17 @@ GstBus *bus; self->priv->playbin = gst_element_factory_make ("playbin", "playbin"); + g_object_set (self->priv->playbin, + "audio-sink", gst_element_factory_make ("gsettingsaudiosink", "audiosink"), + "flags", _GST_PLAY_FLAG_AUDIO, + "volume", 1.0, + NULL); bus = gst_pipeline_get_bus (GST_PIPELINE (self->priv->playbin)); gst_bus_add_signal_watch (bus); - g_signal_connect (bus, "message", G_CALLBACK (bus_message_cb), self); + g_signal_connect (bus, "message::eos", G_CALLBACK (pipeline_eos_cb), self); } else - gst_element_set_state (self->priv->playbin, GST_STATE_NULL); + gst_element_set_state (self->priv->playbin, GST_STATE_READY); g_object_set (G_OBJECT (self->priv->playbin), "uri", self->priv->audio_files[self->priv->current_audio_file], NULL); gst_element_set_state (self->priv->playbin, GST_STATE_PLAYING); } @@ -569,6 +589,13 @@ static void +default_projector_show_cursor (GthSlideshow *self) +{ + gth_image_viewer_show_cursor (GTH_IMAGE_VIEWER (self->priv->viewer)); +} + + +static void default_projector_hide_cursor (GthSlideshow *self) { gth_image_viewer_hide_cursor (GTH_IMAGE_VIEWER (self->priv->viewer)); @@ -720,6 +747,7 @@ GthProjector default_projector = { default_projector_construct, default_projector_paused, + default_projector_show_cursor, default_projector_hide_cursor, default_projector_finalize, default_projector_image_ready, @@ -964,6 +992,13 @@ static void +clutter_projector_show_cursor (GthSlideshow *self) +{ + clutter_stage_show_cursor (CLUTTER_STAGE (self->stage)); +} + + +static void clutter_projector_hide_cursor (GthSlideshow *self) { clutter_stage_hide_cursor (CLUTTER_STAGE (self->stage)); @@ -1197,6 +1232,7 @@ GthProjector clutter_projector = { clutter_projector_construct, clutter_projector_paused, + clutter_projector_show_cursor, clutter_projector_hide_cursor, clutter_projector_finalize, clutter_projector_image_ready, diff -Nru gthumb-3.0.2/extensions/slideshow/gth-slideshow.h gthumb-3.2.3/extensions/slideshow/gth-slideshow.h --- gthumb-3.0.2/extensions/slideshow/gth-slideshow.h 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/slideshow/gth-slideshow.h 2013-07-03 09:06:40.000000000 +0000 @@ -63,6 +63,7 @@ typedef struct { void (* construct) (GthSlideshow *self); void (* paused) (GthSlideshow *self); + void (* show_cursor) (GthSlideshow *self); void (* hide_cursor) (GthSlideshow *self); void (* finalize) (GthSlideshow *self); void (* image_ready) (GthSlideshow *self, diff -Nru gthumb-3.0.2/extensions/webalbums/Makefile.in gthumb-3.2.3/extensions/webalbums/Makefile.in --- gthumb-3.0.2/extensions/webalbums/Makefile.in 2012-08-20 19:54:18.000000000 +0000 +++ gthumb-3.2.3/extensions/webalbums/Makefile.in 2013-07-10 13:33:51.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,17 +81,17 @@ host_triplet = @host@ @ENABLE_JPEG_TOOLS_TRUE@@ENABLE_WEB_ALBUMS_TRUE@am__append_1 = ../image_rotation/libimage_rotation.la subdir = extensions/webalbums -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -157,13 +185,14 @@ am__v_CCLD_1 = SOURCES = $(libwebalbums_la_SOURCES) DIST_SOURCES = $(am__libwebalbums_la_SOURCES_DIST) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -172,9 +201,29 @@ DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = data @@ -233,9 +282,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -249,13 +296,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -284,7 +330,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -300,11 +349,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -321,7 +374,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -351,7 +403,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -484,6 +539,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ @@ -518,6 +574,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libwebalbums.la: $(libwebalbums_la_OBJECTS) $(libwebalbums_la_DEPENDENCIES) $(EXTRA_libwebalbums_la_DEPENDENCIES) $(AM_V_CCLD)$(libwebalbums_la_LINK) $(am_libwebalbums_la_rpath) $(libwebalbums_la_OBJECTS) $(libwebalbums_la_LIBADD) $(LIBS) @@ -540,14 +597,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -638,14 +695,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -666,31 +722,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -706,12 +744,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -723,15 +756,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -740,9 +769,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -928,25 +958,24 @@ uninstall-am: uninstall-extensionLTLIBRARIES \ uninstall-extensioniniDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ - cscopelist-recursive ctags-recursive install install-am \ - install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-extensionLTLIBRARIES \ - clean-generic clean-libtool cscopelist cscopelist-recursive \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extensionLTLIBRARIES \ - install-extensioniniDATA install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +.MAKE: $(am__recursive_targets) all check install install-am \ + install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-extensionLTLIBRARIES clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-extensionLTLIBRARIES install-extensioniniDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA diff -Nru gthumb-3.0.2/extensions/webalbums/albumtheme-lex.c gthumb-3.2.3/extensions/webalbums/albumtheme-lex.c --- gthumb-3.0.2/extensions/webalbums/albumtheme-lex.c 2012-08-20 20:11:29.000000000 +0000 +++ gthumb-3.2.3/extensions/webalbums/albumtheme-lex.c 2013-06-18 17:53:40.000000000 +0000 @@ -681,8 +681,8 @@ #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *gth_albumtheme_yytext; -#line 1 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" -#line 2 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 1 "../../../extensions/webalbums/albumtheme.l" +#line 2 "../../../extensions/webalbums/albumtheme.l" /* * GThumb * @@ -904,7 +904,7 @@ register char *yy_cp, *yy_bp; register int yy_act; -#line 47 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 47 "../../../extensions/webalbums/albumtheme.l" #line 911 "albumtheme-lex.c" @@ -992,7 +992,7 @@ case 1: YY_RULE_SETUP -#line 49 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 49 "../../../extensions/webalbums/albumtheme.l" { BEGIN (CONDITION); return IF; @@ -1000,7 +1000,7 @@ YY_BREAK case 2: YY_RULE_SETUP -#line 53 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 53 "../../../extensions/webalbums/albumtheme.l" { BEGIN (CONDITION); return ELSE_IF; @@ -1008,7 +1008,7 @@ YY_BREAK case 3: YY_RULE_SETUP -#line 57 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 57 "../../../extensions/webalbums/albumtheme.l" { BEGIN (ATTRIBUTES); return ELSE; @@ -1016,7 +1016,7 @@ YY_BREAK case 4: YY_RULE_SETUP -#line 61 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 61 "../../../extensions/webalbums/albumtheme.l" { BEGIN (ATTRIBUTES); return END; @@ -1024,7 +1024,7 @@ YY_BREAK case 5: YY_RULE_SETUP -#line 65 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 65 "../../../extensions/webalbums/albumtheme.l" { BEGIN (ATTRIBUTES); return SET_VAR; @@ -1032,7 +1032,7 @@ YY_BREAK case 6: YY_RULE_SETUP -#line 69 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 69 "../../../extensions/webalbums/albumtheme.l" { BEGIN (CONDITION); yylval.ivalue = GTH_TAG_FOR_EACH_IN_RANGE; @@ -1041,7 +1041,7 @@ YY_BREAK case 7: YY_RULE_SETUP -#line 74 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 74 "../../../extensions/webalbums/albumtheme.l" { BEGIN (FUNCTION); return PRINT; @@ -1049,7 +1049,7 @@ YY_BREAK case 8: YY_RULE_SETUP -#line 78 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 78 "../../../extensions/webalbums/albumtheme.l" { if (g_str_equal (gth_albumtheme_yytext, "eval") || g_str_equal (gth_albumtheme_yytext, "translate")) BEGIN (CONDITION); @@ -1061,7 +1061,7 @@ YY_BREAK case 9: YY_RULE_SETUP -#line 86 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 86 "../../../extensions/webalbums/albumtheme.l" { before_string = YY_START; BEGIN (STRING); @@ -1070,7 +1070,7 @@ YY_BREAK case 10: YY_RULE_SETUP -#line 91 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 91 "../../../extensions/webalbums/albumtheme.l" { BEGIN (before_string); return '\''; @@ -1079,7 +1079,7 @@ case 11: /* rule 11 can match eol */ YY_RULE_SETUP -#line 95 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 95 "../../../extensions/webalbums/albumtheme.l" { yylval.text = g_strdup (gth_albumtheme_yytext); return QUOTED_STRING; @@ -1087,7 +1087,7 @@ YY_BREAK case 12: YY_RULE_SETUP -#line 99 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 99 "../../../extensions/webalbums/albumtheme.l" { BEGIN (QUOTE); return '"'; @@ -1095,7 +1095,7 @@ YY_BREAK case 13: YY_RULE_SETUP -#line 103 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 103 "../../../extensions/webalbums/albumtheme.l" { BEGIN (ATTRIBUTES); return '"'; @@ -1103,7 +1103,7 @@ YY_BREAK case 14: YY_RULE_SETUP -#line 107 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 107 "../../../extensions/webalbums/albumtheme.l" { BEGIN (INITIAL); return END_TAG; @@ -1111,7 +1111,7 @@ YY_BREAK case 15: YY_RULE_SETUP -#line 111 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 111 "../../../extensions/webalbums/albumtheme.l" { yylval.text = g_strdup (gth_albumtheme_yytext); return ATTRIBUTE_NAME; @@ -1119,21 +1119,21 @@ YY_BREAK case 16: YY_RULE_SETUP -#line 115 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 115 "../../../extensions/webalbums/albumtheme.l" { return '='; } YY_BREAK case 17: YY_RULE_SETUP -#line 118 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 118 "../../../extensions/webalbums/albumtheme.l" { return '='; } YY_BREAK case 18: YY_RULE_SETUP -#line 121 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 121 "../../../extensions/webalbums/albumtheme.l" { yylval.ivalue = GTH_OP_CMP_LT; return COMPARE; @@ -1141,7 +1141,7 @@ YY_BREAK case 19: YY_RULE_SETUP -#line 125 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 125 "../../../extensions/webalbums/albumtheme.l" { yylval.ivalue = GTH_OP_CMP_GT; return COMPARE; @@ -1149,63 +1149,63 @@ YY_BREAK case 20: YY_RULE_SETUP -#line 129 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 129 "../../../extensions/webalbums/albumtheme.l" { return '+'; } YY_BREAK case 21: YY_RULE_SETUP -#line 132 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 132 "../../../extensions/webalbums/albumtheme.l" { return '-'; } YY_BREAK case 22: YY_RULE_SETUP -#line 135 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 135 "../../../extensions/webalbums/albumtheme.l" { return '*'; } YY_BREAK case 23: YY_RULE_SETUP -#line 138 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 138 "../../../extensions/webalbums/albumtheme.l" { return '/'; } YY_BREAK case 24: YY_RULE_SETUP -#line 141 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 141 "../../../extensions/webalbums/albumtheme.l" { return '!'; } YY_BREAK case 25: YY_RULE_SETUP -#line 144 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 144 "../../../extensions/webalbums/albumtheme.l" { return '('; } YY_BREAK case 26: YY_RULE_SETUP -#line 147 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 147 "../../../extensions/webalbums/albumtheme.l" { return ')'; } YY_BREAK case 27: YY_RULE_SETUP -#line 150 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 150 "../../../extensions/webalbums/albumtheme.l" { return ','; } YY_BREAK case 28: YY_RULE_SETUP -#line 153 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 153 "../../../extensions/webalbums/albumtheme.l" { yylval.ivalue = GTH_OP_AND; return BOOL_OP; @@ -1213,7 +1213,7 @@ YY_BREAK case 29: YY_RULE_SETUP -#line 157 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 157 "../../../extensions/webalbums/albumtheme.l" { yylval.ivalue = GTH_OP_OR; return BOOL_OP; @@ -1221,7 +1221,7 @@ YY_BREAK case 30: YY_RULE_SETUP -#line 161 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 161 "../../../extensions/webalbums/albumtheme.l" { yylval.ivalue = GTH_OP_CMP_EQ; return COMPARE; @@ -1229,7 +1229,7 @@ YY_BREAK case 31: YY_RULE_SETUP -#line 165 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 165 "../../../extensions/webalbums/albumtheme.l" { yylval.ivalue = GTH_OP_CMP_NE; return COMPARE; @@ -1237,7 +1237,7 @@ YY_BREAK case 32: YY_RULE_SETUP -#line 169 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 169 "../../../extensions/webalbums/albumtheme.l" { yylval.ivalue = GTH_OP_CMP_LE; return COMPARE; @@ -1245,7 +1245,7 @@ YY_BREAK case 33: YY_RULE_SETUP -#line 173 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 173 "../../../extensions/webalbums/albumtheme.l" { yylval.ivalue = GTH_OP_CMP_GE; return COMPARE; @@ -1253,21 +1253,21 @@ YY_BREAK case 34: YY_RULE_SETUP -#line 177 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 177 "../../../extensions/webalbums/albumtheme.l" { return RANGE; } YY_BREAK case 35: YY_RULE_SETUP -#line 180 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 180 "../../../extensions/webalbums/albumtheme.l" { return IN; } YY_BREAK case 36: YY_RULE_SETUP -#line 183 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 183 "../../../extensions/webalbums/albumtheme.l" { yylval.ivalue = atoi (gth_albumtheme_yytext); return NUMBER; @@ -1275,7 +1275,7 @@ YY_BREAK case 37: YY_RULE_SETUP -#line 187 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 187 "../../../extensions/webalbums/albumtheme.l" { yylval.text = g_strdup (gth_albumtheme_yytext); return VARIABLE; @@ -1284,14 +1284,14 @@ case 38: /* rule 38 can match eol */ YY_RULE_SETUP -#line 191 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 191 "../../../extensions/webalbums/albumtheme.l" { /* Eat spaces inside tag. */ } YY_BREAK case 39: YY_RULE_SETUP -#line 194 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 194 "../../../extensions/webalbums/albumtheme.l" { yylval.text = g_strdup (gth_albumtheme_yytext); return HTML; @@ -1300,7 +1300,7 @@ case 40: /* rule 40 can match eol */ YY_RULE_SETUP -#line 198 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 198 "../../../extensions/webalbums/albumtheme.l" { yylval.text = g_strdup (gth_albumtheme_yytext); return HTML; @@ -1312,7 +1312,7 @@ case YY_STATE_EOF(CONDITION): case YY_STATE_EOF(QUOTE): case YY_STATE_EOF(STRING): -#line 202 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 202 "../../../extensions/webalbums/albumtheme.l" { YY_FLUSH_BUFFER; BEGIN(INITIAL); @@ -1321,7 +1321,7 @@ YY_BREAK case 41: YY_RULE_SETUP -#line 208 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 208 "../../../extensions/webalbums/albumtheme.l" ECHO; YY_BREAK #line 1328 "albumtheme-lex.c" @@ -2279,7 +2279,7 @@ #define YYTABLES_NAME "yytables" -#line 208 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.l" +#line 208 "../../../extensions/webalbums/albumtheme.l" diff -Nru gthumb-3.0.2/extensions/webalbums/albumtheme.c gthumb-3.2.3/extensions/webalbums/albumtheme.c --- gthumb-3.0.2/extensions/webalbums/albumtheme.c 2012-08-20 20:11:29.000000000 +0000 +++ gthumb-3.2.3/extensions/webalbums/albumtheme.c 2013-06-18 17:53:40.000000000 +0000 @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 2.6.2. */ +/* A Bison parser, made by GNU Bison 2.7.12-4996. */ /* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -44,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.6.2" +#define YYBISON_VERSION "2.7.12-4996" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -69,8 +69,8 @@ #define yynerrs gth_albumtheme_yynerrs /* Copy the first part of user declarations. */ -/* Line 336 of yacc.c */ -#line 1 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +/* Line 371 of yacc.c */ +#line 1 "../../../extensions/webalbums/albumtheme.y" /* * GThumb @@ -106,7 +106,7 @@ #define YYERROR_VERBOSE 1 -/* Line 336 of yacc.c */ +/* Line 371 of yacc.c */ #line 111 "albumtheme.c" # ifndef YY_NULL @@ -125,10 +125,7 @@ # define YYERROR_VERBOSE 0 #endif -/* In a future release of Bison, this section will be replaced - by #include "". */ -#ifndef GTH_ALBUMTHEME_YY_ -# define GTH_ALBUMTHEME_YY_ + /* Enabling traces. */ #ifndef YYDEBUG # define YYDEBUG 0 @@ -169,8 +166,8 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE { -/* Line 350 of yacc.c */ -#line 37 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +/* Line 387 of yacc.c */ +#line 37 "../../../extensions/webalbums/albumtheme.y" char *text; int ivalue; @@ -182,8 +179,8 @@ GthLoop *loop; -/* Line 350 of yacc.c */ -#line 187 "albumtheme.c" +/* Line 387 of yacc.c */ +#line 184 "albumtheme.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -206,12 +203,12 @@ #endif #endif /* ! YYPARSE_PARAM */ -#endif /* !GTH_ALBUMTHEME_YY_ */ + /* Copy the second part of user declarations. */ -/* Line 353 of yacc.c */ -#line 215 "albumtheme.c" +/* Line 390 of yacc.c */ +#line 212 "albumtheme.c" #ifdef short # undef short @@ -264,24 +261,33 @@ # if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include /* INFRINGES ON USER NAME SPACE */ -# define YY_(msgid) dgettext ("bison-runtime", msgid) +# define YY_(Msgid) dgettext ("bison-runtime", Msgid) # endif # endif # ifndef YY_ -# define YY_(msgid) msgid +# define YY_(Msgid) Msgid +# endif +#endif + +#ifndef __attribute__ +/* This feature is available in gcc versions 2.5 and later. */ +# if (! defined __GNUC__ || __GNUC__ < 2 \ + || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)) +# define __attribute__(Spec) /* empty */ # endif #endif /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ -# define YYUSE(e) ((void) (e)) +# define YYUSE(E) ((void) (E)) #else -# define YYUSE(e) /* empty */ +# define YYUSE(E) /* empty */ #endif + /* Identity function, used to suppress warnings about constant conditions. */ #ifndef lint -# define YYID(n) (n) +# define YYID(N) (N) #else #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) @@ -658,10 +664,10 @@ 63, 48, 49, 0, 90, 50, 51, 52, 53 }; -#define yypact_value_is_default(yystate) \ - ((yystate) == (-39)) +#define yypact_value_is_default(Yystate) \ + (!!((Yystate) == (-39))) -#define yytable_value_is_error(yytable_value) \ +#define yytable_value_is_error(Yytable_value) \ YYID (0) static const yytype_int8 yycheck[] = @@ -754,47 +760,18 @@ } \ while (YYID (0)) - +/* Error token number */ #define YYTERROR 1 #define YYERRCODE 256 -/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. - If N is 0, then set CURRENT to the empty location which ends - the previous symbol: RHS[0] (always defined). */ - -#ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ - if (YYID (N)) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ - while (YYID (0)) -#endif - -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) - - /* This macro is provided for backward compatibility. */ - #ifndef YY_LOCATION_PRINT # define YY_LOCATION_PRINT(File, Loc) ((void) 0) #endif /* YYLEX -- calling `yylex' with the right arguments. */ - #ifdef YYLEX_PARAM # define YYLEX yylex (YYLEX_PARAM) #else @@ -854,11 +831,7 @@ # else YYUSE (yyoutput); # endif - switch (yytype) - { - default: - break; - } + YYUSE (yytype); } @@ -1099,7 +1072,6 @@ { YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]); YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; /* Internationalized format string. */ const char *yyformat = YY_NULL; @@ -1162,11 +1134,13 @@ break; } yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]); - if (! (yysize <= yysize1 - && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; + { + YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]); + if (! (yysize <= yysize1 + && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } } } } @@ -1186,10 +1160,12 @@ # undef YYCASE_ } - yysize1 = yysize + yystrlen (yyformat); - if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; + { + YYSIZE_T yysize1 = yysize + yystrlen (yyformat); + if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } if (*yymsg_alloc < yysize) { @@ -1245,12 +1221,7 @@ yymsg = "Deleting"; YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - switch (yytype) - { - - default: - break; - } + YYUSE (yytype); } @@ -1259,8 +1230,17 @@ /* The lookahead symbol. */ int yychar; + +#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_END +#endif +#ifndef YY_INITIAL_VALUE +# define YY_INITIAL_VALUE(Value) /* Nothing. */ +#endif + /* The semantic value of the lookahead symbol. */ -YYSTYPE yylval; +YYSTYPE yylval YY_INITIAL_VALUE(yyval_default); /* Number of syntax errors so far. */ int yynerrs; @@ -1318,7 +1298,7 @@ int yyn; int yyresult; /* Lookahead token as an internal (translated) token number. */ - int yytoken; + int yytoken = 0; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; @@ -1336,9 +1316,8 @@ Keep to zero when no symbol should be popped. */ int yylen = 0; - yytoken = 0; - yyss = yyssa; - yyvs = yyvsa; + yyssp = yyss = yyssa; + yyvsp = yyvs = yyvsa; yystacksize = YYINITDEPTH; YYDPRINTF ((stderr, "Starting parse\n")); @@ -1347,13 +1326,6 @@ yyerrstatus = 0; yynerrs = 0; yychar = YYEMPTY; /* Cause a token to be read. */ - - /* Initialize stack pointers. - Waste one element of value and location stack - so that they stay on the same level as the state stack. - The wasted elements are never initialized. */ - yyssp = yyss; - yyvsp = yyvs; goto yysetstate; /*------------------------------------------------------------. @@ -1494,7 +1466,9 @@ yychar = YYEMPTY; yystate = yyn; + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END goto yynewstate; @@ -1532,7 +1506,7 @@ { case 2: /* Line 1787 of yacc.c */ -#line 77 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 77 "../../../extensions/webalbums/albumtheme.y" { yy_parsed_doc = (yyvsp[(1) - (1)].list); if (yy_parsed_doc == NULL) @@ -1544,7 +1518,7 @@ case 3: /* Line 1787 of yacc.c */ -#line 86 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 86 "../../../extensions/webalbums/albumtheme.y" { (yyval.list) = g_list_prepend ((yyvsp[(2) - (2)].list), gth_tag_new_html ((yyvsp[(1) - (2)].text))); g_free ((yyvsp[(1) - (2)].text)); @@ -1553,7 +1527,7 @@ case 4: /* Line 1787 of yacc.c */ -#line 91 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 91 "../../../extensions/webalbums/albumtheme.y" { (yyval.list) = g_list_prepend ((yyvsp[(2) - (2)].list), (yyvsp[(1) - (2)].tag)); } @@ -1561,7 +1535,7 @@ case 5: /* Line 1787 of yacc.c */ -#line 95 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 95 "../../../extensions/webalbums/albumtheme.y" { (yyval.list) = g_list_prepend ((yyvsp[(2) - (2)].list), (yyvsp[(1) - (2)].tag)); } @@ -1569,7 +1543,7 @@ case 6: /* Line 1787 of yacc.c */ -#line 99 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 99 "../../../extensions/webalbums/albumtheme.y" { GthTag *tag; @@ -1581,7 +1555,7 @@ case 7: /* Line 1787 of yacc.c */ -#line 107 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 107 "../../../extensions/webalbums/albumtheme.y" { GList *cond_list; GthTag *tag; @@ -1598,7 +1572,7 @@ case 8: /* Line 1787 of yacc.c */ -#line 120 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 120 "../../../extensions/webalbums/albumtheme.y" { (yyval.list) = NULL; } @@ -1606,7 +1580,7 @@ case 9: /* Line 1787 of yacc.c */ -#line 124 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 124 "../../../extensions/webalbums/albumtheme.y" { /*if ($2 != NULL) gth_parsed_doc_free ($2);*/ @@ -1616,7 +1590,7 @@ case 10: /* Line 1787 of yacc.c */ -#line 131 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 131 "../../../extensions/webalbums/albumtheme.y" { if (g_str_equal ((yyvsp[(2) - (3)].text), "thumbnail_caption")) { (yyval.loop) = gth_loop_new (GTH_TAG_FOR_EACH_THUMBNAIL_CAPTION); @@ -1633,7 +1607,7 @@ case 11: /* Line 1787 of yacc.c */ -#line 144 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 144 "../../../extensions/webalbums/albumtheme.y" { (yyval.loop) = gth_range_loop_new (); gth_range_loop_set_range (GTH_RANGE_LOOP ((yyval.loop)), (yyvsp[(2) - (7)].text), (yyvsp[(4) - (7)].expr), (yyvsp[(6) - (7)].expr)); @@ -1646,7 +1620,7 @@ case 12: /* Line 1787 of yacc.c */ -#line 154 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 154 "../../../extensions/webalbums/albumtheme.y" { (yyval.cond) = gth_condition_new ((yyvsp[(2) - (3)].expr)); } @@ -1654,7 +1628,7 @@ case 13: /* Line 1787 of yacc.c */ -#line 158 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 158 "../../../extensions/webalbums/albumtheme.y" { (yyval.cond) = gth_condition_new ((yyvsp[(3) - (5)].expr)); } @@ -1662,7 +1636,7 @@ case 14: /* Line 1787 of yacc.c */ -#line 163 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 163 "../../../extensions/webalbums/albumtheme.y" { gth_condition_add_document ((yyvsp[(1) - (3)].cond), (yyvsp[(2) - (3)].list)); (yyval.list) = g_list_prepend ((yyvsp[(3) - (3)].list), (yyvsp[(1) - (3)].cond)); @@ -1671,7 +1645,7 @@ case 15: /* Line 1787 of yacc.c */ -#line 168 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 168 "../../../extensions/webalbums/albumtheme.y" { (yyval.list) = NULL; } @@ -1679,7 +1653,7 @@ case 16: /* Line 1787 of yacc.c */ -#line 173 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 173 "../../../extensions/webalbums/albumtheme.y" { (yyval.cond) = gth_condition_new ((yyvsp[(2) - (3)].expr)); } @@ -1687,7 +1661,7 @@ case 17: /* Line 1787 of yacc.c */ -#line 177 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 177 "../../../extensions/webalbums/albumtheme.y" { (yyval.cond) = gth_condition_new ((yyvsp[(3) - (5)].expr)); } @@ -1695,7 +1669,7 @@ case 18: /* Line 1787 of yacc.c */ -#line 182 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 182 "../../../extensions/webalbums/albumtheme.y" { GthExpr *else_expr; GthCondition *cond; @@ -1711,7 +1685,7 @@ case 19: /* Line 1787 of yacc.c */ -#line 194 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 194 "../../../extensions/webalbums/albumtheme.y" { (yyval.cond) = NULL; } @@ -1719,7 +1693,7 @@ case 22: /* Line 1787 of yacc.c */ -#line 205 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 205 "../../../extensions/webalbums/albumtheme.y" { (yyval.tag) = gth_tag_new (GTH_TAG_SET_VAR, (yyvsp[(2) - (3)].list)); } @@ -1727,7 +1701,7 @@ case 23: /* Line 1787 of yacc.c */ -#line 210 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 210 "../../../extensions/webalbums/albumtheme.y" { if (gth_tag_get_type_from_name ((yyvsp[(2) - (4)].text)) == GTH_TAG_EVAL) { GthExpr *e; @@ -1779,7 +1753,7 @@ case 24: /* Line 1787 of yacc.c */ -#line 258 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 258 "../../../extensions/webalbums/albumtheme.y" { GthTagType tag_type = gth_tag_get_type_from_name ((yyvsp[(2) - (4)].text)); if (tag_type == GTH_TAG_INVALID) { @@ -1792,7 +1766,7 @@ case 25: /* Line 1787 of yacc.c */ -#line 268 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 268 "../../../extensions/webalbums/albumtheme.y" { (yyval.list) = g_list_prepend ((yyvsp[(2) - (2)].list), (yyvsp[(1) - (2)].attribute)); } @@ -1800,7 +1774,7 @@ case 26: /* Line 1787 of yacc.c */ -#line 272 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 272 "../../../extensions/webalbums/albumtheme.y" { (yyval.list) = NULL; } @@ -1808,7 +1782,7 @@ case 27: /* Line 1787 of yacc.c */ -#line 277 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 277 "../../../extensions/webalbums/albumtheme.y" { (yyval.attribute) = gth_attribute_new_expression ((yyvsp[(1) - (5)].text), (yyvsp[(4) - (5)].expr)); g_free ((yyvsp[(1) - (5)].text)); @@ -1817,7 +1791,7 @@ case 28: /* Line 1787 of yacc.c */ -#line 282 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 282 "../../../extensions/webalbums/albumtheme.y" { (yyval.attribute) = gth_attribute_new_string ((yyvsp[(1) - (5)].text), (yyvsp[(4) - (5)].text)); g_free ((yyvsp[(1) - (5)].text)); @@ -1827,7 +1801,7 @@ case 29: /* Line 1787 of yacc.c */ -#line 288 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 288 "../../../extensions/webalbums/albumtheme.y" { GthExpr *e = gth_expr_new (); gth_expr_push_integer (e, 1); @@ -1838,7 +1812,7 @@ case 30: /* Line 1787 of yacc.c */ -#line 296 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 296 "../../../extensions/webalbums/albumtheme.y" { (yyval.list) = g_list_prepend ((yyvsp[(3) - (3)].list), (yyvsp[(1) - (3)].expr)); } @@ -1846,7 +1820,7 @@ case 31: /* Line 1787 of yacc.c */ -#line 300 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 300 "../../../extensions/webalbums/albumtheme.y" { (yyval.list) = g_list_prepend (NULL, (yyvsp[(1) - (1)].expr)); } @@ -1854,7 +1828,7 @@ case 32: /* Line 1787 of yacc.c */ -#line 304 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 304 "../../../extensions/webalbums/albumtheme.y" { (yyval.list) = NULL; } @@ -1862,7 +1836,7 @@ case 33: /* Line 1787 of yacc.c */ -#line 309 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 309 "../../../extensions/webalbums/albumtheme.y" { (yyval.expr) = (yyvsp[(2) - (3)].expr); } @@ -1870,7 +1844,7 @@ case 34: /* Line 1787 of yacc.c */ -#line 313 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 313 "../../../extensions/webalbums/albumtheme.y" { GthExpr *e = gth_expr_new (); @@ -1887,7 +1861,7 @@ case 35: /* Line 1787 of yacc.c */ -#line 326 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 326 "../../../extensions/webalbums/albumtheme.y" { GthExpr *e = gth_expr_new (); @@ -1904,7 +1878,7 @@ case 36: /* Line 1787 of yacc.c */ -#line 339 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 339 "../../../extensions/webalbums/albumtheme.y" { GthExpr *e = gth_expr_new (); @@ -1921,7 +1895,7 @@ case 37: /* Line 1787 of yacc.c */ -#line 352 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 352 "../../../extensions/webalbums/albumtheme.y" { GthExpr *e = gth_expr_new (); @@ -1938,7 +1912,7 @@ case 38: /* Line 1787 of yacc.c */ -#line 365 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 365 "../../../extensions/webalbums/albumtheme.y" { GthExpr *e = gth_expr_new (); @@ -1955,7 +1929,7 @@ case 39: /* Line 1787 of yacc.c */ -#line 378 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 378 "../../../extensions/webalbums/albumtheme.y" { GthExpr *e = gth_expr_new (); @@ -1972,7 +1946,7 @@ case 40: /* Line 1787 of yacc.c */ -#line 391 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 391 "../../../extensions/webalbums/albumtheme.y" { (yyval.expr) = (yyvsp[(2) - (2)].expr); } @@ -1980,7 +1954,7 @@ case 41: /* Line 1787 of yacc.c */ -#line 395 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 395 "../../../extensions/webalbums/albumtheme.y" { gth_expr_push_op ((yyvsp[(2) - (2)].expr), GTH_OP_NEG); (yyval.expr) = (yyvsp[(2) - (2)].expr); @@ -1989,7 +1963,7 @@ case 42: /* Line 1787 of yacc.c */ -#line 400 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 400 "../../../extensions/webalbums/albumtheme.y" { gth_expr_push_op ((yyvsp[(2) - (2)].expr), GTH_OP_NOT); (yyval.expr) = (yyvsp[(2) - (2)].expr); @@ -1998,7 +1972,7 @@ case 43: /* Line 1787 of yacc.c */ -#line 405 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 405 "../../../extensions/webalbums/albumtheme.y" { /* function call */ GthExpr *e = gth_expr_new (); gth_expr_push_var (e, (yyvsp[(1) - (4)].text)); @@ -2019,7 +1993,7 @@ case 44: /* Line 1787 of yacc.c */ -#line 422 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 422 "../../../extensions/webalbums/albumtheme.y" { GthExpr *e = gth_expr_new (); gth_expr_push_var (e, (yyvsp[(1) - (1)].text)); @@ -2030,7 +2004,7 @@ case 45: /* Line 1787 of yacc.c */ -#line 429 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 429 "../../../extensions/webalbums/albumtheme.y" { GthExpr *e = gth_expr_new (); gth_expr_push_string (e, (yyvsp[(2) - (3)].text)); @@ -2041,7 +2015,7 @@ case 46: /* Line 1787 of yacc.c */ -#line 436 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +#line 436 "../../../extensions/webalbums/albumtheme.y" { GthExpr *e = gth_expr_new (); gth_expr_push_integer (e, (yyvsp[(1) - (1)].ivalue)); @@ -2051,7 +2025,7 @@ /* Line 1787 of yacc.c */ -#line 2055 "albumtheme.c" +#line 2029 "albumtheme.c" default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -2214,7 +2188,9 @@ YY_STACK_PRINT (yyss, yyssp); } + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END /* Shift the error token. */ @@ -2280,8 +2256,8 @@ } -/* Line 2048 of yacc.c */ -#line 443 "/home/paolo/workspace/gthumb-3-0/extensions/webalbums/albumtheme.y" +/* Line 2050 of yacc.c */ +#line 443 "../../../extensions/webalbums/albumtheme.y" diff -Nru gthumb-3.0.2/extensions/webalbums/data/Makefile.in gthumb-3.2.3/extensions/webalbums/data/Makefile.in --- gthumb-3.0.2/extensions/webalbums/data/Makefile.in 2012-08-20 19:54:18.000000000 +0000 +++ gthumb-3.2.3/extensions/webalbums/data/Makefile.in 2013-07-10 13:33:51.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/webalbums/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -375,14 +429,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -403,31 +456,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -443,12 +478,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -460,15 +490,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -477,9 +503,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -651,23 +678,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/webalbums/data/albumthemes/Classic/Makefile.in gthumb-3.2.3/extensions/webalbums/data/albumthemes/Classic/Makefile.in --- gthumb-3.0.2/extensions/webalbums/data/albumthemes/Classic/Makefile.in 2012-08-20 19:54:18.000000000 +0000 +++ gthumb-3.2.3/extensions/webalbums/data/albumthemes/Classic/Makefile.in 2013-07-10 13:33:51.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/webalbums/data/albumthemes/Classic -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(themedir)" DATA = $(theme_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -399,11 +433,9 @@ @list='$(theme_DATA)'; test -n "$(themedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(themedir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -544,16 +576,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-themeDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-themeDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-themeDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-themeDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/webalbums/data/albumthemes/Classic/image.gthtml gthumb-3.2.3/extensions/webalbums/data/albumthemes/Classic/image.gthtml --- gthumb-3.0.2/extensions/webalbums/data/albumthemes/Classic/image.gthtml 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/webalbums/data/albumthemes/Classic/image.gthtml 2013-04-30 16:56:12.000000000 +0000 @@ -20,10 +20,10 @@

<%= header %>

- + - + <% if image_description_enabled || image_attributes_enabled %>
<% else %> @@ -65,15 +65,15 @@ <%= image preview class="preview" %> <% end %>
- + <% for_each image_caption %> <% if first_item %>
<% end %> - +
<%= item_attribute display_name %>
<%= item_attribute value %>
- + <% if last_item %>
diff -Nru gthumb-3.0.2/extensions/webalbums/data/albumthemes/ClassicClips/Makefile.in gthumb-3.2.3/extensions/webalbums/data/albumthemes/ClassicClips/Makefile.in --- gthumb-3.0.2/extensions/webalbums/data/albumthemes/ClassicClips/Makefile.in 2012-08-20 19:54:18.000000000 +0000 +++ gthumb-3.2.3/extensions/webalbums/data/albumthemes/ClassicClips/Makefile.in 2013-07-10 13:33:51.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/webalbums/data/albumthemes/ClassicClips -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(themedir)" DATA = $(theme_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -399,11 +433,9 @@ @list='$(theme_DATA)'; test -n "$(themedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(themedir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -544,16 +576,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-themeDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-themeDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-themeDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-themeDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/webalbums/data/albumthemes/ClassicClips/image.gthtml gthumb-3.2.3/extensions/webalbums/data/albumthemes/ClassicClips/image.gthtml --- gthumb-3.0.2/extensions/webalbums/data/albumthemes/ClassicClips/image.gthtml 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/webalbums/data/albumthemes/ClassicClips/image.gthtml 2013-04-30 16:56:12.000000000 +0000 @@ -20,10 +20,10 @@

<%= header %>

- + - + + <% if image_description_enabled || image_attributes_enabled %>
- <% else %> + <% else %>
<% end %> <% if copy_originals %> @@ -65,15 +65,15 @@ <%= image preview class="preview" %> <% end %>
- + <% for_each image_caption %> <% if first_item %>
<% end %> - +
<%= item_attribute display_name %>
<%= item_attribute value %>
- + <% if last_item %>
diff -Nru gthumb-3.0.2/extensions/webalbums/data/albumthemes/Makefile.in gthumb-3.2.3/extensions/webalbums/data/albumthemes/Makefile.in --- gthumb-3.0.2/extensions/webalbums/data/albumthemes/Makefile.in 2012-08-20 19:54:18.000000000 +0000 +++ gthumb-3.2.3/extensions/webalbums/data/albumthemes/Makefile.in 2013-07-10 13:33:51.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,17 +78,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/webalbums/data/albumthemes -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -78,13 +105,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -92,9 +120,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -153,9 +201,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -169,13 +215,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -204,7 +249,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -220,11 +268,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -241,7 +293,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -271,7 +322,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -376,14 +430,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -404,31 +457,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -444,12 +479,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -461,15 +491,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -478,9 +504,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -652,23 +679,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/webalbums/data/albumthemes/NeatRound/Makefile.in gthumb-3.2.3/extensions/webalbums/data/albumthemes/NeatRound/Makefile.in --- gthumb-3.0.2/extensions/webalbums/data/albumthemes/NeatRound/Makefile.in 2012-08-20 19:54:18.000000000 +0000 +++ gthumb-3.2.3/extensions/webalbums/data/albumthemes/NeatRound/Makefile.in 2013-07-10 13:33:51.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,17 +79,16 @@ build_triplet = @build@ host_triplet = @host@ subdir = extensions/webalbums/data/albumthemes/NeatRound -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gthumb.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -113,6 +140,7 @@ } am__installdirs = "$(DESTDIR)$(themedir)" DATA = $(theme_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -143,9 +171,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -159,13 +185,12 @@ FGREP = @FGREP@ FLEX = @FLEX@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ @@ -194,7 +219,10 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +ITSTOOL = @ITSTOOL@ JPEG_LIBS = @JPEG_LIBS@ +JSON_GLIB_CFLAGS = @JSON_GLIB_CFLAGS@ +JSON_GLIB_LIBS = @JSON_GLIB_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -210,11 +238,15 @@ LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ +LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@ +LIBSECRET_LIBS = @LIBSECRET_LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ +LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@ +LIBWEBP_LIBS = @LIBWEBP_LIBS@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -231,7 +263,6 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -261,7 +292,10 @@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ +WEBKIT2_CFLAGS = @WEBKIT2_CFLAGS@ +WEBKIT2_LIBS = @WEBKIT2_LIBS@ XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -399,11 +433,9 @@ @list='$(theme_DATA)'; test -n "$(themedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(themedir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -544,16 +576,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-themeDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-themeDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-themeDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-themeDATA -include $(top_srcdir)/git.mk diff -Nru gthumb-3.0.2/extensions/webalbums/data/albumthemes/NeatRound/image.gthtml gthumb-3.2.3/extensions/webalbums/data/albumthemes/NeatRound/image.gthtml --- gthumb-3.0.2/extensions/webalbums/data/albumthemes/NeatRound/image.gthtml 2012-08-14 16:25:42.000000000 +0000 +++ gthumb-3.2.3/extensions/webalbums/data/albumthemes/NeatRound/image.gthtml 2013-04-30 16:56:12.000000000 +0000 @@ -20,15 +20,15 @@

<%= header %>

- + - + + <% if image_description_enabled || image_attributes_enabled %>
- <% else %> + <% else %>
<% end %> - <% if copy_originals %> + <% if copy_originals %> <%= image preview class="preview" %> <% else %> <%= image preview class="preview" %> <% end %> -
- +
+ <% for_each image_caption %> <% if first_item %>
<% end %> - +
<%= item_attribute display_name %>
<%= item_attribute value %>
- + <% if last_item %>
@@ -87,7 +87,7 @@
<% end %> - + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

Symbol

+ 		+

Popis

+
+

#

+ 		+

Tento symbol bude nahrazen hodnotou počítadla, které se zvyšuje o 1 při přechodu z jednoho obrázku na další. Pokud tento symbol zadáte v řadě vícekrát za sebou, dostanete číslo s příslušným pevným počtem číslic (v případě menších hodnot budou tyto doplněny nulami). Například ### bude produkovat řadu: 001, 002, 003, atd.

+
+

%F

+ 		+

Tento symbol bude nahrazen původním názvem souboru, vyjma původní přípony.

+
+

%E

+ 		+

Tento symbol bude nahrazen příponou z původního názvu souboru.

+
+

%N

+ 		+

Tento symbol bude nahrazen původní číselnou sekvencí obrázku. Například, jestliže byl původní název obrázku IMG_9876.JPG, vyseparuje se část „9876“. Pokud název souboru obsahuje více než jednu skupinu číslic (např. IMG_123_456.JPG), bude použita jen první skupina (v uvedeném příkladu „123“).

+
+

%M{formát}

+ 		+

Tento symbol bude nahrazen datem změny souboru. Formátování tohoto data (a případně i času) můžete upřesnit zadáním standardních formátovacích kódů ve složených závorkách. Například „%M{%Y-%m-%d, %T}“ bude nahrazeno datem a časem nějak takto: 2010-04-01, 15:02:01.

+
+

%D{formát}

+ 		+

Tento symbol bude nahrazen datem, kdy byla fotografie původně pořízena (normálně se to zjistí z časového razítka EXIF vloženého ve fotografii). Formátování tohoto data (a případně i času) můžete upřesnit zadáním standardních formátovacích kódů ve složených závorkách. Například „%D{%Y-%m-%d, %T}“ bude nahrazeno datem a časem nějak takto: 2010-04-01, 15:02:01.

+
+

%A{identifikátor}

+ 		+

Tento symbol bude nahrazen daty určenýmy identifikátorem. Například „%A{ general::dimensions }“ by bylo nahrazeno velikostí, třeba „320 × 240“.

+
+ +

Souhrnný přehled těchto speciálních kódů si můžete zobrazit kliknutím na ikonu nápovědy uvnitř pole šablony.

+ +

Seznam v dolní části dialogového okna ukazuje, jak konkrétně budou soubory přejmenovány.

+ +

Přejmenování proveďte kliknutím na Přejmenovat.

+ +

V případě, že by při přejmenování obrázku mělo dojít k přepsání nějakého již existujícího obrázku, budete dotázáni, jak pokračovat. Na výběr je z pěti možností: přepsat obrázek, nepřepisovat obrázek, vždy přepsat, nikdy nepřepisovat, zadat nový název.

+ + diff -Nru gthumb-3.0.2/help/cs/sharing-disc.page gthumb-3.2.3/help/cs/sharing-disc.page --- gthumb-3.0.2/help/cs/sharing-disc.page 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/help/cs/sharing-disc.page 2013-06-18 17:54:22.000000000 +0000 @@ -0,0 +1,10 @@ + + + + + + Vytváření CD/DVD/ISO +

Pokud chcete zapsat řadu souborů na optický disk (CD nebo DVD) nebo vytvořit obraz disku ISO, použijte položku nabídky SouborExportovat doOptický disk….

+

Bude vám nabídnuta volba mezi zápisem právě vybraných souborů, celé aktuální složky nebo celé aktuální složky včetně podsložek. Až si vyberete, co chcete, klikněte na OK.

+

V následujícím dialogovém okně vyberte cílový disk nebo uložení do souboru ISO. Až jste připraveni na dokončení procesu, klikněte na Vytvořit obraz. Započne proces vypalování optického disku nebo se zapíše soubor s obrazem ISO.

+ diff -Nru gthumb-3.0.2/help/cs/sharing-social.page gthumb-3.2.3/help/cs/sharing-social.page --- gthumb-3.0.2/help/cs/sharing-social.page 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/help/cs/sharing-social.page 2013-06-18 17:54:22.000000000 +0000 @@ -0,0 +1,12 @@ + + + + + + Nahrávání do služeb pro sdílení fotek +

Aplikace gThumb poskytuje řadu rozšíření sloužících k odesílání fotografií na různé weby „sociálních médií“. Ve výchozím stavu jsou povolená rozšíření pro odesílání na Facebook, Flickr, Picasa a Photobucket.

+

Pokud chcete odeslat řadu fotografií, vyberte v režimu procházení obrázky a klikněte na tlačítko Sdílet na panelu nástrojů. V nabídce, která se objeví, vyberte příslušný web.

+

Můžete být vyzváni k zadání doplňujících informací specifických pro cílový web, jako například název alba. Rovněž můžete být dotázání na své uživatelské jméno a heslo pro web. Někdy je gThumb nucen otevřít webový prohlížeč, abyste potřebný krok autentizace dokončili v něm. Jakmile jste s tím hotovi, vraťte se do aplikace gThumb a pokračujte v odesílání.

+

Jestliže v nabídce Sdílet nevidíte očekávané weby, zkontrolujte, zda jsou povolena příslušná rozšíření pro export v UpravitRozšíření.

+

U některých webů gThumb navíc podporuje stahování fotografií z webu do aplikace gThumb. Viz nabídka SouborImportovat z ohledně dostupných voleb stahování.

+ diff -Nru gthumb-3.0.2/help/cs/shortcuts.page gthumb-3.2.3/help/cs/shortcuts.page --- gthumb-3.0.2/help/cs/shortcuts.page 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/help/cs/shortcuts.page 2013-06-18 17:54:22.000000000 +0000 @@ -0,0 +1,450 @@ + + + + + + + Klávesové zkratky + +
+ Zobrazování a skrývání částí uživatelského rozhraní + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

Klávesová zkratka

+ 		+

Popis

+
+

F9

+ 		+

Zobrazit/skrýt postranní panel v režimu procházení. Postranní panel obsahuje strom složek a přehled vlastností souboru (pokud je zapnut).

+
+

i

+ 		+

Zobrazit přehled vlastností souboru.

+
+

F8

+ 		+

Zobrazit/skrýt panel s miniaturami v režimu zobrazování.

+
+

F11 nebo f

+ 		+

Přepnout režim celé obrazovky.

+
+

Ctrlt

+ 		+

Zobrazit/skrýt miniatury v režimu procházení.

+
+

Esc

+ 		+

Zavřít režim zobrazování nebo režim celé obrazovky.

+
+
+ + +
+ Klávesové zkratky úprav pro režim procházení a zobrazování + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

Klávesová zkratka

+ 		+

Popis

+
+

e

+ 		+

Upravit obrázek. Otevře režim zobrazování a zobrazí editační nástroje.

+
+

g

+ 		+

Otevřít obrázek v programu GIMP (GNU Image Manipulation Program).

+
+

F2

+ 		+

Přejmenovat obrázek.

+
+

c nebo Ctrlm

+ 		+

Přidat do obrázku poznámku nebo metadata.

+
+

]

+ 		+

Otočit obrázek doprava, pokud možno bezestrátově. Soubor je automaticky uložen.

+
+

[

+ 		+

Otočit obrázek doleva, pokud možno bezestrátově. Soubor je automaticky uložen.

+
+

Delete

+ 		+

Přesunout vybrané soubory do koše.

+
+

ShiftDelete

+ 		+

Trvale odstranit vybrané soubory.

+
+
+ +
+ Klávesové zkratky úprav platné jen v režimu zobrazování + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

Klávesová zkratka (rozlišuje se velikost písmen)

+ 		+

Popis

+
+

h

+ 		+

Zvýraznit barvy.

+
+

l

+ 		+

Překlopit obrázek.

+
+

m

+ 		+

Zrcadlit obrázek.

+
+

r

+ 		+

Otočit doprava.

+
+

R

+ 		+

Otočit doleva.

+
+

C

+ 		+

Oříznout obrázek.

+
+

S

+ 		+

Změnit velikost obrázku.

+
+
+ +
+ Klávesové zkratky režimu zobrazování + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

Klávesová zkratka

+ 		+

Popis

+
+

mezerník nebo Page Down

+ 		+

Zobrazit následující obrázek.

+
+

Backspace nebo Page Up

+ 		+

Zobrazit předchozí obrázek.

+
+

Home

+ 		+

Zobrazit první obrázek.

+
+

End

+ 		+

Zobrazit poslední obrázek.

+
+

Ctrl D

+ 		+

Přidat aktuální umístění do záložek.

+
+

+ nebo =

+ 		+

Přiblížit.

+
+

-

+ 		+

Oddálit.

+
+

1 nebo z nebo / (na numerické klávesnici)

+ 		+

Skutečná velikost.

+
+

x nebo * (na numerické klávesnici)

+ 		+

Přizpůsobit přiblížení (pouze směrem dolů, nepoužívat lupu)

+
+

Shift x

+ 		+

Přizpůsobit přiblížení (směrem dolů nebo použít lupu, dle potřeby)

+
+

šipky

+ 		+

Posunout obrázek.

+
+

Shift šipky

+ 		+

Rychleji posunout obrázek.

+
+
+ +
+ Pohyb v režimu procházení + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

Home

+ 		+

Přejít na první soubor v režimu procházení.

+
+

End

+ + 		+

Přejít na poslední soubor v režimu procházení.

+
+

šipka dolů nebo Page Down

+ 		+

Posunout se v miniaturách dolů.

+
+

šipka nahoru nebo Page Up

+ 		+

Posunout se v miniaturách nahoru.

+
+

AltLeft Arrow

+ 		+

Vrátit se zpět do předchozí zobrazené složky.

+
+

AltRight Arrow

+ 		+

Přejít vpřed (po té, co jste ve složkách přešli zpět).

+
+

Alt Up

+ 		+

Přejít o úroveň výš.

+
+
+ +
+ Ovládání promítání + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

Klávesová zkratka

+ 		+

Popis

+
+

F5

+ 		+

Začít promítání.

+
+

mezerník

+ 		+

Pozastavit/pokračovat v promítání.

+
+

Esc

+ 		+

Zavřít promítání.

+
+

šipka dolů nebo šipka vpravo nebo Page Down

+ 		+

Načíst následující obrázek.

+
+

šipka nahoru nebo šipka vlevo nebo šipka nahoru

+ 		+

Načíst předchozí obrázek

+
+
+ diff -Nru gthumb-3.0.2/help/cs/slideshow.page gthumb-3.2.3/help/cs/slideshow.page --- gthumb-3.0.2/help/cs/slideshow.page 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/help/cs/slideshow.page 2013-06-18 17:54:22.000000000 +0000 @@ -0,0 +1,23 @@ + + + + + + + Automatické promítání snímků + +

Funkci promítání snímků pro aktuálně vybrané obrázky můžete spustit v režimu procházení obrázků zmáčknutím F5, kliknutím na ikonu promítání snímků na panelu nástrojů nebo kliknutím na ZobrazitPromítání snímků. Pokud nejsou žádné obrázky vybrány, budou se promítat všechny obrázky ze složky.

+ +

Přechodové efekty a čas, po který jsou jednotlivé snímky zobrazeny, je možné měnit v dialogovém okně UpravitPředvolbyPromítání snímků.

+ +

Může se stát, že u některých grafických karet a ovladačů způsobí zapnutí přechodových efektů problémy (zhroucení). Pokud se s takovýmito obtížemi setkáte, nastavte Přechodový efekt v předvolbách na Žádný.

+ +

Na následující obrázek můžete navíc přejít i ručně zmáčknutím šipky dolů, šipky doprava, Page Down nebo mezerník.

+ +

Na předchozí obrázek se zpět dostanete zmáčknutím šipky nahoru, šipky vlevo nebo Page Up.

+ +

Promítání můžete pozastavit nebo v něm pokračovat zmáčknutím p.

+ +

Promítání ukončíte zmáčknutím Esc nebo F5.

+ + diff -Nru gthumb-3.0.2/help/cs/sorting.page gthumb-3.2.3/help/cs/sorting.page --- gthumb-3.0.2/help/cs/sorting.page 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/help/cs/sorting.page 2013-06-18 17:54:22.000000000 +0000 @@ -0,0 +1,11 @@ + + + + + + + Řazení souborů + +

K výběru požadovaného způsobu řazení v režimu procházení použijte nabídku ZobrazitŘadit podle…. Soubory lze řadit na základě jejich názvu, velikosti, data změny souboru a data pořízení snímku.

+ + diff -Nru gthumb-3.0.2/help/cs/strftime.page gthumb-3.2.3/help/cs/strftime.page --- gthumb-3.0.2/help/cs/strftime.page 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/help/cs/strftime.page 2013-06-18 17:54:21.000000000 +0000 @@ -0,0 +1,336 @@ + + + + + + Formátovací kódy data/času + +

Jedná se o přehled standardních kódů data a času, které lze použít ve formátovacích řetězcích:

+ + + Platné formátovací kódy pro vlastní podsložky + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

%a

+ 		+

Zkratka dne v týdnu podle aktuálního národního prostředí.

+
+

%A

+ 		+

Celý název dne v týdnu podle aktuálního národního prostředí.

+
+

%b

+ 		+

Zkratka měsíce podle aktuálního národního prostředí.

+
+

%B

+ 		+

Celý název měsíce podle aktuálního národního prostředí.

+
+

%c

+ 		+

Reprezentace data a času, která je upřednostňována v aktuálním národním prostředí.

+
+

%C

+ 		+

Století (rok/100) jako dvoumístné celé číslo.

+
+

%d

+ 		+

Den v měsíci jako desítkové číslo (v rozsahu 01 až 31).

+
+

%D

+ 		+

Odpovídá %m/%d%y. (V podstatě jen pro Američany. Američané by si měli uvědomit, že v ostatních zemních je běžnější %d/%m/%y. To znamená, že z mezinárodního hlediska je tento formát nejednoznačný a neměl by být používán.)

+
+

%e

+ 		+

Podobně jako %d, den v měsíci jako desítkové číslo, ale bez úvodní nuly. Ta je nahrazena mezerou.

+
+

%E

+ 		+

Modifikátor: použít alternativní formát, viz níže.

+
+

%F

+ 		+

Odpovídá %Y-%m-%d (formát data podle ISO 8601). (C99)

+
+

%G

+ 		+

Rok podle ISO 8601 jako desítkové číslo, včetně století. Čtyřčíselný rok, který se na přelomu řídí číslem týdne podle ISO (viz %V). Jde o stejný formát a hodnotu jako u %y vyjma toho, že když číslo týdne podle ISO náleží předchozímu nebo následujícímu roku, použije se místo toho onen rok.

+
+

%g

+ 		+

Podobně jako %G, ale bez století, t.j. dvoučíselný rok (00 – 99).

+
+

%h

+ 		+

Odpovídá %b.

+
+

%H

+ 		+

Hodina jako desítkové číslo v 24hodinovém cyklu (rozsah 00 až 23).

+
+

%I

+ 		+

Hodina jako desítkové číslo v 12hodinovém cyklu (rozsah 01 až 12).

+
+

%j

+ 		+

Den roku jako desítkové číslo (rozsah 001 až 366).

+
+

%k

+ 		+

Hodiny (24hodinový cyklus) jako desítkové číslo (v rozsahu 0 až 23), čísla s jednou čislicí mají předřaznu mezeru. (viz také %H)

+
+

%l

+ 		+

Hodiny (12hodinový cyklus) jako desítkové číslo (v rozsahu 1 až 12), čísla s jednou čislicí mají předřaznu mezeru. (viz také %I)

+
+

%m

+ 		+

Měsíc jako desítkové číslo (v rozsau 01 až 12).

+
+

%M

+ 		+

Minuty jako desítkové číslo (rozsah 00 až 59).

+
+

%O

+ 		+

Modifikátor: použít alternativní formát, viz níže.

+
+

%p

+ 		+

Buď „AM“ nebo „PM“ podle hodnoty času, případně jiný text podle aktuálního národního prostředí. Poledne je označováno jako „PM“ a půlnoc jako „am“.

+
+

%P

+ 		+

Podobně jako %p, ale malými písmeny: „am“ nebo „pm“, případně jiný text podle aktuálního národního prostředí.

+
+

%r

+ 		+

Čas v notaci a.m. nebo p.m. V nastavení národního prostředí podle POSIX to odpovídá „%I:%M:%S %p“.

+
+

%R

+ 		+

Čas ve 24hodinové notaci (%H:%M). Pokud chcete verzi i se sekundami, podívejte se na %T.

+
+

%s

+ 		+

Počet sekund od začátku Epochy, t.j. od 1970-01-01 00:00:00 UTC

+
+

%S

+ 		+

Sekundy jako desítkové číslo (v rozsahu 00 až 60). (rozsah je až do 60 kvůli přestupným sekundám)

+
+

%T

+ 		+

Čas v 24hodinové notaci (%H:%M:%S).

+
+

%u

+ 		+

Den v týdnu jako desítkové číslo, rozsah do 1 do 7, pondělí je 1. Viz také %w.

+
+

%U

+ 		+

Číslo týdne v aktuálním roce jako desítkové číslo, v rozsahu 00 až 53. Začíná se první nedělí jako prvním dnem týdne 01. Viz také %V a %W.

+
+

%V

+ 		+

Číslo týdne v aktuálním roce jako desítkové číslo podle ISO 8601:1988, v rozsahu 00 až 53, kdy první týden 1 je první týden, který má nejméně 4 dny v aktuálním roce, a s pondělím, jako prvním dnem v týdnu. Viz také %U a %W.

+
+

%w

+ 		+

Den v týdnu jako desítkové číslo, rozsah od 0 do 6, neděle je 0. Viz také %u.

+
+

%W

+ 		+

Číslo týdne v aktuálním roce jako desítkové číso, v rozshau 00 až 53. Začíná se prvním pondělím jako prvním dnem týdne 01.

+
+

%x

+ 		+

Reprezentace data bez časového údaje, která je upřednostňována v aktuálním národním prostředí.

+
+

%X

+ 		+

Reprezentace času bez data, která je upřednostňována v aktuálním národním prostředí.

+
+

%y

+ 		+

Rok jako desítkové číslo bez století (rozsah 00 až 99).

+
+

%Y

+ 		+

Rok jako desítkové číslo, včetně století.

+
+

%z

+ 		+

Časová zóna jako posun v hodinách oproti Greenewitchskému času GMT. Požadováno pro formátování data při posílání v souladu s RFC 822 (používá „%a, %d %b %Y %H:%M:%S %z“).

+
+

%Z

+ 		+

Časová zóna nebo její název nebo její zkratka.

+
+ +

Některé specifikace převodu je možné měnit předřazením modifikátoru E nebo O, který říká, že se má použít alternativní formát. Pokud alternativní formát nebo specifikace neexistuje pro aktuální národní prostředí, bude se to chovat, jako by byla zadána nemodifikovaná specifikace. Single Unix Specification zavádí %Ec, %EC, %Ex, %EX, %Ey, %EY, %Od, %Oe, %OH, %OI, %Om, %OM, %OS, %Ou, %OU, %OV, %Ow, %OW, %Oy, kdy O se používá jako alternativní číselný symbol (třeba římské číslice) a E se používá jako alternativní reprezentace závislá na národním prostředí.

+ + diff -Nru gthumb-3.0.2/help/cs/thumbnail-pane.page gthumb-3.2.3/help/cs/thumbnail-pane.page --- gthumb-3.0.2/help/cs/thumbnail-pane.page 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/help/cs/thumbnail-pane.page 2013-06-18 17:54:21.000000000 +0000 @@ -0,0 +1,17 @@ + + + + + + Panel s miniaturami + +

Když obrázek otevřete v režimu zobrazování gThumb, můžete si volitelně zapnout nebo vypnout panel s miniaturami, který ukazuje v podobě náhledů ostatní obrázky ze stejné složky. Tuto funkci můžete přepínat pomocí ZobrazitPanel s náhledy nebo zmáčknutím F8.

+ +

Panel s miniaturami může být umístěn pod hlavním obrázkem a nebo po straně. Řídí se to nastavením UpravitPředvolbyObecnéMiniatury v režimu zobrazování.

+ +
+ Panel s miniaturami umístění pod hlavním obrázkem + +
+ + diff -Nru gthumb-3.0.2/help/cs/thumbnails.page gthumb-3.2.3/help/cs/thumbnails.page --- gthumb-3.0.2/help/cs/thumbnails.page 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/help/cs/thumbnails.page 2013-06-18 17:54:21.000000000 +0000 @@ -0,0 +1,21 @@ + + + + + + Zdroje miniatur + +

Okno v režimu procházení normálně zobrazuje miniatury obrázků a filmů ve vybrané složce. Pro ostatní soubory (zvukové soubory například) mohou být zobrazeny obecné ikony.

+ +

Pomocí dialogového okna ZobrazitFiltr… si můžete vybrat, které typy souborů chcete v režimu procházení zobrazovat. Výchozí je zobrazování všech multimediálních souborů (obrázků, videí, zvukových souborů), ale můžete si to omezit více nebo naopak méně.

+ +

Miniatury mohou být generovány mnoha rozdílnými způsoby. gThumb nejdříve zkontroluje existenci v systémové mezipaměti.

+ +

Pokud není žádná miniatura nalezena v mezipaměti a soubor s obrázkem obsahuje vloženou miniaturu (soubory JPEG generované fotoaparáty je normálně mají), zkusí gThumb použít tyto. Přitom si ověří, že poměr stran miniatury je přibližně stejný jako u hlavního obrázku a miniatury, které to nesplňují, jsou vynechány.

+ +

Pokud to takto nejde, zkusí gThumb načíst celý soubor a vygenerovat přeškálováním miniaturu.

+ +

A konečně, gThumb použije v systému definované skripty pro vytvoření miniatur vybraných typů multimédií. Například některé systémy mohou používat ke generování miniatur mplayer nebo totem nebo jiný přehrávač filmů.

+ +

Aplikace gThumb miniatury ukládá do systémové mezipaměti, aby je mohly sdílet ostatní aplikace. Systémy Gnome standardně zahazují miniatury v mezipaměti, které jsou starší než 180 dní nebo když velikost mezipaměti miniatur překročí 512 MB. Technicky zdatní uživatelé si mohou tyto hodnoty vyladit pomocí aplikace gconf-editor. Hledejte klíče /desktop/gnome/thumbnail_cache/maximum_age a /desktop/gnome/thumbnail_cache/maximum_size. Některé aplikace (jako F-Spot) mohout toto nastavení rapidně zvýšit bez zásahu uživatele.

+ diff -Nru gthumb-3.0.2/help/cs/viewer.page gthumb-3.2.3/help/cs/viewer.page --- gthumb-3.0.2/help/cs/viewer.page 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/help/cs/viewer.page 2013-06-18 17:54:21.000000000 +0000 @@ -0,0 +1,21 @@ + + + + + + Otevírání obrázku + +

V režimu procházení se zobrazují obrázky z aktuální složky nebo katalogu (viz ). Dvojitým kliknutím na obrázek (nebo zmáčknutím Enter) v režimu procházení se otevře v režimu zobrazování.

+ +

Zmáčknutím Esc se režim zobrazování opustí a vrátí se do režimu procházení. Je pro to k dispozici i tlačítko na panelu nástrojů (Zobrazit složky).

+ +

V režimu zobrazování může být, dle přání, zobrazen .

+ +
+ Režim zobrazování s panelem miniatur + +
+ +

V režimu zobrazování můžete přejít na následující obrázek kliknutím na tlačítko Následující nebo zmáčknutím mezerníku nebo Page Down. Vrátit se zpět na předchozí obrázek můžete kliknutím na tlačítko Předchozí nebo zmáčknutím Backspace nebo Page Up. Přejít na jiný obrázek můžete můžete také kliknutím na miniaturu v panelu miniatur.

+ + diff -Nru gthumb-3.0.2/help/cs/wallpaper.page gthumb-3.2.3/help/cs/wallpaper.page --- gthumb-3.0.2/help/cs/wallpaper.page 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.2.3/help/cs/wallpaper.page 2013-06-18 17:54:22.000000000 +0000 @@ -0,0 +1,8 @@ + + + + + + Tapeta pracovní plochy +

Pokud chcete nastavit obrázek jako systémovou tapetu na pracovní plochu, klikněte na něj pravým tlačítkem a ve vyskakovací nabídce vyberte Nastavit jako pozadí pracovní plochy. Pozadí pracovní plochy se změní a zobrazí se dialogové okno předvoleb vzhledu Gnome. V tomto dialogovém okně si můžete dále upravit nastavení pozadí (umístění, roztažení, dláždění atd.).

+ diff -Nru gthumb-3.0.2/help/de/attributes.page gthumb-3.2.3/help/de/attributes.page --- gthumb-3.0.2/help/de/attributes.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/attributes.page 2013-06-18 17:54:21.000000000 +0000 @@ -2,6 +2,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + Attribut-Codes

gThumb speichert viele verschiedene Attribute für jede Datei. Erweiterungen könnten noch weitere hinzufügen. Die unten aufgeführte Liste enthält eine Zusammenfassung einiger häufig anzutreffender Attribute:

diff -Nru gthumb-3.0.2/help/de/batch-change-date.page gthumb-3.2.3/help/de/batch-change-date.page --- gthumb-3.0.2/help/de/batch-change-date.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/batch-change-date.page 2013-06-18 17:54:21.000000000 +0000 @@ -2,6 +2,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + das Datum ändern diff -Nru gthumb-3.0.2/help/de/batch-convert-format.page gthumb-3.2.3/help/de/batch-convert-format.page --- gthumb-3.0.2/help/de/batch-convert-format.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/batch-convert-format.page 2013-06-18 17:54:21.000000000 +0000 @@ -2,6 +2,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + Umwandeln von Dateiformaten diff -Nru gthumb-3.0.2/help/de/batch-resize.page gthumb-3.2.3/help/de/batch-resize.page --- gthumb-3.0.2/help/de/batch-resize.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/batch-resize.page 2013-06-18 17:54:21.000000000 +0000 @@ -2,6 +2,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + Bildgröße ändern diff -Nru gthumb-3.0.2/help/de/batch-rotate.page gthumb-3.2.3/help/de/batch-rotate.page --- gthumb-3.0.2/help/de/batch-rotate.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/batch-rotate.page 2013-06-18 17:54:21.000000000 +0000 @@ -2,6 +2,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + Bilder verlustfrei drehen diff -Nru gthumb-3.0.2/help/de/batch-scripts.page gthumb-3.2.3/help/de/batch-scripts.page --- gthumb-3.0.2/help/de/batch-scripts.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/batch-scripts.page 2013-06-18 17:54:21.000000000 +0000 @@ -2,6 +2,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + Benutzerdefinierte Skripte diff -Nru gthumb-3.0.2/help/de/bookmarks.page gthumb-3.2.3/help/de/bookmarks.page --- gthumb-3.0.2/help/de/bookmarks.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/bookmarks.page 2013-06-18 17:54:22.000000000 +0000 @@ -2,6 +2,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + Verwendung von Lesezeichen diff -Nru gthumb-3.0.2/help/de/browser.page gthumb-3.2.3/help/de/browser.page --- gthumb-3.0.2/help/de/browser.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/browser.page 2013-06-18 17:54:21.000000000 +0000 @@ -2,6 +2,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + Durchsuchen des Dateisystems diff -Nru gthumb-3.0.2/help/de/de.po gthumb-3.2.3/help/de/de.po --- gthumb-3.0.2/help/de/de.po 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/de/de.po 2013-04-30 16:56:13.000000000 +0000 @@ -1,14 +1,15 @@ # German translation of the gThumb manual. -# Mario Blättermann , 2009, 2010, 2011. +# Mario Blättermann , 2009, 2010, 2011, 2013. # Christian Kirbach , 2008, 2009, 2011. # msgid "" msgstr "" "Project-Id-Version: gthumb docs master\n" -"POT-Creation-Date: 2012-05-13 17:43+0000\n" -"PO-Revision-Date: 2012-05-13 21:46+0100\n" -"Last-Translator: Daniel Winzen \n" +"POT-Creation-Date: 2013-03-04 21:11+0000\n" +"PO-Revision-Date: 2013-03-05 23:12+0100\n" +"Last-Translator: Mario Blättermann \n" "Language-Team: Deutsch \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -16,975 +17,1085 @@ "X-Poedit-Country: GERMANY\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: C/file-copy-move.page:6(title) -msgid "Copying and Moving Files" -msgstr "Dateien kopieren und verschieben" - -#: C/file-copy-move.page:8(p) -msgid "There are three ways to copy or move files in gThumb." +#. Put one translator per line, in the form NAME , YEAR1, YEAR2 +msgctxt "_" +msgid "translator-credits" msgstr "" -"In gThumb gibt es drei Möglichkeiten zum Kopieren oder " -"Verschieben von Dateien." - -#: C/file-copy-move.page:12(title) -msgid "Cut and Paste" -msgstr "Ausschneiden und Einfügen" +"Christian Kirbach , 2008\n" +"Mario Blättermann , 2009, 2010, 2011, 2013" -#: C/file-copy-move.page:13(p) +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#. +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#. +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#. +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#. +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#. +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#. +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/index.page:33(media) C/edit-save-undo-redo.page:8(media) +#: C/edit-colors.page:8(media) C/edit-rotate.page:8(media) +#: C/edit-resize-crop.page:8(media) C/edit-redeye.page:7(media) +msgctxt "_" msgid "" -"To copy a file in the browser view, use EditCopy, or press CtrlC. To " -"move a file, use EditCut, or press " -"CtrlX. Then navigate to the " -"destination folder using the folder tree. Use EditPaste, or press CtrlV, to complete the file transfer." -msgstr "" -"Um eine Datei in der Browseransicht zu kopieren, wählen Sie " -"BearbeitenKopieren oder drücken Sie " -"StrgC. Um eine Datei zu verschieben, " -"wählen Sie BearbeitenAusschneiden " -"oder drücken Sie StrgX. Dann gehen " -"Sie im Ordnerbaum zum Zielordner. Wählen Sie BearbeitenEinfügen oder drücken Sie StrgV, um die Dateiverschiebung abzuschließen." +"external ref='figures/palette.png' md5='32835e7d77efd9833244ca80a4adb48e'" +msgstr "original" -#: C/file-copy-move.page:26(title) -msgid "Drag and Drop" -msgstr "Anklicken und Ziehen" +#: C/index.page:7(credit/name) +msgid "Paolo Bacchilega" +msgstr "Paolo Bacchilega" -#: C/file-copy-move.page:27(p) -msgid "" -"To copy a file to another folder, simply drag the file (with a sustained " -"left-mouse click) to the destination folder visible in the folder tree. To " -"move a file, hold down the Shift key while dragging." -msgstr "" -"Um eine Datei in einen anderen Ordner zu kopieren, ziehen Sie sie mit der " -"Maus bei gedrückter linker Maustaste in den im Ordnerbaum sichtbaren " -"Zielordner. Um eine Datei zu verschieben, halten Sie bei diesem Vorgang die " -"Umschalttaste gedrückt." +#: C/index.page:12(credit/name) +msgid "Michael J. Chudobiak" +msgstr "Michael J. Chudobiak" -#: C/file-copy-move.page:31(p) -msgid "" -"You can also use the middle mouse button to drag files. In this case, " -"gThumb will ask you if you wish to copy the files, move the " -"files, or cancel the operation." -msgstr "" -"Sie können zum Ziehen von Dateien auch die mittlere Maustaste verwenden. In " -"diesem Fall fragt gThumb, ob Sie die Datei kopieren oder " -"verschieben oder den Vorgang abbrechen wollen." +#: C/index.page:20(page/title) +msgid "gThumb Help" +msgstr "gThumb-Hilfe" -#: C/file-copy-move.page:37(title) -msgid "File Copy / Move Dialog" -msgstr "Dialog zum Kopieren und Verschieben von Dateien" +#: C/index.page:23(section/title) +msgid "Welcome" +msgstr "Willkommen" -#: C/file-copy-move.page:38(p) -msgid "" -"Select the files to be transferred, right-click on the selection, and choose " -"Copy to... or Move to.... This will open a folder-selection dialog, where you can choose the " -"destination folder. At the bottom of the dialog, you can enable the " -"View the destination option if you want to go to " -"the destination folder after the file transfer is complete." -msgstr "" -"Wählen Sie die zu übertragenden Dateien aus und klicken Sie mit der rechten " -"Maustaste in die Auswahl. Wählen Sie dann Kopieren nach … oder Verschieben nach …. Dadurch " -"wird ein Dateiauswahldialog geöffnet, in welchem Sie den Zielordner wählen " -"können. Am unteren Rand des Dialogs können Sie die Option Ziel " -"betrachten aktivieren, falls Sie den Zielordner öffnen " -"wollen, nachdem die Dateiübertragung abgeschlossen ist." +#: C/index.page:27(section/title) +msgid "File Management" +msgstr "Dateiverwaltung" -#: C/slideshow.page:7(title) -msgid "Automatic Slideshow" -msgstr "Automatische Dia-Vorführungen" +#: C/index.page:31(section/title) +msgid "Editing Mode" +msgstr "Bearbeitungsmodus" -#: C/slideshow.page:9(p) +#: C/index.page:32(section/p) msgid "" -"A slideshow of the currently selected images can be started from the image " -"browser by pressing F5, by clicking the slideshow toolbar icon, " -"or by clicking ViewSlideshow. If no " -"images are selected, all images in the folder will be included." +" " +"Numerous editing tools are provided for touching-up individual photos. Undo " +"and redo functions are provided, up until the photo is saved. To access the " +"editing tools, open an image and then click the Edit File toolbar " +"button (the palette icon), or press e." msgstr "" -"Eine Diaschau der derzeit ausgewählten Bilder kann im Bildbetrachter mit " -"F5 gestartet werden, durch Drücken des Diaschau-Knopfes in der " -"Werkzeugleiste oder über den Menüpunkt AnsichtDiaschau. Wenn keine Bilder ausgewählt sind, so " -"werden alle Bilder im Ordner einbezogen." +" " +"Verschiedene Bearbeitungswerkzeuge stehen zum Individualisieren Ihrer Fotos " +"bereit. Sie haben Möglichkeiten, Ihre Änderungen zurückzunehmen oder zu " +"wiederholen, bis das Foto endgültig gespeichert wird. Um auf die " +"Bearbeitungswerkzeuge zuzugreifen, öffnen Sie ein Bild und klicken Sie auf " +"den Werkzeugleistenknopf Datei bearbeiten (das Symbol einer " +"Palette) oder drücken Sie e." -#: C/slideshow.page:15(p) -msgid "" -"The transition effects and the time each image is shown can be modified from " -"the EditPreferencesSlideshow dialog." -msgstr "" -"Die Überblendeffekte und die Anzeigedauer jedes Bildes können im Dialog " -"BearbeitenEinstellungenDiaschau angepasst werden." +#: C/index.page:42(section/title) +msgid "Batch Tools" +msgstr "Werkzeuge zur Stapelverarbeitung" -#: C/slideshow.page:19(p) +#: C/index.page:43(section/p) msgid "" -"Some graphics cards and drivers may experience problems (crashes) if " -"transition effects are enabled. If you experience such difficulties, set the " -"Transition effect preference to None." +"Batch tools are provided to modify multiple images simultaneously. Changes " +"are written immediately, and are not undoable." msgstr "" -"Einige Grafikkarten und Treiber können Probleme mit Überblendeffekten " -"bekommen und sogar abstürzen. Wenn Sie solchen Problemen begegnen, dann " -"setzen Sie die Einstellung Übergangseffekt auf Keinen." +"Werkzeuge zur Stapelverarbeitung ermöglichen Änderungen an mehreren Bildern " +"gleichzeitig. Die Änderungen werden unmittelbar angewendet, lassen sich aber " +"auch rückgängig machen." -#: C/slideshow.page:23(p) -msgid "" -"You can advance manually to the next image by pressing Down Arrow, Right Arrow, Page Down or Space." -msgstr "" -"Sie können manuell zum nächsten Bild durch Drücken von Pfeiltaste " -"runter, Rechtspfeil, Bild ab oder der " -"Leertaste gelangen." +#: C/index.page:49(section/title) +msgid "Slideshows" +msgstr "Dia-Vorführungen" -#: C/slideshow.page:27(p) +#: C/index.page:53(section/title) +msgid "Importing" +msgstr "Importieren" + +#: C/index.page:57(section/title) +msgid "Sharing" +msgstr "Freigeben" + +#: C/index.page:61(section/title) +msgid "Organizing" +msgstr "Organisieren" + +#: C/index.page:65(section/title) +msgid "Other Tools" +msgstr "Weitere Werkzeuge" + +#: C/index.page:69(section/title) +msgid "Reference" +msgstr "Referenz" + +#: C/attributes.page:6(page/title) +msgid "Attribute Codes" +msgstr "Attribut-Codes" + +#: C/attributes.page:7(page/p) msgid "" -"You can go back to the previous image by pressing Up Arrow, " -"Left Arrow or Page Up." +"gThumb stores many different attributes for each file. Extensions " +"may add more. The list below is a summary of some of the more common " +"attributes:" msgstr "" -"Sie können zum vorigen Bild durch Drücken von Pfeiltaste hoch, " -"Linkspfeil oder Bild auf gelangen." +"gThumb speichert viele verschiedene Attribute für jede Datei. " +"Erweiterungen könnten noch weitere hinzufügen. Die unten aufgeführte Liste " +"enthält eine Zusammenfassung einiger häufig anzutreffender Attribute:" -#: C/slideshow.page:30(p) -msgid "You can pause or un-pause the slideshow by pressing p." -msgstr "" -"Sie können die Diaschau durch Drücken von p anhalten oder " -"fortsetzen." +#: C/attributes.page:12(item/p) +msgid "gth::file::display-size" +msgstr "gth::file::display-size" -#: C/slideshow.page:32(p) -msgid "To exit the slideshow, press Escape or F5." -msgstr "" -"Um die Diaschau zu verlassen, drücken Sie Esc oder F5." +#: C/attributes.page:15(item/p) +msgid "standard::fast-content-type" +msgstr "standard::fast-content-type" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/import.page:21(None) -msgid "@@image: 'figures/import.png'; md5=aab2ba4d889d170b219c554294d69b0f" -msgstr "translated" +#: C/attributes.page:18(item/p) +msgid "general::dimensions" +msgstr "general::dimensions" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/import.page:43(None) -msgid "" -"@@image: 'figures/import-pref-auto-folder.png'; " -"md5=0a41de83da83b762e37f3962a7e4c042" -msgstr "translated" +#: C/attributes.page:21(item/p) +msgid "general::format" +msgstr "general::format" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/import.page:75(None) -msgid "" -"@@image: 'figures/import-pref-custom-format.png'; " -"md5=989ca536c873ec926a4a71c876004b9f" -msgstr "translated" +#: C/attributes.page:24(item/p) +msgid "general::location" +msgstr "general::location" -#: C/import.page:8(title) -msgid "Importing From a Camera" -msgstr "Importieren von einer Digitalkamera" +#: C/attributes.page:27(item/p) +msgid "general::datetime" +msgstr "general::datetime" -#: C/import.page:10(p) -msgid "" -"On most systems, gThumb will automatically launch the import " -"dialog when a digital camera is connected to the computer, or a memory card " -"with photos is plugged into a card reader. (It does this because it is " -"registered as the default handler for x-content/image-dcf and x-content/" -"image-picturecd mime types.)" -msgstr "" -"Auf den meisten Systemen wird gThumb automatisch den Import-" -"Dialog öffnen, sobald eine Digitalkamera mit dem Rechner verbunden wird oder " -"eine Speicherkarte mit Fotos in einen Kartenleser gesteckt wird. Die " -"geschieht, weil es als Handler für die MIME-Typen x-content/image-dcf und x-" -"content/image-picturecd registriert ist." +#: C/attributes.page:30(item/p) +msgid "general::rating" +msgstr "general::rating" -#: C/import.page:16(p) -msgid "" -"To manually launch the import dialog, use FileImport " -"FromRemovable Device." -msgstr "" -"Um den Import-Dialog manuell zu starten, wählen Sie DateiImportieren vonTragbares Gerät." +#: C/attributes.page:33(item/p) +msgid "Exif::Image::Make" +msgstr "Exif::Image::Make" -#: C/import.page:20(title) -msgid "The Import Dialog" -msgstr "Der Importdialog" +#: C/attributes.page:36(item/p) +msgid "Exif::Image::Model" +msgstr "Exif::Image::Model" -#: C/import.page:24(p) -msgid "" -"The import dialog shows thumbnails of the photos available on the selected " -"device. The user can select one of more photos using normal keyboard or " -"mouse techniques (for example, Ctrl+click to add a photo to the selection, " -"or click and drag the mouse over the desired photos.) If no photos are " -"explicitly selected, all will be imported." -msgstr "" -"Der Importdialog zeigt Vorschaubilder der auf dem gewählten Gerät " -"vorliegenden Fotos. Der Benutzer kann ein oder mehrere Fotos mit den " -"üblichen Tastatur- und Maustechniken importieren (wie z.B. Strg+Mausklick " -"zum Hinzufügen eines Fotos zur Auswahl, Einfassen von Fotos mit gedrückter " -"linker Maustaste etc.). Wenn explizit keine Fotos ausgewählt sind, so werden " -"alle importiert." +#: C/attributes.page:39(item/p) +msgid "Exif::Image::Software" +msgstr "Exif::Image::Software" -#: C/import.page:30(p) -msgid "" -"Tags may optionally be associated with the imported photos, using the " -"Tags control below the thumbnail window. Click the drop-down " -"control to see the predefined tags." -msgstr "" -"Schlagwörter können bei Bedarf mit importierten Fotos mit Hilfe des " -"Auswahlfeldes Schlagwörter unter dem Vorschau-Fenster verknüpft " -"werden. Klicken Sie auf den entsprechenden Knopf mit Pfeil nach unten, um " -"die voreingestellten Schlagwörter einzusehen." +#: C/attributes.page:42(item/p) +msgid "Exif::Image::Artist" +msgstr "Exif::Image::Artist" -#: C/import.page:34(p) -msgid "" -"An event name may also be optionally associated with the photos. This event " -"name can be used to generate an automatic subfolder name (possibly " -"incorporating a date) as described below. For example, if the base " -"destination folder is \"/photos\", and you enter \"Wedding-Jennifer\" in the " -"Event field, you can configure generation of automatic subfolders " -"like \"/photos/2010-07-31, Wedding-Jennifer\"." -msgstr "" -"Ein Name für ein Ereignis kann ebenfalls optional mit den Fotos verknüpft " -"werden. Dieser Ereignisname kann zum automatischen Erstellen eines " -"Unterordnernamens (ggfs. mit einem Datum im Namen) wie unten beschrieben " -"genutzt werden. Wenn zum Beispiel der Zielordner »Fotos« wäre und Sie " -"»Hochzeit Jennifer« in das Textfeld Ereignis eingeben, dann können " -"Sie die automatische Erstellung von Unterordnern etwa mit dem Namen »/" -"Fotos/31.7.2010, Hochzeit Jennifer« einstellen." +#: C/attributes.page:45(item/p) +msgid "Exif::Image::Copyright" +msgstr "Exif::Image::Copyright" -#: C/import.page:42(title) -msgid "Standard Date-Based Subfolders" -msgstr "Normale, auf Datum basierende Unterordner" +#: C/attributes.page:48(item/p) +msgid "Exif::Photo::ISOSpeedRatings" +msgstr "Exif::Photo::ISOSpeedRatings" -#: C/import.page:46(p) -msgid "" -"As mentioned above, subfolders for imported photos can be automatically " -"generated based on event names and dates. This is enabled or disabled by " -"clicking on the destination foldername in the import dialog. This opens a " -"second dialog, where the base folder for imports may be selected (the " -"Destination folder). To generate automatic subfolders, select " -"Automatic subfolder." -msgstr "" -"Wie zuvor erwähnt, können Unterordner für importierte Fotos automatisch auf " -"Basis von Ereignisnamen oder Kalenderdatum erstellt werden. Dies wird durch " -"einen Klick auf den Zielordnernamen im Dialog zum Importieren festgelegt. " -"Dadurch wird ein zweiter Dialog geöffnet, in dem der Basisordner (der " -"Speicherort) für die importierten Fotos gewählt wird. Wählen Sie " -"Automatischer Unterordner, um automatisch Unterordner erstellen " -"zu lassen." +#: C/attributes.page:51(item/p) +msgid "Exif::Photo::BrightnessValue" +msgstr "Exif::Photo::BrightnessValue" -#: C/import.page:52(p) -msgid "" -"You can select either the File Date or the Current Date to use as the basis for subfolder naming. (The File Date " -"examines the dates embedded in the file metadata to determine when the photo " -"was taken.) A variety of standard date formats are available (year-" -"month for example). The as single subfolder checkbox " -"controls whether a \"deep\" or \"shallow\" hierarchy of files is made (for " -"example, with year-month, you can have year subfolders with month " -"subfolders under them, or all subfolders can be at the same level in the " -"filesystem, with the year and name both the folder name." -msgstr "" -"Sie können entweder das Dateidatum oder das aktuelle Datum als Basis für den Namen des Unterordners verwenden (Das " -"Dateidatum untersucht die Metadaten der Datei zur Bestimmung des " -"Aufnahmedatums). Eine Reihe von üblichen Datumsformaten steht zur Auswahl " -"(zum Beispiel Jahr-Monat). Das Ankreuzfeld als einzelner " -"Unterordner legt fest, ob eine tiefe oder flache Ordner-Hierarchie " -"angelegt wird. Zum Beispiel kann es für die Einstellung Jahr-Monat einen Unterordner mit der Jahreszahl und einen weiteren innerhalb mit " -"dem Monat geben, oder es kann nur einen mit Monat und Jahreszahl im " -"Ordnernamen geben." +#: C/attributes.page:54(item/p) +msgid "Exif::Photo::FNumber" +msgstr "Exif::Photo::FNumber" + +#: C/attributes.page:57(item/p) +msgid "Exif::Photo::ApertureValue" +msgstr "Exif::Photo::ApertureValue" + +#: C/attributes.page:60(item/p) +msgid "Exif::Photo::MaxApertureValue" +msgstr "Exif::Photo::MaxApertureValue" + +#: C/attributes.page:63(item/p) +msgid "Exif::Photo::ExposureTime" +msgstr "Exif::Photo::ExposureTime" + +#: C/attributes.page:66(item/p) +msgid "Exif::Photo::ExposureProgram" +msgstr "Exif::Photo::ExposureProgram" + +#: C/attributes.page:69(item/p) +msgid "Exif::Photo::ExposureIndex" +msgstr "Exif::Photo::ExposureIndex" + +#: C/attributes.page:72(item/p) +msgid "Exif::Photo::ExposureBiasValue" +msgstr "Exif::Photo::ExposureBiasValue" + +#: C/attributes.page:75(item/p) +msgid "Exif::Photo::ExposureMode" +msgstr "Exif::Photo::ExposureMode" + +#: C/attributes.page:78(item/p) +msgid "Exif::Photo::ShutterSpeedValue" +msgstr "Exif::Photo::ShutterSpeedValue" + +#: C/attributes.page:81(item/p) +msgid "Exif::Photo::MeteringMode" +msgstr "Exif::Photo::MeteringMode" + +#: C/attributes.page:84(item/p) +msgid "Exif::Photo::LightSource" +msgstr "Exif::Photo::LightSource" + +#: C/attributes.page:87(item/p) +msgid "Exif::Photo::WhiteBalance" +msgstr "Exif::Photo::WhiteBalance" + +#: C/attributes.page:90(item/p) +msgid "Exif::Photo::Flash" +msgstr "Exif::Photo::Flash" + +#: C/attributes.page:93(item/p) +msgid "Exif::Photo::FocalLength" +msgstr "Exif::Photo::FocalLength" -#: C/import.page:61(p) -msgid "" -"It is not necessary to use the predefined date formats. If you select " -"custom format, standard date codes can be used. Click on the help " -"icon to the right of the custom format field for a list of format codes. \"%E" -"\" is a special code that will embed the Event name defined in " -"the main import dialog." -msgstr "" -"Es ist nicht zwingend, die vordefinierten Datumsformate zu verwenden. Wenn " -"Sie Eigenes Format wählen, können Sie voreingestellte " -"Datumsformatangaben verwenden. Klicken Sie auf das Hilfesymbol rechts im " -"Eingabefeld für das Datumsformat, um eine Liste der Formatangaben " -"einzusehen. »%E« ist eine spezielle Angabe, die den Ereignisnamen " -"aus dem Import-Dialog einbindet." +#: C/attributes.page:96(item/p) +msgid "Exif::Photo::SubjectArea" +msgstr "Exif::Photo::SubjectArea" -#: C/import.page:67(p) -msgid "See for more date format codes." -msgstr "" -"Lesen Sie auch für weitere " -"Datumsformatangaben." +#: C/attributes.page:99(item/p) +msgid "Exif::Photo::Contrast" +msgstr "Exif::Photo::Contrast" -#: C/import.page:69(p) -msgid "" -"If you use automatic subfolder naming, the Destination field in " -"the main import dialog will show the automatic portion of the folder in red. " -"(For date-based formats, dummy data may be shown in the red portion.)" -msgstr "" -"Wenn Sie automatische Benennung der Unterordner verwenden, dann zeigt das " -"Feld Speicherort im Import-Dialog den automatisch erzeugten " -"Anteil des Ordnernamens in rot. Für auf Datum basierende Formate wird " -"eventuell ein Scheinteil in rot dargestellt." +#: C/attributes.page:102(item/p) +msgid "Exif::Photo::Saturation" +msgstr "Exif::Photo::Saturation" -#: C/import.page:74(title) -msgid "Using Custom Formats" -msgstr "Verwendung benutzerdefinierter Formate" +#: C/attributes.page:105(item/p) +msgid "Exif::Photo::Sharpness" +msgstr "Exif::Photo::Sharpness" -#: C/bookmarks.page:6(title) -msgid "Using Bookmarks" -msgstr "Verwendung von Lesezeichen" +#: C/strftime.page:6(page/title) +msgid "Date/Time Format Codes" +msgstr "Codes für Datums- und Zeitformat" -#: C/bookmarks.page:8(p) +#: C/strftime.page:8(page/p) msgid "" -"Frequently-used folders can be added to the bookmark list for rapid access. " -"To add the current folder to the bookmark list, press CtrlD or use the command BookmarksAdd Bookmark." +"This is a summary of standard date/time codes that may be used in format " +"strings:" msgstr "" -"Häufig genutzte Ordner können für schnellen Zugriff den Lesezeichen " -"hinzugefügt werden. Wechseln Sie zu dem Ordner, den Sie hinzufügen möchten, " -"und drücken Sie StrgD oder verwenden " -"Sie das Menü LesezeichenLesezeichen hinzufügen." +"Es folgt eine Zusammenfassung der Datums- und Uhrzeit-Codes, die in " +"Formatangaben verwendet werden können:" -#: C/bookmarks.page:13(p) -msgid "" -"To remove or rearrange bookmarks in a different order use the " -"BookmarksEdit Bookmarks command." -msgstr "" -"Wählen Sie LesezeichenLesezeichen bearbeiten, um Lesezeichen zu löschen oder neu zu sortieren." +#: C/strftime.page:12(table/title) +msgid "Valid format codes for custom subfolders" +msgstr "Gültige Formatangaben für eigene Unterordner" -#: C/bookmarks.page:16(p) -msgid "" -"BookmarksSystem Bookmarks provides " -"access to the system bookmarks that have been defined in Nautilus " -"or the file-chooser dialog used in most Gnome applications." -msgstr "" -"LesezeichenSystemlesezeichen bietet " -"Zugriff auf die Systemlesezeichen, welche in Nautilus oder dem " -"Dateiwähler-Dialog festgelegt wurden, welcher von den meisten GNOME-" -"Anwendungen eingesetzt wird." +#: C/strftime.page:15(td/p) +msgid "%a" +msgstr "%a" -#: C/wallpaper.page:6(title) -msgid "Desktop Wallpaper" -msgstr "Bildschirmhintergrund" +#: C/strftime.page:18(td/p) +msgid "The abbreviated weekday name according to the current locale." +msgstr "Der abgekürzte Wochentag entsprechend der Ortseinstellung." -#: C/wallpaper.page:7(p) -msgid "" -"To set an image as the system desktop wallpaper, right-click on the image " -"and select Set as Desktop Background from the " -"pop-up menu. The desktop background will change, and the Gnome Appearance " -"Preferences dialog will appear. You can use this dialog to make adjustments " -"to the background settings (positioning, stretching, tiling, et cetera.)." -msgstr "" -"Um ein Bild als Arbeitsflächenhintergrund festzulegen, klicken Sie mit der " -"rechten Maustaste auf das Bild und wählen Sie Als " -"Arbeitsflächenhintergrund verwenden aus dem Einblend-Menü. " -"Der Arbeitsflächenhintergrund wird sich daraufhin ändern und der Dialog zum " -"Erscheinungsbild von GNOME wird geöffnet. Sie können mit diesem Dialog " -"Anpassungen an den Einstellungen für das Hintergrundbild (Position, " -"Streckung, Kacheln usw.) vornehmen." +#: C/strftime.page:24(td/p) +msgid "%A" +msgstr "%A" -#: C/sharing-social.page:6(title) -msgid "Uploading to Photo-Sharing Web Sites" -msgstr "Übertragen zu Bilderdiensten im Web" +#: C/strftime.page:27(td/p) +msgid "The full weekday name according to the current locale." +msgstr "Der volle Wochentag entsprechend der Ortseinstellung." -#: C/sharing-social.page:7(p) -msgid "" -"gThumb is provided with a number of extensions for uploading photos to " -"various \"social media\" web sites. By default, uploaders for Facebook, " -"Flickr, Picasa, and Photobucket are enabled." -msgstr "" -"gThumb verfügt über eine Reihe von Erweiterungen zum Übertragen von Fotos zu " -"Webseiten verschiedener »sozialer Netzwerke«. Als Voreinstellung sind die " -"Übertragungen zu Facebook, Flickr, Picasa und Photobucket aktiviert." +#: C/strftime.page:33(td/p) +msgid "%b" +msgstr "%b" -#: C/sharing-social.page:13(p) -msgid "" -"To upload a series of photos, select the images in the browser view, and " -"click the Share button in the toolbar. Select the appropriate web " -"site from the menu that appears." -msgstr "" -"Um eine Reihe von Fotos hochzuladen, wählen Sie die Bilder in der " -"Browseransicht aus und klicken Sie auf den Knopf Freigeben in der " -"Werkzeugleiste. Wählen Sie die entsprechende Webseite im erscheinenden Menü " -"aus." +#: C/strftime.page:36(td/p) +msgid "The abbreviated month name according to the current locale." +msgstr "Der abgekürzte Monat entsprechend der Ortseinstellung." -#: C/sharing-social.page:17(p) -msgid "" -"You may be prompted for additional information specific to the destination " -"site, like an album name. You may also be prompted for your user name and " -"password for the site. It may be necessary for gThumb to open a web browser, " -"where you complete the required authentication steps. Once you have " -"completed the required authentication steps in the browser, return to gThumb " -"and continue the upload." -msgstr "" -"Sie werden um die Angabe zusätzlicher Informationen gebeten, abhängig vom " -"Ziel der Übertragung, wie beispielsweise ein Albumname. Außerdem werden Sie " -"nach dem Benutzernamen und dem Passwort gefragt. Es könnte erforderlich " -"sein, dass gThumb einen Webbrowser öffnet, in welchem Sie die notwendigen " -"Schritte zur Legitimierung vollziehen können. Sobald dies erledigt ist, " -"kehren Sie zu gThumb zurück und setzen Sie die Übertragung fort." +#: C/strftime.page:42(td/p) +msgid "%B" +msgstr "%B" -#: C/sharing-social.page:26(p) -msgid "" -"If you do not see the expected upload sites in the Share menu, " -"check that the appropriate exporter extensions are enabled in " -"EditExtensions." -msgstr "" -"Falls die erwarteten Webseiten im Menü Freigeben nicht angezeigt " -"werden, prüfen Sie, ob die entsprechende Export-Erweiterung in " -"BearbeitenErweiterungen aktiviert ist." +#: C/strftime.page:45(td/p) +msgid "The full month name according to the current locale." +msgstr "Der volle Monat entsprechend der Ortseinstellung." -#: C/sharing-social.page:31(p) -msgid "" -"For some sites, gThumb also supports downloading photos from the site into " -"gThumb. See the FileImport From menu " -"for the available download options." -msgstr "" -"Bei einigen Diensten unterstützt gThumb außerdem das Herunterladen von Fotos " -"in gThumb. Schauen Sie im Menü DateiImportieren von nach den verfügbaren Download-Optionen." +#: C/strftime.page:50(td/p) +msgid "%c" +msgstr "%c" -#: C/sharing-disc.page:6(title) -msgid "Creating a CD/DVD/ISO" -msgstr "Erzeugen einer CD/DVD oder eines ISO-Abbildes" +#: C/strftime.page:53(td/p) +msgid "The preferred date and time representation for the current locale." +msgstr "Die übliche Datums- und Zeitangabe entsprechend der Ortseinstellung." -#: C/sharing-disc.page:7(p) -msgid "" -"To write a series of files to an optical disk (CD or DVD), or to create an " -"ISO disk image file, use the FileExport ToOptical Disc menu item." -msgstr "" -"Um eine Reihe von Dateien auf ein optisches Medium (CD oder DVD) zu " -"schreiben oder um ein ISO-Abbild zu erstellen, verwenden Sie bitte den " -"Menüpunkt DateiExportieren nachOptisches " -"Medium." +#: C/strftime.page:59(td/p) +msgid "%C" +msgstr "%C" + +#: C/strftime.page:62(td/p) +msgid "The century number (year/100) as a 2-digit integer." +msgstr "Das Jahrhundert als zweistellige Zahl." + +#: C/strftime.page:67(td/p) +msgid "%d" +msgstr "%d" + +#: C/strftime.page:70(td/p) +msgid "The day of the month as a decimal number (range 01 to 31)." +msgstr "Der Monatstag als Dezimalzahl (zwischen 01 und 31)." + +#: C/strftime.page:76(td/p) +msgid "%D" +msgstr "%D" -#: C/sharing-disc.page:13(p) +#: C/strftime.page:79(td/p) msgid "" -"You will be offered the choice of writing the currently selected files, the " -"entire current folder, or the entire current folder and its subfolders. " -"Click OK when you have made the appropriate selection." +"Equivalent to %m/%d/%y. (Yecch -- for Americans only. Americans should note " +"that in other countries %d/%m/%y is rather common. This means that in " +"international context this format is ambiguous and should not be used.)" msgstr "" -"Sie erhalten die Wahl zwischen dem Schreiben der aktuell ausgewählten " -"Dateien, des gesamten aktuellen Ordners oder des gesamten Ordners " -"einschließlich Unterordner. Klicken Sie auf OK, sobald Sie Ihre " -"Auswahl getroffen haben." +"Identisch zu »%m/%d/%y«. (Nur in Nordamerika üblich, der Rest der Welt " +"verwendet Tag/Monat/Jahr: »%d/%m/%y«.)" -#: C/sharing-disc.page:19(p) +#: C/strftime.page:87(td/p) +msgid "%e" +msgstr "%e" + +#: C/strftime.page:90(td/p) msgid "" -"The next dialog will select the destination disk, or the ISO file to save. " -"When you are ready to complete the process, click Create Image. " -"The optical disk writing process will then commence, or the ISO file will be " -"written, completing the process." +"Like %d, the day of the month as a decimal number, but a leading zero is " +"replaced by a space." msgstr "" -"Der nächste Dialog legt das Zielmedium oder den Namen des ISO-Abbildes fest. " -"Klicken Sie anschließend auf Abbild erstellen, um den Vorgang zu " -"starten. Der optische Schreibvorgang beginnt bzw. wird dann die ISO-Datei " -"geschrieben." +"Repräsentiert wie %d den Tag als Dezimalzahl, aber führende Nullen werden " +"als Leerzeichen dargestellt." -#: C/shortcuts.page:7(title) -msgid "Keyboard Shortcuts" -msgstr "Tastenkombinationen" +#: C/strftime.page:96(td/p) +msgid "%E" +msgstr "%E" -#: C/shortcuts.page:10(title) -msgid "Viewing and hiding parts of the user interface" -msgstr "Anzeigen und verbergen von Teilen der grafischen Oberflächen" +#: C/strftime.page:99(td/p) C/strftime.page:208(td/p) +msgid "Modifier: use alternative format, see below." +msgstr "Verwende alternatives Format, siehe weiter unten." -#: C/shortcuts.page:14(p) C/shortcuts.page:91(p) C/shortcuts.page:270(p) -#: C/shortcuts.page:495(p) -msgid "Keyboard Shortcut" -msgstr "Tastenkombination" +#: C/strftime.page:104(td/p) +msgid "%F" +msgstr "%F" -#: C/shortcuts.page:17(p) C/shortcuts.page:94(p) C/shortcuts.page:189(p) -#: C/shortcuts.page:273(p) C/shortcuts.page:498(p) C/rename-series.page:27(p) -msgid "Description" -msgstr "Beschreibung" +#: C/strftime.page:107(td/p) +msgid "Equivalent to %Y-%m-%d (the ISO 8601 date format). (C99)" +msgstr "Identisch zu %Y-%m-%d (das ISO 8601 Datumsformat). (C99)" -#: C/shortcuts.page:23(key) -msgid "F9" -msgstr "F9" +#: C/strftime.page:113(td/p) +msgid "%G" +msgstr "%G" -#: C/shortcuts.page:27(p) +#: C/strftime.page:116(td/p) msgid "" -"Show/Hide the sidebar in the browser mode. The sidebar contains the folder " -"tree and the file properties summary (if enabled)." +"The ISO 8601 year with century as a decimal number. The 4-digit year " +"corresponding to the ISO week number (see %V). This has the same format and " +"value as %y, except that if the ISO week number belongs to the previous or " +"next year, that year is used instead." msgstr "" -"Die Seitenleiste im Ansichtsmodus anzeigen/verbergen. Die Seitenleiste " -"enthält den Ordnerbaum und die Zusammenfassung der Dateieigenschaften " -"(sofern aktiviert)." +"Das ISO 8601-Jahr mit dem Jahrhundert als Dezimalzahl. Das Jahr mit vier " +"Ziffern entspricht der ISO Wochenzahl (siehe %V). Es hat das selbe Format " +"und Jahr wie »%y«, mit der Ausnahme, dass wenn die ISO Wochenzahl zum " +"vorherigen oder nächsten Jahr gehört, jenes Jahr stattdessen verwendet wird." + +#: C/strftime.page:125(td/p) +msgid "%g" +msgstr "%g" -#: C/shortcuts.page:34(key) -msgid "i" -msgstr "I" +#: C/strftime.page:128(td/p) +msgid "Like %G, but without century, i.e., with a 2-digit year (00-99)." +msgstr "" +"Wie »%G«, aber ohne Jahrhundert, d.h. mit einer zweistelligen Jahreszahl " +"(00-99)." -#: C/shortcuts.page:38(p) -msgid "Show the file properties summary." -msgstr "Die Zusammenfassung der Eigenschaften der Datei anzeigen." +#: C/strftime.page:134(td/p) +msgid "%h" +msgstr "%h" + +#: C/strftime.page:137(td/p) +msgid "Equivalent to %b." +msgstr "Entspricht %b." + +#: C/strftime.page:142(td/p) +msgid "%H" +msgstr "%H" + +#: C/strftime.page:145(td/p) +msgid "The hour as a decimal number using a 24-hour clock (range 00 to 23)." +msgstr "Die Stunde als Dezimalzahl im 24-Stunden-Format (von 00 bis 23)." -#: C/shortcuts.page:44(key) -msgid "F8" -msgstr "F8" +#: C/strftime.page:151(td/p) +msgid "%I" +msgstr "%I" -#: C/shortcuts.page:48(p) -msgid "Shows/hides the thumbnail pane in the viewer mode." -msgstr "Die Vorschauleiste im Ansichtsmodus anzeigen/verbergen." +#: C/strftime.page:154(td/p) +msgid "The hour as a decimal number using a 12-hour clock (range 01 to 12)." +msgstr "Die Stunde als Dezimalzahl im 12-Stunden-Format (von 01 bis 12)." -#: C/shortcuts.page:53(p) -msgid "F11 or f" -msgstr "F11 or f" +#: C/strftime.page:160(td/p) +msgid "%j" +msgstr "%j" -#: C/shortcuts.page:58(p) -msgid "Toggles the fullscreen mode." -msgstr "Den Vollbildmodus ein- oder ausschalten." +#: C/strftime.page:163(td/p) +msgid "The day of the year as a decimal number (range 001 to 366)." +msgstr "Der Jahrestag als Dezimalzahl (von 001 bis 366)." -#: C/shortcuts.page:64(key) C/shortcuts.page:320(key) -msgid "Ctrl" -msgstr "Strg" - -#: C/shortcuts.page:64(key) -msgid "t" -msgstr "T" +#: C/strftime.page:169(td/p) +msgid "%k" +msgstr "%k" -#: C/shortcuts.page:68(p) -msgid "Shows/hides the thumbnails in the browser mode." -msgstr "Die Vorschaubilder im Ansichtsmodus anzeigen/verbergen." +#: C/strftime.page:172(td/p) +msgid "" +"The hour (24-hour clock) as a decimal number (range 0 to 23); single digits " +"are preceded by a blank. (See also %H.)" +msgstr "" +"Die Stunde (24-Stunden-Format) als Dezimalzahl (von 0 bis 23); einzelnen " +"Ziffern geht ein Leerzeichen vor. (Siehe auch %H.)" -#: C/shortcuts.page:74(key) C/shortcuts.page:524(key) -msgid "Esc" -msgstr "Esc" +#: C/strftime.page:179(td/p) +msgid "%l" +msgstr "%l" -#: C/shortcuts.page:78(p) -msgid "Closes the viewer or fullscreen mode." -msgstr "Schließt den Betrachter oder den Vollbildmodus." +#: C/strftime.page:182(td/p) +msgid "" +"The hour (12-hour clock) as a decimal number (range 1 to 12); single digits " +"are preceded by a blank. (See also %I.)" +msgstr "" +"Die Stunde (12-Stunden-Format) als Dezimalzahl (von 1 bis 12); einzelnen " +"Ziffern geht ein Leerzeichen vor. (Siehe auch %I.)" -#: C/shortcuts.page:87(title) -msgid "Editing shortcuts for the browser and viewer" -msgstr "Tastenkombinationen für Bildbetrachter und Browser bearbeiten" +#: C/strftime.page:189(td/p) +msgid "%m" +msgstr "%m" -#: C/shortcuts.page:100(key) -msgid "e" -msgstr "E" +#: C/strftime.page:192(td/p) +msgid "The month as a decimal number (range 01 to 12)." +msgstr "Der Monat als Dezimalzahl (von 01 bis 12)." -#: C/shortcuts.page:104(p) -msgid "Edit the image. Opens the viewer and shows the editing tools." -msgstr "" -"Das Bild bearbeiten. Es wird der Betrachter geöffnet und die " -"Bearbeitungswerkzeuge angezeigt." +#: C/strftime.page:197(td/p) +msgid "%M" +msgstr "%M" -#: C/shortcuts.page:110(key) -msgid "g" -msgstr "G" +#: C/strftime.page:200(td/p) +msgid "The minute as a decimal number (range 00 to 59)." +msgstr "Die Minute als Dezimalzahl (von 00 bis 59)." -#: C/shortcuts.page:114(p) -msgid "Open the image with the GNU Image Manipulation Program (GIMP)." -msgstr "Das Bild mit dem GNU Image Manipulation Program (GIMP) öffnen." +#: C/strftime.page:205(td/p) +msgid "%O" +msgstr "%O" -#: C/shortcuts.page:120(key) -msgid "F2" -msgstr "F2" +#: C/strftime.page:213(td/p) +msgid "%p" +msgstr "%p" -#: C/shortcuts.page:124(p) -msgid "Rename the image." -msgstr "Das Bild umbenennen." +#: C/strftime.page:216(td/p) +msgid "" +"Either 'AM' or 'PM' according to the given time value, or the corresponding " +"strings for the current locale. Noon is treated as 'pm' and midnight as 'am'." +msgstr "" +"Entweder »AM« oder »PM« je nach Uhrzeit, oder der entsprechende Text der " +"aktuellen Ortseinstellung. Die Mittagszeit wird als »pm« und Mitternacht als " +"»am« geführt." -#: C/shortcuts.page:129(p) -msgid "c or Ctrlm" -msgstr "c oder Strgm" +#: C/strftime.page:223(td/p) +msgid "%P" +msgstr "%P" -#: C/shortcuts.page:134(p) -msgid "Add comments or metadata to an image." -msgstr "Einen Kommentar oder Metadaten zu einem Bild hinzufügen." +#: C/strftime.page:226(td/p) +msgid "" +"Like %p but in lowercase: 'am' or 'pm' or a corresponding string for the " +"current locale." +msgstr "" +"Wie »%p«, aber in Kleinbuchstaben: »am« oder »pm«, oder der entsprechende " +"Text der aktuellen Ortseinstellung." -#: C/shortcuts.page:140(key) -msgid "]" -msgstr "]" +#: C/strftime.page:232(td/p) +msgid "%r" +msgstr "%r" -#: C/shortcuts.page:144(p) -msgid "Rotate right, losslessly if possible. The file is saved automatically." +#: C/strftime.page:235(td/p) +msgid "" +"The time in a.m. or p.m. notation. In the POSIX locale this is equivalent to " +"'%I:%M:%S %p'." msgstr "" -"Im Uhrzeigersinn nach Möglichkeit verlustfrei drehen. Die Datei wird " -"automatisch gespeichert." +"Die Zeit als Notation mit folgendem »a.m.« oder »p.m.«. In der POSIX " +"Ortseinstellung entspricht dies »%I:%M:%S %p«." -#: C/shortcuts.page:150(key) -msgid "[" -msgstr "[" +#: C/strftime.page:241(td/p) +msgid "%R" +msgstr "%R" -#: C/shortcuts.page:154(p) -msgid "Rotate left, losslessly if possible. The file is saved automatically." +#: C/strftime.page:244(td/p) +msgid "" +"The time in 24-hour notation (%H:%M). For a version including the seconds, " +"see %T below." msgstr "" -"Gegen den Uhrzeigersinn nach Möglichkeit verlustfrei drehen. Die Datei wird " -"automatisch gespeichert." +"Die Zeit im 24-Stunden-Format (»%H:%M«). Eine Variante mit Sekunden findet " +"sich unter »%H« weiter unten." -#: C/shortcuts.page:160(key) C/shortcuts.page:170(key) -msgid "Delete" -msgstr "Entf" +#: C/strftime.page:250(td/p) +msgid "%s" +msgstr "%s" -#: C/shortcuts.page:164(p) -msgid "Move the selected files to the Trash." -msgstr "Die ausgewählten Dateien in den Müll verschieben." +#: C/strftime.page:253(td/p) +msgid "" +"The number of seconds since the Epoch, i.e., since 1970-01-01 00:00:00 UTC." +msgstr "Die Anzahl vergangener Sekunden seit dem 01.01.1970, 00:00:00 Uhr UTC." -#: C/shortcuts.page:170(key) C/shortcuts.page:374(key) -#: C/shortcuts.page:397(key) -msgid "Shift" -msgstr "Umschalttaste" +#: C/strftime.page:259(td/p) +msgid "%S" +msgstr "%S" -#: C/shortcuts.page:174(p) -msgid "Delete the selected files permanently." -msgstr "Die gewählten Bilder dauerhaft löschen." +#: C/strftime.page:262(td/p) +msgid "" +"The second as a decimal number (range 00 to 60). (The range is up to 60 to " +"allow for occasional leap seconds.)" +msgstr "" +"Die Sekunden als Dezimalzahl (von 00 bis 60). (Die Spanne enthält die 60, um " +"gelegentliche Schlupfsekunden zu ermöglichen.)" -#: C/shortcuts.page:182(title) -msgid "Editing shortcuts for the viewer mode only" -msgstr "Tastenkombinationen nur für den Ansichtsmodus bearbeiten" +#: C/strftime.page:269(td/p) +msgid "%T" +msgstr "%T" -#: C/shortcuts.page:186(p) -msgid "Keyboard Shortcut (Case Sensitive)" -msgstr "Tastenkombinationen (Groß-/Kleinschreibung wird berücksichtigt)" +#: C/strftime.page:272(td/p) +msgid "The time in 24-hour notation (%H:%M:%S)." +msgstr "Die Uhrzeit im 24-Stunden-Format (»%H:%M:%S«)." -#: C/shortcuts.page:195(key) -msgid "h" -msgstr "h" +#: C/strftime.page:277(td/p) +msgid "%u" +msgstr "%u" -#: C/shortcuts.page:199(p) -msgid "Enhance colors." -msgstr "Farben verbessern." +#: C/strftime.page:280(td/p) +msgid "" +"The day of the week as a decimal number, range 1 to 7, Monday being 1. See " +"also %w." +msgstr "" +"Der Wochentag als Dezimalzahl im Intervall von 1 bis 7. Montag ist der erste " +"Wochentag 1. Siehe auch »%w«." -#: C/shortcuts.page:205(key) -msgid "l" -msgstr "L" +#: C/strftime.page:286(td/p) +msgid "%U" +msgstr "%U" -#: C/shortcuts.page:209(p) -msgid "Flip image." -msgstr "Das Bild umdrehen." +#: C/strftime.page:289(td/p) +msgid "" +"The week number of the current year as a decimal number, range 00 to 53, " +"starting with the first Sunday as the first day of week 01. See also %V and " +"%W." +msgstr "" +"Die Wochenzahl des laufenden Jahres als Dezimalzahl, von 00 bis 53, " +"beginnend mit dem ersten Sonntag als erster Wochentag 01. Siehe auch »%V« " +"und »%W«." -#: C/shortcuts.page:215(key) -msgid "m" -msgstr "M" +#: C/strftime.page:296(td/p) +msgid "%V" +msgstr "%V" -#: C/shortcuts.page:219(p) -msgid "Mirror image." -msgstr "Das Bild spiegeln." +#: C/strftime.page:299(td/p) +msgid "" +"The ISO 8601:1988 week number of the current year as a decimal number, range " +"01 to 53, where week 1 is the first week that has at least 4 days in the " +"current year, and with Monday as the first day of the week. See also %U and " +"%W." +msgstr "" +"Die ISO 8601:1988 Wochenzahl des laufenden Jahres als Dezimalzahl, von 01 " +"bis 53, wobei Woche 1 die erste Woche mit mindestens vier Tagen im laufenden " +"Jahr ist und Montag als erster Wochentag zählt. Siehe auch »%U« und »%W«." -#: C/shortcuts.page:225(key) -msgid "r" -msgstr "R" +#: C/strftime.page:308(td/p) +msgid "%w" +msgstr "%w" -#: C/shortcuts.page:229(p) -msgid "Rotate right." -msgstr "Rechts herum drehen." +#: C/strftime.page:311(td/p) +msgid "" +"The day of the week as a decimal, range 0 to 6, Sunday being 0. See also %u." +msgstr "" +"Der Wochentag als Dezimalzahl, von 0 bis 6. Sonntag zählt als Tag 0. Siehe " +"auch »%u«." -#: C/shortcuts.page:235(key) -msgid "R" -msgstr "R" +#: C/strftime.page:317(td/p) +msgid "%W" +msgstr "%W" -#: C/shortcuts.page:239(p) -msgid "Rotate left." -msgstr "Links herum drehen." +#: C/strftime.page:320(td/p) +msgid "" +"The week number of the current year as a decimal number, range 00 to 53, " +"starting with the first Monday as the first day of week 01." +msgstr "" +"Die Wochenzahl des laufenden Jahres als Dezimalzahl, im Intervall von 00 bis " +"53, beginnend mit dem ersten Montag als erster Wochentag 01." -#: C/shortcuts.page:245(key) -msgid "C" -msgstr "C" +#: C/strftime.page:327(td/p) +msgid "%x" +msgstr "%x" -#: C/shortcuts.page:249(p) -msgid "Crop image." -msgstr "Das Bild zuschneiden." +#: C/strftime.page:330(td/p) +msgid "" +"The preferred date representation for the current locale without the time." +msgstr "" +"Die übliche Datumsdarstellungsform der aktuellen Ortseinstellungen ohne die " +"Uhrzeit." -#: C/shortcuts.page:255(key) -msgid "S" -msgstr "S" +#: C/strftime.page:336(td/p) +msgid "%X" +msgstr "%X" -#: C/shortcuts.page:259(p) -msgid "Resize image." -msgstr "Größe des Bildes ändern." +#: C/strftime.page:339(td/p) +msgid "" +"The preferred time representation for the current locale without the date." +msgstr "" +"Die übliche Datumsdarstellungform der aktuellen Ortseinstellungen ohne das " +"Datum." -#: C/shortcuts.page:266(title) -msgid "Viewer shortcuts" -msgstr "Tastenkombinationen des Betrachters" +#: C/strftime.page:345(td/p) +msgid "%y" +msgstr "%y" -#: C/shortcuts.page:278(p) -msgid "Space or Page Down" -msgstr "Leertaste oder Bild ab" +#: C/strftime.page:348(td/p) +msgid "The year as a decimal number without a century (range 00 to 99)." +msgstr "Das Jahr als Dezimalzahl ohne das Jahrhundert (von 00 bis 99)." -#: C/shortcuts.page:283(p) -msgid "View the next image." -msgstr "Das nächste Bild zeigen." +#: C/strftime.page:354(td/p) +msgid "%Y" +msgstr "%Y" -#: C/shortcuts.page:288(p) -msgid "Backspace or Page Up" -msgstr "Löschtaste oder Bild auf" +#: C/strftime.page:357(td/p) +msgid "The year as a decimal number including the century." +msgstr "Das Jahr als Dezimalzahl einschließlich Jahrhundert." -#: C/shortcuts.page:293(p) -msgid "View the previous image." -msgstr "Das vorhergehende Bild zeigen." +#: C/strftime.page:362(td/p) +msgid "%z" +msgstr "%z" -#: C/shortcuts.page:299(key) C/shortcuts.page:416(key) -msgid "Home" -msgstr "Pos1" +#: C/strftime.page:365(td/p) +msgid "" +"The time-zone as hour offset from GMT. Required to emit RFC 822-conformant " +"dates (using \"%a, %d %b %Y %H:%M:%S %z\")." +msgstr "" +"Die Zeitzone als Stundendifferenz zu GMT. Wird für zu RFC 822 konforme " +"Datumsangaben benötigt (mit »%a, %d %b %Y %H:%M:%S %z«)." -#: C/shortcuts.page:303(p) -msgid "View the first image." -msgstr "Das erste Bild zeigen." +#: C/strftime.page:372(td/p) +msgid "%Z" +msgstr "%Z" -#: C/shortcuts.page:309(key) C/shortcuts.page:426(key) -msgid "End" -msgstr "Ende" +#: C/strftime.page:375(td/p) +msgid "The time zone or name or abbreviation." +msgstr "Die Zeitzone oder Name oder Abkürzung." -#: C/shortcuts.page:313(p) -msgid "View the last image." -msgstr "Das letzte Bild zeigen." +#: C/strftime.page:380(page/p) +msgid "" +"Some conversion specifications can be modified by preceding the conversion " +"specifier character by the E or O modifier to indicate that an alternative " +"format should be used. If the alternative format or specification does not " +"exist for the current locale, the behaviour will be as if the unmodified " +"conversion specification were used. The Single Unix Specification mentions " +"%Ec, %EC, %Ex, %EX, %Ey, %EY, %Od, %Oe, %OH, %OI, %Om, %OM, %OS, %Ou, %OU, " +"%OV, %Ow, %OW, %Oy, where the effect of the O modifier is to use alternative " +"numeric symbols (say, roman numerals), and that of the E modifier is to use " +"a locale-dependent alternative representation." +msgstr "" +"Einige Konvertierungsangaben können durch Voranstellen von »E« oder »O« vor " +"dem Buchstaben der Angabe so beeinflusst werden, dass ein alternatives " +"Format festgelegt wird. Falls das alternative Format nicht in der aktuellen " +"Ortseinstellung existiert, wird das ursprüngliche Format verwendet. Die " +"Single-Unix-Spezifikation verwendet %Ec, %EC, %Ex, %EX, %Ey, %EY, %Od, %Oe, " +"%OH, %OI, %Om, %OM, %OS, %Ou, %OU, %OV, %Ow, %OW, %Oy. Der Zusatz »O« " +"bedeutet, dass alternative numerische Angeben (wie z.B. römische Ziffern) " +"verwendet werden, und der Zusatz »E« bestimmt, dass eine von der " +"Ortseinstellung festgelegte alternative Darstellung verwendet wird." -#: C/shortcuts.page:321(key) -msgid "D" -msgstr "D" +#: C/introduction.page:6(page/title) +msgid "About gThumb" +msgstr "Info zu gThumb" -#: C/shortcuts.page:326(p) -msgid "Add the current location to the bookmarks." -msgstr "Den aktuellen Ort zu den Lesezeichen hinzufügen." +#: C/introduction.page:8(page/p) +msgid "" +"gThumb is an image viewer and browser written for the GNOME " +"environment. It lets you browse your hard disk, showing you thumbnails of " +"image files and view single images of many different formats." +msgstr "" +"gThumb ist ein Bildbetrachter für die GNOME-Umgebung. Es erlaubt " +"das Durchstöbern Ihrer Medien, zeigt Vorschaubilder an und stellt einzelne " +"Bilder verschiedenster Formate dar." -#: C/shortcuts.page:331(p) -msgid "+ or =" -msgstr "+ oder =" +#: C/introduction.page:13(page/p) +msgid "" +"gThumb supports the most common graphics formats, including JPEG, " +"GIF, TIF, and PNG. gThumb will also display other less common " +"image types if the supporting libraries are installed, including TGA, ICO, " +"BMP, XPM, and others." +msgstr "" +"gThumb unterstützt die häufigsten Grafikformate, wie JPEG, GIF, " +"TIF und PNG. gThumb zeigt auch weniger verbreitete Formate an, " +"sofern die dazu nötigen Bibliotheken installiert sind, wie TGA, ICO, BMP, " +"XPM und weitere." -#: C/shortcuts.page:336(p) -msgid "Zoom in." -msgstr "Vergrößern." +#: C/introduction.page:18(page/p) +msgid "" +"Some support for RAW image types is included, especially if the dcraw " +"program is installed on your system." +msgstr "" +"Verschiedene RAW-Bildtypen werden unterstützt, insbesondere dann, wenn auf " +"Ihrem System das Programm dcraw installiert ist." -#: C/shortcuts.page:342(key) -msgid "-" -msgstr "-" +#: C/introduction.page:21(page/p) +msgid "" +"gThumb not only lets you view image files but has many other " +"features such as adding comments to images, organizing images into catalogs, " +"printing images, slideshows, setting your desktop background, and more." +msgstr "" +"gThumb stellt nicht nur Bilder dar, sondern bietet auch viele " +"andere Funktionen wie z.B. das Hinzufügen von Bildkommentaren, Ordnen von " +"Bildern in Katalogen, Drucken, Diashow, das Ändern des Arbeitsflächen-" +"Hintergrundbildes und mehr." -#: C/shortcuts.page:346(p) -msgid "Zoom out." -msgstr "Verkleinern." +#: C/introduction.page:26(page/p) +msgid "" +"gThumb includes a tool to import photos from attached cameras and " +"memory card readers." +msgstr "" +"gThumb enthält ein Werkzeug zum Importieren von Fotos von einer " +"angeschlossenen Kameras und Speicherkarten-Lesegeräten." -#: C/shortcuts.page:351(p) -msgid "1 or z or / (numeric keypad)" +#: C/introduction.page:29(page/p) +msgid "" +"gThumb can read EXIF, XMP, and IPTC metadata that is commonly " +"embedded in files." msgstr "" -"1 oder z oder / (auf dem Nummernblock)" +"gThumb kann EXIF-, XMP- und IPTC-Metadaten lesen, die " +"üblicherweise in Dateien eingebettet sind." -#: C/shortcuts.page:357(p) -msgid "Actual size." -msgstr "Normale Größe." +#: C/introduction.page:32(page/p) +msgid "" +"gThumb provides a systems of extensions (or plug-ins), to allow " +"users to extend the functionality of gThumb." +msgstr "" +"gThumb bietet ein System für Erweiterungen (Plugins) und " +"ermöglicht es so Benutzern, die Funktionalität von gThumb zu " +"erweitern." -#: C/shortcuts.page:362(p) -msgid "x or * (numeric keypad)" -msgstr "xoder * (auf dem Nummernblock)" +#: C/introduction.page:34(page/p) +msgid "" +"More information about these extensions, and about gThumb " +"generally, is available at http://live.gnome.org/gthumb." +msgstr "" +"Weitere Informationen zu den Erweiterungen und zu gThumb erhalten " +"Sie unter http://live.gnome.org/" +"gthumb." -#: C/shortcuts.page:367(p) -msgid "Zoom to fit (scales down only, does not magnify)" -msgstr "Einpassen (verkleinert nur)" +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/browser.page:13(media) +msgctxt "_" +msgid "" +"external ref='figures/main-win.png' md5='93cf84bd05a153ab61951ae12bbe3f26'" +msgstr "translated" -#: C/shortcuts.page:375(key) -msgid "x" -msgstr "X" +#: C/browser.page:6(page/title) +msgid "Browsing Your Files" +msgstr "Durchsuchen des Dateisystems" -#: C/shortcuts.page:380(p) -msgid "Zoom to fit (scale down or magnify, as required)" -msgstr "Einpassen (verkleinert oder vergrößert je nach Bedarf)" +#: C/browser.page:8(page/p) +msgid "When you start gThumb the following window is displayed:" +msgstr "Wenn Sie gThumb starten, wird folgendes Fenster angezeigt:" -#: C/shortcuts.page:386(key) C/shortcuts.page:398(key) -msgid "Arrows" -msgstr "Pfeiltasten" +#: C/browser.page:11(figure/title) +msgid "The main window" +msgstr "Das Hauptfenster" -#: C/shortcuts.page:390(p) -msgid "Scroll the image." -msgstr "Das Bild vorschieben." +#: C/browser.page:16(page/p) +msgid "The gThumb browser contains the following elements:" +msgstr "Der gThumb-Bildbetrachter enthält die folgenden Elemente:" -#: C/shortcuts.page:403(p) -msgid "Scroll the image faster." -msgstr "Das Bild schneller vorschieben." +#: C/browser.page:20(item/title) +msgid "Menubar" +msgstr "Menüleiste" -#: C/shortcuts.page:410(title) -msgid "Browser Navigation" -msgstr "Browser-Navigation" +#: C/browser.page:21(item/p) +msgid "" +"The menus on the menubar contain all of the commands that you can use in " +"gThumb" +msgstr "" +"Die Menüs der Menüleiste enthalten alle Befehle, die Sie in gThumb nutzen können." -#: C/shortcuts.page:420(p) -msgid "Go to the first file in the browser view." -msgstr "Zur ersten Datei in der Browseransicht wechseln." +#: C/browser.page:25(item/title) +msgid "Toolbar" +msgstr "Werkzeugleiste" -#: C/shortcuts.page:431(p) -msgid "Go to the last file in the browser view." -msgstr "Zur letzten Datei in der Browseransicht wechseln." +#: C/browser.page:26(item/p) +msgid "" +"The toolbar contains a subset of the commands that you can access from the " +"menubar. In particular, the Tools button contains functions for batch " +"processing multiple images." +msgstr "" +"Die Werkzeugleiste enthält eine Teilmenge der Befehle aus der Menüleiste. Im " +"einzelnen enthält der Werkzeuge-Knopf Funktionen für die Stapelverarbeitung " +"mehrerer Bilder." -#: C/shortcuts.page:436(p) -msgid "Down Arrow or Page Down" -msgstr "Pfeiltaste runter oder Bild ab" +#: C/browser.page:31(item/title) +msgid "Locationbar" +msgstr "Adressleiste" -#: C/shortcuts.page:441(p) -msgid "Scroll downwards through the thumbnails." -msgstr "Nach unten durch die Vorschaubilder bewegen." +#: C/browser.page:32(item/p) +msgid "The locationbar contains the current folder or catalog name." +msgstr "Die Adressleiste zeigt den aktuellen Ordner- oder Katalognamen an." -#: C/shortcuts.page:446(p) -msgid "Up Arrow or Page Up" -msgstr "Pfeiltaste rauf oder Bild rauf" +#: C/browser.page:36(item/title) +msgid "Folder Tree" +msgstr "Ordnerliste" -#: C/shortcuts.page:451(p) -msgid "Scroll upwards through the thumbnails." -msgstr "Nach oben durch die Vorschaubilder bewegen." +#: C/browser.page:37(item/p) +msgid "" +"The folder tree allows you to navigate the filesystem. Single-clicking on a " +"folder will load its images in the browser view. Double-clicking a folder, " +"or clicking the expander arrow, will also list folder's subfolders in the " +"tree." +msgstr "" +"Der Ordnerbaum ermöglicht Ihnen die Navigation im Dateisystem. Ein einfacher " +"Klick auf einen Ordner lädt die darin enthaltenen Bilder in der " +"Browseransicht. Durch Doppelklick auf einen Ordner oder den Ausklapppfeil " +"werden zusätzlich dessen Unterordner in der Baumansicht angezeigt." -#: C/shortcuts.page:457(key) C/shortcuts.page:467(key) -#: C/shortcuts.page:478(key) -msgid "Alt" -msgstr "Alt" - -#: C/shortcuts.page:457(key) -msgid "Left Arrow" -msgstr "Pfeiltaste links" +#: C/browser.page:44(item/title) +msgid "Browser View" +msgstr "Browseransicht" -#: C/shortcuts.page:461(p) -msgid "Go back to the previously viewed folder." -msgstr "Zum zuletzt besuchten Ordner gehen." +#: C/browser.page:45(item/p) +msgid "" +"The browser view shows the images in the current folder or catalog. Single-" +"clicking an image will enable the Information Sidebar for that image. Double-" +"clicking an image will open it in the viewer mode. Double-clicking with the " +"middle mouse button will load the image in fullscreen viewer mode." +msgstr "" +"Die Browseransicht zeigt die Bilder im aktuellen Ordner oder Katalog an. " +"Durch einen einfachen Klick auf ein Bild wird die Informations-Seitenleiste " +"für dieses Bild aktiviert. Ein Doppelklick auf ein Bild öffnet es im " +"Betrachtermodus. Durch einen Doppelklick mit der mittleren Maustaste wird " +"das Bild im Vollbild-Betrachtermodus geladen." -#: C/shortcuts.page:467(key) -msgid "Right Arrow" -msgstr "Rechtspfeil" +#: C/browser.page:52(item/title) +msgid "Organize Button" +msgstr "GUI Schaltfläche" -#: C/shortcuts.page:471(p) -msgid "Go forward (after going back to a folder)." -msgstr "Vorwärts gehen (nach vorhergehendem rückwärts gehen)" +#: C/browser.page:53(item/p) +msgid "" +"The Organize button, just above the browser view, allows you to group images " +"into catalogs." +msgstr "" +"Der Ordnen-Knopf oberhalb der Browseransicht ermöglicht Ihnen die Sortierung " +"der Bilder in Kataloge." -#: C/shortcuts.page:479(key) -msgid "Up" -msgstr "Pfeiltaste rauf" +#: C/browser.page:57(item/title) +msgid "Statusbar" +msgstr "Statusleiste" -#: C/shortcuts.page:484(p) -msgid "Go up one level." -msgstr "Eine Ebene hoch gehen." +#: C/browser.page:58(item/p) +msgid "On the statusbar you can read:" +msgstr "Auf der Statusleiste können Sie lesen:" -#: C/shortcuts.page:491(title) -msgid "Slideshow controls" -msgstr "Steuerung von Dia-Vorführungen" +#: C/browser.page:61(item/p) +msgid "" +"the total number of images contained in the current folder or catalog and " +"their total size." +msgstr "" +"Die gesamte Anzahl Bilder, die der aktuelle Ordner enthält sowie ihre " +"Gesamtgröße." -#: C/shortcuts.page:504(key) -msgid "F5" -msgstr "F5" +#: C/browser.page:65(item/p) +msgid "the number of the selected images and their size." +msgstr "Die Anzahl der ausgewählten Bilder und ihre Größe." -#: C/shortcuts.page:508(p) -msgid "Start a slideshow." -msgstr "Die Diaschau starten." +#: C/browser.page:68(item/p) +msgid "some properties of the currently focused image." +msgstr "Einige Eigenschaften des ausgewählten Bildes." -#: C/shortcuts.page:514(key) -msgid "Space" -msgstr "Leertaste" +#: C/browser.page:73(item/title) +msgid "Information Sidebar" +msgstr "Informations-Seitenleiste" -#: C/shortcuts.page:518(p) -msgid "Pause/Unpause the slideshow." -msgstr "Eine Diaschau pausieren/fortsetzen." +#: C/browser.page:74(item/p) +msgid "" +"If a single image is selected, the information sidebar (below the folder " +"tree) will display detailed information (such as EXIF or XMP tags) about the " +"selected image." +msgstr "" +"Wenn ein einzelnes Bild ausgewählt ist, zeigt die Informations-Seitenleiste " +"(unterhalb des Ordnerbaums) detaillierte Informationen zum gewählten Bild " +"an, zum Beispiel die EXIF- oder XMP-Markierungen." -#: C/shortcuts.page:528(p) -msgid "Close the slideshow." -msgstr "Die Diashow schließen." +#: C/browser.page:79(item/title) +msgid "Filter Bar" +msgstr "Filterleiste" -#: C/shortcuts.page:533(p) -msgid "Down Arrow or Right Arrow or Page Down" +#: C/browser.page:80(item/p) +msgid "" +"An image filtering tool is provided just below the browser view. This can be " +"used to filter the displayed images. For example, the browser view can be " +"limited to files of a certain size, date, or name pattern, or other " +"characteristics." msgstr "" -"Pfeiltaste runter oder Pfeiltaste rechts oder " -"Bild ab" +"Unterhalb der Browseransicht steht ein Werkzeug zur Filterung bereit. Sie " +"können dieses zum Filtern der angezeigten Bilder verwenden. Zum Beispiel " +"kann die Browseransicht auf Bilder einer bestimmten Größe begrenzt werden, " +"oder auf Bilder, deren Namen, Daten oder Größen einem bestimmten Muster " +"entsprechen, oder weitere Charakteristiken." -#: C/shortcuts.page:538(p) -msgid "Load the next image." -msgstr "Das nächste Bild zeigen." +#: C/batch-rotate.page:6(page/title) +msgid "Rotating Images Losslessly" +msgstr "Bilder verlustfrei drehen" -#: C/shortcuts.page:543(p) -msgid "Up Arrow or Left Arrow or Page Up" +#: C/batch-rotate.page:8(page/p) +msgid "" +"To rotate one or more images, select the images in the browser view. Then " +"click the Tools button on the main toolbar, and select either " +"ToolsRotate Right or " +"ToolsRotate Left. The images will be " +"rotated." msgstr "" -"Pfeiltaste rauf oder Pfeiltaste links oder Bild " -"rauf" +"Um ein oder mehrere Bilder zu drehen, wählen Sie die Bilder zunächst in der " +"Browseransicht aus. Klicken Sie dann auf den Werkzeuge-Knopf in " +"der Hauptwerkzeugleiste und wählen Sie entweder WerkzeugeRechts herum drehen oder WerkzeugeLinks herum drehen. Die Bilder werden nun gedreht." -#: C/shortcuts.page:548(p) -msgid "Load the previous image." -msgstr "Das vorhergehende Bild zeigen." +#: C/batch-rotate.page:14(page/p) +msgid "Lossless rotation is used for jpeg images, when possible." +msgstr "Für JPEG-Bilder wird verlustlose Drehung angewendet, falls möglich." -#: C/printing.page:7(title) -msgid "Printing Images" -msgstr "Bilder drucken" +#: C/batch-convert-format.page:6(page/title) +msgid "Converting File Formats" +msgstr "Umwandeln von Dateiformaten" -#: C/printing.page:9(p) +#: C/batch-convert-format.page:8(page/p) msgid "" -"To print the current image in the viewer mode, use FilePrint or Ctrlp." +"To convert one or more images into a new file format, select the images in " +"the browser view. Then click the Tools button on the main " +"toolbar, and select ToolsConvert Format." msgstr "" -"Um das aktuelle Bild im Ansichtsmodus zu drucken, wählen Sie bitte " -"DateiDrucken oder Strgp." +"Um eines oder mehrere Bilder in ein neues Format umzuwandeln, wählen Sie " +"zunächst die Bilder in der Browseransicht aus. Klicken Sie dann auf den " +"Werkzeuge-Knopf in der Hauptwerkzeugleiste und wählen Sie " +"WerkzeugeFormat umwandeln." -#: C/printing.page:13(p) +#: C/batch-convert-format.page:12(page/p) msgid "" -"To print one or more images from the browser mode, select the desired images " -"and then use FilePrint or " -"Ctrlp." +"Select the desired output format and destination folder. Click Execute to complete the process." msgstr "" -"Um eines oder mehrere Bilder im Browsermodus zu drucken, wählen Sie die " -"Bilder im Browser aus und wählen Sie DateiDrucken oder drücken Sie Strgp." +"Wählen Sie das gewünschte Ausgabeformat und den Zielordner. Klicken Sie auf " +"Ausführen, um den Vorgang abzuschließen." + +#: C/batch-resize.page:6(page/title) +msgid "Resizing Images" +msgstr "Bildgröße ändern" + +#: C/batch-resize.page:8(page/p) +msgid "" +"To resize one or more images using the same dimensions or scaling factors, " +"select the images in the browser view. Then click the Tools " +"button on the main toolbar, and select ToolsResize " +"Images." +msgstr "" +"Um die Größe eines oder mehrere Bilder anhand der gleichen Abmessungen oder " +"Skalierungsfaktoren zu ändern, wählen Sie die Bilder zunächst in der " +"Browseransicht aus. Klicken Sie dann auf den Werkzeuge-Knopf in " +"der Hauptwerkzeugleiste und wählen Sie WerkzeugeBildgröße ändern." -#: C/printing.page:18(p) +#: C/batch-resize.page:12(page/p) msgid "" -"The printer to use can be selected from the General tab of the " -"print dialog." +"Then select the desired maximum output dimensions, or the desired percentage " +"scaling, and the destination folder. Click Execute to complete " +"the process." msgstr "" -"Der zu verwendende Drucker kann im Reiter Allgemein im " -"Druckdialog ausgewählt werden." +"Dann wählen Sie die gewünschten Größenwerte der Ausgabe oder den Prozentsatz " +"der Skalierung sowie den Zielordner aus. Klicken Sie auf Ausführen, um den Vorgang abzuschließen." + +#: C/batch-change-date.page:6(page/title) +msgid "Changing Dates" +msgstr "das Datum ändern" -#: C/printing.page:21(p) +#: C/batch-change-date.page:8(page/p) msgid "" -"The type of paper to use can be selected from the Page Setup tab." +"To change the file modification times, the comment dates, or the Exif " +"DateTimeOriginal tags of multiple files, select the files in the browser " +"view. Then click the Tools button on the main toolbar, and select " +"ToolsChange Date." msgstr "" -"Der zu verwendende Papiertyp kann im Reiter Seite einrichten " -"ausgewählt werden." +"Um die Änderungszeitpunkte, die Daten der Kommentare oder die Exif-" +"DateTimeOriginal-Markierungen mehrerer Dateien anzupassen, wählen Sie " +"zunächst die Bilder in der Browseransicht aus. Klicken Sie dann auf den " +"Werkzeuge-Knopf in der Hauptwerkzeugleiste und wählen Sie " +"WerkzeugeDatum ändern." -#: C/printing.page:24(p) +#: C/batch-change-date.page:13(page/p) msgid "" -"The Layout tab provides some additional gThumb-" -"specific options. You can set the number of images to include on each page " -"here, and a preview pane is provided. Captions can also be added under the " -"image, in a configurable font. The captions can be chosen from a selection " -"of listed file attributes (like the file name, the date of the photo, camera " -"shutter speed, and others). Each image can be repositioned inside its print " -"area using the controls on this tab." +"Select the desired date options, and click Execute to complete " +"the process." msgstr "" -"Der Reiter Layout bietet einige zusätzliche gThumb-" -"spezifische Optionen. Sie können hier die Anzahl der Bilder pro Seite " -"festlegen. Außerdem finden Sie hier einen Vorschaubereich. Sie können " -"Bildunterschriften hinzufügen, die aus einer Auswahl aufgelisteter " -"Dateiattribute bezogen werden können, wie dem Dateinamen, dem Aufnahmedatum, " -"der Belichtungszeit der Kamera und mehr. Jedes Bild kann mit den Optionen in " -"diesem Reiter innerhalb des druckbaren Bereiches neu positioniert werden." +"Wählen Sie die gewünschten Datumseinstellungen und klicken Sie auf " +"Ausführen, um den Vorgang abzuschließen." -#: C/printing.page:34(p) -msgid "When you are ready to print, press the Print button." -msgstr "Klicken Sie auf den Knopf Drucken, sobald Sie fertig sind." +#: C/batch-scripts.page:6(page/title) +msgid "User-Defined Scripts" +msgstr "Benutzerdefinierte Skripte" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/filtering.page:17(None) +#: C/batch-scripts.page:8(page/p) msgid "" -"@@image: 'figures/general-filter.png'; md5=818fcb0f12da6496f3c72699f12beb28" -msgstr "translated" +"To define a script (a command-line sequence that gThumb will " +"execute on your files), click the Tools button on the main " +"toolbar, and select ToolsPersonalize." +msgstr "" +"Um ein Skript zu definieren, das gThumb auf Ihre Dateien " +"anwendet, klicken Sie auf den Werkzeugleistenknopf Werkzeuge und " +"wählen Sie WerkzeugePersonalisieren." -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/filtering.page:30(None) -msgid "" -"@@image: 'figures/specific-filter.png'; md5=e7036e5b958301c6acb3ab5e4a618bbe" -msgstr "translated" +#: C/batch-scripts.page:12(page/p) +msgid "TODO: further documentation is need here." +msgstr "TODO: Hier ist ausführlichere Dokumentation nötig." -#: C/filtering.page:7(title) -msgid "Filtering Files" -msgstr "Filtern von Dateien" +#: C/thumbnails.page:6(page/title) +msgid "Thumbnail Sources" +msgstr "Quellen für Vorschaubilder" + +#: C/thumbnails.page:8(page/p) +msgid "" +"The browser window normally shows the thumbnails of the images and movies in " +"the selected folder. Generic icons for other files (audio files, for " +"instance) may also be shown." +msgstr "" +"Das Browsrfenster zeigt normalerweise die Vorschauen der Bilder und Filme im " +"gewählten Ordner an. Außerdem werden allgemeine Symbole für sonstige Dateien " +"angezeigt, zum Beispiel für Audio-Dateien." -#: C/filtering.page:9(p) C/thumbnails.page:12(p) +#: C/thumbnails.page:12(page/p) msgid "" "You can select what types of files to show in the browser view using the " -"ViewFilter dialog. The default is to " +"ViewFilter dialog. The default is to " "show all media files (images, movies, audio), but this can be made more or " "less restrictive." msgstr "" @@ -994,254 +1105,309 @@ "Bilder, Filme und Audio) angezeigt, aber dies kann nach Ihren Wünschen " "angepasst werden." -#: C/filtering.page:15(title) -msgid "Enabling Filters" -msgstr "Aktivieren von Filtern" - -#: C/filtering.page:20(p) +#: C/thumbnails.page:18(page/p) msgid "" -"The figure above shows how to configure gThumb to display media " -"files only, by setting the General Filter." +"The thumbnails may be generated by a number of different methods. " +"gThumb will first check for existing thumbnails in the system " +"cache." msgstr "" -"Die Abbildung oben zeigt, wie Sie gThumb so konfigurieren, dass " -"nur Medien-Dateien durch Festlegen eines Allgemeinen Filters " -"angezeigt werden." +"Die Vorschaubilder können auf verschiedenen Wegen erzeugt werden. " +"gThumb schaut zuerst nach vorhandenen Vorschaubildern im " +"Zwischenspeicher des Systems." -#: C/filtering.page:23(p) +#: C/thumbnails.page:22(page/p) msgid "" -"Also, by enabling Filename in Other Filters, a filter-" -"by-filename ability is added to the filter bar at the bottom of the browser " -"view:" +"If no cached thumbnail is found, and an image file contains an embedded " +"thumbnail (jpeg files generated by digital cameras normally do), " +"gThumb will attempt to use that. gThumb will confirm " +"that the aspect ratio of the thumbnail is similar to that of the main image, " +"and ignore thumbnails that do not appear to match the main image." msgstr "" -"Durch Aktivieren von Dateiname unter Andere Filter " -"wird die Möglichkeit des Filterns nach Dateinamen der Filterleiste unten in " -"der Browseransicht hinzugefügt:" - -#: C/filtering.page:28(title) -msgid "Browser Filter Bar" -msgstr "Filterleiste in der Browseransicht" +"Falls kein zwischengespeichertes Vorschaubild gefunden wird und eine Datei " +"ein eingebettetes Vorschaubild enthält (wie es normalerweise bei von Kameras " +"erstellten JPEG-Bildern der Fall ist), dann wird versucht, dieses zu " +"verwenden. gThumb überprüft, ob das Seitenverhältnis das gleiche " +"wie das des eigentlichen Bildes ist, und ignoriert Vorschaubilder, deren " +"Seitenverhältnis offensichtlich nicht mit dem des Originalbildes " +"übereinstimmt." -#: C/filtering.page:33(p) +#: C/thumbnails.page:29(page/p) msgid "" -"In the above figure, the filename filter has been configured to show only " -"files with \"gen\" in the filename. The matching is case-insensitive." +"If that doesn't work, gThumb will attempt to load the entire file " +"and generate a scaled-down thumbnail." msgstr "" -"In der Abbildung oben ist der Dateinamen-Filter so konfiguriert, dass nur " -"Dateien angezeigt werden, deren Name »gen« enthält. Die Suche berücksichtigt " -"nicht Groß-/Kleinschreibung." - -#: C/sorting.page:7(title) -msgid "Sorting Files" -msgstr "Dateien sortieren" +"Falls dies nicht gelingt, versucht gThumb, die Datei vollständig " +"zu laden und ein auf die entsprechende Größe skaliertes Vorschaubild zu " +"erstellen." -#: C/sorting.page:9(p) +#: C/thumbnails.page:32(page/p) msgid "" -"Use the ViewSort By menu to select " -"the desired file-sorting method for the browser view. Files can be sorted on " -"the basis of their name, the file size, the file modification date, or the " -"date the photo was taken." +"Lastly, gThumb will use any system-defined scripts for " +"thumbnailing particular media types. For example, some systems may use " +"mplayer or totem or other movie viewers to generate " +"movie thumbnails." msgstr "" -"Im Menü AnsichtSortieren nach können " -"Sie die gewünschte Sortiermethode der Browseransicht auswählen. Dateien " -"können anhand ihres Dateinamens, der Dateigröße, des Änderungszeitpunkts " -"oder des Aufnahmedatums sortiert werden." - -#: C/fullscreen.page:8(title) -msgid "Manual Fullscreen Mode" -msgstr "Manueller Vollbildmodus" +"Letztlich verwendet gThumb jegliche im System definierten Skripte " +"zur Erzeugung von Vorschaubildern für verschiedene Medientypen. " +"Beispielsweise werden auf einigen Systemen mplayer, totem oder andere Video-Wiedergabeprogramme zur Erzeugung von Videovorschauen " +"verwendet." -#: C/fullscreen.page:10(p) +#: C/thumbnails.page:37(page/p) msgid "" -"Pressing f in the browser or viewer modes will display the " -"current image in fullscreen mode. (In the browser mode, you can also double-" -"click with the middle mouse button.)" +"gThumb will save thumbnails to a system cache, to share them with " +"other applications. By default, Gnome systems prune cached thumbnails when " +"they are older than 180 days, or when the thumbnail cache exceeds 512 MB. " +"Technically-inclined users can explore these settings with gconf-" +"editor. See the /desktop/gnome/thumbnail_cache/maximum_age and /" +"desktop/gnome/thumbnail_cache/maximum_size keys in particular. Certain " +"applications (like F-Spot) may automatically increase these " +"settings greatly." msgstr "" -"Durch Drücken von f im Browser- oder Betrachtermodus wird das " -"aktuelle Bild im Vollbildmodus angezeigt. Im Browsermodus gelangen Sie " -"außerdem durch Drücken der mittleren Maustaste in den Vollbildmodus." +"gThumb speichert Vorschaubilder in einem Zwischenspeicher des " +"Systems, um sie auf diese Weise anderen Anwendungen zur Verfügung zu " +"stellen. Standardmäßig löscht GNOME Vorschaubilder aus dem Zwischenspeicher, " +"wenn sie älter als 180 Tage sind oder wenn die Größe des Zwischenspeichers " +"512 MB überschreitet. Technisch versierte Benutzer können diese " +"Einstellungen im Konfigurationseditor erkunden, in den " +"Schlüsseln /desktop/gnome/thumbnail_cache/maximum_age und /desktop/gnome/" +"thumbnail_cache/maximum_size. Einige Anwendungen, wie F-Spot, " +"können diese Einstellungen automatisch großzügig erhöhen." -#: C/fullscreen.page:14(p) +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#. +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/thumbnail-pane.page:21(media) C/viewer.page:23(media) +msgctxt "_" msgid "" -"Moving the mouse will activate a popup control panel briefly. This can be " -"used to navigate to the next or previous image, or change zoom levels." -msgstr "" -"Durch Verschieben der Maus wird kurzzeitig eine Bedienleiste angezeigt. " -"Diese können Sie zum Blättern zum nächsten oder vorigen Bild verwenden oder " -"die Vergrößerungsstufe einstellen." +"external ref='figures/thumbnail-pane.png' " +"md5='af28541956094195dac6bc0e11624d64'" +msgstr "translated" + +#: C/thumbnail-pane.page:6(page/title) +msgid "Thumbnail Pane" +msgstr "Vorschauleiste" -#: C/fullscreen.page:18(p) +#: C/thumbnail-pane.page:8(page/p) msgid "" -"You can also advance to the next image by pressing PageDown or " -"Space." +"When an image has been opened in the gThumb viewer, the user has " +"the option of enabling or disabling a thumbnail pane, which shows the other " +"images in the folder as thumbnails. This feature can be toggled with the " +"ViewThumbnail Pane command, or by " +"pressing F8." msgstr "" -"Sie können auch manuell zum nächsten Bild durch Drücken von Bild ab oder der Leertaste gelangen." +"Wenn ein Bild im Betrachter von gThumb geöffnet ist, können Sie " +"die Vorschauleiste aktivieren oder deaktivieren, in der die anderen im " +"Ordner enthalten Bilder als Vorschaubilder angezeigt werden. Sie können " +"dieses Funktionsmerkmal über das Menü AnsichtVorschauleiste oder durch Drücken von F8 " +"ein- und ausschalten." -#: C/fullscreen.page:21(p) +#: C/thumbnail-pane.page:14(page/p) msgid "" -"You can go back to the previous image by pressing PageUp or " -"Backspace." +"The thumbnail pane may be positioned along the bottom of the main image, or " +"along the side. This is controlled by the settings in EditPreferencesGeneralThumbnails in Viewer." msgstr "" -"Sie können zurück zum vorigen Bild durch Drücken von Bild auf " -"oder der Leertaste gelangen." +"Die Vorschauleiste kann entlang des unteren Randes oder an der Seite " +"angezeigt werden. Sie können die Platzierung der Vorschaleiste in " +"BearbeitenEinstellungenAllgemeinVorschaubilder im Betrachter festlegen." -#: C/fullscreen.page:24(p) -msgid "This can be used to implement a manually-controlled slideshow." -msgstr "Damit können Sie eine manuell gesteuerte Diaschau verwirklichen." +#: C/thumbnail-pane.page:19(figure/title) +msgid "Thumbnail Pane, Along Bottom of Main Image" +msgstr "Vorschauleiste am unteren Rand des Hauptbildes" -#: C/fullscreen.page:27(p) -msgid "To exit the fullscreen mode, press f or Escape." -msgstr "" -"Um den Vollbildmodus zu verlassen, drücken Sie f oder Esc." +#: C/rename-series.page:8(page/title) +msgid "Renaming Files" +msgstr "Dateien umbenennen" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/viewer.page:23(None) C/thumbnail-pane.page:21(None) +#: C/rename-series.page:10(page/p) msgid "" -"@@image: 'figures/thumbnail-pane.png'; md5=af28541956094195dac6bc0e11624d64" -msgstr "translated" - -#: C/viewer.page:6(title) -msgid "Opening an Image" -msgstr "Ein Bild öffnen" +"To rename one or more images using a name template, select the files in the " +"browser and choose EditRename, or " +"press F2." +msgstr "" +"Um eines oder mehrere Bilder anhand einer Namensvorlage umzubenennen, wählen " +"Sie die Dateien im Browser aus und wählen Sie BearbeitenUmbenennen oder drücken Sie F2." -#: C/viewer.page:8(p) +#: C/rename-series.page:15(page/p) msgid "" -"The browser view shows the images in the current folder or catalog (see " -"). Double-clicking an image (or pressing " -"Return) in the browser will open it in the viewer mode." +"The name template is simply a pattern that is used for renaming all of the " +"selected images. You can use some special characters to make the new names " +"differ each other (this is essential if you are renaming more than one " +"image, and optional if you are renaming a single image):" msgstr "" -"Die Browseransicht zeigt die Bilder im aktuellen Ordner oder Katalog an " -"(siehe ). Durch einen Doppelklick auf " -"ein Bild (oder durch Drücken der Eingabetaste) im Browser wird " -"dieses im Betrachtermodus geöffnet." +"Die Namensschablone ist ein Muster, mit dem alle ausgewählten Dateien " +"umbenannt werden. Sie können einige Spezialzeichen verwenden, um die neuen " +"Namen unterschiedlich zu gestalten (dies ist entscheidend, wenn Sie mehr als " +"eine Datei umbenennen und optional, wenn Sie eine Datei umbenennen):" + +#: C/rename-series.page:24(td/p) +msgid "Symbol" +msgstr "Symbol" -#: C/viewer.page:13(p) +#: C/rename-series.page:27(td/p) C/shortcuts.page:17(td/p) +#: C/shortcuts.page:94(td/p) C/shortcuts.page:189(td/p) +#: C/shortcuts.page:273(td/p) C/shortcuts.page:498(td/p) +msgid "Description" +msgstr "Beschreibung" + +#: C/rename-series.page:32(td/p) +msgid "#" +msgstr "#" + +#: C/rename-series.page:37(td/p) msgid "" -"Pressing Escape will exit the viewer mode, and return the user to " -"the browser mode. A toolbar button (View the folders) is also " -"provided for this purpose." +"This symbol will be replaced with the value of a counter that increments " +"itself by 1 passing from one image to another. If you specify this symbols " +"in sequence you'll get leading zeros if the counter value has a lesser " +"number of digits, for example ### will produce the sequence: 001, 002, 003, " +"etc.." msgstr "" -"Durch Drücken der Esc-Taste wird der Betrachtermodus beendet und " -"Sie kehren zum Browsermodus zurück. Für diesen Zweck ist auch ein Knopf in " -"der Werkzeugleiste vorhanden (Die Ordner anzeigen)." +"Dieses Symbol wird durch einen fortlaufenden Zähler ersetzt, der pro Bild um " +"1 erhöht wird. Wenn Sie das Symbol mehrfach hintereinander angeben, wird die " +"Zahl gegebenenfalls durch führende Nullen aufgefüllt. Zum Beispiel ergibt " +"### die folgende Sequenz: 001, 002, 003, usw." + +#: C/rename-series.page:47(td/p) +msgid "%F" +msgstr "%F" -#: C/viewer.page:17(p) +#: C/rename-series.page:52(td/p) msgid "" -"A may be displayed in the viewer " -"mode, if desired." +"This symbol will be replaced with the file's original name, excluding the " +"original extension." msgstr "" -"Eine kann auf Wunsch im Ansichtsmodus " -"angezeigt werden." +"Dieses Symbol wird durch den ursprünglichen Bildnamen ohne die Erweiterung " +"ersetzt." -#: C/viewer.page:21(title) -msgid "Viewer Mode with Thumbnail Pane" -msgstr "Betrachtungsmodus mit Vorschauleiste" +#: C/rename-series.page:58(td/p) +msgid "%E" +msgstr "%E" -#: C/viewer.page:26(p) +#: C/rename-series.page:63(td/p) msgid "" -"In the viewer mode, you can advance to the next image by clicking the " -"Next button, or by pressing Space or Page Down. You can go back to the previous image by clicking the Previous button, or by pressing Backspace or Page Up. You " -"can go also click on thumbnails in the thumbnail pane to open a different " -"image." +"This symbol will be replaced with the file's original filename extension." msgstr "" -"Im Betrachtermodus gehen Sie zum nächsten Bild, indem Sie auf den " -"Nächstes-Knopf klicken oder die Leertaste oder " -"Bild ab-Taste drücken. Zum vorigen Bild gelangen Sie durch " -"Anklicken des Voriges-Knopfes oder durch Drücken der " -"Löschtaste oder Bild auf. Sie können auch auf eines " -"der Vorschaubilder in der Vorschauleiste klicken, um ein anderes Bild zu " -"öffnen." +"Dieses Symbol wird durch die Dateinamenserweiterung des ursprünglichen " +"Bildes ersetzt." -#: C/gimp.page:6(title) -msgid "Launching GIMP" -msgstr "GIMP starten" +#: C/rename-series.page:69(td/p) +msgid "%N" +msgstr "%N" -#: C/gimp.page:7(p) +#: C/rename-series.page:74(td/p) msgid "" -"If you have files selected in the browser, or an image open in the viewer, " -"you can open them in the GNU Image Manipulation Program (GIMP) by " -"pressing g." +"This symbol will be replaced with original image enumerator. For instance, " +"if the original filename was IMG_9876.JPG, this extracts the \"9876\" " +"portion. If the filename has more than one group of digits embedded in it " +"(for example, IMG_123_456.JPG) only the first number will be used (\"123\" " +"in this example)." msgstr "" -"Falls Dateien im Browser ausgewählt sind, oder ein Bild im Betrachter " -"geöffnet ist, können Sie sie im GNU Image Manipulation Program (GIMP) durch Drücken von g öffnen." +"Dieses Symbol wird durch den ursprünglichen Bildzähler ersetzt. Wenn z.B. " +"der ursprüngliche Dateiname »IMG_9876.JPG« lautet, wird die Zahl »9876« " +"verwendet. Falls der Dateiname mehr als eine Zahlengruppe enthält (wie z.B. " +"»IMG_123_456.JPG«), wird nur die erste Gruppe verwendet, d.h. in diesem " +"Beispiel »123«." -#: C/gimp.page:10(p) +#: C/rename-series.page:84(td/p) +msgid "%M{format}" +msgstr "%M{format}" + +#: C/rename-series.page:89(td/p) msgid "" -"GIMP provides a more sophisticated set of editing tools than that " -"provided with gThumb." +"This symbol will be replaced with the file modification date. The formatting " +"of this date (and optionally time) can be specified by adding a standard " +"formatting code in curly braces. For example, \"%M{%Y-%m-%d, %T}\" would be " +"replaced with a date and time like \"2010-04-01, 15:02:01\"." msgstr "" -"GIMP bietet weitreichendere Bearbeitungswerkzeuge als jene, die " -"von gThumb angeboten werden." +"Das Symbol wird durch das Änderungsdatum der Datei ersetzt. Die Formatierung " +"dieses Datums (und wahlweise auch der Zeit) kann durch Hinzufügen eines " +"standardisierten Formatierungscodes in geschweiften Klammern angegeben " +"werden. Beispielsweise wird die Zeichenkette »%M{%Y-%m-%d, %T}« durch eine " +"Datums- und Zeitangabe wie »2010-04-01, 15:02:01« ersetzt." -#: C/extensions.page:6(title) -msgid "Extending gThumb" -msgstr "gThumb erweitern" +#: C/rename-series.page:98(td/p) +msgid "%D{format}" +msgstr "%D{format}" -#: C/extensions.page:8(p) +#: C/rename-series.page:103(td/p) msgid "" -"gThumb has a plug-in system for extensions. Some standard " -"features are implemented as extensions and are supplied with the standard " -"distribution. Users may write (and share) additional extensions." +"This symbol will be replaced with the date that the photo was original taken " +"(normally determined from the EXIF datestamps embedded inside the photo). " +"The formatting of this date (and optionally time) can be specified by adding " +"a standard formatting code in curly braces. For example, \"%D{%Y-%m-%d, " +"%T}\" would be replaced with a date and time like \"2010-04-01, 15:02:01\"." msgstr "" -"gThumb besitzt ein System für Plugins von Erweiterungen. Einige " -"grundlegende Funktionsmerkmale sind als Erweiterungen implementiert und " -"werden mit Standard-Distributionen ausgeliefert. Benutzer können weitere " -"Erweiterungen erstellen (und der Allgemeinheit zur Verfügung stellen)." +"Dieses Symbol wird durch das originale Aufnahmedatum des Fotos ersetzt, " +"welches üblicherweise aus den im Foto eingebetteten EXIF-Daten ermittelt " +"wird. Die Formatierung dieses Datums (und wahlweise auch der Zeit) kann " +"durch Hinzufügen eines standardisierten Formatierungscodes in geschweiften " +"Klammern angegeben werden. Beispielsweise wird die Zeichenkette »%M{%Y-%m-" +"%d, %T}« durch eine Datums- und Zeitangabe wie »2010-04-01, 15:02:01« " +"ersetzt." + +#: C/rename-series.page:114(td/p) +msgid "%A{identifier}" +msgstr "%A{identifier}" -#: C/extensions.page:12(p) +#: C/rename-series.page:119(td/p) msgid "" -"You can enable or disable extensions using EditExtensions. Some extensions will have " -"Preferences that can be modified from this dialog." +"This symbol will be replaced with the data that has been specified by the " +"identifier. For example, \"%A{ general::dimensions }\" would be replaced " +"with a size like \"320 x 240\"." msgstr "" -"Sie können Erweiterungen unter BearbeitenErweiterungen aktivieren und deaktivieren. Einige " -"Erweiterungen bieten Einstellungen, die in diesem Dialog " -"bearbeitet werden können." +"Dieses Symbol wird durch die im Bezeichner angegebenen Daten ersetzt. " +"Beispielsweise wird »%A{ general::dimensions }« durch eine Größe wie »320 x " +"240« ersetzt." -#: C/extensions.page:16(p) +#: C/rename-series.page:127(page/p) msgid "" -"This manual is written with the assumption that the standard extensions are " -"enabled. If you seem to be missing a feature, check to see which extensions " -"are actually enabled." +"A summary of these special codes may be viewed by clicking on the Help icon " +"inside the template field." msgstr "" -"Dieses Handbuch ist unter der Annahme geschrieben worden, dass grundlegende " -"Erweiterungen aktiviert sind. Falls ein Funktionsmerkmal zu fehlen scheint, " -"so prüfen Sie bitte, welche Erweiterungen tatsächlich aktiviert sind." +"Eine Zusammenfassung dieser speziellen Codes kann durch einen Mausklick auf " +"das Hilfe-Symbol im Vorlagen-Feld eingesehen werden." -#: C/extensions.page:20(p) +#: C/rename-series.page:130(page/p) msgid "" -"If you would like to write your own extension, please visit http://live.gnome.org/gthumb for " -"development information. An example extension is provided in the source " -"code, which you can base your own extension on." +"The list at the bottom of the dialog displays how the filenames will be " +"renamed." msgstr "" -"Wenn Sie eigene Erweiterungen erstellen möchten, so besuchen Sie bitte http://live.gnome.org/gthumb " -"für weitere Informationen zum Entwickeln. Eine Beispiel-Erweiterung ist im " -"Quellcode der Software enthalten, auf die Sie Ihre Erweiterung aufbauen " -"können." +"Die Liste unten im Dialog zeigt, wie die Dateinamen umbenannt werden würden." -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/edit-redeye.page:7(None) C/edit-resize-crop.page:8(None) -#: C/edit-rotate.page:8(None) C/edit-colors.page:8(None) -#: C/edit-save-undo-redo.page:8(None) C/index.page:33(None) -msgid "@@image: 'figures/palette.png'; md5=32835e7d77efd9833244ca80a4adb48e" -msgstr "original" +#: C/rename-series.page:133(page/p) +msgid "To rename the images click on Rename." +msgstr "Klicken Sie auf Umbenennen, um die Bilder umzubenennen." -#: C/edit-redeye.page:6(title) -msgid "Red Eye Removal" -msgstr "Rote Augen entfernen" +#: C/rename-series.page:135(page/p) +msgid "" +"If the renaming of an image can overwrite an already existing image you will " +"be asked how to proceed, five options are available: overwrite the image; do " +"not overwrite the image; always overwrite; never overwrite; specify a new " +"name." +msgstr "" +"Falls das Umbenennen eines Bildes ein bereits vorhandenes Bild überschreiben " +"würde, dann werden Sie gefragt, wie Sie fortfahren möchten. Es gibt fünf " +"Möglichkeiten: Das Bild überschreiben; das Bild nicht überschreiben; immer " +"überschreiben; niemals überschreiben; einen neuen Namen angeben." + +#: C/edit-save-undo-redo.page:6(page/title) +msgid "File Save, Undo, Redo" +msgstr "Dateien speichern, rückgängig machen, wiederholen" -#: C/edit-redeye.page:7(p) C/edit-resize-crop.page:8(p) -#: C/edit-rotate.page:8(p) C/edit-colors.page:8(p) -#: C/edit-save-undo-redo.page:8(p) +#: C/edit-save-undo-redo.page:8(page/p) C/edit-colors.page:8(page/p) +#: C/edit-rotate.page:8(page/p) C/edit-resize-crop.page:8(page/p) +#: C/edit-redeye.page:7(page/p) msgid "" " To " "access the editing tools, open an image and then click the Edit FileDatei bearbeiten in der Werkzeugleiste " "(das Symbol der Malerpalette), um zu den Bearbeitungswerkzeugen zu gelangen." -#: C/edit-redeye.page:11(p) +#: C/edit-save-undo-redo.page:12(page/p) msgid "" -"gThumb provides a Red Eye Removal tool. To remove a " -"red eye, position the mouse pointer over the red eye and click on it. " -"gThumb will attempt to remove the red region and replace it with " -"a more natural-looking gray region. If the results do not look correct, " -"press Escape and click on the Undo item." +"Multiple changes may be made to an image before saving it. Undo " +"and Redo buttons are provided, and may be used up until the file " +"is saved." msgstr "" -"gThumb stellt Ihnen ein Werkzeug zum Entfernen roter Augen zur Verfügung. Um ein rotes Auge zu entfernen, positionieren Sie den " -"Mauszeiger über dem roten Auge und klicken Sie darauf. gThumb " -"versucht un, den roten Bereich zu löschen und durch einen natürlicheren " -"Grauton zu ersetzen. Falls das Ergebnis nicht zufriedenstellend ist, drücken " -"Sie Esc und klicken Sie auf Rückgängig." +"Bevor ein Bild gespeichert wird, können mehrere Änderungen vorgenommen " +"werden. Knöpfe für Rückgängig und Wiederholen sind " +"vorhanden und können so lange genutzt werden, bis das Bild gespeichert wird." -#: C/edit-redeye.page:18(p) +#: C/edit-save-undo-redo.page:16(page/p) msgid "" -"This tool works best when there is a high color contrast between the red eye " -"and the surrounding facial area. It does not work well for \"orange eye\" " -"sometimes seen in photos of children, or if the surrounding skin has a " -"reddish tinge. This tool could use improvement - if you are fiendishly " -"clever, love matrix algebra and open source software, please submit a patch!" +"A modified image may be saved by pressing Save. To save the " +"modified image to a new location instead, leaving the original image " +"unchanged, use Save As." msgstr "" -"Dieses Werkzeug arbeitet am effektivsten bei einem hohen Kontrast zwischen " -"dem roten Auge und dem umgebenden Bereich des Gesichts. Es funktioniert " -"weniger gut bei »orangefarbenen Augen«, die Sie oft in Fotos von Kindern " -"sehen, oder wenn der umgebende Hautton bereits rötlich ist. Dieses Werkzeug " -"kann noch verbessert werden: Wenn Sie richtig clever sind, etwas von Matrix-" -"Algebra verstehen und freie Software mögen, stellen Sie uns einen Patch zur Verfügung!" +"Klicken Sie auf Speichern, um ein verändertes Bild zu speichern. " +"Wollen Sie stattdessen das veränderte Bild an einem anderen Ort speichern " +"und das Originalbild unverändert belassen, klicken Sie auf Speichern " +"unter." -#: C/edit-resize-crop.page:6(title) -msgid "Resizing and Cropping" -msgstr "Größe ändern und Beschneiden" +#: C/edit-save-undo-redo.page:20(page/p) +msgid "" +"If you exit the editing mode (by pressing Esc or the View " +"the Folders toolbar button), or navigate away from the current image, " +"you will be prompted to save or discard your changes." +msgstr "" +"Sobald Sie den Bearbeitungsmodus verlassen (durch Drücken von Esc " +"oder durch Anklicken des Werkzeugleistenknopfs Die Ordner anzeigen), werden Sie gefragt, ob Sie Ihre Änderungen speichern oder verwerfen " +"wollen." -#: C/edit-resize-crop.page:12(p) -msgid "Two tools are provided to resize and crop images." +#: C/edit-colors.page:6(page/title) +msgid "Color Adjustments" +msgstr "Farbanpassungen" + +#: C/edit-colors.page:12(page/p) +msgid "Several tools are provided to manipulate the colors in images." msgstr "" -"Zwei Werkzeuge werden zum Ändern der Größe und Beschneiden mitgeliefert." +"Verschiedene Werkzeuge werden zum Manipulieren der Farben eines Bildes " +"mitgeliefert." -#: C/edit-resize-crop.page:15(gui) -msgid "Resize" -msgstr "Größe ändern" +#: C/edit-colors.page:17(item/title) +msgid "Enhance Colors" +msgstr "Farben verbessern" -#: C/edit-resize-crop.page:16(p) +#: C/edit-colors.page:18(item/p) msgid "" -"This allows you to resize the image. The image may be scaled to a certain " -"physical size, or to a certain percentage of the original size. The aspect " -"ratio may be locked to a specific value, or freely adjusted." +"This tool provides automatic white balance correction. No user adjustments " +"are required." msgstr "" -"Dies ermöglicht Ihnen, die Größe des Bildes zu ändern. Das Bild kann auf " -"eine bestimmte physische Größe skaliert werden oder anhand eines " -"Prozentsatzes der Originalgröße. Das Seitenverhältnis kann entweder " -"beibehalten oder auf einen bestimmten Wert angepasst werden." +"Dieses Werkzeug erledigt den automatischen Weißabgleich. Ihrerseits sind " +"keine Einstellungen erforderlich." -#: C/edit-resize-crop.page:22(gui) -msgid "Crop" -msgstr "Zuschneiden" +#: C/edit-colors.page:22(item/title) +msgid "Adjust Colors" +msgstr "Farben anpassen" -#: C/edit-resize-crop.page:23(p) +#: C/edit-colors.page:23(item/p) msgid "" -"This allows you to crop the image. Click and drag the mouse over the desired " -"area of the image. The area may be locked to a specific aspect ratio, or it " -"may be freely adjusted. A rule-of-thirds grid or golden-sections grid may be " -"superimposed over the image for composition guidance." +"This tool provides manual color adjustments. Adjustments to the gamma, " +"brightness, contrast, saturation, and the cyan/red, magenta/green, and " +"yellow/blue color balances may be made." msgstr "" -"Dies ermöglicht Ihnen, das Bild zu beschneiden. Klicken und ziehen Sie die " -"Maus über den gewünschten Bildbereich. Das Seitenverhältnis des Bereiches " -"kann auf einen bestimmten Wert gesperrt oder wahlweise frei angepasst " -"werden. Die Drittelregel oder der Goldene Schnitt können dem Bild überlagert " -"werden, um die Bildkomposition zu erleichtern." +"Dieses Werkzeug dient zum manuellen Anpassen der Farben. Sie können hier den " +"Gamma-Wert, die Helligkeit, den Kontrast, die Sättigung beeinflussen und die " +"Balance der Komplementärfarben anpassen." + +#: C/edit-colors.page:29(item/title) +msgid "Equalize" +msgstr "Angleichen" -#: C/edit-resize-crop.page:31(p) +#: C/edit-colors.page:30(item/p) msgid "" -"gThumb also offers a batch-mode tool for resizing multiple images " -"simultaneously. See ." +"This tool provides automatic histogram equalization. No user adjustments are " +"required." msgstr "" -"gThumb bietet auch ein Werkzeug zur Stapelverarbeitung, um die " -"Größe mehrerer Bilder in einem Arbeitsgang zu ändern. Siehe ." +"Dieses Werkzeug bietet automatisches Angleichen des Bildhistogramms. Es sind " +"keine Anpassungen durch den Benutzer notwendig." + +#: C/edit-colors.page:34(item/title) +msgid "Desaturate" +msgstr "Entsättigen" + +#: C/edit-colors.page:35(item/p) +msgid "" +"This tool converts the image colors into shades of grey. (This does not " +"change this image storage format.)" +msgstr "" +"Dieses Werkzeug wandelt die Farben des Bildes in Graustufen um. Dadurch wird " +"das Speicherformat des Bildes nicht beeinflusst." + +#: C/edit-colors.page:39(item/title) +msgid "Negative" +msgstr "Negativ" + +#: C/edit-colors.page:40(item/p) +msgid "This tool inverts the color levels, providing an image negative." +msgstr "" +"Dieses Werkzeug kehrt Farbwerte um, so dass ein Negativ des Bildes entsteht." -#: C/edit-rotate.page:6(title) +#: C/edit-rotate.page:6(page/title) msgid "Rotations and Flips" msgstr "Drehungen und Spiegelungen" -#: C/edit-rotate.page:12(p) +#: C/edit-rotate.page:12(page/p) msgid "Several tools are provided to manipulate the orientation of images." msgstr "" "Verschiedene Werkzeuge werden zum Ändern der Orientierung von Bildern " "mitgeliefert." -#: C/edit-rotate.page:17(gui) -msgid "Mirror" -msgstr "Horizontal spiegeln" +#: C/edit-rotate.page:17(item/title) +msgid "Mirror" +msgstr "Horizontal spiegeln" -#: C/edit-rotate.page:18(p) +#: C/edit-rotate.page:18(item/p) msgid "" "This flips the image horizontally. The left and right sides are swapped." msgstr "" "Dadurch wird das Bild horizontal gespiegelt. Die rechte und die linke Seite " "werden vertauscht." -#: C/edit-rotate.page:22(gui) -msgid "Flip" -msgstr "Vertikal spiegeln" +#: C/edit-rotate.page:22(item/title) +msgid "Flip" +msgstr "Vertikal spiegeln" -#: C/edit-rotate.page:23(p) +#: C/edit-rotate.page:23(item/p) msgid "This flips the image vertically. The top and bottom are swapped." msgstr "" "Dadurch wird das Bild vertikal gespiegelt. Die obere und die untere Seite " "werden vertauscht." -#: C/edit-rotate.page:27(gui) -msgid "Rotate Right" -msgstr "Rechts herum drehen" +#: C/edit-rotate.page:27(item/title) +msgid "Rotate Right" +msgstr "Rechts herum drehen" -#: C/edit-rotate.page:28(p) +#: C/edit-rotate.page:28(item/p) msgid "This rotates the image clockwise." msgstr "Dadurch wird das Bild 90 Grad im Uhrzeigersinn gedreht." -#: C/edit-rotate.page:31(gui) -msgid "Rotate Left" -msgstr "Links herum drehen" +#: C/edit-rotate.page:31(item/title) +msgid "Rotate Left" +msgstr "Links herum drehen" -#: C/edit-rotate.page:32(p) +#: C/edit-rotate.page:32(item/p) msgid "This rotates the image counter-clockwise." msgstr "Dadurch wird das Bild 90 Grad gegen den Uhrzeigersinn gedreht." -#: C/edit-rotate.page:36(p) +#: C/edit-rotate.page:36(page/p) msgid "" "The rotations offered in the edit mode act on the image in memory. They are " "not direct file operations. For jpeg images, these means they are not " @@ -1395,1409 +1580,1443 @@ "verlustfrei arbeitende Werkzeuge zum Drehen bereit. Siehe ." -#: C/edit-colors.page:6(title) -msgid "Color Adjustments" -msgstr "Farbanpassungen" +#: C/edit-resize-crop.page:6(page/title) +msgid "Resizing and Cropping" +msgstr "Größe ändern und Beschneiden" -#: C/edit-colors.page:12(p) -msgid "Several tools are provided to manipulate the colors in images." +#: C/edit-resize-crop.page:12(page/p) +msgid "Two tools are provided to resize and crop images." msgstr "" -"Verschiedene Werkzeuge werden zum Manipulieren der Farben eines Bildes " -"mitgeliefert." +"Zwei Werkzeuge werden zum Ändern der Größe und Beschneiden mitgeliefert." + +#: C/edit-resize-crop.page:15(item/title) +msgid "Resize" +msgstr "Bildgröße ändern" + +#: C/edit-resize-crop.page:16(item/p) +msgid "" +"This allows you to resize the image. The image may be scaled to a certain " +"physical size, or to a certain percentage of the original size. The aspect " +"ratio may be locked to a specific value, or freely adjusted." +msgstr "" +"Dies ermöglicht Ihnen, die Größe des Bildes zu ändern. Das Bild kann auf " +"eine bestimmte physische Größe skaliert werden oder anhand eines " +"Prozentsatzes der Originalgröße. Das Seitenverhältnis kann entweder " +"beibehalten oder auf einen bestimmten Wert angepasst werden." -#: C/edit-colors.page:17(gui) -msgid "Enhance Colors" -msgstr "Farben verbessern" +#: C/edit-resize-crop.page:22(item/title) +msgid "Crop" +msgstr "Zuschneiden" -#: C/edit-colors.page:18(p) +#: C/edit-resize-crop.page:23(item/p) msgid "" -"This tool provides automatic white balance correction. No user adjustments " -"are required." +"This allows you to crop the image. Click and drag the mouse over the desired " +"area of the image. The area may be locked to a specific aspect ratio, or it " +"may be freely adjusted. A rule-of-thirds grid or golden-sections grid may be " +"superimposed over the image for composition guidance." msgstr "" -"Dieses Werkzeug erledigt den automatischen Weißabgleich. Ihrerseits sind " -"keine Einstellungen erforderlich." - -#: C/edit-colors.page:22(gui) -msgid "Adjust Colors" -msgstr "Farben anpassen" +"Dies ermöglicht Ihnen, das Bild zu beschneiden. Klicken und ziehen Sie die " +"Maus über den gewünschten Bildbereich. Das Seitenverhältnis des Bereiches " +"kann auf einen bestimmten Wert gesperrt oder wahlweise frei angepasst " +"werden. Die Drittelregel oder der Goldene Schnitt können dem Bild überlagert " +"werden, um die Bildkomposition zu erleichtern." -#: C/edit-colors.page:23(p) +#: C/edit-resize-crop.page:31(page/p) msgid "" -"This tool provides manual color adjustments. Adjustments to the gamma, " -"brightness, contrast, saturation, and the cyan/red, magenta/green, and " -"yellow/blue color balances may be made." +"gThumb also offers a batch-mode tool for resizing multiple images " +"simultaneously. See ." msgstr "" -"Dieses Werkzeug dient zum manuellen Anpassen der Farben. Sie können hier den " -"Gamma-Wert, die Helligkeit, den Kontrast, die Sättigung beeinflussen und die " -"Balance der Komplementärfarben anpassen." +"gThumb bietet auch ein Werkzeug zur Stapelverarbeitung, um die " +"Größe mehrerer Bilder in einem Arbeitsgang zu ändern. Siehe ." -#: C/edit-colors.page:29(gui) -msgid "Equalize" -msgstr "Abgleichen" +#: C/edit-redeye.page:6(page/title) +msgid "Red Eye Removal" +msgstr "Rote Augen entfernen" -#: C/edit-colors.page:30(p) +#: C/edit-redeye.page:11(page/p) msgid "" -"This tool provides automatic histogram equalization. No user adjustments are " -"required." +"gThumb provides a Red Eye Removal tool. To remove a " +"red eye, position the mouse pointer over the red eye and click on it. " +"gThumb will attempt to remove the red region and replace it with " +"a more natural-looking gray region. If the results do not look correct, " +"press Escape and click on the Undo item." msgstr "" -"Dieses Werkzeug bietet automatisches Angleichen des Bildhistogramms. Es sind " -"keine Anpassungen durch den Benutzer notwendig." - -#: C/edit-colors.page:34(gui) -msgid "Desaturate" -msgstr "Entsättigen" +"gThumb stellt Ihnen ein Werkzeug zum Entfernen roter Augen zur Verfügung. Um ein rotes Auge zu entfernen, positionieren Sie den " +"Mauszeiger über dem roten Auge und klicken Sie darauf. gThumb " +"versucht un, den roten Bereich zu löschen und durch einen natürlicheren " +"Grauton zu ersetzen. Falls das Ergebnis nicht zufriedenstellend ist, drücken " +"Sie Esc und klicken Sie auf Rückgängig." -#: C/edit-colors.page:35(p) +#: C/edit-redeye.page:18(page/p) msgid "" -"This tool converts the image colors into shades of grey. (This does not " -"change this image storage format.)" +"This tool works best when there is a high color contrast between the red eye " +"and the surrounding facial area. It does not work well for \"orange eye\" " +"sometimes seen in photos of children, or if the surrounding skin has a " +"reddish tinge. This tool could use improvement - if you are fiendishly " +"clever, love matrix algebra and open source software, please submit a patch!" msgstr "" -"Dieses Werkzeug wandelt die Farben des Bildes in Graustufen um. Dadurch wird " -"das Speicherformat des Bildes nicht beeinflusst." +"Dieses Werkzeug arbeitet am effektivsten bei einem hohen Kontrast zwischen " +"dem roten Auge und dem umgebenden Bereich des Gesichts. Es funktioniert " +"weniger gut bei »orangefarbenen Augen«, die Sie oft in Fotos von Kindern " +"sehen, oder wenn der umgebende Hautton bereits rötlich ist. Dieses Werkzeug " +"kann noch verbessert werden: Wenn Sie richtig clever sind, etwas von Matrix-" +"Algebra verstehen und freie Software mögen, stellen Sie uns einen Patch zur Verfügung!" -#: C/edit-colors.page:39(gui) -msgid "Negative" -msgstr "Negativ" +#: C/extensions.page:6(page/title) +msgid "Extending gThumb" +msgstr "gThumb erweitern" -#: C/edit-colors.page:40(p) -msgid "This tool inverts the color levels, providing an image negative." +#: C/extensions.page:8(page/p) +msgid "" +"gThumb has a plug-in system for extensions. Some standard " +"features are implemented as extensions and are supplied with the standard " +"distribution. Users may write (and share) additional extensions." msgstr "" -"Dieses Werkzeug kehrt Farbwerte um, so dass ein Negativ des Bildes entsteht." - -#: C/edit-save-undo-redo.page:6(title) -msgid "File Save, Undo, Redo" -msgstr "Dateien speichern, rückgängig machen, wiederholen" +"gThumb besitzt ein System für Plugins von Erweiterungen. Einige " +"grundlegende Funktionsmerkmale sind als Erweiterungen implementiert und " +"werden mit Standard-Distributionen ausgeliefert. Benutzer können weitere " +"Erweiterungen erstellen (und der Allgemeinheit zur Verfügung stellen)." -#: C/edit-save-undo-redo.page:12(p) +#: C/extensions.page:12(page/p) msgid "" -"Multiple changes may be made to an image before saving it. Undo " -"and Redo buttons are provided, and may be used up until the file " -"is saved." +"You can enable or disable extensions using EditExtensions. Some extensions will have " +"Preferences that can be modified from this dialog." msgstr "" -"Bevor ein Bild gespeichert wird, können mehrere Änderungen vorgenommen " -"werden. Knöpfe für Rückgängig und Wiederholen sind " -"vorhanden und können so lange genutzt werden, bis das Bild gespeichert wird." +"Sie können Erweiterungen unter BearbeitenErweiterungen aktivieren und deaktivieren. Einige " +"Erweiterungen bieten Einstellungen, die in diesem Dialog " +"bearbeitet werden können." -#: C/edit-save-undo-redo.page:16(p) +#: C/extensions.page:16(page/p) msgid "" -"A modified image may be saved by pressing Save. To save the " -"modified image to a new location instead, leaving the original image " -"unchanged, use Save As." +"This manual is written with the assumption that the standard extensions are " +"enabled. If you seem to be missing a feature, check to see which extensions " +"are actually enabled." msgstr "" -"Klicken Sie auf Speichern, um ein verändertes Bild zu speichern. " -"Wollen Sie stattdessen das veränderte Bild an einem anderen Ort speichern " -"und das Originalbild unverändert belassen, klicken Sie auf Speichern " -"unter." +"Dieses Handbuch ist unter der Annahme geschrieben worden, dass grundlegende " +"Erweiterungen aktiviert sind. Falls ein Funktionsmerkmal zu fehlen scheint, " +"so prüfen Sie bitte, welche Erweiterungen tatsächlich aktiviert sind." -#: C/edit-save-undo-redo.page:20(p) +#: C/extensions.page:20(page/p) msgid "" -"If you exit the editing mode (by pressing Esc or the View " -"the Folders toolbar button), or navigate away from the current image, " -"you will be prompted to save or discard your changes." +"If you would like to write your own extension, please visit http://live.gnome.org/gthumb for " +"development information. An example extension is provided in the source " +"code, which you can base your own extension on." msgstr "" -"Sobald Sie den Bearbeitungsmodus verlassen (durch Drücken von Esc " -"oder durch Anklicken des Werkzeugleistenknopfs Die Ordner anzeigen), werden Sie gefragt, ob Sie Ihre Änderungen speichern oder verwerfen " -"wollen." +"Wenn Sie eigene Erweiterungen erstellen möchten, so besuchen Sie bitte http://live.gnome.org/gthumb " +"für weitere Informationen zum Entwickeln. Eine Beispiel-Erweiterung ist im " +"Quellcode der Software enthalten, auf die Sie Ihre Erweiterung aufbauen " +"können." -#: C/rename-series.page:8(title) -msgid "Renaming Files" -msgstr "Dateien umbenennen" +#: C/gimp.page:6(page/title) +msgid "Launching GIMP" +msgstr "GIMP starten" -#: C/rename-series.page:10(p) +#: C/gimp.page:7(page/p) msgid "" -"To rename one or more images using a name template, select the files in the " -"browser and choose EditRename, or " -"press F2." +"If you have files selected in the browser, or an image open in the viewer, " +"you can open them in the GNU Image Manipulation Program (GIMP) by " +"pressing g." msgstr "" -"Um eines oder mehrere Bilder anhand einer Namensvorlage umzubenennen, wählen " -"Sie die Dateien im Browser aus und wählen Sie BearbeitenUmbenennen oder drücken Sie F2." +"Falls Dateien im Browser ausgewählt sind, oder ein Bild im Betrachter " +"geöffnet ist, können Sie sie im GNU Image Manipulation Program (GIMP) durch Drücken von g öffnen." -#: C/rename-series.page:15(p) +#: C/gimp.page:10(page/p) msgid "" -"The name template is simply a pattern that is used for renaming all of the " -"selected images. You can use some special characters to make the new names " -"differ each other (this is essential if you are renaming more than one " -"image, and optional if you are renaming a single image):" +"GIMP provides a more sophisticated set of editing tools than that " +"provided with gThumb." msgstr "" -"Die Namensschablone ist ein Muster, mit dem alle ausgewählten Dateien " -"umbenannt werden. Sie können einige Spezialzeichen verwenden, um die neuen " -"Namen unterschiedlich zu gestalten (dies ist entscheidend, wenn Sie mehr als " -"eine Datei umbenennen und optional, wenn Sie eine Datei umbenennen):" - -#: C/rename-series.page:24(p) -msgid "Symbol" -msgstr "Symbol" +"GIMP bietet weitreichendere Bearbeitungswerkzeuge als jene, die " +"von gThumb angeboten werden." -#: C/rename-series.page:33(key) -msgid "#" -msgstr "#" +#: C/viewer.page:6(page/title) +msgid "Opening an Image" +msgstr "Ein Bild öffnen" -#: C/rename-series.page:37(p) +#: C/viewer.page:8(page/p) msgid "" -"This symbol will be replaced with the value of a counter that increments " -"itself by 1 passing from one image to another. If you specify this symbols " -"in sequence you'll get leading zeros if the counter value has a lesser " -"number of digits, for example ### will produce the sequence: 001, 002, 003, " -"etc.." +"The browser view shows the images in the current folder or catalog (see " +"). Double-clicking an image (or pressing " +"Return) in the browser will open it in the viewer mode." msgstr "" -"Dieses Symbol wird durch einen fortlaufenden Zähler ersetzt, der pro Bild um " -"1 erhöht wird. Wenn Sie das Symbol mehrfach hintereinander angeben, wird die " -"Zahl gegebenenfalls durch führende Nullen aufgefüllt. Zum Beispiel ergibt " -"### die folgende Sequenz: 001, 002, 003, usw." +"Die Browseransicht zeigt die Bilder im aktuellen Ordner oder Katalog an " +"(siehe ). Durch einen Doppelklick auf " +"ein Bild (oder durch Drücken der Eingabetaste) im Browser wird " +"dieses im Betrachtermodus geöffnet." -#: C/rename-series.page:48(key) C/strftime.page:104(p) -msgid "%F" -msgstr "%F" +#: C/viewer.page:13(page/p) +msgid "" +"Pressing Escape will exit the viewer mode, and return the user to " +"the browser mode. A toolbar button (View the folders) is also " +"provided for this purpose." +msgstr "" +"Durch Drücken der Esc-Taste wird der Betrachtermodus beendet und " +"Sie kehren zum Browsermodus zurück. Für diesen Zweck ist auch ein Knopf in " +"der Werkzeugleiste vorhanden (Die Ordner anzeigen)." -#: C/rename-series.page:52(p) +#: C/viewer.page:17(page/p) msgid "" -"This symbol will be replaced with the file's original name, excluding the " -"original extension." +"A may be displayed in the viewer " +"mode, if desired." msgstr "" -"Dieses Symbol wird durch den ursprünglichen Bildnamen ohne die Erweiterung " -"ersetzt." +"Eine kann auf Wunsch im Ansichtsmodus " +"angezeigt werden." -#: C/rename-series.page:59(key) C/strftime.page:96(p) -msgid "%E" -msgstr "%E" +#: C/viewer.page:21(figure/title) +msgid "Viewer Mode with Thumbnail Pane" +msgstr "Betrachtungsmodus mit Vorschauleiste" -#: C/rename-series.page:63(p) +#: C/viewer.page:26(page/p) msgid "" -"This symbol will be replaced with the file's original filename extension." +"In the viewer mode, you can advance to the next image by clicking the " +"Next button, or by pressing Space or Page Down. You can go back to the previous image by clicking the Previous button, or by pressing Backspace or Page Up. You " +"can go also click on thumbnails in the thumbnail pane to open a different " +"image." msgstr "" -"Dieses Symbol wird durch die Dateinamenserweiterung des ursprünglichen " -"Bildes ersetzt." +"Im Betrachtermodus gehen Sie zum nächsten Bild, indem Sie auf den " +"Nächstes-Knopf klicken oder die Leertaste oder " +"Bild ab-Taste drücken. Zum vorigen Bild gelangen Sie durch " +"Anklicken des Voriges-Knopfes oder durch Drücken der " +"Löschtaste oder Bild auf. Sie können auch auf eines " +"der Vorschaubilder in der Vorschauleiste klicken, um ein anderes Bild zu " +"öffnen." -#: C/rename-series.page:70(key) -msgid "%N" -msgstr "%N" +#: C/fullscreen.page:8(page/title) +msgid "Manual Fullscreen Mode" +msgstr "Manueller Vollbildmodus" -#: C/rename-series.page:74(p) +#: C/fullscreen.page:10(page/p) msgid "" -"This symbol will be replaced with original image enumerator. For instance, " -"if the original filename was IMG_9876.JPG, this extracts the \"9876\" " -"portion. If the filename has more than one group of digits embedded in it " -"(for example, IMG_123_456.JPG) only the first number will be used (\"123\" " -"in this example)." +"Pressing f in the browser or viewer modes will display the " +"current image in fullscreen mode. (In the browser mode, you can also double-" +"click with the middle mouse button.)" msgstr "" -"Dieses Symbol wird durch den ursprünglichen Bildzähler ersetzt. Wenn z.B. " -"der ursprüngliche Dateiname »IMG_9876.JPG« lautet, wird die Zahl »9876« " -"verwendet. Falls der Dateiname mehr als eine Zahlengruppe enthält (wie z.B. " -"»IMG_123_456.JPG«), wird nur die erste Gruppe verwendet, d.h. in diesem " -"Beispiel »123«." - -#: C/rename-series.page:85(key) -msgid "%M{format}" -msgstr "%M{format}" +"Durch Drücken von f im Browser- oder Betrachtermodus wird das " +"aktuelle Bild im Vollbildmodus angezeigt. Im Browsermodus gelangen Sie " +"außerdem durch Drücken der mittleren Maustaste in den Vollbildmodus." -#: C/rename-series.page:89(p) +#: C/fullscreen.page:14(page/p) msgid "" -"This symbol will be replaced with the file modification date. The formatting " -"of this date (and optionally time) can be specified by adding a standard " -"formatting code in curly braces. For example, \"%M{%Y-%m-%d, %T}\" would be " -"replaced with a date and time like \"2010-04-01, 15:02:01\"." +"Moving the mouse will activate a popup control panel briefly. This can be " +"used to navigate to the next or previous image, or change zoom levels." msgstr "" -"Das Symbol wird durch das Änderungsdatum der Datei ersetzt. Die Formatierung " -"dieses Datums (und wahlweise auch der Zeit) kann durch Hinzufügen eines " -"standardisierten Formatierungscodes in geschweiften Klammern angegeben " -"werden. Beispielsweise wird die Zeichenkette »%M{%Y-%m-%d, %T}« durch eine " -"Datums- und Zeitangabe wie »2010-04-01, 15:02:01« ersetzt." +"Durch Verschieben der Maus wird kurzzeitig eine Bedienleiste angezeigt. " +"Diese können Sie zum Blättern zum nächsten oder vorigen Bild verwenden oder " +"die Vergrößerungsstufe einstellen." -#: C/rename-series.page:99(key) -msgid "%D{format}" -msgstr "%D{format}" +#: C/fullscreen.page:18(page/p) +msgid "" +"You can also advance to the next image by pressing PageDown or " +"Space." +msgstr "" +"Sie können auch manuell zum nächsten Bild durch Drücken von Bild ab oder der Leertaste gelangen." -#: C/rename-series.page:103(p) +#: C/fullscreen.page:21(page/p) msgid "" -"This symbol will be replaced with the date that the photo was original taken " -"(normally determined from the EXIF datestamps embedded inside the photo). " -"The formatting of this date (and optionally time) can be specified by adding " -"a standard formatting code in curly braces. For example, \"%D{%Y-%m-%d, %T}" -"\" would be replaced with a date and time like \"2010-04-01, 15:02:01\"." +"You can go back to the previous image by pressing PageUp or " +"Backspace." +msgstr "" +"Sie können zurück zum vorigen Bild durch Drücken von Bild auf " +"oder der Leertaste gelangen." + +#: C/fullscreen.page:24(page/p) +msgid "This can be used to implement a manually-controlled slideshow." +msgstr "Damit können Sie eine manuell gesteuerte Diaschau verwirklichen." + +#: C/fullscreen.page:27(page/p) +msgid "To exit the fullscreen mode, press f or Escape." msgstr "" -"Dieses Symbol wird durch das originale Aufnahmedatum des Fotos ersetzt, " -"welches üblicherweise aus den im Foto eingebetteten EXIF-Daten ermittelt " -"wird. Die Formatierung dieses Datums (und wahlweise auch der Zeit) kann " -"durch Hinzufügen eines standardisierten Formatierungscodes in geschweiften " -"Klammern angegeben werden. Beispielsweise wird die Zeichenkette »%M{%Y-%m-%" -"d, %T}« durch eine Datums- und Zeitangabe wie »2010-04-01, 15:02:01« ersetzt." +"Um den Vollbildmodus zu verlassen, drücken Sie f oder Esc." -#: C/rename-series.page:115(key) -msgid "%A{identifier}" -msgstr "%A{identifier}" +#: C/sorting.page:7(page/title) +msgid "Sorting Files" +msgstr "Dateien sortieren" -#: C/rename-series.page:119(p) +#: C/sorting.page:9(page/p) msgid "" -"This symbol will be replaced with the data that has been specified by the " -"identifier. For example, \"%A{ general::dimensions }\" would be replaced " -"with a size like \"320 x 240\"." +"Use the ViewSort By menu to select " +"the desired file-sorting method for the browser view. Files can be sorted on " +"the basis of their name, the file size, the file modification date, or the " +"date the photo was taken." msgstr "" -"Dieses Symbol wird durch die im Bezeichner angegebenen Daten ersetzt. " -"Beispielsweise wird »%A{ general::dimensions }« durch eine Größe wie »320 x " -"240« ersetzt." +"Im Menü AnsichtSortieren nach können " +"Sie die gewünschte Sortiermethode der Browseransicht auswählen. Dateien " +"können anhand ihres Dateinamens, der Dateigröße, des Änderungszeitpunkts " +"oder des Aufnahmedatums sortiert werden." -#: C/rename-series.page:127(p) +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/filtering.page:17(media) +msgctxt "_" msgid "" -"A summary of these special codes may be viewed by clicking on the Help icon " -"inside the template field." -msgstr "" -"Eine Zusammenfassung dieser speziellen Codes kann durch einen Mausklick auf " -"das Hilfe-Symbol im Vorlagen-Feld eingesehen werden." +"external ref='figures/general-filter.png' " +"md5='818fcb0f12da6496f3c72699f12beb28'" +msgstr "translated" -#: C/rename-series.page:130(p) +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/filtering.page:30(media) +msgctxt "_" msgid "" -"The list at the bottom of the dialog displays how the filenames will be " -"renamed." -msgstr "" -"Die Liste unten im Dialog zeigt, wie die Dateinamen umbenannt werden würden." +"external ref='figures/specific-filter.png' " +"md5='e7036e5b958301c6acb3ab5e4a618bbe'" +msgstr "translated" -#: C/rename-series.page:133(p) -msgid "To rename the images click on Rename." -msgstr "Klicken Sie auf Umbenennen, um die Bilder umzubenennen." +#: C/filtering.page:7(page/title) +msgid "Filtering Files" +msgstr "Filtern von Dateien" -#: C/rename-series.page:135(p) +#: C/filtering.page:9(page/p) msgid "" -"If the renaming of an image can overwrite an already existing image you will " -"be asked how to proceed, five options are available: overwrite the image; do " -"not overwrite the image; always overwrite; never overwrite; specify a new " -"name." +"You can select what types of files to show in the browser view using the " +"ViewFilter dialog. The default is to " +"show all media files (images, movies, audio), but this can be made more or " +"less restrictive." msgstr "" -"Falls das Umbenennen eines Bildes ein bereits vorhandenes Bild überschreiben " -"würde, dann werden Sie gefragt, wie Sie fortfahren möchten. Es gibt fünf " -"Möglichkeiten: Das Bild überschreiben; das Bild nicht überschreiben; immer " -"überschreiben; niemals überschreiben; einen neuen Namen angeben." +"Sie können festlegen, welche Dateitypen in der Browseransicht angezeigt " +"werden sollen, indem Sie den Dialog AnsichtFilter verwenden. Per Voreinstellung werden alle Medien-Dateien (wie " +"Bilder, Filme und Audio) angezeigt, aber dies kann nach Ihren Wünschen " +"angepasst werden." -#: C/thumbnail-pane.page:6(title) -msgid "Thumbnail Pane" -msgstr "Vorschauleiste" +#: C/filtering.page:15(figure/title) +msgid "Enabling Filters" +msgstr "Aktivieren von Filtern" -#: C/thumbnail-pane.page:8(p) +#: C/filtering.page:20(page/p) msgid "" -"When an image has been opened in the gThumb viewer, the user has " -"the option of enabling or disabling a thumbnail pane, which shows the other " -"images in the folder as thumbnails. This feature can be toggled with the " -"ViewThumbnail Pane command, or by " -"pressing F8." +"The figure above shows how to configure gThumb to display media " +"files only, by setting the General Filter." msgstr "" -"Wenn ein Bild im Betrachter von gThumb geöffnet ist, können Sie " -"die Vorschauleiste aktivieren oder deaktivieren, in der die anderen im " -"Ordner enthalten Bilder als Vorschaubilder angezeigt werden. Sie können " -"dieses Funktionsmerkmal über das Menü AnsichtVorschauleiste oder durch Drücken von F8 " -"ein- und ausschalten." +"Die Abbildung oben zeigt, wie Sie gThumb so konfigurieren, dass " +"nur Medien-Dateien durch Festlegen eines Allgemeinen Filters " +"angezeigt werden." -#: C/thumbnail-pane.page:14(p) +#: C/filtering.page:23(page/p) msgid "" -"The thumbnail pane may be positioned along the bottom of the main image, or " -"along the side. This is controlled by the settings in EditPreferencesGeneralThumbnails in Viewer." +"Also, by enabling Filename in Other Filters, a filter-" +"by-filename ability is added to the filter bar at the bottom of the browser " +"view:" msgstr "" -"Die Vorschauleiste kann entlang des unteren Randes oder an der Seite " -"angezeigt werden. Sie können die Platzierung der Vorschaleiste in " -"BearbeitenEinstellungenAllgemeinVorschaubilder im Betrachter festlegen." - -#: C/thumbnail-pane.page:19(title) -msgid "Thumbnail Pane, Along Bottom of Main Image" -msgstr "Vorschauleiste am unteren Rand des Hauptbildes" +"Durch Aktivieren von Dateiname unter Andere Filter " +"wird die Möglichkeit des Filterns nach Dateinamen der Filterleiste unten in " +"der Browseransicht hinzugefügt:" -#: C/thumbnails.page:6(title) -msgid "Thumbnail Sources" -msgstr "Quellen für Vorschaubilder" +#: C/filtering.page:28(figure/title) +msgid "Browser Filter Bar" +msgstr "Filterleiste in der Browseransicht" -#: C/thumbnails.page:8(p) +#: C/filtering.page:33(page/p) msgid "" -"The browser window normally shows the thumbnails of the images and movies in " -"the selected folder. Generic icons for other files (audio files, for " -"instance) may also be shown." +"In the above figure, the filename filter has been configured to show only " +"files with \"gen\" in the filename. The matching is case-insensitive." msgstr "" -"Das Browsrfenster zeigt normalerweise die Vorschauen der Bilder und Filme im " -"gewählten Ordner an. Außerdem werden allgemeine Symbole für sonstige Dateien " -"angezeigt, zum Beispiel für Audio-Dateien." +"In der Abbildung oben ist der Dateinamen-Filter so konfiguriert, dass nur " +"Dateien angezeigt werden, deren Name »gen« enthält. Die Suche berücksichtigt " +"nicht Groß-/Kleinschreibung." -#: C/thumbnails.page:18(p) +#: C/printing.page:7(page/title) +msgid "Printing Images" +msgstr "Bilder drucken" + +#: C/printing.page:9(page/p) msgid "" -"The thumbnails may be generated by a number of different methods. " -"gThumb will first check for existing thumbnails in the system " -"cache." +"To print the current image in the viewer mode, use FilePrint or Ctrlp." msgstr "" -"Die Vorschaubilder können auf verschiedenen Wegen erzeugt werden. " -"gThumb schaut zuerst nach vorhandenen Vorschaubildern im " -"Zwischenspeicher des Systems." +"Um das aktuelle Bild im Ansichtsmodus zu drucken, wählen Sie bitte " +"DateiDrucken oder Strgp." -#: C/thumbnails.page:22(p) +#: C/printing.page:13(page/p) msgid "" -"If no cached thumbnail is found, and an image file contains an embedded " -"thumbnail (jpeg files generated by digital cameras normally do), " -"gThumb will attempt to use that. gThumb will confirm " -"that the aspect ratio of the thumbnail is similar to that of the main image, " -"and ignore thumbnails that do not appear to match the main image." +"To print one or more images from the browser mode, select the desired images " +"and then use FilePrint or " +"Ctrlp." msgstr "" -"Falls kein zwischengespeichertes Vorschaubild gefunden wird und eine Datei " -"ein eingebettetes Vorschaubild enthält (wie es normalerweise bei von Kameras " -"erstellten JPEG-Bildern der Fall ist), dann wird versucht, dieses zu " -"verwenden. gThumb überprüft, ob das Seitenverhältnis das gleiche " -"wie das des eigentlichen Bildes ist, und ignoriert Vorschaubilder, deren " -"Seitenverhältnis offensichtlich nicht mit dem des Originalbildes " -"übereinstimmt." +"Um eines oder mehrere Bilder im Browsermodus zu drucken, wählen Sie die " +"Bilder im Browser aus und wählen Sie DateiDrucken oder drücken Sie Strgp." -#: C/thumbnails.page:29(p) +#: C/printing.page:18(page/p) msgid "" -"If that doesn't work, gThumb will attempt to load the entire file " -"and generate a scaled-down thumbnail." +"The printer to use can be selected from the General tab of the " +"print dialog." msgstr "" -"Falls dies nicht gelingt, versucht gThumb, die Datei vollständig " -"zu laden und ein auf die entsprechende Größe skaliertes Vorschaubild zu " -"erstellen." +"Der zu verwendende Drucker kann im Reiter Allgemein im " +"Druckdialog ausgewählt werden." -#: C/thumbnails.page:32(p) +#: C/printing.page:21(page/p) msgid "" -"Lastly, gThumb will use any system-defined scripts for " -"thumbnailing particular media types. For example, some systems may use " -"mplayer or totem or other movie viewers to generate " -"movie thumbnails." +"The type of paper to use can be selected from the Page Setup tab." msgstr "" -"Letztlich verwendet gThumb jegliche im System definierten Skripte " -"zur Erzeugung von Vorschaubildern für verschiedene Medientypen. " -"Beispielsweise werden auf einigen Systemen mplayer, totem oder andere Video-Wiedergabeprogramme zur Erzeugung von Videovorschauen " -"verwendet." +"Der zu verwendende Papiertyp kann im Reiter Seite einrichten " +"ausgewählt werden." -#: C/thumbnails.page:37(p) +#: C/printing.page:24(page/p) msgid "" -"gThumb will save thumbnails to a system cache, to share them with " -"other applications. By default, Gnome systems prune cached thumbnails when " -"they are older than 180 days, or when the thumbnail cache exceeds 512 MB. " -"Technically-inclined users can explore these settings with gconf-" -"editor. See the /desktop/gnome/thumbnail_cache/maximum_age and /" -"desktop/gnome/thumbnail_cache/maximum_size keys in particular. Certain " -"applications (like F-Spot) may automatically increase these " -"settings greatly." +"The Layout tab provides some additional gThumb-" +"specific options. You can set the number of images to include on each page " +"here, and a preview pane is provided. Captions can also be added under the " +"image, in a configurable font. The captions can be chosen from a selection " +"of listed file attributes (like the file name, the date of the photo, camera " +"shutter speed, and others). Each image can be repositioned inside its print " +"area using the controls on this tab." msgstr "" -"gThumb speichert Vorschaubilder in einem Zwischenspeicher des " -"Systems, um sie auf diese Weise anderen Anwendungen zur Verfügung zu " -"stellen. Standardmäßig löscht GNOME Vorschaubilder aus dem Zwischenspeicher, " -"wenn sie älter als 180 Tage sind oder wenn die Größe des Zwischenspeichers " -"512 MB überschreitet. Technisch versierte Benutzer können diese " -"Einstellungen im Konfigurationseditor erkunden, in den " -"Schlüsseln /desktop/gnome/thumbnail_cache/maximum_age und /desktop/gnome/" -"thumbnail_cache/maximum_size. Einige Anwendungen, wie F-Spot, " -"können diese Einstellungen automatisch großzügig erhöhen." +"Der Reiter Layout bietet einige zusätzliche gThumb-" +"spezifische Optionen. Sie können hier die Anzahl der Bilder pro Seite " +"festlegen. Außerdem finden Sie hier einen Vorschaubereich. Sie können " +"Bildunterschriften hinzufügen, die aus einer Auswahl aufgelisteter " +"Dateiattribute bezogen werden können, wie dem Dateinamen, dem Aufnahmedatum, " +"der Belichtungszeit der Kamera und mehr. Jedes Bild kann mit den Optionen in " +"diesem Reiter innerhalb des druckbaren Bereiches neu positioniert werden." -#: C/batch-scripts.page:6(title) -msgid "User-Defined Scripts" -msgstr "Benutzerdefinierte Skripte" +#: C/printing.page:34(page/p) +msgid "When you are ready to print, press the Print button." +msgstr "Klicken Sie auf den Knopf Drucken, sobald Sie fertig sind." + +#: C/shortcuts.page:7(page/title) +msgid "Keyboard Shortcuts" +msgstr "Tastenkombinationen" -#: C/batch-scripts.page:8(p) +#: C/shortcuts.page:10(section/title) +msgid "Viewing and hiding parts of the user interface" +msgstr "Anzeigen und verbergen von Teilen der grafischen Oberflächen" + +#: C/shortcuts.page:14(td/p) C/shortcuts.page:91(td/p) +#: C/shortcuts.page:270(td/p) C/shortcuts.page:495(td/p) +msgid "Keyboard Shortcut" +msgstr "Tastenkombination" + +#: C/shortcuts.page:22(td/p) +msgid "F9" +msgstr "F9" + +#: C/shortcuts.page:27(td/p) msgid "" -"To define a script (a command-line sequence that gThumb will " -"execute on your files), click the Tools button on the main " -"toolbar, and select ToolsPersonalize." +"Show/Hide the sidebar in the browser mode. The sidebar contains the folder " +"tree and the file properties summary (if enabled)." msgstr "" -"Um ein Skript zu definieren, das gThumb auf Ihre Dateien " -"anwendet, klicken Sie auf den Werkzeugleistenknopf Werkzeuge und " -"wählen Sie WerkzeugePersonalisieren." +"Die Seitenleiste im Ansichtsmodus anzeigen/verbergen. Die Seitenleiste " +"enthält den Ordnerbaum und die Zusammenfassung der Dateieigenschaften " +"(sofern aktiviert)." + +#: C/shortcuts.page:33(td/p) +msgid "i" +msgstr "i" + +#: C/shortcuts.page:38(td/p) +msgid "Show the file properties summary." +msgstr "Die Zusammenfassung der Eigenschaften der Datei anzeigen." + +#: C/shortcuts.page:43(td/p) +msgid "F8" +msgstr "F8" + +#: C/shortcuts.page:48(td/p) +msgid "Shows/hides the thumbnail pane in the viewer mode." +msgstr "Die Vorschauleiste im Ansichtsmodus anzeigen/verbergen." + +#: C/shortcuts.page:53(td/p) +msgid "F11 or f" +msgstr "F11 or f" + +#: C/shortcuts.page:58(td/p) +msgid "Toggles the fullscreen mode." +msgstr "Den Vollbildmodus ein- oder ausschalten." + +#: C/shortcuts.page:63(td/p) +msgid "Ctrlt" +msgstr "Strgt" + +#: C/shortcuts.page:68(td/p) +msgid "Shows/hides the thumbnails in the browser mode." +msgstr "Die Vorschaubilder im Ansichtsmodus anzeigen/verbergen." + +#: C/shortcuts.page:73(td/p) C/shortcuts.page:523(td/p) +msgid "Esc" +msgstr "Esc" + +#: C/shortcuts.page:78(td/p) +msgid "Closes the viewer or fullscreen mode." +msgstr "Schließt den Betrachter oder den Vollbildmodus." + +#: C/shortcuts.page:87(section/title) +msgid "Editing shortcuts for the browser and viewer" +msgstr "Tastenkombinationen für Bildbetrachter und Browser bearbeiten" + +#: C/shortcuts.page:99(td/p) +msgid "e" +msgstr "e" + +#: C/shortcuts.page:104(td/p) +msgid "Edit the image. Opens the viewer and shows the editing tools." +msgstr "" +"Das Bild bearbeiten. Es wird der Betrachter geöffnet und die " +"Bearbeitungswerkzeuge angezeigt." + +#: C/shortcuts.page:109(td/p) +msgid "g" +msgstr "g" + +#: C/shortcuts.page:114(td/p) +msgid "Open the image with the GNU Image Manipulation Program (GIMP)." +msgstr "Das Bild mit dem GNU Image Manipulation Program (GIMP) öffnen." + +#: C/shortcuts.page:119(td/p) +msgid "F2" +msgstr "F2" + +#: C/shortcuts.page:124(td/p) +msgid "Rename the image." +msgstr "Das Bild umbenennen." -#: C/batch-scripts.page:12(p) -msgid "TODO: further documentation is need here." -msgstr "TODO: Hier ist ausführlichere Dokumentation nötig." +#: C/shortcuts.page:129(td/p) +msgid "c or Ctrlm" +msgstr "c oder Strgm" -#: C/batch-change-date.page:6(title) -msgid "Changing Dates" -msgstr "das Datum ändern" +#: C/shortcuts.page:134(td/p) +msgid "Add comments or metadata to an image." +msgstr "Einen Kommentar oder Metadaten zu einem Bild hinzufügen." -#: C/batch-change-date.page:8(p) -msgid "" -"To change the file modification times, the comment dates, or the Exif " -"DateTimeOriginal tags of multiple files, select the files in the browser " -"view. Then click the Tools button on the main toolbar, and select " -"ToolsChange Date." -msgstr "" -"Um die Änderungszeitpunkte, die Daten der Kommentare oder die Exif-" -"DateTimeOriginal-Markierungen mehrerer Dateien anzupassen, wählen Sie " -"zunächst die Bilder in der Browseransicht aus. Klicken Sie dann auf den " -"Werkzeuge-Knopf in der Hauptwerkzeugleiste und wählen Sie " -"WerkzeugeDatum ändern." +#: C/shortcuts.page:139(td/p) +msgid "]" +msgstr "]" -#: C/batch-change-date.page:13(p) -msgid "" -"Select the desired date options, and click Execute to complete " -"the process." +#: C/shortcuts.page:144(td/p) +msgid "Rotate right, losslessly if possible. The file is saved automatically." msgstr "" -"Wählen Sie die gewünschten Datumseinstellungen und klicken Sie auf " -"Ausführen, um den Vorgang abzuschließen." +"Im Uhrzeigersinn nach Möglichkeit verlustfrei drehen. Die Datei wird " +"automatisch gespeichert." -#: C/batch-resize.page:6(title) -msgid "Resizing Images" -msgstr "Bildgröße ändern" +#: C/shortcuts.page:149(td/p) +msgid "[" +msgstr "[" -#: C/batch-resize.page:8(p) -msgid "" -"To resize one or more images using the same dimensions or scaling factors, " -"select the images in the browser view. Then click the Tools " -"button on the main toolbar, and select ToolsResize " -"Images." +#: C/shortcuts.page:154(td/p) +msgid "Rotate left, losslessly if possible. The file is saved automatically." msgstr "" -"Um die Größe eines oder mehrere Bilder anhand der gleichen Abmessungen oder " -"Skalierungsfaktoren zu ändern, wählen Sie die Bilder zunächst in der " -"Browseransicht aus. Klicken Sie dann auf den Werkzeuge-Knopf in " -"der Hauptwerkzeugleiste und wählen Sie WerkzeugeBildgröße ändern." +"Gegen den Uhrzeigersinn nach Möglichkeit verlustfrei drehen. Die Datei wird " +"automatisch gespeichert." -#: C/batch-resize.page:12(p) -msgid "" -"Then select the desired maximum output dimensions, or the desired percentage " -"scaling, and the destination folder. Click Execute to complete " -"the process." -msgstr "" -"Dann wählen Sie die gewünschten Größenwerte der Ausgabe oder den Prozentsatz " -"der Skalierung sowie den Zielordner aus. Klicken Sie auf Ausführen, um den Vorgang abzuschließen." +#: C/shortcuts.page:159(td/p) +msgid "Delete" +msgstr "Entf" -#: C/batch-convert-format.page:6(title) -msgid "Converting File Formats" -msgstr "Umwandeln von Dateiformaten" +#: C/shortcuts.page:164(td/p) +msgid "Move the selected files to the Trash." +msgstr "Die ausgewählten Dateien in den Papierkorb verschieben." -#: C/batch-convert-format.page:8(p) -msgid "" -"To convert one or more images into a new file format, select the images in " -"the browser view. Then click the Tools button on the main " -"toolbar, and select ToolsConvert Format." -msgstr "" -"Um eines oder mehrere Bilder in ein neues Format umzuwandeln, wählen Sie " -"zunächst die Bilder in der Browseransicht aus. Klicken Sie dann auf den " -"Werkzeuge-Knopf in der Hauptwerkzeugleiste und wählen Sie " -"WerkzeugeFormat umwandeln." +#: C/shortcuts.page:169(td/p) +msgid "ShiftDelete" +msgstr "UmschalttasteEntf" -#: C/batch-convert-format.page:12(p) -msgid "" -"Select the desired output format and destination folder. Click Execute to complete the process." -msgstr "" -"Wählen Sie das gewünschte Ausgabeformat und den Zielordner. Klicken Sie auf " -"Ausführen, um den Vorgang abzuschließen." +#: C/shortcuts.page:174(td/p) +msgid "Delete the selected files permanently." +msgstr "Die gewählten Bilder dauerhaft löschen." -#: C/batch-rotate.page:6(title) -msgid "Rotating Images Losslessly" -msgstr "Bilder verlustfrei drehen" +#: C/shortcuts.page:182(section/title) +msgid "Editing shortcuts for the viewer mode only" +msgstr "Tastenkombinationen nur für den Ansichtsmodus bearbeiten" -#: C/batch-rotate.page:8(p) -msgid "" -"To rotate one or more images, select the images in the browser view. Then " -"click the Tools button on the main toolbar, and select either " -"ToolsRotate Right or " -"ToolsRotate Left. The images will be " -"rotated." -msgstr "" -"Um ein oder mehrere Bilder zu drehen, wählen Sie die Bilder zunächst in der " -"Browseransicht aus. Klicken Sie dann auf den Werkzeuge-Knopf in " -"der Hauptwerkzeugleiste und wählen Sie entweder WerkzeugeRechts herum drehen oder WerkzeugeLinks herum drehen. Die Bilder werden nun gedreht." +#: C/shortcuts.page:186(td/p) +msgid "Keyboard Shortcut (Case Sensitive)" +msgstr "Tastenkombinationen (Groß-/Kleinschreibung wird berücksichtigt)" -#: C/batch-rotate.page:14(p) -msgid "Lossless rotation is used for jpeg images, when possible." -msgstr "Für JPEG-Bilder wird verlustlose Drehung angewendet, falls möglich." +#: C/shortcuts.page:194(td/p) +msgid "h" +msgstr "h" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/browser.page:13(None) -msgid "@@image: 'figures/main-win.png'; md5=93cf84bd05a153ab61951ae12bbe3f26" -msgstr "translated" +#: C/shortcuts.page:199(td/p) +msgid "Enhance colors." +msgstr "Farben verbessern." -#: C/browser.page:6(title) -msgid "Browsing Your Files" -msgstr "Durchsuchen des Dateisystems" +#: C/shortcuts.page:204(td/p) +msgid "l" +msgstr "l" -#: C/browser.page:8(p) -msgid "When you start gThumb the following window is displayed:" -msgstr "Wenn Sie gThumb starten, wird folgendes Fenster angezeigt:" +#: C/shortcuts.page:209(td/p) +msgid "Flip image." +msgstr "Das Bild umdrehen." -#: C/browser.page:11(title) -msgid "The main window" -msgstr "Das Hauptfenster" +#: C/shortcuts.page:214(td/p) +msgid "m" +msgstr "m" -#: C/browser.page:16(p) -msgid "The gThumb browser contains the following elements:" -msgstr "Der gThumb-Bildbetrachter enthält die folgenden Elemente:" +#: C/shortcuts.page:219(td/p) +msgid "Mirror image." +msgstr "Das Bild spiegeln." -#: C/browser.page:20(title) -msgid "Menubar" -msgstr "Menüleiste" +#: C/shortcuts.page:224(td/p) +msgid "r" +msgstr "r" -#: C/browser.page:21(p) -msgid "" -"The menus on the menubar contain all of the commands that you can use in " -"gThumb" -msgstr "" -"Die Menüs der Menüleiste enthalten alle Befehle, die Sie in gThumb nutzen können." +#: C/shortcuts.page:229(td/p) +msgid "Rotate right." +msgstr "Rechts herum drehen." -#: C/browser.page:25(title) -msgid "Toolbar" -msgstr "Werkzeugleiste" +#: C/shortcuts.page:234(td/p) +msgid "R" +msgstr "R" -#: C/browser.page:26(p) -msgid "" -"The toolbar contains a subset of the commands that you can access from the " -"menubar. In particular, the Tools button contains functions for batch " -"processing multiple images." -msgstr "" -"Die Werkzeugleiste enthält eine Teilmenge der Befehle aus der Menüleiste. Im " -"einzelnen enthält der Werkzeuge-Knopf Funktionen für die Stapelverarbeitung " -"mehrerer Bilder." +#: C/shortcuts.page:239(td/p) +msgid "Rotate left." +msgstr "Links herum drehen." -#: C/browser.page:31(title) -msgid "Locationbar" -msgstr "Adressleiste" +#: C/shortcuts.page:244(td/p) +msgid "C" +msgstr "C" -#: C/browser.page:32(p) -msgid "The locationbar contains the current folder or catalog name." -msgstr "Die Adressleiste zeigt den aktuellen Ordner- oder Katalognamen an." +#: C/shortcuts.page:249(td/p) +msgid "Crop image." +msgstr "Das Bild zuschneiden." -#: C/browser.page:36(title) -msgid "Folder Tree" -msgstr "Ordnerliste" +#: C/shortcuts.page:254(td/p) +msgid "S" +msgstr "S" -#: C/browser.page:37(p) -msgid "" -"The folder tree allows you to navigate the filesystem. Single-clicking on a " -"folder will load its images in the browser view. Double-clicking a folder, " -"or clicking the expander arrow, will also list folder's subfolders in the " -"tree." -msgstr "" -"Der Ordnerbaum ermöglicht Ihnen die Navigation im Dateisystem. Ein einfacher " -"Klick auf einen Ordner lädt die darin enthaltenen Bilder in der " -"Browseransicht. Durch Doppelklick auf einen Ordner oder den Ausklapppfeil " -"werden zusätzlich dessen Unterordner in der Baumansicht angezeigt." +#: C/shortcuts.page:259(td/p) +msgid "Resize image." +msgstr "Größe des Bildes ändern." -#: C/browser.page:44(title) -msgid "Browser View" -msgstr "Browseransicht" +#: C/shortcuts.page:266(section/title) +msgid "Viewer shortcuts" +msgstr "Tastenkombinationen des Betrachters" -#: C/browser.page:45(p) -msgid "" -"The browser view shows the images in the current folder or catalog. Single-" -"clicking an image will enable the Information Sidebar for that image. Double-" -"clicking an image will open it in the viewer mode. Double-clicking with the " -"middle mouse button will load the image in fullscreen viewer mode." -msgstr "" -"Die Browseransicht zeigt die Bilder im aktuellen Ordner oder Katalog an. " -"Durch einen einfachen Klick auf ein Bild wird die Informations-Seitenleiste " -"für dieses Bild aktiviert. Ein Doppelklick auf ein Bild öffnet es im " -"Betrachtermodus. Durch einen Doppelklick mit der mittleren Maustaste wird " -"das Bild im Vollbild-Betrachtermodus geladen." +#: C/shortcuts.page:278(td/p) +msgid "Space or Page Down" +msgstr "Leertaste oder Bild ab" -#: C/browser.page:52(title) -msgid "Organize Button" -msgstr "GUI Schaltfläche" +#: C/shortcuts.page:283(td/p) +msgid "View the next image." +msgstr "Das nächste Bild zeigen." -#: C/browser.page:53(p) -msgid "" -"The Organize button, just above the browser view, allows you to group images " -"into catalogs." -msgstr "" -"Der Ordnen-Knopf oberhalb der Browseransicht ermöglicht Ihnen die Sortierung " -"der Bilder in Kataloge." +#: C/shortcuts.page:288(td/p) +msgid "Backspace or Page Up" +msgstr "Löschtaste oder Bild auf" -#: C/browser.page:57(title) -msgid "Statusbar" -msgstr "Statusleiste" +#: C/shortcuts.page:293(td/p) +msgid "View the previous image." +msgstr "Das vorhergehende Bild zeigen." -#: C/browser.page:58(p) -msgid "On the statusbar you can read:" -msgstr "Auf der Statusleiste können Sie lesen:" +#: C/shortcuts.page:298(td/p) C/shortcuts.page:415(td/p) +msgid "Home" +msgstr "Pos1" -#: C/browser.page:61(p) -msgid "" -"the total number of images contained in the current folder or catalog and " -"their total size." -msgstr "" -"Die gesamte Anzahl Bilder, die der aktuelle Ordner enthält sowie ihre " -"Gesamtgröße." +#: C/shortcuts.page:303(td/p) +msgid "View the first image." +msgstr "Das erste Bild zeigen." -#: C/browser.page:65(p) -msgid "the number of the selected images and their size." -msgstr "Die Anzahl der ausgewählten Bilder und ihre Größe." +#: C/shortcuts.page:308(td/p) C/shortcuts.page:425(td/p) +msgid "End" +msgstr "Ende" -#: C/browser.page:68(p) -msgid "some properties of the currently focused image." -msgstr "Einige Eigenschaften des ausgewählten Bildes." +#: C/shortcuts.page:313(td/p) +msgid "View the last image." +msgstr "Das letzte Bild zeigen." -#: C/browser.page:73(title) -msgid "Information Sidebar" -msgstr "Informations-Seitenleiste" +#: C/shortcuts.page:318(td/p) +msgid " Ctrl D " +msgstr " Strg D " -#: C/browser.page:74(p) -msgid "" -"If a single image is selected, the information sidebar (below the folder " -"tree) will display detailed information (such as EXIF or XMP tags) about the " -"selected image." -msgstr "" -"Wenn ein einzelnes Bild ausgewählt ist, zeigt die Informations-Seitenleiste " -"(unterhalb des Ordnerbaums) detaillierte Informationen zum gewählten Bild " -"an, zum Beispiel die EXIF- oder XMP-Markierungen." +#: C/shortcuts.page:326(td/p) +msgid "Add the current location to the bookmarks." +msgstr "Den aktuellen Ort zu den Lesezeichen hinzufügen." -#: C/browser.page:79(title) -msgid "Filter Bar" -msgstr "Filterleiste" +#: C/shortcuts.page:331(td/p) +msgid "+ or =" +msgstr "+ oder =" -#: C/browser.page:80(p) -msgid "" -"An image filtering tool is provided just below the browser view. This can be " -"used to filter the displayed images. For example, the browser view can be " -"limited to files of a certain size, date, or name pattern, or other " -"characteristics." -msgstr "" -"Unterhalb der Browseransicht steht ein Werkzeug zur Filterung bereit. Sie " -"können dieses zum Filtern der angezeigten Bilder verwenden. Zum Beispiel " -"kann die Browseransicht auf Bilder einer bestimmten Größe begrenzt werden, " -"oder auf Bilder, deren Namen, Daten oder Größen einem bestimmten Muster " -"entsprechen, oder weitere Charakteristiken." +#: C/shortcuts.page:336(td/p) +msgid "Zoom in." +msgstr "Vergrößern." -#: C/introduction.page:6(title) -msgid "About gThumb" -msgstr "Info zu gThumb" +#: C/shortcuts.page:341(td/p) +msgid "-" +msgstr "-" -#: C/introduction.page:8(p) -msgid "" -"gThumb is an image viewer and browser written for the GNOME " -"environment. It lets you browse your hard disk, showing you thumbnails of " -"image files and view single images of many different formats." -msgstr "" -"gThumb ist ein Bildbetrachter für die GNOME-Umgebung. Es erlaubt " -"das Durchstöbern Ihrer Medien, zeigt Vorschaubilder an und stellt einzelne " -"Bilder verschiedenster Formate dar." +#: C/shortcuts.page:346(td/p) +msgid "Zoom out." +msgstr "Verkleinern." -#: C/introduction.page:13(p) -msgid "" -"gThumb supports the most common graphics formats, including JPEG, " -"GIF, TIF, and PNG. gThumb will also display other less common " -"image types if the supporting libraries are installed, including TGA, ICO, " -"BMP, XPM, and others." +#: C/shortcuts.page:351(td/p) +msgid "1 or z or / (numeric keypad)" msgstr "" -"gThumb unterstützt die häufigsten Grafikformate, wie JPEG, GIF, " -"TIF und PNG. gThumb zeigt auch weniger verbreitete Formate an, " -"sofern die dazu nötigen Bibliotheken installiert sind, wie TGA, ICO, BMP, " -"XPM und weitere." +"1 oder z oder / (auf dem Nummernblock)" + +#: C/shortcuts.page:357(td/p) +msgid "Actual size." +msgstr "Normale Größe." + +#: C/shortcuts.page:362(td/p) +msgid "x or * (numeric keypad)" +msgstr "xoder * (auf dem Nummernblock)" -#: C/introduction.page:18(p) -msgid "" -"Some support for RAW image types is included, especially if the dcraw " -"program is installed on your system." -msgstr "" -"Verschiedene RAW-Bildtypen werden unterstützt, insbesondere dann, wenn auf " -"Ihrem System das Programm dcraw installiert ist." +#: C/shortcuts.page:367(td/p) +msgid "Zoom to fit (scales down only, does not magnify)" +msgstr "Einpassen (verkleinert nur)" -#: C/introduction.page:21(p) -msgid "" -"gThumb not only lets you view image files but has many other " -"features such as adding comments to images, organizing images into catalogs, " -"printing images, slideshows, setting your desktop background, and more." -msgstr "" -"gThumb stellt nicht nur Bilder dar, sondern bietet auch viele " -"andere Funktionen wie z.B. das Hinzufügen von Bildkommentaren, Ordnen von " -"Bildern in Katalogen, Drucken, Diashow, das Ändern des Arbeitsflächen-" -"Hintergrundbildes und mehr." +#: C/shortcuts.page:372(td/p) +msgid " Shift x " +msgstr " Umschalttaste x " -#: C/introduction.page:26(p) -msgid "" -"gThumb includes a tool to import photos from attached cameras and " -"memory card readers." -msgstr "" -"gThumb enthält ein Werkzeug zum Importieren von Fotos von einer " -"angeschlossenen Kameras und Speicherkarten-Lesegeräten." +#: C/shortcuts.page:380(td/p) +msgid "Zoom to fit (scale down or magnify, as required)" +msgstr "Einpassen (verkleinert oder vergrößert je nach Bedarf)" -#: C/introduction.page:29(p) -msgid "" -"gThumb can read EXIF, XMP, and IPTC metadata that is commonly " -"embedded in files." -msgstr "" -"gThumb kann EXIF-, XMP- und IPTC-Metadaten lesen, die " -"üblicherweise in Dateien eingebettet sind." +#: C/shortcuts.page:385(td/p) +msgid "Arrows" +msgstr "Pfeile" -#: C/introduction.page:32(p) -msgid "" -"gThumb provides a systems of extensions (or plug-ins), to allow " -"users to extend the functionality of gThumb." -msgstr "" -"gThumb bietet ein System für Erweiterungen (Plugins) und " -"ermöglicht es so Benutzern, die Funktionalität von gThumb zu " -"erweitern." +#: C/shortcuts.page:390(td/p) +msgid "Scroll the image." +msgstr "Das Bild vorschieben." -#: C/introduction.page:34(p) -msgid "" -"More information about these extensions, and about gThumb " -"generally, is available at http://live.gnome.org/gthumb." -msgstr "" -"Weitere Informationen zu den Erweiterungen und zu gThumb erhalten " -"Sie unter http://live.gnome.org/" -"gthumb." +#: C/shortcuts.page:395(td/p) +msgid " Shift Arrows " +msgstr " Umschalttaste Pfeiltasten " -#: C/strftime.page:6(title) -msgid "Date/Time Format Codes" -msgstr "Codes für Datums- und Zeitformat" +#: C/shortcuts.page:403(td/p) +msgid "Scroll the image faster." +msgstr "Das Bild schneller vorschieben." -#: C/strftime.page:8(p) -msgid "" -"This is a summary of standard date/time codes that may be used in format " -"strings:" -msgstr "" -"Es folgt eine Zusammenfassung der Datums- und Uhrzeit-Codes, die in " -"Formatangaben verwendet werden können:" +#: C/shortcuts.page:410(section/title) +msgid "Browser Navigation" +msgstr "Browser-Navigation" -#: C/strftime.page:12(title) -msgid "Valid format codes for custom subfolders" -msgstr "Gültige Formatangaben für eigene Unterordner" +#: C/shortcuts.page:420(td/p) +msgid "Go to the first file in the browser view." +msgstr "Zur ersten Datei in der Browseransicht wechseln." -#: C/strftime.page:15(p) -msgid "%a" -msgstr "%a" +#: C/shortcuts.page:431(td/p) +msgid "Go to the last file in the browser view." +msgstr "Zur letzten Datei in der Browseransicht wechseln." -#: C/strftime.page:18(p) -msgid "The abbreviated weekday name according to the current locale." -msgstr "Der abgekürzte Wochentag entsprechend der Ortseinstellung." +#: C/shortcuts.page:436(td/p) +msgid "Down Arrow or Page Down" +msgstr "Pfeiltaste runter oder Bild ab" -#: C/strftime.page:24(p) -msgid "%A" -msgstr "%A" +#: C/shortcuts.page:441(td/p) +msgid "Scroll downwards through the thumbnails." +msgstr "Nach unten durch die Vorschaubilder bewegen." -#: C/strftime.page:27(p) -msgid "The full weekday name according to the current locale." -msgstr "Der volle Wochentag entsprechend der Ortseinstellung." +#: C/shortcuts.page:446(td/p) +msgid "Up Arrow or Page Up" +msgstr "Pfeiltaste rauf oder Bild rauf" -#: C/strftime.page:33(p) -msgid "%b" -msgstr "%b" +#: C/shortcuts.page:451(td/p) +msgid "Scroll upwards through the thumbnails." +msgstr "Nach oben durch die Vorschaubilder bewegen." -#: C/strftime.page:36(p) -msgid "The abbreviated month name according to the current locale." -msgstr "Der abgekürzte Monat entsprechend der Ortseinstellung." +#: C/shortcuts.page:456(td/p) +msgid "AltLeft Arrow" +msgstr "AltLinke Pfeiltaste" -#: C/strftime.page:42(p) -msgid "%B" -msgstr "%B" +#: C/shortcuts.page:461(td/p) +msgid "Go back to the previously viewed folder." +msgstr "Zum zuletzt besuchten Ordner gehen." -#: C/strftime.page:45(p) -msgid "The full month name according to the current locale." -msgstr "Der volle Monat entsprechend der Ortseinstellung." +#: C/shortcuts.page:466(td/p) +msgid "AltRight Arrow" +msgstr "AltRechte Pfeiltaste" -#: C/strftime.page:50(p) -msgid "%c" -msgstr "%c" +#: C/shortcuts.page:471(td/p) +msgid "Go forward (after going back to a folder)." +msgstr "Vorwärts gehen (nach vorhergehendem rückwärts gehen)" -#: C/strftime.page:53(p) -msgid "The preferred date and time representation for the current locale." -msgstr "Die übliche Datums- und Zeitangabe entsprechend der Ortseinstellung." +#: C/shortcuts.page:476(td/p) +msgid " Alt Up " +msgstr " Alt Pfeiltaste hoch " -#: C/strftime.page:59(p) -msgid "%C" -msgstr "%C" +#: C/shortcuts.page:484(td/p) +msgid "Go up one level." +msgstr "Eine Ebene hoch gehen." -#: C/strftime.page:62(p) -msgid "The century number (year/100) as a 2-digit integer." -msgstr "Das Jahrhundert als zweistellige Zahl." +#: C/shortcuts.page:491(section/title) +msgid "Slideshow controls" +msgstr "Steuerung von Dia-Vorführungen" -#: C/strftime.page:67(p) -msgid "%d" -msgstr "%d" +#: C/shortcuts.page:503(td/p) +msgid "F5" +msgstr "F5" -#: C/strftime.page:70(p) -msgid "The day of the month as a decimal number (range 01 to 31)." -msgstr "Der Monatstag als Dezimalzahl (zwischen 01 und 31)." +#: C/shortcuts.page:508(td/p) +msgid "Start a slideshow." +msgstr "Die Diaschau starten." -#: C/strftime.page:76(p) -msgid "%D" -msgstr "%D" +#: C/shortcuts.page:513(td/p) +msgid "Space" +msgstr "Leertaste" -#: C/strftime.page:79(p) -msgid "" -"Equivalent to %m/%d/%y. (Yecch -- for Americans only. Americans should note " -"that in other countries %d/%m/%y is rather common. This means that in " -"international context this format is ambiguous and should not be used.)" -msgstr "" -"Identisch zu »%m/%d/%y«. (Nur in Nordamerika üblich, der Rest der Welt " -"verwendet Tag/Monat/Jahr: »%d/%m/%y«.)" +#: C/shortcuts.page:518(td/p) +msgid "Pause/Unpause the slideshow." +msgstr "Eine Diaschau pausieren/fortsetzen." -#: C/strftime.page:87(p) -msgid "%e" -msgstr "%e" +#: C/shortcuts.page:528(td/p) +msgid "Close the slideshow." +msgstr "Die Diashow schließen." -#: C/strftime.page:90(p) -msgid "" -"Like %d, the day of the month as a decimal number, but a leading zero is " -"replaced by a space." +#: C/shortcuts.page:533(td/p) +msgid "Down Arrow or Right Arrow or Page Down" msgstr "" -"Repräsentiert wie %d den Tag als Dezimalzahl, aber führende Nullen werden " -"als Leerzeichen dargestellt." +"Pfeiltaste runter oder Pfeiltaste rechts oder " +"Bild ab" -#: C/strftime.page:99(p) C/strftime.page:208(p) -msgid "Modifier: use alternative format, see below." -msgstr "Verwende alternatives Format, siehe weiter unten." +#: C/shortcuts.page:538(td/p) +msgid "Load the next image." +msgstr "Das nächste Bild zeigen." -#: C/strftime.page:107(p) -msgid "Equivalent to %Y-%m-%d (the ISO 8601 date format). (C99)" -msgstr "Identisch zu %Y-%m-%d (das ISO 8601 Datumsformat). (C99)" +#: C/shortcuts.page:543(td/p) +msgid "Up Arrow or Left Arrow or Page Up" +msgstr "" +"Pfeiltaste rauf oder Pfeiltaste links oder Bild " +"rauf" -#: C/strftime.page:113(p) -msgid "%G" -msgstr "%G" +#: C/shortcuts.page:548(td/p) +msgid "Load the previous image." +msgstr "Das vorhergehende Bild zeigen." + +#: C/sharing-disc.page:6(page/title) +msgid "Creating a CD/DVD/ISO" +msgstr "Erzeugen einer CD/DVD oder eines ISO-Abbildes" -#: C/strftime.page:116(p) +#: C/sharing-disc.page:7(page/p) msgid "" -"The ISO 8601 year with century as a decimal number. The 4-digit year " -"corresponding to the ISO week number (see %V). This has the same format and " -"value as %y, except that if the ISO week number belongs to the previous or " -"next year, that year is used instead." +"To write a series of files to an optical disk (CD or DVD), or to create an " +"ISO disk image file, use the File Export ToOptical Disc menu item." msgstr "" -"Das ISO 8601-Jahr mit dem Jahrhundert als Dezimalzahl. Das Jahr mit vier " -"Ziffern entspricht der ISO Wochenzahl (siehe %V). Es hat das selbe Format " -"und Jahr wie »%y«, mit der Ausnahme, dass wenn die ISO Wochenzahl zum " -"vorherigen oder nächsten Jahr gehört, jenes Jahr stattdessen verwendet wird." - -#: C/strftime.page:125(p) -msgid "%g" -msgstr "%g" +"Um eine Reihe von Dateien auf ein optisches Medium (CD oder DVD) zu " +"schreiben oder um ein ISO-Abbild zu erstellen, verwenden Sie bitte den " +"Menüpunkt DateiExportieren nachOptisches " +"Medium." -#: C/strftime.page:128(p) -msgid "Like %G, but without century, i.e., with a 2-digit year (00-99)." +#: C/sharing-disc.page:13(page/p) +msgid "" +"You will be offered the choice of writing the currently selected files, the " +"entire current folder, or the entire current folder and its subfolders. " +"Click OK when you have made the appropriate selection." msgstr "" -"Wie »%G«, aber ohne Jahrhundert, d.h. mit einer zweistelligen Jahreszahl (00-" -"99)." - -#: C/strftime.page:134(p) -msgid "%h" -msgstr "%h" +"Sie erhalten die Wahl zwischen dem Schreiben der aktuell ausgewählten " +"Dateien, des gesamten aktuellen Ordners oder des gesamten Ordners " +"einschließlich Unterordner. Klicken Sie auf OK, sobald Sie Ihre " +"Auswahl getroffen haben." -#: C/strftime.page:137(p) -msgid "Equivalent to %b." -msgstr "Entspricht %b." +#: C/sharing-disc.page:19(page/p) +msgid "" +"The next dialog will select the destination disk, or the ISO file to save. " +"When you are ready to complete the process, click Create Image. " +"The optical disk writing process will then commence, or the ISO file will be " +"written, completing the process." +msgstr "" +"Der nächste Dialog legt das Zielmedium oder den Namen des ISO-Abbildes fest. " +"Klicken Sie anschließend auf Abbild erstellen, um den Vorgang zu " +"starten. Der optische Schreibvorgang beginnt bzw. wird dann die ISO-Datei " +"geschrieben." -#: C/strftime.page:142(p) -msgid "%H" -msgstr "%H" +#: C/sharing-social.page:6(page/title) +msgid "Uploading to Photo-Sharing Web Sites" +msgstr "Übertragen zu Bilderdiensten im Web" -#: C/strftime.page:145(p) -msgid "The hour as a decimal number using a 24-hour clock (range 00 to 23)." -msgstr "Die Stunde als Dezimalzahl im 24-Stunden-Format (von 00 bis 23)." +#: C/sharing-social.page:7(page/p) +msgid "" +"gThumb is provided with a number of extensions for uploading photos to " +"various \"social media\" web sites. By default, uploaders for Facebook, " +"Flickr, Picasa, and Photobucket are enabled." +msgstr "" +"gThumb verfügt über eine Reihe von Erweiterungen zum Übertragen von Fotos zu " +"Webseiten verschiedener »sozialer Netzwerke«. Als Voreinstellung sind die " +"Übertragungen zu Facebook, Flickr, Picasa und Photobucket aktiviert." -#: C/strftime.page:151(p) -msgid "%I" -msgstr "%I" +#: C/sharing-social.page:13(page/p) +msgid "" +"To upload a series of photos, select the images in the browser view, and " +"click the Share button in the toolbar. Select the appropriate web " +"site from the menu that appears." +msgstr "" +"Um eine Reihe von Fotos hochzuladen, wählen Sie die Bilder in der " +"Browseransicht aus und klicken Sie auf den Knopf Freigeben in der " +"Werkzeugleiste. Wählen Sie die entsprechende Webseite im erscheinenden Menü " +"aus." -#: C/strftime.page:154(p) -msgid "The hour as a decimal number using a 12-hour clock (range 01 to 12)." -msgstr "Die Stunde als Dezimalzahl im 12-Stunden-Format (von 01 bis 12)." +#: C/sharing-social.page:17(page/p) +msgid "" +"You may be prompted for additional information specific to the destination " +"site, like an album name. You may also be prompted for your user name and " +"password for the site. It may be necessary for gThumb to open a web browser, " +"where you complete the required authentication steps. Once you have " +"completed the required authentication steps in the browser, return to gThumb " +"and continue the upload." +msgstr "" +"Sie werden um die Angabe zusätzlicher Informationen gebeten, abhängig vom " +"Ziel der Übertragung, wie beispielsweise ein Albumname. Außerdem werden Sie " +"nach dem Benutzernamen und dem Passwort gefragt. Es könnte erforderlich " +"sein, dass gThumb einen Webbrowser öffnet, in welchem Sie die notwendigen " +"Schritte zur Legitimierung vollziehen können. Sobald dies erledigt ist, " +"kehren Sie zu gThumb zurück und setzen Sie die Übertragung fort." -#: C/strftime.page:160(p) -msgid "%j" -msgstr "%j" +#: C/sharing-social.page:26(page/p) +msgid "" +"If you do not see the expected upload sites in the Share menu, " +"check that the appropriate exporter extensions are enabled in " +"EditExtensions." +msgstr "" +"Falls die erwarteten Webseiten im Menü Freigeben nicht angezeigt " +"werden, prüfen Sie, ob die entsprechende Export-Erweiterung in " +"BearbeitenErweiterungen aktiviert ist." -#: C/strftime.page:163(p) -msgid "The day of the year as a decimal number (range 001 to 366)." -msgstr "Der Jahrestag als Dezimalzahl (von 001 bis 366)." +#: C/sharing-social.page:31(page/p) +msgid "" +"For some sites, gThumb also supports downloading photos from the site into " +"gThumb. See the FileImport From menu " +"for the available download options." +msgstr "" +"Bei einigen Diensten unterstützt gThumb außerdem das Herunterladen von Fotos " +"in gThumb. Schauen Sie im Menü DateiImportieren von nach den verfügbaren Download-Optionen." -#: C/strftime.page:169(p) -msgid "%k" -msgstr "%k" +#: C/wallpaper.page:6(page/title) +msgid "Desktop Wallpaper" +msgstr "Bildschirmhintergrund" -#: C/strftime.page:172(p) +#: C/wallpaper.page:7(page/p) msgid "" -"The hour (24-hour clock) as a decimal number (range 0 to 23); single digits " -"are preceded by a blank. (See also %H.)" +"To set an image as the system desktop wallpaper, right-click on the image " +"and select Set as Desktop Background from the " +"pop-up menu. The desktop background will change, and the Gnome Appearance " +"Preferences dialog will appear. You can use this dialog to make adjustments " +"to the background settings (positioning, stretching, tiling, et cetera.)." msgstr "" -"Die Stunde (24-Stunden-Format) als Dezimalzahl (von 0 bis 23); einzelnen " -"Ziffern geht ein Leerzeichen vor. (Siehe auch %H.)" +"Um ein Bild als Arbeitsflächenhintergrund festzulegen, klicken Sie mit der " +"rechten Maustaste auf das Bild und wählen Sie Als " +"Arbeitsflächenhintergrund verwenden aus dem Einblend-Menü. " +"Der Arbeitsflächenhintergrund wird sich daraufhin ändern und der Dialog zum " +"Erscheinungsbild von GNOME wird geöffnet. Sie können mit diesem Dialog " +"Anpassungen an den Einstellungen für das Hintergrundbild (Position, " +"Streckung, Kacheln usw.) vornehmen." -#: C/strftime.page:179(p) -msgid "%l" -msgstr "%l" +#: C/bookmarks.page:6(page/title) +msgid "Using Bookmarks" +msgstr "Verwendung von Lesezeichen" -#: C/strftime.page:182(p) +#: C/bookmarks.page:8(page/p) msgid "" -"The hour (12-hour clock) as a decimal number (range 1 to 12); single digits " -"are preceded by a blank. (See also %I.)" +"Frequently-used folders can be added to the bookmark list for rapid access. " +"To add the current folder to the bookmark list, press CtrlD or use the command BookmarksAdd Bookmark." msgstr "" -"Die Stunde (12-Stunden-Format) als Dezimalzahl (von 1 bis 12); einzelnen " -"Ziffern geht ein Leerzeichen vor. (Siehe auch %I.)" +"Häufig genutzte Ordner können für schnellen Zugriff den Lesezeichen " +"hinzugefügt werden. Wechseln Sie zu dem Ordner, den Sie hinzufügen möchten, " +"und drücken Sie StrgD oder verwenden " +"Sie das Menü LesezeichenLesezeichen hinzufügen." -#: C/strftime.page:189(p) -msgid "%m" -msgstr "%m" +#: C/bookmarks.page:13(page/p) +msgid "" +"To remove or rearrange bookmarks in a different order use the " +"BookmarksEdit Bookmarks command." +msgstr "" +"Wählen Sie LesezeichenLesezeichen bearbeiten, um Lesezeichen zu löschen oder neu zu sortieren." -#: C/strftime.page:192(p) -msgid "The month as a decimal number (range 01 to 12)." -msgstr "Der Monat als Dezimalzahl (von 01 bis 12)." +#: C/bookmarks.page:16(page/p) +msgid "" +"BookmarksSystem Bookmarks provides " +"access to the system bookmarks that have been defined in Nautilus " +"or the file-chooser dialog used in most Gnome applications." +msgstr "" +"LesezeichenSystemlesezeichen bietet " +"Zugriff auf die Systemlesezeichen, welche in Nautilus oder dem " +"Dateiwähler-Dialog festgelegt wurden, welcher von den meisten GNOME-" +"Anwendungen eingesetzt wird." -#: C/strftime.page:197(p) -msgid "%M" -msgstr "%M" +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/import.page:21(media) +msgctxt "_" +msgid "" +"external ref='figures/import.png' md5='aab2ba4d889d170b219c554294d69b0f'" +msgstr "translated" -#: C/strftime.page:200(p) -msgid "The minute as a decimal number (range 00 to 59)." -msgstr "Die Minute als Dezimalzahl (von 00 bis 59)." +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/import.page:43(media) +msgctxt "_" +msgid "" +"external ref='figures/import-pref-auto-folder.png' " +"md5='0a41de83da83b762e37f3962a7e4c042'" +msgstr "translated" -#: C/strftime.page:205(p) -msgid "%O" -msgstr "%O" +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/import.page:75(media) +msgctxt "_" +msgid "" +"external ref='figures/import-pref-custom-format.png' " +"md5='989ca536c873ec926a4a71c876004b9f'" +msgstr "translated" -#: C/strftime.page:213(p) -msgid "%p" -msgstr "%p" +#: C/import.page:8(page/title) +msgid "Importing From a Camera" +msgstr "Importieren von einer Digitalkamera" -#: C/strftime.page:216(p) +#: C/import.page:10(page/p) msgid "" -"Either 'AM' or 'PM' according to the given time value, or the corresponding " -"strings for the current locale. Noon is treated as 'pm' and midnight as 'am'." +"On most systems, gThumb will automatically launch the import " +"dialog when a digital camera is connected to the computer, or a memory card " +"with photos is plugged into a card reader. (It does this because it is " +"registered as the default handler for x-content/image-dcf and x-content/" +"image-picturecd mime types.)" msgstr "" -"Entweder »AM« oder »PM« je nach Uhrzeit, oder der entsprechende Text der " -"aktuellen Ortseinstellung. Die Mittagszeit wird als »pm« und Mitternacht als " -"»am« geführt." - -#: C/strftime.page:223(p) -msgid "%P" -msgstr "%P" +"Auf den meisten Systemen wird gThumb automatisch den Import-" +"Dialog öffnen, sobald eine Digitalkamera mit dem Rechner verbunden wird oder " +"eine Speicherkarte mit Fotos in einen Kartenleser gesteckt wird. Die " +"geschieht, weil es als Handler für die MIME-Typen x-content/image-dcf und x-" +"content/image-picturecd registriert ist." -#: C/strftime.page:226(p) +#: C/import.page:16(page/p) msgid "" -"Like %p but in lowercase: 'am' or 'pm' or a corresponding string for the " -"current locale." +"To manually launch the import dialog, use FileImport " +"FromRemovable Device." msgstr "" -"Wie »%p«, aber in Kleinbuchstaben: »am« oder »pm«, oder der entsprechende Text " -"der aktuellen Ortseinstellung." +"Um den Import-Dialog manuell zu starten, wählen Sie DateiImportieren vonTragbares Gerät." -#: C/strftime.page:232(p) -msgid "%r" -msgstr "%r" +#: C/import.page:20(figure/title) +msgid "The Import Dialog" +msgstr "Der Importdialog" -#: C/strftime.page:235(p) +#: C/import.page:24(page/p) msgid "" -"The time in a.m. or p.m. notation. In the POSIX locale this is equivalent to " -"'%I:%M:%S %p'." +"The import dialog shows thumbnails of the photos available on the selected " +"device. The user can select one of more photos using normal keyboard or " +"mouse techniques (for example, Ctrl+click to add a photo to the selection, " +"or click and drag the mouse over the desired photos.) If no photos are " +"explicitly selected, all will be imported." msgstr "" -"Die Zeit als Notation mit folgendem »a.m.« oder »p.m.«. In der POSIX " -"Ortseinstellung entspricht dies »%I:%M:%S %p«." - -#: C/strftime.page:241(p) -msgid "%R" -msgstr "%R" +"Der Importdialog zeigt Vorschaubilder der auf dem gewählten Gerät " +"vorliegenden Fotos. Der Benutzer kann ein oder mehrere Fotos mit den " +"üblichen Tastatur- und Maustechniken importieren (wie z.B. Strg+Mausklick " +"zum Hinzufügen eines Fotos zur Auswahl, Einfassen von Fotos mit gedrückter " +"linker Maustaste etc.). Wenn explizit keine Fotos ausgewählt sind, so werden " +"alle importiert." -#: C/strftime.page:244(p) +#: C/import.page:30(page/p) msgid "" -"The time in 24-hour notation (%H:%M). For a version including the seconds, " -"see %T below." +"Tags may optionally be associated with the imported photos, using the " +"Tags control below the thumbnail window. Click the drop-down " +"control to see the predefined tags." msgstr "" -"Die Zeit im 24-Stunden-Format (»%H:%M«). Eine Variante mit Sekunden findet " -"sich unter »%H« weiter unten." - -#: C/strftime.page:250(p) -msgid "%s" -msgstr "%s" +"Schlagwörter können bei Bedarf mit importierten Fotos mit Hilfe des " +"Auswahlfeldes Schlagwörter unter dem Vorschau-Fenster verknüpft " +"werden. Klicken Sie auf den entsprechenden Knopf mit Pfeil nach unten, um " +"die voreingestellten Schlagwörter einzusehen." -#: C/strftime.page:253(p) +#: C/import.page:34(page/p) msgid "" -"The number of seconds since the Epoch, i.e., since 1970-01-01 00:00:00 UTC." -msgstr "Die Anzahl vergangener Sekunden seit dem 01.01.1970, 00:00:00 Uhr UTC." +"An event name may also be optionally associated with the photos. This event " +"name can be used to generate an automatic subfolder name (possibly " +"incorporating a date) as described below. For example, if the base " +"destination folder is \"/photos\", and you enter \"Wedding-Jennifer\" in the " +"Event field, you can configure generation of automatic subfolders " +"like \"/photos/2010-07-31, Wedding-Jennifer\"." +msgstr "" +"Ein Name für ein Ereignis kann ebenfalls optional mit den Fotos verknüpft " +"werden. Dieser Ereignisname kann zum automatischen Erstellen eines " +"Unterordnernamens (ggfs. mit einem Datum im Namen) wie unten beschrieben " +"genutzt werden. Wenn zum Beispiel der Zielordner »Fotos« wäre und Sie " +"»Hochzeit Jennifer« in das Textfeld Ereignis eingeben, dann " +"können Sie die automatische Erstellung von Unterordnern etwa mit dem Namen »/" +"Fotos/31.7.2010, Hochzeit Jennifer« einstellen." -#: C/strftime.page:259(p) -msgid "%S" -msgstr "%S" +#: C/import.page:42(figure/title) +msgid "Standard Date-Based Subfolders" +msgstr "Normale, auf Datum basierende Unterordner" -#: C/strftime.page:262(p) +#: C/import.page:46(page/p) msgid "" -"The second as a decimal number (range 00 to 60). (The range is up to 60 to " -"allow for occasional leap seconds.)" +"As mentioned above, subfolders for imported photos can be automatically " +"generated based on event names and dates. This is enabled or disabled by " +"clicking on the destination foldername in the import dialog. This opens a " +"second dialog, where the base folder for imports may be selected (the " +"Destination folder). To generate automatic subfolders, select " +"Automatic subfolder." msgstr "" -"Die Sekunden als Dezimalzahl (von 00 bis 60). (Die Spanne enthält die 60, um " -"gelegentliche Schlupfsekunden zu ermöglichen.)" - -#: C/strftime.page:269(p) -msgid "%T" -msgstr "%T" - -#: C/strftime.page:272(p) -msgid "The time in 24-hour notation (%H:%M:%S)." -msgstr "Die Uhrzeit im 24-Stunden-Format (»%H:%M:%S«)." - -#: C/strftime.page:277(p) -msgid "%u" -msgstr "%u" +"Wie zuvor erwähnt, können Unterordner für importierte Fotos automatisch auf " +"Basis von Ereignisnamen oder Kalenderdatum erstellt werden. Dies wird durch " +"einen Klick auf den Zielordnernamen im Dialog zum Importieren festgelegt. " +"Dadurch wird ein zweiter Dialog geöffnet, in dem der Basisordner (der " +"Speicherort) für die importierten Fotos gewählt wird. Wählen Sie " +"Automatischer Unterordner, um automatisch Unterordner erstellen " +"zu lassen." -#: C/strftime.page:280(p) +#: C/import.page:52(page/p) msgid "" -"The day of the week as a decimal number, range 1 to 7, Monday being 1. See " -"also %w." +"You can select either the File Date or the Current Date to use as the basis for subfolder naming. (The File Date " +"examines the dates embedded in the file metadata to determine when the photo " +"was taken.) A variety of standard date formats are available (year-" +"month for example). The as single subfolder checkbox " +"controls whether a \"deep\" or \"shallow\" hierarchy of files is made (for " +"example, with year-month, you can have year subfolders with month " +"subfolders under them, or all subfolders can be at the same level in the " +"filesystem, with the year and name both the folder name." msgstr "" -"Der Wochentag als Dezimalzahl im Intervall von 1 bis 7. Montag ist der erste " -"Wochentag 1. Siehe auch »%w«." - -#: C/strftime.page:286(p) -msgid "%U" -msgstr "%U" +"Sie können entweder das Dateidatum oder das aktuelle Datum als Basis für den Namen des Unterordners verwenden (Das " +"Dateidatum untersucht die Metadaten der Datei zur Bestimmung des " +"Aufnahmedatums). Eine Reihe von üblichen Datumsformaten steht zur Auswahl " +"(zum Beispiel Jahr-Monat). Das Ankreuzfeld als einzelner " +"Unterordner legt fest, ob eine tiefe oder flache Ordner-Hierarchie " +"angelegt wird. Zum Beispiel kann es für die Einstellung Jahr-Monat einen Unterordner mit der Jahreszahl und einen weiteren innerhalb mit " +"dem Monat geben, oder es kann nur einen mit Monat und Jahreszahl im " +"Ordnernamen geben." -#: C/strftime.page:289(p) +#: C/import.page:61(page/p) msgid "" -"The week number of the current year as a decimal number, range 00 to 53, " -"starting with the first Sunday as the first day of week 01. See also %V and %" -"W." +"It is not necessary to use the predefined date formats. If you select " +"custom format, standard date codes can be used. Click on the help " +"icon to the right of the custom format field for a list of format codes. \"%E" +"\" is a special code that will embed the Event name defined in " +"the main import dialog." msgstr "" -"Die Wochenzahl des laufenden Jahres als Dezimalzahl, von 00 bis 53, " -"beginnend mit dem ersten Sonntag als erster Wochentag 01. Siehe auch »%V« und " -"»%W«." +"Es ist nicht zwingend, die vordefinierten Datumsformate zu verwenden. Wenn " +"Sie Eigenes Format wählen, können Sie voreingestellte " +"Datumsformatangaben verwenden. Klicken Sie auf das Hilfesymbol rechts im " +"Eingabefeld für das Datumsformat, um eine Liste der Formatangaben " +"einzusehen. »%E« ist eine spezielle Angabe, die den Ereignisnamen " +"aus dem Import-Dialog einbindet." -#: C/strftime.page:296(p) -msgid "%V" -msgstr "%V" +#: C/import.page:67(page/p) +msgid "See for more date format codes." +msgstr "" +"Lesen Sie auch für weitere " +"Datumsformatangaben." -#: C/strftime.page:299(p) +#: C/import.page:69(page/p) msgid "" -"The ISO 8601:1988 week number of the current year as a decimal number, range " -"01 to 53, where week 1 is the first week that has at least 4 days in the " -"current year, and with Monday as the first day of the week. See also %U and %" -"W." +"If you use automatic subfolder naming, the Destination field in " +"the main import dialog will show the automatic portion of the folder in red. " +"(For date-based formats, dummy data may be shown in the red portion.)" msgstr "" -"Die ISO 8601:1988 Wochenzahl des laufenden Jahres als Dezimalzahl, von 01 " -"bis 53, wobei Woche 1 die erste Woche mit mindestens vier Tagen im laufenden " -"Jahr ist und Montag als erster Wochentag zählt. Siehe auch »%U« und »%W«." +"Wenn Sie automatische Benennung der Unterordner verwenden, dann zeigt das " +"Feld Speicherort im Import-Dialog den automatisch erzeugten " +"Anteil des Ordnernamens in rot. Für auf Datum basierende Formate wird " +"eventuell ein Scheinteil in rot dargestellt." -#: C/strftime.page:308(p) -msgid "%w" -msgstr "%w" +#: C/import.page:74(figure/title) +msgid "Using Custom Formats" +msgstr "Verwendung benutzerdefinierter Formate" + +#: C/slideshow.page:7(page/title) +msgid "Automatic Slideshow" +msgstr "Automatische Dia-Vorführungen" -#: C/strftime.page:311(p) +#: C/slideshow.page:9(page/p) msgid "" -"The day of the week as a decimal, range 0 to 6, Sunday being 0. See also %u." +"A slideshow of the currently selected images can be started from the image " +"browser by pressing F5, by clicking the slideshow toolbar icon, " +"or by clicking ViewSlideshow. If no " +"images are selected, all images in the folder will be included." msgstr "" -"Der Wochentag als Dezimalzahl, von 0 bis 6. Sonntag zählt als Tag 0. Siehe " -"auch »%u«." +"Eine Diaschau der derzeit ausgewählten Bilder kann im Bildbetrachter mit " +"F5 gestartet werden, durch Drücken des Diaschau-Knopfes in der " +"Werkzeugleiste oder über den Menüpunkt AnsichtDiaschau. Wenn keine Bilder ausgewählt sind, so " +"werden alle Bilder im Ordner einbezogen." -#: C/strftime.page:317(p) -msgid "%W" -msgstr "%W" +#: C/slideshow.page:15(page/p) +msgid "" +"The transition effects and the time each image is shown can be modified from " +"the EditPreferencesSlideshow dialog." +msgstr "" +"Die Überblendeffekte und die Anzeigedauer jedes Bildes können im Dialog " +"BearbeitenEinstellungenDiaschau angepasst werden." -#: C/strftime.page:320(p) +#: C/slideshow.page:19(page/p) msgid "" -"The week number of the current year as a decimal number, range 00 to 53, " -"starting with the first Monday as the first day of week 01." +"Some graphics cards and drivers may experience problems (crashes) if " +"transition effects are enabled. If you experience such difficulties, set the " +"Transition effect preference to None." msgstr "" -"Die Wochenzahl des laufenden Jahres als Dezimalzahl, im Intervall von 00 bis " -"53, beginnend mit dem ersten Montag als erster Wochentag 01." - -#: C/strftime.page:327(p) -msgid "%x" -msgstr "%x" +"Einige Grafikkarten und Treiber können Probleme mit Überblendeffekten " +"bekommen und sogar abstürzen. Wenn Sie solchen Problemen begegnen, dann " +"setzen Sie die Einstellung Übergangseffekt auf Keinen." -#: C/strftime.page:330(p) +#: C/slideshow.page:23(page/p) msgid "" -"The preferred date representation for the current locale without the time." +"You can advance manually to the next image by pressing Down Arrow, Right Arrow, Page Down or Space." msgstr "" -"Die übliche Datumsdarstellungsform der aktuellen Ortseinstellungen ohne die " -"Uhrzeit." - -#: C/strftime.page:336(p) -msgid "%X" -msgstr "%X" +"Sie können manuell zum nächsten Bild durch Drücken von Pfeiltaste " +"runter, Rechtspfeil, Bild ab oder der " +"Leertaste gelangen." -#: C/strftime.page:339(p) +#: C/slideshow.page:27(page/p) msgid "" -"The preferred time representation for the current locale without the date." +"You can go back to the previous image by pressing Up Arrow, " +"Left Arrow or Page Up." msgstr "" -"Die übliche Datumsdarstellungform der aktuellen Ortseinstellungen ohne das " -"Datum." +"Sie können zum vorigen Bild durch Drücken von Pfeiltaste hoch, " +"Linkspfeil oder Bild auf gelangen." -#: C/strftime.page:345(p) -msgid "%y" -msgstr "%y" +#: C/slideshow.page:30(page/p) +msgid "You can pause or un-pause the slideshow by pressing p." +msgstr "" +"Sie können die Diaschau durch Drücken von p anhalten oder " +"fortsetzen." -#: C/strftime.page:348(p) -msgid "The year as a decimal number without a century (range 00 to 99)." -msgstr "Das Jahr als Dezimalzahl ohne das Jahrhundert (von 00 bis 99)." +#: C/slideshow.page:32(page/p) +msgid "To exit the slideshow, press Escape or F5." +msgstr "" +"Um die Diaschau zu verlassen, drücken Sie Esc oder F5." -#: C/strftime.page:354(p) -msgid "%Y" -msgstr "%Y" +#: C/file-copy-move.page:6(page/title) +msgid "Copying and Moving Files" +msgstr "Dateien kopieren und verschieben" -#: C/strftime.page:357(p) -msgid "The year as a decimal number including the century." -msgstr "Das Jahr als Dezimalzahl einschließlich Jahrhundert." +#: C/file-copy-move.page:8(page/p) +msgid "There are three ways to copy or move files in gThumb." +msgstr "" +"In gThumb gibt es drei Möglichkeiten zum Kopieren oder " +"Verschieben von Dateien." -#: C/strftime.page:362(p) -msgid "%z" -msgstr "%z" +#: C/file-copy-move.page:12(item/title) +msgid "Cut and Paste" +msgstr "Ausschneiden und Einfügen" -#: C/strftime.page:365(p) +#: C/file-copy-move.page:13(item/p) msgid "" -"The time-zone as hour offset from GMT. Required to emit RFC 822-conformant " -"dates (using \"%a, %d %b %Y %H:%M:%S %z\")." +"To copy a file in the browser view, use EditCopy, or press CtrlC. To " +"move a file, use EditCut, or press " +"CtrlX. Then navigate to the " +"destination folder using the folder tree. Use EditPaste, or press CtrlV, to complete the file transfer." msgstr "" -"Die Zeitzone als Stundendifferenz zu GMT. Wird für zu RFC 822 konforme " -"Datumsangaben benötigt (mit »%a, %d %b %Y %H:%M:%S %z«)." - -#: C/strftime.page:372(p) -msgid "%Z" -msgstr "%Z" +"Um eine Datei in der Browseransicht zu kopieren, wählen Sie " +"BearbeitenKopieren oder drücken Sie " +"StrgC. Um eine Datei zu verschieben, " +"wählen Sie BearbeitenAusschneiden " +"oder drücken Sie StrgX. Dann gehen " +"Sie im Ordnerbaum zum Zielordner. Wählen Sie BearbeitenEinfügen oder drücken Sie StrgV, um die Dateiverschiebung abzuschließen." -#: C/strftime.page:375(p) -msgid "The time zone or name or abbreviation." -msgstr "Die Zeitzone oder Name oder Abkürzung." +#: C/file-copy-move.page:26(item/title) +msgid "Drag and Drop" +msgstr "Anklicken und Ziehen" -#: C/strftime.page:380(p) +#: C/file-copy-move.page:27(item/p) msgid "" -"Some conversion specifications can be modified by preceding the conversion " -"specifier character by the E or O modifier to indicate that an alternative " -"format should be used. If the alternative format or specification does not " -"exist for the current locale, the behaviour will be as if the unmodified " -"conversion specification were used. The Single Unix Specification mentions %" -"Ec, %EC, %Ex, %EX, %Ey, %EY, %Od, %Oe, %OH, %OI, %Om, %OM, %OS, %Ou, %OU, %" -"OV, %Ow, %OW, %Oy, where the effect of the O modifier is to use alternative " -"numeric symbols (say, roman numerals), and that of the E modifier is to use " -"a locale-dependent alternative representation." +"To copy a file to another folder, simply drag the file (with a sustained " +"left-mouse click) to the destination folder visible in the folder tree. To " +"move a file, hold down the Shift key while dragging." msgstr "" -"Einige Konvertierungsangaben können durch Voranstellen von »E« oder »O« vor " -"dem Buchstaben der Angabe so beeinflusst werden, dass ein alternatives " -"Format festgelegt wird. Falls das alternative Format nicht in der aktuellen " -"Ortseinstellung existiert, wird das ursprüngliche Format verwendet. Die " -"Single-Unix-Spezifikation verwendet %Ec, %EC, %Ex, %EX, %Ey, %EY, %Od, %Oe, %" -"OH, %OI, %Om, %OM, %OS, %Ou, %OU, %OV, %Ow, %OW, %Oy. Der Zusatz »O« " -"bedeutet, dass alternative numerische Angeben (wie z.B. römische Ziffern) " -"verwendet werden, und der Zusatz »E« bestimmt, dass eine von der " -"Ortseinstellung festgelegte alternative Darstellung verwendet wird." - -#: C/attributes.page:6(title) -msgid "Attribute Codes" -msgstr "Attribut-Codes" +"Um eine Datei in einen anderen Ordner zu kopieren, ziehen Sie sie mit der " +"Maus bei gedrückter linker Maustaste in den im Ordnerbaum sichtbaren " +"Zielordner. Um eine Datei zu verschieben, halten Sie bei diesem Vorgang die " +"Umschalttaste gedrückt." -#: C/attributes.page:7(p) +#: C/file-copy-move.page:31(item/p) msgid "" -"gThumb stores many different attributes for each file. Extensions " -"may add more. The list below is a summary of some of the more common " -"attributes:" +"You can also use the middle mouse button to drag files. In this case, " +"gThumb will ask you if you wish to copy the files, move the " +"files, or cancel the operation." msgstr "" -"gThumb speichert viele verschiedene Attribute für jede Datei. " -"Erweiterungen könnten noch weitere hinzufügen. Die unten aufgeführte Liste " -"enthält eine Zusammenfassung einiger häufig anzutreffender Attribute:" - -#: C/attributes.page:12(p) -msgid "gth::file::display-size" -msgstr "gth::file::display-size" - -#: C/attributes.page:15(p) -msgid "standard::fast-content-type" -msgstr "standard::fast-content-type" - -#: C/attributes.page:18(p) -msgid "general::dimensions" -msgstr "general::dimensions" +"Sie können zum Ziehen von Dateien auch die mittlere Maustaste verwenden. In " +"diesem Fall fragt gThumb, ob Sie die Datei kopieren oder " +"verschieben oder den Vorgang abbrechen wollen." -#: C/attributes.page:21(p) -msgid "general::format" -msgstr "general::format" +#: C/file-copy-move.page:37(item/title) +msgid "File Copy / Move Dialog" +msgstr "Dialog zum Kopieren und Verschieben von Dateien" -#: C/attributes.page:24(p) -msgid "general::location" -msgstr "general::location" +#: C/file-copy-move.page:38(item/p) +msgid "" +"Select the files to be transferred, right-click on the selection, and choose " +"Copy to... or Move to.... This will open a folder-selection dialog, where you can choose the " +"destination folder. At the bottom of the dialog, you can enable the " +"View the destination option if you want to go to " +"the destination folder after the file transfer is complete." +msgstr "" +"Wählen Sie die zu übertragenden Dateien aus und klicken Sie mit der rechten " +"Maustaste in die Auswahl. Wählen Sie dann Kopieren nach … oder Verschieben nach …. Dadurch " +"wird ein Dateiauswahldialog geöffnet, in welchem Sie den Zielordner wählen " +"können. Am unteren Rand des Dialogs können Sie die Option Ziel " +"betrachten aktivieren, falls Sie den Zielordner öffnen " +"wollen, nachdem die Dateiübertragung abgeschlossen ist." -#: C/attributes.page:27(p) -msgid "general::datetime" -msgstr "general::datetime" +#: C/legal.xml:4(p/link) +msgid "Creative Commons Attribution-Share Alike 3.0 Unported License" +msgstr "Creative Commons Attribution-Share Alike 3.0 Unported License" -#: C/attributes.page:30(p) -msgid "general::rating" -msgstr "general::rating" +#: C/legal.xml:3(license/p) +msgid "This work is licensed under a <_:link-1/>." +msgstr "Dieses Werk wird unter einer <_:link-1/> verbreitet." -#: C/attributes.page:33(p) -msgid "Exif::Image::Make" -msgstr "Exif::Image::Make" +#: C/legal.xml:6(license/p) +msgid "" +"As a special exception, the copyright holders give you permission to copy, " +"modify, and distribute the example code contained in this document under the " +"terms of your choosing, without restriction." +msgstr "" +"Als besondere Ausnahme erteilen Ihnen die Urheberrechtsinhaber die " +"Genehmigung, den in diesem Dokument enthaltenen Beispielcode ohne " +"Einschränkung unter den Bedingungen Ihrer Wahl zu verbreiten." -#: C/attributes.page:36(p) -msgid "Exif::Image::Model" -msgstr "Exif::Image::Model" +#~ msgid "F9" +#~ msgstr "F9" -#: C/attributes.page:39(p) -msgid "Exif::Image::Software" -msgstr "Exif::Image::Software" +#~ msgid "i" +#~ msgstr "I" -#: C/attributes.page:42(p) -msgid "Exif::Image::Artist" -msgstr "Exif::Image::Artist" +#~ msgid "F8" +#~ msgstr "F8" -#: C/attributes.page:45(p) -msgid "Exif::Image::Copyright" -msgstr "Exif::Image::Copyright" +#~ msgid "Ctrl" +#~ msgstr "Strg" -#: C/attributes.page:48(p) -msgid "Exif::Photo::ISOSpeedRatings" -msgstr "Exif::Photo::ISOSpeedRatings" +#~ msgid "t" +#~ msgstr "T" -#: C/attributes.page:51(p) -msgid "Exif::Photo::BrightnessValue" -msgstr "Exif::Photo::BrightnessValue" +#~ msgid "Esc" +#~ msgstr "Esc" -#: C/attributes.page:54(p) -msgid "Exif::Photo::FNumber" -msgstr "Exif::Photo::FNumber" +#~ msgid "e" +#~ msgstr "E" -#: C/attributes.page:57(p) -msgid "Exif::Photo::ApertureValue" -msgstr "Exif::Photo::ApertureValue" +#~ msgid "g" +#~ msgstr "G" -#: C/attributes.page:60(p) -msgid "Exif::Photo::MaxApertureValue" -msgstr "Exif::Photo::MaxApertureValue" +#~ msgid "F2" +#~ msgstr "F2" -#: C/attributes.page:63(p) -msgid "Exif::Photo::ExposureTime" -msgstr "Exif::Photo::ExposureTime" +#~ msgid "]" +#~ msgstr "]" -#: C/attributes.page:66(p) -msgid "Exif::Photo::ExposureProgram" -msgstr "Exif::Photo::ExposureProgram" +#~ msgid "[" +#~ msgstr "[" -#: C/attributes.page:69(p) -msgid "Exif::Photo::ExposureIndex" -msgstr "Exif::Photo::ExposureIndex" +#~ msgid "Delete" +#~ msgstr "Entf" -#: C/attributes.page:72(p) -msgid "Exif::Photo::ExposureBiasValue" -msgstr "Exif::Photo::ExposureBiasValue" +#~ msgid "Shift" +#~ msgstr "Umschalttaste" -#: C/attributes.page:75(p) -msgid "Exif::Photo::ExposureMode" -msgstr "Exif::Photo::ExposureMode" +#~ msgid "h" +#~ msgstr "h" -#: C/attributes.page:78(p) -msgid "Exif::Photo::ShutterSpeedValue" -msgstr "Exif::Photo::ShutterSpeedValue" +#~ msgid "l" +#~ msgstr "L" -#: C/attributes.page:81(p) -msgid "Exif::Photo::MeteringMode" -msgstr "Exif::Photo::MeteringMode" +#~ msgid "m" +#~ msgstr "M" -#: C/attributes.page:84(p) -msgid "Exif::Photo::LightSource" -msgstr "Exif::Photo::LightSource" +#~ msgid "r" +#~ msgstr "R" -#: C/attributes.page:87(p) -msgid "Exif::Photo::WhiteBalance" -msgstr "Exif::Photo::WhiteBalance" +#~ msgid "R" +#~ msgstr "R" -#: C/attributes.page:90(p) -msgid "Exif::Photo::Flash" -msgstr "Exif::Photo::Flash" +#~ msgid "C" +#~ msgstr "C" -#: C/attributes.page:93(p) -msgid "Exif::Photo::FocalLength" -msgstr "Exif::Photo::FocalLength" +#~ msgid "S" +#~ msgstr "S" -#: C/attributes.page:96(p) -msgid "Exif::Photo::SubjectArea" -msgstr "Exif::Photo::SubjectArea" +#~ msgid "Home" +#~ msgstr "Pos1" -#: C/attributes.page:99(p) -msgid "Exif::Photo::Contrast" -msgstr "Exif::Photo::Contrast" +#~ msgid "End" +#~ msgstr "Ende" -#: C/attributes.page:102(p) -msgid "Exif::Photo::Saturation" -msgstr "Exif::Photo::Saturation" +#~ msgid "D" +#~ msgstr "D" -#: C/attributes.page:105(p) -msgid "Exif::Photo::Sharpness" -msgstr "Exif::Photo::Sharpness" +#~ msgid "-" +#~ msgstr "-" -#: C/index.page:7(name) -msgid "Paolo Bacchilega" -msgstr "Paolo Bacchilega" +#~ msgid "x" +#~ msgstr "X" -#: C/index.page:8(email) -msgid "paobac@src.gnome.org" -msgstr "paobac@src.gnome.org" +#~ msgid "Arrows" +#~ msgstr "Pfeiltasten" -#: C/index.page:12(name) -msgid "Michael J. Chudobiak" -msgstr "Michael J. Chudobiak" +#~ msgid "Alt" +#~ msgstr "Alt" -#: C/index.page:13(email) -msgid "mjc@avtechpulse.com" -msgstr "mjc@avtechpulse.com" +#~ msgid "Left Arrow" +#~ msgstr "Pfeiltaste links" -#: C/index.page:20(title) -msgid "gThumb Help" -msgstr "gThumb-Hilfe" +#~ msgid "Right Arrow" +#~ msgstr "Rechtspfeil" -#: C/index.page:23(title) -msgid "Welcome" -msgstr "Willkommen" +#~ msgid "Up" +#~ msgstr "Pfeiltaste rauf" -#: C/index.page:27(title) -msgid "File Management" -msgstr "Dateiverwaltung" +#~ msgid "F5" +#~ msgstr "F5" -#: C/index.page:31(title) -msgid "Editing Mode" -msgstr "Bearbeitungsmodus" +#~ msgid "Space" +#~ msgstr "Leertaste" -#: C/index.page:32(p) -msgid "" -" " -"Numerous editing tools are provided for touching-up individual photos. Undo " -"and redo functions are provided, up until the photo is saved. To access the " -"editing tools, open an image and then click the Edit File toolbar " -"button (the palette icon), or press e." -msgstr "" -" " -"Verschiedene Bearbeitungswerkzeuge stehen zum Individualisieren Ihrer Fotos " -"bereit. Sie haben Möglichkeiten, Ihre Änderungen zurückzunehmen oder zu " -"wiederholen, bis das Foto endgültig gespeichert wird. Um auf die " -"Bearbeitungswerkzeuge zuzugreifen, öffnen Sie ein Bild und klicken Sie auf " -"den Werkzeugleistenknopf Datei bearbeiten (das Symbol einer " -"Palette) oder drücken Sie e." +#~ msgid "Resize" +#~ msgstr "Größe ändern" -#: C/index.page:42(title) -msgid "Batch Tools" -msgstr "Werkzeuge zur Stapelverarbeitung" +#~ msgid "Crop" +#~ msgstr "Zuschneiden" -#: C/index.page:43(p) -msgid "" -"Batch tools are provided to modify multiple images simultaneously. Changes " -"are written immediately, and are not undoable." -msgstr "" -"Werkzeuge zur Stapelverarbeitung ermöglichen Änderungen an mehreren Bildern " -"gleichzeitig. Die Änderungen werden unmittelbar angewendet, lassen sich aber " -"auch rückgängig machen." +#~ msgid "Mirror" +#~ msgstr "Horizontal spiegeln" -#: C/index.page:49(title) -msgid "Slideshows" -msgstr "Dia-Vorführungen" +#~ msgid "Flip" +#~ msgstr "Vertikal spiegeln" -#: C/index.page:53(title) -msgid "Importing" -msgstr "Importieren" +#~ msgid "Equalize" +#~ msgstr "Abgleichen" -#: C/index.page:57(title) -msgid "Sharing" -msgstr "Freigeben" +#~ msgid "Negative" +#~ msgstr "Negativ" -#: C/index.page:61(title) -msgid "Organizing" -msgstr "Organisieren" +#~ msgid "#" +#~ msgstr "#" -#: C/index.page:65(title) -msgid "Other Tools" -msgstr "Weitere Werkzeuge" +#~ msgid "%N" +#~ msgstr "%N" -#: C/index.page:69(title) -msgid "Reference" -msgstr "Referenz" +#~ msgid "paobac@src.gnome.org" +#~ msgstr "paobac@src.gnome.org" -#. Put one translator per line, in the form of NAME , YEAR1, YEAR2 -#: C/index.page:0(None) -msgid "translator-credits" -msgstr "" -"Christian Kirbach , 2008\n" -"Mario Blättermann , 2009, 2010, 2011" +#~ msgid "mjc@avtechpulse.com" +#~ msgstr "mjc@avtechpulse.com" diff -Nru gthumb-3.0.2/help/de/edit-colors.page gthumb-3.2.3/help/de/edit-colors.page --- gthumb-3.0.2/help/de/edit-colors.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/edit-colors.page 2013-06-18 17:54:21.000000000 +0000 @@ -2,6 +2,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + Farbanpassungen @@ -19,7 +31,7 @@

Dieses Werkzeug dient zum manuellen Anpassen der Farben. Sie können hier den Gamma-Wert, die Helligkeit, den Kontrast, die Sättigung beeinflussen und die Balance der Komplementärfarben anpassen.

- <gui>Abgleichen</gui> + <gui>Angleichen</gui>

Dieses Werkzeug bietet automatisches Angleichen des Bildhistogramms. Es sind keine Anpassungen durch den Benutzer notwendig.

 diff -Nru gthumb-3.0.2/help/de/edit-redeye.page gthumb-3.2.3/help/de/edit-redeye.page --- gthumb-3.0.2/help/de/edit-redeye.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/edit-redeye.page 2013-06-18 17:54:21.000000000 +0000 @@ -2,6 +2,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + Rote Augen entfernen

Klicken Sie auf den Knopf Datei bearbeiten in der Werkzeugleiste (das Symbol der Malerpalette), um zu den Bearbeitungswerkzeugen zu gelangen.

diff -Nru gthumb-3.0.2/help/de/edit-resize-crop.page gthumb-3.2.3/help/de/edit-resize-crop.page --- gthumb-3.0.2/help/de/edit-resize-crop.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/edit-resize-crop.page 2013-06-18 17:54:21.000000000 +0000 @@ -2,6 +2,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + Größe ändern und Beschneiden @@ -10,7 +22,7 @@

Zwei Werkzeuge werden zum Ändern der Größe und Beschneiden mitgeliefert.

- <gui>Größe ändern</gui> + <gui>Bildgröße ändern</gui>

Dies ermöglicht Ihnen, die Größe des Bildes zu ändern. Das Bild kann auf eine bestimmte physische Größe skaliert werden oder anhand eines Prozentsatzes der Originalgröße. Das Seitenverhältnis kann entweder beibehalten oder auf einen bestimmten Wert angepasst werden.

 diff -Nru gthumb-3.0.2/help/de/edit-rotate.page gthumb-3.2.3/help/de/edit-rotate.page --- gthumb-3.0.2/help/de/edit-rotate.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/edit-rotate.page 2013-06-18 17:54:21.000000000 +0000 @@ -2,6 +2,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + Drehungen und Spiegelungen diff -Nru gthumb-3.0.2/help/de/edit-save-undo-redo.page gthumb-3.2.3/help/de/edit-save-undo-redo.page --- gthumb-3.0.2/help/de/edit-save-undo-redo.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/edit-save-undo-redo.page 2013-06-18 17:54:21.000000000 +0000 @@ -2,6 +2,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + Dateien speichern, rückgängig machen, wiederholen diff -Nru gthumb-3.0.2/help/de/extensions.page gthumb-3.2.3/help/de/extensions.page --- gthumb-3.0.2/help/de/extensions.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/extensions.page 2013-06-18 17:54:21.000000000 +0000 @@ -2,6 +2,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + gThumb erweitern Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/help/de/figures/general-filter.png and /tmp/43kzZNuclK/gthumb-3.2.3/help/de/figures/general-filter.png differ Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/help/de/figures/import-pref-auto-folder.png and /tmp/43kzZNuclK/gthumb-3.2.3/help/de/figures/import-pref-auto-folder.png differ Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/help/de/figures/import-pref-custom-format.png and /tmp/43kzZNuclK/gthumb-3.2.3/help/de/figures/import-pref-custom-format.png differ Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/help/de/figures/import.png and /tmp/43kzZNuclK/gthumb-3.2.3/help/de/figures/import.png differ Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/help/de/figures/main-win.png and /tmp/43kzZNuclK/gthumb-3.2.3/help/de/figures/main-win.png differ Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/help/de/figures/specific-filter.png and /tmp/43kzZNuclK/gthumb-3.2.3/help/de/figures/specific-filter.png differ Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/help/de/figures/thumbnail-pane.png and /tmp/43kzZNuclK/gthumb-3.2.3/help/de/figures/thumbnail-pane.png differ diff -Nru gthumb-3.0.2/help/de/file-copy-move.page gthumb-3.2.3/help/de/file-copy-move.page --- gthumb-3.0.2/help/de/file-copy-move.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/file-copy-move.page 2013-06-18 17:54:22.000000000 +0000 @@ -2,6 +2,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + Dateien kopieren und verschieben diff -Nru gthumb-3.0.2/help/de/filtering.page gthumb-3.2.3/help/de/filtering.page --- gthumb-3.0.2/help/de/filtering.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/filtering.page 2013-06-18 17:54:22.000000000 +0000 @@ -2,6 +2,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + Filtern von Dateien diff -Nru gthumb-3.0.2/help/de/fullscreen.page gthumb-3.2.3/help/de/fullscreen.page --- gthumb-3.0.2/help/de/fullscreen.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/fullscreen.page 2013-06-18 17:54:21.000000000 +0000 @@ -3,6 +3,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + Manueller Vollbildmodus diff -Nru gthumb-3.0.2/help/de/gimp.page gthumb-3.2.3/help/de/gimp.page --- gthumb-3.0.2/help/de/gimp.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/gimp.page 2013-06-18 17:54:21.000000000 +0000 @@ -2,6 +2,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + GIMP starten

Falls Dateien im Browser ausgewählt sind, oder ein Bild im Betrachter geöffnet ist, können Sie sie im GNU Image Manipulation Program (GIMP) durch Drücken von g öffnen.

diff -Nru gthumb-3.0.2/help/de/import.page gthumb-3.2.3/help/de/import.page --- gthumb-3.0.2/help/de/import.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/import.page 2013-06-18 17:54:22.000000000 +0000 @@ -3,6 +3,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + Importieren von einer Digitalkamera diff -Nru gthumb-3.0.2/help/de/index.page gthumb-3.2.3/help/de/index.page --- gthumb-3.0.2/help/de/index.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/index.page 2013-06-18 17:54:21.000000000 +0000 @@ -15,6 +15,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + gThumb-Hilfe diff -Nru gthumb-3.0.2/help/de/introduction.page gthumb-3.2.3/help/de/introduction.page --- gthumb-3.0.2/help/de/introduction.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/introduction.page 2013-06-18 17:54:21.000000000 +0000 @@ -2,6 +2,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + Info zu gThumb diff -Nru gthumb-3.0.2/help/de/legal.xml gthumb-3.2.3/help/de/legal.xml --- gthumb-3.0.2/help/de/legal.xml 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/legal.xml 2013-06-18 17:54:22.000000000 +0000 @@ -1,9 +1,5 @@ -

This work is licensed under a -Creative Commons -Attribution-Share Alike 3.0 Unported License.

-

As a special exception, the copyright holders give you permission to copy, -modify, and distribute the example code contained in this document under the -terms of your choosing, without restriction.

+

Dieses Werk wird unter einer Creative Commons Attribution-Share Alike 3.0 Unported License verbreitet.

+

Als besondere Ausnahme erteilen Ihnen die Urheberrechtsinhaber die Genehmigung, den in diesem Dokument enthaltenen Beispielcode ohne Einschränkung unter den Bedingungen Ihrer Wahl zu verbreiten.

 diff -Nru gthumb-3.0.2/help/de/printing.page gthumb-3.2.3/help/de/printing.page --- gthumb-3.0.2/help/de/printing.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/printing.page 2013-06-18 17:54:22.000000000 +0000 @@ -2,6 +2,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + Bilder drucken diff -Nru gthumb-3.0.2/help/de/rename-series.page gthumb-3.2.3/help/de/rename-series.page --- gthumb-3.0.2/help/de/rename-series.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/rename-series.page 2013-06-18 17:54:21.000000000 +0000 @@ -4,6 +4,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + Dateien umbenennen @@ -22,9 +34,7 @@
-

- # -

+

#

Dieses Symbol wird durch einen fortlaufenden Zähler ersetzt, der pro Bild um 1 erhöht wird. Wenn Sie das Symbol mehrfach hintereinander angeben, wird die Zahl gegebenenfalls durch führende Nullen aufgefüllt. Zum Beispiel ergibt ### die folgende Sequenz: 001, 002, 003, usw.

@@ -32,9 +42,7 @@
-

- %F -

+

%F

Dieses Symbol wird durch den ursprünglichen Bildnamen ohne die Erweiterung ersetzt.

@@ -42,9 +50,7 @@
-

- %E -

+

%E

Dieses Symbol wird durch die Dateinamenserweiterung des ursprünglichen Bildes ersetzt.

@@ -52,9 +58,7 @@
-

- %N -

+

%N

Dieses Symbol wird durch den ursprünglichen Bildzähler ersetzt. Wenn z.B. der ursprüngliche Dateiname »IMG_9876.JPG« lautet, wird die Zahl »9876« verwendet. Falls der Dateiname mehr als eine Zahlengruppe enthält (wie z.B. »IMG_123_456.JPG«), wird nur die erste Gruppe verwendet, d.h. in diesem Beispiel »123«.

@@ -62,9 +66,7 @@
-

- %M{format} -

+

%M{format}

Das Symbol wird durch das Änderungsdatum der Datei ersetzt. Die Formatierung dieses Datums (und wahlweise auch der Zeit) kann durch Hinzufügen eines standardisierten Formatierungscodes in geschweiften Klammern angegeben werden. Beispielsweise wird die Zeichenkette »%M{%Y-%m-%d, %T}« durch eine Datums- und Zeitangabe wie »2010-04-01, 15:02:01« ersetzt.

@@ -72,9 +74,7 @@
-

- %D{format} -

+

%D{format}

Dieses Symbol wird durch das originale Aufnahmedatum des Fotos ersetzt, welches üblicherweise aus den im Foto eingebetteten EXIF-Daten ermittelt wird. Die Formatierung dieses Datums (und wahlweise auch der Zeit) kann durch Hinzufügen eines standardisierten Formatierungscodes in geschweiften Klammern angegeben werden. Beispielsweise wird die Zeichenkette »%M{%Y-%m-%d, %T}« durch eine Datums- und Zeitangabe wie »2010-04-01, 15:02:01« ersetzt.

@@ -82,9 +82,7 @@
-

- %A{identifier} -

+

%A{identifier}

Dieses Symbol wird durch die im Bezeichner angegebenen Daten ersetzt. Beispielsweise wird »%A{ general::dimensions }« durch eine Größe wie »320 x 240« ersetzt.

diff -Nru gthumb-3.0.2/help/de/sharing-disc.page gthumb-3.2.3/help/de/sharing-disc.page --- gthumb-3.0.2/help/de/sharing-disc.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/sharing-disc.page 2013-06-18 17:54:22.000000000 +0000 @@ -2,9 +2,21 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + Erzeugen einer CD/DVD oder eines ISO-Abbildes -

Um eine Reihe von Dateien auf ein optisches Medium (CD oder DVD) zu schreiben oder um ein ISO-Abbild zu erstellen, verwenden Sie bitte den Menüpunkt DateiExportieren nachOptisches Medium.

+

Um eine Reihe von Dateien auf ein optisches Medium (CD oder DVD) zu schreiben oder um ein ISO-Abbild zu erstellen, verwenden Sie bitte den Menüpunkt DateiExportieren nachOptisches Medium.

Sie erhalten die Wahl zwischen dem Schreiben der aktuell ausgewählten Dateien, des gesamten aktuellen Ordners oder des gesamten Ordners einschließlich Unterordner. Klicken Sie auf OK, sobald Sie Ihre Auswahl getroffen haben.

Der nächste Dialog legt das Zielmedium oder den Namen des ISO-Abbildes fest. Klicken Sie anschließend auf Abbild erstellen, um den Vorgang zu starten. Der optische Schreibvorgang beginnt bzw. wird dann die ISO-Datei geschrieben.

 diff -Nru gthumb-3.0.2/help/de/sharing-social.page gthumb-3.2.3/help/de/sharing-social.page --- gthumb-3.0.2/help/de/sharing-social.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/sharing-social.page 2013-06-18 17:54:22.000000000 +0000 @@ -2,6 +2,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + Übertragen zu Bilderdiensten im Web

gThumb verfügt über eine Reihe von Erweiterungen zum Übertragen von Fotos zu Webseiten verschiedener »sozialer Netzwerke«. Als Voreinstellung sind die Übertragungen zu Facebook, Flickr, Picasa und Photobucket aktiviert.

diff -Nru gthumb-3.0.2/help/de/shortcuts.page gthumb-3.2.3/help/de/shortcuts.page --- gthumb-3.0.2/help/de/shortcuts.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/shortcuts.page 2013-06-18 17:54:22.000000000 +0000 @@ -2,6 +2,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + Tastenkombinationen @@ -19,9 +31,7 @@
-

- F9 -

+

F9

Die Seitenleiste im Ansichtsmodus anzeigen/verbergen. Die Seitenleiste enthält den Ordnerbaum und die Zusammenfassung der Dateieigenschaften (sofern aktiviert).

@@ -29,9 +39,7 @@
-

- I -

+

i

Die Zusammenfassung der Eigenschaften der Datei anzeigen.

@@ -39,9 +47,7 @@
-

- F8 -

+

F8

Die Vorschauleiste im Ansichtsmodus anzeigen/verbergen.

@@ -57,9 +63,7 @@
-

- StrgT -

+

Strgt

Die Vorschaubilder im Ansichtsmodus anzeigen/verbergen.

@@ -67,9 +71,7 @@
-

- Esc -

+

Esc

Schließt den Betrachter oder den Vollbildmodus.

@@ -93,9 +95,7 @@
-

- E -

+

e

Das Bild bearbeiten. Es wird der Betrachter geöffnet und die Bearbeitungswerkzeuge angezeigt.

@@ -103,9 +103,7 @@
-

- G -

+

g

Das Bild mit dem GNU Image Manipulation Program (GIMP) öffnen.

@@ -113,9 +111,7 @@
-

- F2 -

+

F2

Das Bild umbenennen.

@@ -131,9 +127,7 @@
-

- ] -

+

]

Im Uhrzeigersinn nach Möglichkeit verlustfrei drehen. Die Datei wird automatisch gespeichert.

@@ -141,9 +135,7 @@
-

- [ -

+

[

Gegen den Uhrzeigersinn nach Möglichkeit verlustfrei drehen. Die Datei wird automatisch gespeichert.

@@ -151,19 +143,15 @@
-

- Entf -

+

Entf

 -

Die ausgewählten Dateien in den Müll verschieben.

+

Die ausgewählten Dateien in den Papierkorb verschieben.
-

- UmschalttasteEntf -

+

UmschalttasteEntf

Die gewählten Bilder dauerhaft löschen.

@@ -186,9 +174,7 @@
-

- h -

+

h

Farben verbessern.

@@ -196,9 +182,7 @@
-

- L -

+

l

Das Bild umdrehen.

@@ -206,9 +190,7 @@
-

- M -

+

m

Das Bild spiegeln.

@@ -216,9 +198,7 @@
-

- R -

+

r

Rechts herum drehen.

@@ -226,9 +206,7 @@
-

- R -

+

R

Links herum drehen.

@@ -236,9 +214,7 @@
-

- C -

+

C

Das Bild zuschneiden.

@@ -246,9 +222,7 @@
-

- S -

+

S

Größe des Bildes ändern.

@@ -286,9 +260,7 @@
-

- Pos1 -

+

Pos1

Das erste Bild zeigen.

@@ -296,9 +268,7 @@
-

- Ende -

+

Ende

Das letzte Bild zeigen.

@@ -306,12 +276,7 @@
-

- - Strg - D - -

+

Strg D

Den aktuellen Ort zu den Lesezeichen hinzufügen.

@@ -327,9 +292,7 @@
-

- - -

+

-

Verkleinern.

@@ -353,12 +316,7 @@
-

- - Umschalttaste - X - -

+

Umschalttaste x

Einpassen (verkleinert oder vergrößert je nach Bedarf)

@@ -366,9 +324,7 @@
-

- Pfeiltasten -

+

Pfeile

Das Bild vorschieben.

@@ -376,12 +332,7 @@
-

- - Umschalttaste - Pfeiltasten - -

+

Umschalttaste Pfeiltasten

Das Bild schneller vorschieben.

@@ -396,9 +347,7 @@
-

- Pos1 -

+

Pos1

Zur ersten Datei in der Browseransicht wechseln.

@@ -406,9 +355,7 @@
-

- Ende -

+

Ende

 @@ -433,9 +380,7 @@
-

- AltPfeiltaste links -

+

AltLinke Pfeiltaste

Zum zuletzt besuchten Ordner gehen.

@@ -443,9 +388,7 @@
-

- AltRechtspfeil -

+

AltRechte Pfeiltaste

Vorwärts gehen (nach vorhergehendem rückwärts gehen)

@@ -453,12 +396,7 @@
-

- - Alt - Pfeiltaste rauf - -

+

Alt Pfeiltaste hoch

Eine Ebene hoch gehen.

@@ -480,9 +418,7 @@
-

- F5 -

+

F5

Die Diaschau starten.

@@ -490,9 +426,7 @@
-

- Leertaste -

+

Leertaste

Eine Diaschau pausieren/fortsetzen.

@@ -500,9 +434,7 @@
-

- Esc -

+

Esc

Die Diashow schließen.

diff -Nru gthumb-3.0.2/help/de/slideshow.page gthumb-3.2.3/help/de/slideshow.page --- gthumb-3.0.2/help/de/slideshow.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/slideshow.page 2013-06-18 17:54:22.000000000 +0000 @@ -2,6 +2,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + Automatische Dia-Vorführungen diff -Nru gthumb-3.0.2/help/de/sorting.page gthumb-3.2.3/help/de/sorting.page --- gthumb-3.0.2/help/de/sorting.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/sorting.page 2013-06-18 17:54:21.000000000 +0000 @@ -2,6 +2,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + Dateien sortieren diff -Nru gthumb-3.0.2/help/de/strftime.page gthumb-3.2.3/help/de/strftime.page --- gthumb-3.0.2/help/de/strftime.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/strftime.page 2013-06-18 17:54:21.000000000 +0000 @@ -2,6 +2,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + Codes für Datums- und Zeitformat diff -Nru gthumb-3.0.2/help/de/thumbnail-pane.page gthumb-3.2.3/help/de/thumbnail-pane.page --- gthumb-3.0.2/help/de/thumbnail-pane.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/thumbnail-pane.page 2013-06-18 17:54:21.000000000 +0000 @@ -2,6 +2,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + Vorschauleiste diff -Nru gthumb-3.0.2/help/de/thumbnails.page gthumb-3.2.3/help/de/thumbnails.page --- gthumb-3.0.2/help/de/thumbnails.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/thumbnails.page 2013-06-18 17:54:21.000000000 +0000 @@ -2,6 +2,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + Quellen für Vorschaubilder diff -Nru gthumb-3.0.2/help/de/viewer.page gthumb-3.2.3/help/de/viewer.page --- gthumb-3.0.2/help/de/viewer.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/viewer.page 2013-06-18 17:54:21.000000000 +0000 @@ -2,6 +2,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + Ein Bild öffnen diff -Nru gthumb-3.0.2/help/de/wallpaper.page gthumb-3.2.3/help/de/wallpaper.page --- gthumb-3.0.2/help/de/wallpaper.page 2012-08-20 20:25:44.000000000 +0000 +++ gthumb-3.2.3/help/de/wallpaper.page 2013-06-18 17:54:22.000000000 +0000 @@ -2,6 +2,18 @@ + + + Christian Kirbach + Christian.Kirbach@googlemail.com + 2008 + + + + Mario Blättermann + mario.blaettermann@gmail.com + 2009, 2010, 2011, 2013 + Bildschirmhintergrund

Um ein Bild als Arbeitsflächenhintergrund festzulegen, klicken Sie mit der rechten Maustaste auf das Bild und wählen Sie Als Arbeitsflächenhintergrund verwenden aus dem Einblend-Menü. Der Arbeitsflächenhintergrund wird sich daraufhin ändern und der Dialog zum Erscheinungsbild von GNOME wird geöffnet. Sie können mit diesem Dialog Anpassungen an den Einstellungen für das Hintergrundbild (Position, Streckung, Kacheln usw.) vornehmen.

diff -Nru gthumb-3.0.2/help/el/edit-colors.page gthumb-3.2.3/help/el/edit-colors.page --- gthumb-3.0.2/help/el/edit-colors.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/el/edit-colors.page 2013-06-18 17:54:23.000000000 +0000 @@ -31,12 +31,12 @@ user adjustments are required.

- <gui>Αφαίρεση κορεσμού</gui> + <gui>Desaturate</gui>

This tool converts the image colors into shades of grey. (This does not change this image storage format.)

 - <gui>Αρνητικό</gui> + <gui>Negative</gui>

This tool inverts the color levels, providing an image negative.

 diff -Nru gthumb-3.0.2/help/el/edit-resize-crop.page gthumb-3.2.3/help/el/edit-resize-crop.page --- gthumb-3.0.2/help/el/edit-resize-crop.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/el/edit-resize-crop.page 2013-06-18 17:54:23.000000000 +0000 @@ -12,14 +12,14 @@

Two tools are provided to resize and crop images.

- <gui>Αλλαγή μεγέθους...</gui> + <gui>Resize</gui>

This allows you to resize the image. The image may be scaled to a certain physical size, or to a certain percentage of the original size. The aspect ratio may be locked to a specific value, or freely adjusted.

 - <gui>Αποκοπή...</gui> + <gui>Crop</gui>

This allows you to crop the image. Click and drag the mouse over the desired area of the image. The area may be locked to a specific aspect ratio, or it may be freely adjusted. A rule-of-thirds diff -Nru gthumb-3.0.2/help/el/edit-rotate.page gthumb-3.2.3/help/el/edit-rotate.page --- gthumb-3.0.2/help/el/edit-rotate.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/el/edit-rotate.page 2013-06-18 17:54:23.000000000 +0000 @@ -14,21 +14,21 @@ - <gui>Καθρέπτης</gui> + <gui>Mirror</gui>

This flips the image horizontally. The left and right sides are swapped.

 - <gui>Αναστροφή</gui> + <gui>Flip</gui>

This flips the image vertically. The top and bottom are swapped.

 - <gui>Περιστροφή δεξιά</gui> + <gui>Rotate Right</gui>

This rotates the image clockwise.

 - <gui>Περιστροφή αριστερά</gui> + <gui>Rotate Left</gui>

This rotates the image counter-clockwise.

 diff -Nru gthumb-3.0.2/help/el/el.po gthumb-3.2.3/help/el/el.po --- gthumb-3.0.2/help/el/el.po 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/el/el.po 2013-04-30 16:56:13.000000000 +0000 @@ -58,14 +58,14 @@ "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any " "later version published by the Free Software Foundation with no Invariant " "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy " -"of the GFDL at this link or " +"of the GFDL at this link or " "in the file COPYING-DOCS distributed with this manual." msgstr "" "Δίνεται άδεια για αντιγραφή, διανομή και/ή τροποποίηση του εγγράφου υπό τους " "όρους της Ελεύθερης Άδειας Τεκμηρίωσης GNU (GFDL), Έκδοση 1.1 ή " "μεταγενέστερη εκδιδόμενη από το Ίδρυμα Ελεύθερου Λογισμικού χωρίς Σταθερά " "Εδάφια, χωρίς Εξώφυλλα Κειμένου και χωρίς Οπισθόφυλλα Κειμένου. Μπορείτε να " -"βρείτε ένα αντίγραφο της GFDL σε αυτόν τον σύνδεσμο ή στο αρχείο COPYING-DOCS που διανεμήθηκε με αυτόν " "τον οδηγό." Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/help/el/figures/comment.png and /tmp/43kzZNuclK/gthumb-3.2.3/help/el/figures/comment.png differ Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/help/el/figures/main-win.png and /tmp/43kzZNuclK/gthumb-3.2.3/help/el/figures/main-win.png differ Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/help/el/figures/preferences.png and /tmp/43kzZNuclK/gthumb-3.2.3/help/el/figures/preferences.png differ diff -Nru gthumb-3.0.2/help/el/shortcuts.page gthumb-3.2.3/help/el/shortcuts.page --- gthumb-3.0.2/help/el/shortcuts.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/el/shortcuts.page 2013-06-18 17:54:23.000000000 +0000 @@ -157,7 +157,7 @@

- Διαγραφή + Delete

@@ -167,7 +167,7 @@

- ShiftΔιαγραφή + ShiftDelete

@@ -296,7 +296,7 @@

- Αρχικός κατάλογος + Home

@@ -306,7 +306,7 @@

- Τέλος + End

@@ -383,7 +383,7 @@

- Βέλη + Arrows

@@ -395,7 +395,7 @@

Shift - Βέλη + Arrows

- Αρχικός κατάλογος + Home

@@ -423,7 +423,7 @@

- Τέλος + End

-

- # -

+

#

Este símbolo será reemplazado con el valor de un contador que se autoincrementa en 1 unidad pasando de una imagen a otra. Si especifica estos símbolos secuencialmente obtendrá ceros a la izquierda si el valor del contador tiene un número menor de dígitos, por ejemplo ### generará la secuencia 001, 002, 003, etc.

@@ -32,9 +42,7 @@
-

- %F -

+

%F

Este símbolo se reemplazará con el nombre original del archivo, exluyendo la extensión original.

@@ -42,9 +50,7 @@
-

- %E -

+

%E

Este símbolo se reemplazará con la extensión original del nombre del archivo.

@@ -52,9 +58,7 @@
-

- %N -

+

%N

Este símbolo se reemplazará con el enumerador de la imagen original. Por ejemplo, si el nombre original del archivo era IMG_9876.JPG, esto extrae la parte «9876». Si el nombre del archivo tiene más de un grupo de dígitos en su interior (por ejemplo, IMG_123_456.JPG) sólo se utiliza el primero de ellos («123» en este ejemplo).

@@ -62,9 +66,7 @@
-

- %M{formato} -

+

%M{formato}

Este símbolo se reemplazará con la fecha de modificación del archivo. El formato de esta fecha (y opcionalmente de la hora) se puede especificar añadiendo un código estándar de formato entre corchetes. Por ejemplo, «%M{%Y-%m-%d, %T}» se reemplazará con una fecha y una hora similar a «2010-04-01, 15:02:01».

@@ -72,9 +74,7 @@
-

- %D{formato} -

+

%D{formato}

Este símbolo se reemplazará con la fecha original en que se tomó la foto (normalmente determinada por las marcas de tiempo EXIF empotradas en la foto). El formato de esta fecha (y, opcionalmente, de la hora) se puede especificar añadiendo un código estándar de formateo entre corchetes. Por ejemplo, «%D{%Y-%m-%d, %T}» se reemplazará con una fecha y una hora similares a «2010-04-01, 15:02:01».

@@ -82,9 +82,7 @@
-

- %A{identificador} -

+

%A{identificador}

Este símbolo se reemplazará con los datos especificados por el identificador. Por ejemplo, «%A{ general::dimensions }» se reemplazará con un tamaño similar a «320 x 240».

diff -Nru gthumb-3.0.2/help/es/sharing-disc.page gthumb-3.2.3/help/es/sharing-disc.page --- gthumb-3.0.2/help/es/sharing-disc.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/sharing-disc.page 2013-06-18 17:54:24.000000000 +0000 @@ -2,6 +2,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Crear un(a) CD/DVD/ISO

Para escribir una serie de archivos en un disco óptico (CD o DVD), o para crear un archivo de imagen ISO, use el elemento de menú ArchivoExportar aDisco óptico.

diff -Nru gthumb-3.0.2/help/es/sharing-social.page gthumb-3.2.3/help/es/sharing-social.page --- gthumb-3.0.2/help/es/sharing-social.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/sharing-social.page 2013-06-18 17:54:24.000000000 +0000 @@ -2,6 +2,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Subir fotos a sitios web de compartición de fotos

gThumb se proporciona con ciertas extensiones para subir fotos a sitios web «sociales». De manera predeterminada, los cargadores activados son Facebook, Flickr, Picasa y Photobucket.

diff -Nru gthumb-3.0.2/help/es/shortcuts.page gthumb-3.2.3/help/es/shortcuts.page --- gthumb-3.0.2/help/es/shortcuts.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/shortcuts.page 2013-06-18 17:54:24.000000000 +0000 @@ -2,6 +2,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Combinaciones de teclas @@ -19,9 +31,7 @@
-

- F9 -

+

F9

Mostrar/ocultar la barra lateral en el modo navegador. La barra lateral contiene el árbol de carpetas y el resumen de las propiedades del archivo (si está activado).

@@ -29,9 +39,7 @@
-

- i -

+

i

Mostrar el resumen de propiedades del archivo

@@ -39,9 +47,7 @@
-

- F8 -

+

F8

Muestra/oculta el panel de miniaturas en el modo visor.

@@ -57,9 +63,7 @@
-

- Ctrlt -

+

Ctrlt

Muestra/oculta las miniaturas en el modo navegador.

@@ -67,9 +71,7 @@
-

- Esc -

+

Esc

Cierra el visor o el modo a pantalla completa.

@@ -93,9 +95,7 @@
-

- e -

+

e

Editar la imagen. Abre el visor y muestra las herramientas de edición.

@@ -103,9 +103,7 @@
-

- g -

+

g

Abrir la imagen con el programa de manipulación de imágenes de GNU (GIMP).

@@ -113,9 +111,7 @@
-

- F2 -

+

F2

Renombrar la imagen.

@@ -131,9 +127,7 @@
-

- ] -

+

]

Rotar a la derecha, sin pérdidas si es posible. El archivo se guarda automáticamente.

@@ -141,9 +135,7 @@
-

- [ -

+

[

Rotar a la izquierda, sin pérdidas si es posible. El archivo se guarda automáticamente.

@@ -151,9 +143,7 @@
-

- Borrar -

+

Supr

Mover los archivos seleccionados a la papelera.

@@ -161,9 +151,7 @@
-

- MayúsBorrar -

+

MayúsSupr

Eliminar permanentemente los archivos seleccionados.

@@ -186,9 +174,7 @@
-

- h -

+

h

Realzar colores.

@@ -196,9 +182,7 @@
-

- l -

+

l

Voltear imagen.

@@ -206,9 +190,7 @@
-

- m -

+

m

Reflejar imagen.

@@ -216,9 +198,7 @@
-

- r -

+

r

Rotar a la derecha.

@@ -226,9 +206,7 @@
-

- R -

+

R

Rotar a la izquierda.

@@ -236,9 +214,7 @@
-

- C -

+

C

Recortar imagen.

@@ -246,9 +222,7 @@
-

- S -

+

S

Redimensionar imagen.

@@ -286,9 +260,7 @@
-

- Inicio -

+

Inicio

Ver la primera imagen.

@@ -296,9 +268,7 @@
-

- Fin -

+

Fin

Ver la última imagen.

@@ -306,12 +276,7 @@
-

- - Ctrl - D - -

+

Ctrl D

Añadir la ubicación actual a los marcadores.

@@ -327,9 +292,7 @@
-

- - -

+

-

Alejar.

@@ -353,12 +316,7 @@
-

- - Mayús - x - -

+

Mayús x

Ampliar hasta ajustar (reducir o aumentar, según se requiera)

@@ -366,9 +324,7 @@
-

- Flechas -

+

Flechas

Desplazar la imagen.

@@ -376,12 +332,7 @@
-

- - Mayús - Flechas - -

+

Mayús Flechas

Desplazar la imagen más rápidamente.

@@ -396,9 +347,7 @@
-

- Inicio -

+

Inicio

Ir al primer archivo en la vista de navegador.

@@ -406,9 +355,7 @@
-

- Fin -

+

Fin

 @@ -433,9 +380,7 @@
-

- AltFlecha izquierda -

+

AltFlecha izquierda

Ir a la carpeta anteriormente visitada.

@@ -443,9 +388,7 @@
-

- AltFlecha derecha -

+

AltFlecha derecha

Ir hacia adelante (después de retroceder hasta una carpeta).

@@ -453,12 +396,7 @@
-

- - Alt - Arriba - -

+

Alt Arriba

Subir un nivel.

@@ -480,9 +418,7 @@
-

- F5 -

+

F5

Iniciar la muestra de diapositivas.

@@ -490,9 +426,7 @@
-

- Espacio -

+

Espacio

Pausar/Reanudar la muestra de diapositivas.

@@ -500,9 +434,7 @@
-

- Esc -

+

Esc

Cerrar la muestra de diapositivas.

diff -Nru gthumb-3.0.2/help/es/slideshow.page gthumb-3.2.3/help/es/slideshow.page --- gthumb-3.0.2/help/es/slideshow.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/slideshow.page 2013-06-18 17:54:24.000000000 +0000 @@ -2,6 +2,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Muestra automática de diapositivas diff -Nru gthumb-3.0.2/help/es/sorting.page gthumb-3.2.3/help/es/sorting.page --- gthumb-3.0.2/help/es/sorting.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/sorting.page 2013-06-18 17:54:23.000000000 +0000 @@ -2,6 +2,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Ordenar archivos diff -Nru gthumb-3.0.2/help/es/strftime.page gthumb-3.2.3/help/es/strftime.page --- gthumb-3.0.2/help/es/strftime.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/es/strftime.page 2013-06-18 17:54:23.000000000 +0000 @@ -2,6 +2,18 @@ + + + Daniel Mustieles + daniel.mustieles@ie.edu + 2008-2012 + + + + Jorge González + jorgegonz@svn.gnome.org + 2007-2008 + Códigos de formato de fecha/hora @@ -118,7 +130,7 @@

%h

 -

Equivalente a

+

Equivalent to %b.

- Ktrlt + Ctrlt

@@ -68,7 +68,7 @@

- Ihes + Esc

@@ -152,7 +152,7 @@

- Ezabatu + Delete

@@ -162,7 +162,7 @@

- MaiusEzabatu + ShiftDelete

@@ -291,7 +291,7 @@

- Hasi + Home

@@ -301,7 +301,7 @@

- Amai + End

@@ -312,7 +312,7 @@

- Ktrl + Ctrl D

@@ -366,7 +366,7 @@

- Maius + Shift x

@@ -378,7 +378,7 @@

- Geziak + Arrows

@@ -389,8 +389,8 @@

- Maius - Geziak + Shift + Arrows

- Hasi + Home

@@ -418,7 +418,7 @@

- Amai + End

- AltEzker-gezia + AltLeft Arrow

@@ -455,7 +455,7 @@

- AltEskuin-gezia + AltRight Arrow

@@ -467,7 +467,7 @@

Alt - Gora + Up

- Zuriunea + Space

@@ -512,7 +512,7 @@

- Ihes + Esc

diff -Nru gthumb-3.0.2/help/eu/thumbnails.page gthumb-3.2.3/help/eu/thumbnails.page --- gthumb-3.0.2/help/eu/thumbnails.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/eu/thumbnails.page 2013-06-18 17:54:24.000000000 +0000 @@ -7,7 +7,11 @@

Arakatzailearen leihoan hautatutako karpetako irudien eta filmen koadro txikiak azaltzen dira normalean. Beste fitxategi batzuen ikono generikoak (audio-fitxategiak, esate baterako) ere azal daitezke.

-

Arakatzaile-ikuspegian erakutsi beharreko fitxategi motak hautatzeko, erabili IkusiIragazkia elkarrizketa-koadroa. Modu lehenetsian, multimedia-fitxategi guztiak erakusten dira (irudiak, filmak, audioa...), baina murriztu daiteke.

+

You can select what types of files to show in the browser view + using the ViewFilter + dialog. The default is to show all media files (images, + movies, audio), but this can be made more or less + restrictive.

Hainbat metodok sor ditzakete koadro txikiak. gThumb-ek sistemako cachean bilatuko ditu lehenik koadro txikiak.

diff -Nru gthumb-3.0.2/help/fr/attributes.page gthumb-3.2.3/help/fr/attributes.page --- gthumb-3.0.2/help/fr/attributes.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/attributes.page 2013-06-18 17:54:24.000000000 +0000 @@ -2,6 +2,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Codes d'attributs

gThumb enregistre de nombreux attributs pour chaque fichier. Les extensions en ajoutent encore plus. La liste qui suit est un résumé d'une partie des attributs les plus courants :

diff -Nru gthumb-3.0.2/help/fr/batch-change-date.page gthumb-3.2.3/help/fr/batch-change-date.page --- gthumb-3.0.2/help/fr/batch-change-date.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/batch-change-date.page 2013-06-18 17:54:24.000000000 +0000 @@ -2,6 +2,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Modification de dates diff -Nru gthumb-3.0.2/help/fr/batch-convert-format.page gthumb-3.2.3/help/fr/batch-convert-format.page --- gthumb-3.0.2/help/fr/batch-convert-format.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/batch-convert-format.page 2013-06-18 17:54:24.000000000 +0000 @@ -2,6 +2,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Conversion du format des fichiers diff -Nru gthumb-3.0.2/help/fr/batch-resize.page gthumb-3.2.3/help/fr/batch-resize.page --- gthumb-3.0.2/help/fr/batch-resize.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/batch-resize.page 2013-06-18 17:54:24.000000000 +0000 @@ -2,6 +2,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Redimensionnement des images diff -Nru gthumb-3.0.2/help/fr/batch-rotate.page gthumb-3.2.3/help/fr/batch-rotate.page --- gthumb-3.0.2/help/fr/batch-rotate.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/batch-rotate.page 2013-06-18 17:54:24.000000000 +0000 @@ -2,6 +2,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Rotation d'images sans perte diff -Nru gthumb-3.0.2/help/fr/batch-scripts.page gthumb-3.2.3/help/fr/batch-scripts.page --- gthumb-3.0.2/help/fr/batch-scripts.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/batch-scripts.page 2013-06-18 17:54:24.000000000 +0000 @@ -2,6 +2,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Scripts utilisateur diff -Nru gthumb-3.0.2/help/fr/bookmarks.page gthumb-3.2.3/help/fr/bookmarks.page --- gthumb-3.0.2/help/fr/bookmarks.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/bookmarks.page 2013-06-18 17:54:25.000000000 +0000 @@ -2,6 +2,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Utilisation des signets diff -Nru gthumb-3.0.2/help/fr/browser.page gthumb-3.2.3/help/fr/browser.page --- gthumb-3.0.2/help/fr/browser.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/browser.page 2013-06-18 17:54:24.000000000 +0000 @@ -2,6 +2,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Navigation parmi vos fichiers diff -Nru gthumb-3.0.2/help/fr/edit-colors.page gthumb-3.2.3/help/fr/edit-colors.page --- gthumb-3.0.2/help/fr/edit-colors.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/edit-colors.page 2013-06-18 17:54:25.000000000 +0000 @@ -2,6 +2,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Ajustements des couleur @@ -19,7 +37,7 @@

Cet outil permet d'effectuer manuellement des ajustements sur les couleurs. Les ajustements disponibles sont le gamma, la luminosité, le contraste, la saturation et les balances de couleur cyan/rouge, magenta/vert et jaune/bleu.

- <gui>Égaliser</gui> + <gui>Égaliser</gui>

Cet outil fournit une égalisation automatique de l'histogramme. L'utilisateur n'a pas besoin de faire d'ajustements.

 diff -Nru gthumb-3.0.2/help/fr/edit-redeye.page gthumb-3.2.3/help/fr/edit-redeye.page --- gthumb-3.0.2/help/fr/edit-redeye.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/edit-redeye.page 2013-06-18 17:54:25.000000000 +0000 @@ -2,6 +2,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Correction des yeux rouges

Pour accéder aux outils de modification, ouvrez une image et cliquez sur le bouton Modifier le fichier de la barre d'outils (icône palette).

diff -Nru gthumb-3.0.2/help/fr/edit-resize-crop.page gthumb-3.2.3/help/fr/edit-resize-crop.page --- gthumb-3.0.2/help/fr/edit-resize-crop.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/edit-resize-crop.page 2013-06-18 17:54:25.000000000 +0000 @@ -2,6 +2,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Redimensionnement et découpe @@ -14,7 +32,7 @@

Cela vous permet de redimensionner une image. L'image peut être mise à l'échelle à une taille physique donnée ou à un pourcentage de la taille originale. Les proportions de l'image peuvent être conservées ou ajustées librement.

 - <gui>Découper</gui> + <gui>Découper</gui>

Cela vous permet de découper l'image. Cliquez et déplacez la souris pour entourer la zone de l'image que vous souhaitez conserver. Vous pouvez choisir des proportions hauteur-largeurspécifiques ou ajuster librement la zone sélectionnée. Vous pouvez aussi surimposer une grille respectant la règle des tiers ou du nombre d'or pour vous aider dans la composition de l'image.

 diff -Nru gthumb-3.0.2/help/fr/edit-rotate.page gthumb-3.2.3/help/fr/edit-rotate.page --- gthumb-3.0.2/help/fr/edit-rotate.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/edit-rotate.page 2013-06-18 17:54:25.000000000 +0000 @@ -2,6 +2,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Pivotement et retournement diff -Nru gthumb-3.0.2/help/fr/edit-save-undo-redo.page gthumb-3.2.3/help/fr/edit-save-undo-redo.page --- gthumb-3.0.2/help/fr/edit-save-undo-redo.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/edit-save-undo-redo.page 2013-06-18 17:54:25.000000000 +0000 @@ -2,6 +2,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Enregistrement des fichiers, annulation, rétablissement diff -Nru gthumb-3.0.2/help/fr/extensions.page gthumb-3.2.3/help/fr/extensions.page --- gthumb-3.0.2/help/fr/extensions.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/extensions.page 2013-06-18 17:54:25.000000000 +0000 @@ -2,6 +2,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Extension de gThumb Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/help/fr/figures/general-filter.png and /tmp/43kzZNuclK/gthumb-3.2.3/help/fr/figures/general-filter.png differ Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/help/fr/figures/import-pref-auto-folder.png and /tmp/43kzZNuclK/gthumb-3.2.3/help/fr/figures/import-pref-auto-folder.png differ Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/help/fr/figures/import-pref-custom-format.png and /tmp/43kzZNuclK/gthumb-3.2.3/help/fr/figures/import-pref-custom-format.png differ Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/help/fr/figures/import.png and /tmp/43kzZNuclK/gthumb-3.2.3/help/fr/figures/import.png differ Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/help/fr/figures/main-win.png and /tmp/43kzZNuclK/gthumb-3.2.3/help/fr/figures/main-win.png differ Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/help/fr/figures/specific-filter.png and /tmp/43kzZNuclK/gthumb-3.2.3/help/fr/figures/specific-filter.png differ Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/help/fr/figures/thumbnail-pane.png and /tmp/43kzZNuclK/gthumb-3.2.3/help/fr/figures/thumbnail-pane.png differ diff -Nru gthumb-3.0.2/help/fr/file-copy-move.page gthumb-3.2.3/help/fr/file-copy-move.page --- gthumb-3.0.2/help/fr/file-copy-move.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/file-copy-move.page 2013-06-18 17:54:25.000000000 +0000 @@ -2,6 +2,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Copie et déplacement de fichiers diff -Nru gthumb-3.0.2/help/fr/filtering.page gthumb-3.2.3/help/fr/filtering.page --- gthumb-3.0.2/help/fr/filtering.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/filtering.page 2013-06-18 17:54:25.000000000 +0000 @@ -2,6 +2,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Filtrage des fichiers diff -Nru gthumb-3.0.2/help/fr/fr.po gthumb-3.2.3/help/fr/fr.po --- gthumb-3.0.2/help/fr/fr.po 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/fr/fr.po 2013-04-30 16:56:13.000000000 +0000 @@ -11,1408 +11,1462 @@ msgstr "" "Project-Id-Version: gthumb.help\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-23 17:16+0000\n" -"PO-Revision-Date: 2012-02-12 16:18+0100 \n" +"POT-Creation-Date: 2013-03-21 09:34+0000\n" +"PO-Revision-Date: 2013-03-23 14:50+0100\n" "Last-Translator: Bruno Brouard \n" "Language-Team: GNOME French Team \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: C/file-copy-move.page:6(title) -msgid "Copying and Moving Files" -msgstr "Copie et déplacement de fichiers" - -#: C/file-copy-move.page:8(p) -msgid "There are three ways to copy or move files in gThumb." +#. Put one translator per line, in the form NAME , YEAR1, YEAR2 +msgctxt "_" +msgid "translator-credits" msgstr "" -"Il y a trois façons de copier ou de déplacer des fichiers dans gThumb." - -#: C/file-copy-move.page:12(title) -msgid "Cut and Paste" -msgstr "Couper et coller" +"Bruno Brouard , 2007,2010\n" +"Claude Paroz , 2007,2011\n" +"Laurent Coudeur , 2010" -#: C/file-copy-move.page:13(p) +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/index.page:33(media) C/edit-save-undo-redo.page:8(media) +#: C/edit-colors.page:8(media) C/edit-rotate.page:8(media) +#: C/edit-resize-crop.page:8(media) C/edit-redeye.page:7(media) +msgctxt "_" msgid "" -"To copy a file in the browser view, use EditCopy, or press CtrlC. To " -"move a file, use EditCut, or press " -"CtrlX. Then navigate to the " -"destination folder using the folder tree. Use EditPaste, or press CtrlV, to complete the file transfer." +"external ref='figures/palette.png' md5='32835e7d77efd9833244ca80a4adb48e'" msgstr "" -"Pour copier un fichier dans le navigateur, choisissez ÉditionCopier ou appuyez sur CtrlC. Pour déplacer un fichier, choisissez ÉditionCouper ou appuyez sur CtrlX. Placez-vous ensuite dans le dossier de destination dans " -"l'arborescence. Choisissez ÉditionColler ou appuyez sur CtrlV pour " -"terminer le transfert du fichier." +"external ref='figures/palette.png' md5='32835e7d77efd9833244ca80a4adb48e'" -#: C/file-copy-move.page:26(title) -msgid "Drag and Drop" -msgstr "Glisser-déposer" +#: C/index.page:7(credit/name) +msgid "Paolo Bacchilega" +msgstr "Paolo Bacchilega" -#: C/file-copy-move.page:27(p) -msgid "" -"To copy a file to another folder, simply drag the file (with a sustained " -"left-mouse click) to the destination folder visible in the folder tree. To " -"move a file, hold down the Shift key while dragging." -msgstr "" -"Pour copier un fichier vers un autre dossier, faites simplement glisser le " -"fichier (par un clic gauche non relâché) vers le dossier de destination " -"visible dans l'arborescence des dossiers. Pour déplacer un fichier, appuyez " -"sur la touche Maj tout en effectuant le glisser-déposer." +#: C/index.page:12(credit/name) +msgid "Michael J. Chudobiak" +msgstr "Michael J. Chudobiak" -#: C/file-copy-move.page:31(p) -msgid "" -"You can also use the middle mouse button to drag files. In this case, " -"gThumb will ask you if you wish to copy the files, move the " -"files, or cancel the operation." -msgstr "" -"Il est aussi possible d'utiliser le bouton central de la souris pour faire " -"glisser des fichiers. Dans ce cas, gThumb demande si vous voulez " -"copier les fichiers, les déplacer ou annuler l'opération." +#: C/index.page:20(page/title) +msgid "gThumb Help" +msgstr "Manuel de gThumb" -#: C/file-copy-move.page:37(title) -msgid "File Copy / Move Dialog" -msgstr "Boîte de dialogue de copie/déplacement de fichier" +#: C/index.page:23(section/title) +msgid "Welcome" +msgstr "Bienvenue" -#: C/file-copy-move.page:38(p) -msgid "" -"Select the files to be transferred, right-click on the selection, and choose " -"Copy to... or Move to.... This will open a folder-selection dialog, where you can choose the " -"destination folder. At the bottom of the dialog, you can enable the " -"View the destination option if you want to go to " -"the destination folder after the file transfer is complete." -msgstr "" -"Choisissez les fichiers à transférer, faites un clic droit sur la sélection " -"puis choisissez Copier vers… ou " -"Déplacer vers…. Cela ouvre une boîte de dialogue " -"de sélection de dossier qui permet de choisir le dossier de destination. Au " -"bas de cette boîte de dialogue, vous pouvez activer l'option " -"Afficher la destination si vous souhaitez aller " -"dans le dossier de destination après la fin du transfert de fichier." +#: C/index.page:27(section/title) +msgid "File Management" +msgstr "Gestion des fichiers" -#: C/slideshow.page:7(title) -msgid "Automatic Slideshow" -msgstr "Diaporama automatique" +#: C/index.page:31(section/title) +msgid "Editing Mode" +msgstr "Mode Édition" -#: C/slideshow.page:9(p) +#: C/index.page:32(section/p) msgid "" -"A slideshow of the currently selected images can be started from the image " -"browser by pressing F5, by clicking the slideshow toolbar icon, " -"or by clicking ViewSlideshow. If no " -"images are selected, all images in the folder will be included." +" " +"Numerous editing tools are provided for touching-up individual photos. Undo " +"and redo functions are provided, up until the photo is saved. To access the " +"editing tools, open an image and then click the Edit File toolbar " +"button (the palette icon), or press e." msgstr "" -"Pour lancer un diaporama des images sélectionnées depuis le navigateur " -"appuyez sur F5, cliquez sur l'icône de diaporama de la barre " -"d'outils ou cliquez AffichageDiaporama. Si " -"aucune image n'est sélectionnée, toutes les images du dossier sont inclues." +" De " +"nombreux outils d'édition sont fournis pour modifier les photos " +"individuellement. Des fonctions annuler et rétablir sont fournies tant que " +"la photo n'est pas enregistrée. Pour accéder aux outils d'édition, ouvrez " +"une image et cliquez sur le bouton Modifier le fichier de la " +"barre d'outils (l'icône palette) ou appuyez sur la touche e." -#: C/slideshow.page:15(p) -msgid "" -"The transition effects and the time each image is shown can be modified from " -"the EditPreferencesSlideshow dialog." -msgstr "" -"Les effets de transition et la durée pendant laquelle chaque image est " -"affichée peuvent être modifiés dans la boîte de dialogue " -"ÉditionPréférencesDiaporama." +#: C/index.page:42(section/title) +msgid "Batch Tools" +msgstr "Outils de traitement par lot" -#: C/slideshow.page:19(p) +#: C/index.page:43(section/p) msgid "" -"Some graphics cards and drivers may experience problems (crashes) if " -"transition effects are enabled. If you experience such difficulties, set the " -"Transition effect preference to None." +"Batch tools are provided to modify multiple images simultaneously. Changes " +"are written immediately, and are not undoable." msgstr "" -"Certaines cartes graphiques et leur pilote peuvent présenter des problèmes " -"(arrêt brutal) si les effets de transition sont activés. Si vous rencontrez " -"ce type de problèmes, configurez les préférences Effet de transition à Aucun." +"Des outils de traitement par lot sont fournis pour traiter plusieurs images " +"en même temps. Les modifications sont enregistrées immédiatement et ne sont " +"pas réversibles." -#: C/slideshow.page:23(p) -msgid "" -"You can advance manually to the next image by pressing Down Arrow, Right Arrow, Page Down or Space." -msgstr "" -"Pour aller à l'image suivante, appuyez sur la touche Flèche bas, " -"Flèche droite, Page bas ou Espace." +#: C/index.page:49(section/title) +msgid "Slideshows" +msgstr "Diaporamas" -#: C/slideshow.page:27(p) -msgid "" -"You can go back to the previous image by pressing Up Arrow, " -"Left Arrow or Page Up." -msgstr "" -"Pour retourner à l'image précédente, appuyez sur la touche Flèche haut, Flèche gauche ou Page haut." +#: C/index.page:53(section/title) +msgid "Importing" +msgstr "Importation" -#: C/slideshow.page:30(p) -msgid "You can pause or un-pause the slideshow by pressing p." -msgstr "Pour interrompre ou reprendre un diaporama, appuyez sur p." +#: C/index.page:57(section/title) +msgid "Sharing" +msgstr "Partage" -#: C/slideshow.page:32(p) -msgid "To exit the slideshow, press Escape or F5." -msgstr "" -"Pour quitter le diaporama, appuyez sur Échap ou F5." +#: C/index.page:61(section/title) +msgid "Organizing" +msgstr "Organisation" + +#: C/index.page:65(section/title) +msgid "Other Tools" +msgstr "Autres outils" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/import.page:21(None) -msgid "@@image: 'figures/import.png'; md5=aab2ba4d889d170b219c554294d69b0f" -msgstr "@@image: 'figures/import.png'; md5=aab2ba4d889d170b219c554294d69b0f" +#: C/index.page:69(section/title) +msgid "Reference" +msgstr "Référence" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/import.page:43(None) -msgid "" -"@@image: 'figures/import-pref-auto-folder.png'; " -"md5=0a41de83da83b762e37f3962a7e4c042" -msgstr "" -"@@image: 'figures/import-pref-auto-folder.png'; " -"md5=0a41de83da83b762e37f3962a7e4c042" +#: C/attributes.page:6(page/title) +msgid "Attribute Codes" +msgstr "Codes d'attributs" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/import.page:75(None) +#: C/attributes.page:7(page/p) msgid "" -"@@image: 'figures/import-pref-custom-format.png'; " -"md5=989ca536c873ec926a4a71c876004b9f" +"gThumb stores many different attributes for each file. Extensions " +"may add more. The list below is a summary of some of the more common " +"attributes:" msgstr "" -"@@image: 'figures/import-pref-custom-format.png'; " -"md5=989ca536c873ec926a4a71c876004b9f" +"gThumb enregistre de nombreux attributs pour chaque fichier. Les " +"extensions en ajoutent encore plus. La liste qui suit est un résumé d'une " +"partie des attributs les plus courants :" -#: C/import.page:8(title) -msgid "Importing From a Camera" -msgstr "Importation depuis un appareil photo" +#: C/attributes.page:12(item/p) +msgid "gth::file::display-size" +msgstr "gth::file::display-size" -#: C/import.page:10(p) -msgid "" -"On most systems, gThumb will automatically launch the import " -"dialog when a digital camera is connected to the computer, or a memory card " -"with photos is plugged into a card reader. (It does this because it is " -"registered as the default handler for x-content/image-dcf and x-content/" -"image-picturecd mime types.)" -msgstr "" -"Sur la plupart des systèmes, gThumb ouvre automatiquement la " -"boîte de dialogue d'importation quand un appareil photo numérique est " -"connecté à l'ordinateur, ou si une carte mémoire contenant des photos est " -"insérée dans un lecteur de carte car gThumb est déclaré comme " -"gestionnaire par défaut des types MIME x-content/image-dcf et x-content/" -"image-picturecd." +#: C/attributes.page:15(item/p) +msgid "standard::fast-content-type" +msgstr "standard::fast-content-type" -#: C/import.page:16(p) -msgid "" -"To manually launch the import dialog, use FileImport " -"FromRemovable Device." -msgstr "" -"Pour lancer la boîte de dialogue d'importation manuellement, utilisez le " -"menu FichierImporter depuisPériphérique " -"amovible." +#: C/attributes.page:18(item/p) +msgid "general::dimensions" +msgstr "general::dimensions" -#: C/import.page:20(title) -msgid "The Import Dialog" -msgstr "Boîte de dialogue d'importation" +#: C/attributes.page:21(item/p) +msgid "general::format" +msgstr "general::format" -#: C/import.page:24(p) -msgid "" -"The import dialog shows thumbnails of the photos available on the selected " -"device. The user can select one of more photos using normal keyboard or " -"mouse techniques (for example, Ctrl+click to add a photo to the selection, " -"or click and drag the mouse over the desired photos.) If no photos are " -"explicitly selected, all will be imported." -msgstr "" -"La boîte de dialogue d'importation affiche les vignettes des photos " -"disponibles sur le périphérique sélectionné. L'utilisateur peut sélectionner " -"une ou plusieurs photos avec les méthodes standards au clavier ou à la " -"souris (par exemple : Ctrl + clic pour ajouter une photo à la sélection, ou " -"clic et déplacement de la souris sur les photos souhaitées). Si aucune photo " -"n'est sélectionnée explicitement alors elles sont toutes importées." +#: C/attributes.page:24(item/p) +msgid "general::location" +msgstr "general::location" -#: C/import.page:30(p) -msgid "" -"Tags may optionally be associated with the imported photos, using the " -"Tags control below the thumbnail window. Click the drop-down " -"control to see the predefined tags." -msgstr "" -"Des étiquettes peuvent être associées aux photos importées, à l'aide du " -"contrôle Étiquettes en dessous de la fenêtres des vignettes. " -"Cliquez sur la liste déroulante pour visualiser les étiquettes prédéfinies." +#: C/attributes.page:27(item/p) +msgid "general::datetime" +msgstr "general::datetime" -#: C/import.page:34(p) -msgid "" -"An event name may also be optionally associated with the photos. This event " -"name can be used to generate an automatic subfolder name (possibly " -"incorporating a date) as described below. For example, if the base " -"destination folder is \"/photos\", and you enter \"Wedding-Jennifer\" in the " -"Event field, you can configure generation of automatic subfolders " -"like \"/photos/2010-07-31, Wedding-Jennifer\"." -msgstr "" -"Le nom d'un évènement peut être associé aux photos. Le nom de cet évènement " -"peut être utilisé pour générer un sous-dossier automatique (avec la " -"possibilité d'ajouter la date) tel que décrit ci-dessous. Par exemple : si " -"le dossier de destination est « /photos », et que vous saisissez « Mariage-" -"Magalie » dans le champ Évènement, vous pouvez configurer la " -"génération automatique des sous-dossiers comme cela « /photos/2010-07-31, " -"Mariage-Magalie »." +#: C/attributes.page:30(item/p) +msgid "general::rating" +msgstr "general::rating" -#: C/import.page:42(title) -msgid "Standard Date-Based Subfolders" -msgstr "Sous-dossiers standards basés sur la date" +#: C/attributes.page:33(item/p) +msgid "Exif::Image::Make" +msgstr "Exif::Image::Make" -#: C/import.page:46(p) -msgid "" -"As mentioned above, subfolders for imported photos can be automatically " -"generated based on event names and dates. This is enabled or disabled by " -"clicking on the destination foldername in the import dialog. This opens a " -"second dialog, where the base folder for imports may be selected (the " -"Destination folder). To generate automatic subfolders, select " -"Automatic subfolder." -msgstr "" -"Comme mentionné ci-dessus, les sous-dossiers pour les photos importées " -"peuvent être créés automatiquement et nommés en fonction des évènements et " -"de la date. Cette action est activée en cliquant sur le nom de dossier cible " -"dans la boîte de dialogue d'importation. Une seconde boîte de dialogue " -"s'ouvre, où le dossier de base pour les importations peut être sélectionné " -"(le dossier Destination). Pour générer des sous-dossiers " -"automatiquement, sélectionnez Sous-dossier automatique." +#: C/attributes.page:36(item/p) +msgid "Exif::Image::Model" +msgstr "Exif::Image::Model" -#: C/import.page:52(p) -msgid "" -"You can select either the File Date or the Current Date to use as the basis for subfolder naming. (The File Date " -"examines the dates embedded in the file metadata to determine when the photo " -"was taken.) A variety of standard date formats are available (year-" -"month for example). The as single subfolder checkbox " -"controls whether a \"deep\" or \"shallow\" hierarchy of files is made (for " -"example, with year-month, you can have year subfolders with month " -"subfolders under them, or all subfolders can be at the same level in the " -"filesystem, with the year and name both the folder name." -msgstr "" -"Vous pouvez sélectionner soit la Date du fichier soit la " -"Date actuelle comme base pour le nom du dossier. L'option " -"Date du fichier lit la date intégrée dans les méta-données du " -"fichier pour déterminer quand la photo a été prise. Divers formats standards " -"de date sont disponibles (par exemple Mois-année). La case à " -"cocher comme sous-dossier unique contrôle la profondeur de " -"l'arborescence des fichiers (par exemple, avec l'option Année-mois, vous pouvez avoir des sous-dossiers « année » contenant des sous-" -"dossiers « mois » ou bien tous les sous-dossiers au même niveau dans le " -"système de fichiers, contenant l'année et le mois dans leur nom." +#: C/attributes.page:39(item/p) +msgid "Exif::Image::Software" +msgstr "Exif::Image::Software" -#: C/import.page:61(p) -msgid "" -"It is not necessary to use the predefined date formats. If you select " -"custom format, standard date codes can be used. Click on the help " -"icon to the right of the custom format field for a list of format codes. \"%E" -"\" is a special code that will embed the Event name defined in " -"the main import dialog." -msgstr "" -"Il n'est pas obligatoire d'utiliser les formats de date prédéfinis. Si vous " -"sélectionnez Format personnalisé, les codes de date standards " -"peuvent être utilisés. Cliquez sur l'icône d'aide à droite du champ de " -"format personnalisé pour obtenir une liste des codes disponibles. Le code « %" -"E » est un code spécial qui permet d'inclure le nom de l'Évènement défini dans la boîte de dialogue d'importation principale." +#: C/attributes.page:42(item/p) +msgid "Exif::Image::Artist" +msgstr "Exif::Image::Artist" -#: C/import.page:67(p) -msgid "See for more date format codes." -msgstr "" -"Pour plus d'informations sur les codes de format de date, consultez la " -"section ." +#: C/attributes.page:45(item/p) +msgid "Exif::Image::Copyright" +msgstr "Exif::Image::Copyright" -#: C/import.page:69(p) -msgid "" -"If you use automatic subfolder naming, the Destination field in " -"the main import dialog will show the automatic portion of the folder in red. " -"(For date-based formats, dummy data may be shown in the red portion.)" -msgstr "" -"Si vous utilisez l'attribution automatique de nom de sous-dossier, le champ " -"Destination de la boîte de dialogue d'importation principale " -"affiche la partie automatique du nom de dossier en rouge (pour les formats " -"de date, une valeur fictive peut être affichée dans la partie en rouge)." +#: C/attributes.page:48(item/p) +msgid "Exif::Photo::ISOSpeedRatings" +msgstr "Exif::Photo::ISOSpeedRatings" -#: C/import.page:74(title) -msgid "Using Custom Formats" -msgstr "Utilisation des formats personnalisés" +#: C/attributes.page:51(item/p) +msgid "Exif::Photo::BrightnessValue" +msgstr "Exif::Photo::BrightnessValue" -#: C/bookmarks.page:6(title) -msgid "Using Bookmarks" -msgstr "Utilisation des signets" +#: C/attributes.page:54(item/p) +msgid "Exif::Photo::FNumber" +msgstr "Exif::Photo::FNumber" -#: C/bookmarks.page:8(p) -msgid "" -"Frequently-used folders can be added to the bookmark list for rapid access. " -"To add the current folder to the bookmark list, press CtrlD or use the command BookmarksAdd Bookmark." -msgstr "" -"Les dossiers fréquemment utilisés peuvent être ajoutés à la liste des " -"signets pour un accès rapide. Pour ajouter le dossier actuel dans la liste " -"des signets, appuyez sur CtrlD ou " -"utilisez la commande SignetsAjouter un signet." +#: C/attributes.page:57(item/p) +msgid "Exif::Photo::ApertureValue" +msgstr "Exif::Photo::ApertureValue" -#: C/bookmarks.page:13(p) -msgid "" -"To remove or rearrange bookmarks in a different order use the " -"BookmarksEdit Bookmarks command." -msgstr "" -"Pour supprimer ou modifier l'ordre des signets, utilisez la commande " -"SignetsÉditer les signets." +#: C/attributes.page:60(item/p) +msgid "Exif::Photo::MaxApertureValue" +msgstr "Exif::Photo::MaxApertureValue" -#: C/bookmarks.page:16(p) -msgid "" -"BookmarksSystem Bookmarks provides " -"access to the system bookmarks that have been defined in Nautilus " -"or the file-chooser dialog used in most Gnome applications." -msgstr "" -"Le menu SignetsSignets du système " -"donne accès aux signets du système qui ont été définis dans Nautilus ou la boîte de dialogue de sélection de fichiers utilisée dans de " -"nombreuses applications GNOME." +#: C/attributes.page:63(item/p) +msgid "Exif::Photo::ExposureTime" +msgstr "Exif::Photo::ExposureTime" -#: C/wallpaper.page:6(title) -msgid "Desktop Wallpaper" -msgstr "Papier peint du bureau" +#: C/attributes.page:66(item/p) +msgid "Exif::Photo::ExposureProgram" +msgstr "Exif::Photo::ExposureProgram" -#: C/wallpaper.page:7(p) -msgid "" -"To set an image as the system desktop wallpaper, right-click on the image " -"and select Set as Desktop Background from the " -"pop-up menu. The desktop background will change, and the Gnome Appearance " -"Preferences dialog will appear. You can use this dialog to make adjustments " -"to the background settings (positioning, stretching, tiling, et cetera.)." -msgstr "" -"Pour définir une image comme fond d'écran, faites un clic droit sur l'image " -"et sélectionnez dans le menu contextuel Définir comme arrière-" -"plan du bureau. Le fond d'écran change et la boîte de " -"dialogue des préférences Apparence de GNOME s'affiche. Vous pouvez utiliser " -"cette boîte de dialogue pour faire des ajustements aux paramètres du fond " -"d'écran (positionnement, étirement, mosaïque, etc)." +#: C/attributes.page:69(item/p) +msgid "Exif::Photo::ExposureIndex" +msgstr "Exif::Photo::ExposureIndex" -#: C/sharing-social.page:6(title) -msgid "Uploading to Photo-Sharing Web Sites" -msgstr "Envoi de photos sur des sites Web de partage" +#: C/attributes.page:72(item/p) +msgid "Exif::Photo::ExposureBiasValue" +msgstr "Exif::Photo::ExposureBiasValue" -#: C/sharing-social.page:7(p) -msgid "" -"gThumb is provided with a number of extensions for uploading photos to " -"various \"social media\" web sites. By default, uploaders for Facebook, " -"Flickr, Picasa, and Photobucket are enabled." -msgstr "" -"gThumb possède un certain nombre d'extensions pour envoyer des photos sur " -"divers sites Web de réseaux sociaux. Par défaut, les extensions pour " -"Facebook, Flickr, Picasa et Photobucket sont activés." +#: C/attributes.page:75(item/p) +msgid "Exif::Photo::ExposureMode" +msgstr "Exif::Photo::ExposureMode" -#: C/sharing-social.page:13(p) -msgid "" -"To upload a series of photos, select the images in the browser view, and " -"click the Share button in the toolbar. Select the appropriate web " -"site from the menu that appears." -msgstr "" -"Pour envoyer une série de photos, choisissez les images dans le navigateur " -"et cliquez sur le bouton Partager de la barre d'outils. " -"Choisissez le site Web souhaité dans le menu qui apparaît." +#: C/attributes.page:78(item/p) +msgid "Exif::Photo::ShutterSpeedValue" +msgstr "Exif::Photo::ShutterSpeedValue" -#: C/sharing-social.page:17(p) -msgid "" -"You may be prompted for additional information specific to the destination " -"site, like an album name. You may also be prompted for your user name and " -"password for the site. It may be necessary for gThumb to open a web browser, " -"where you complete the required authentication steps. Once you have " -"completed the required authentication steps in the browser, return to gThumb " -"and continue the upload." -msgstr "" -"Il se peut que vous deviez renseigner des informations supplémentaires " -"spécifiques au site de destination, comme par exemple un nom d'album ou vos " -"nom d'utilisateur et mot de passe pour se connecter au site. Il peut arriver " -"que gThumb doive ouvrir un navigateur Web pour que vous puissiez effectuer " -"la phase d'authentification. Lorsque celle-ci est terminée, revenez dans " -"gThumb pour continuer l'envoi des photos." +#: C/attributes.page:81(item/p) +msgid "Exif::Photo::MeteringMode" +msgstr "Exif::Photo::MeteringMode" -#: C/sharing-social.page:26(p) -msgid "" -"If you do not see the expected upload sites in the Share menu, " -"check that the appropriate exporter extensions are enabled in " -"EditExtensions." -msgstr "" -"Si le site souhaité ne se trouve pas dans le menu Partager, " -"vérifiez que l'extension correspondante est bien activée dans " -"ÉditionExtensions." +#: C/attributes.page:84(item/p) +msgid "Exif::Photo::LightSource" +msgstr "Exif::Photo::LightSource" -#: C/sharing-social.page:31(p) -msgid "" -"For some sites, gThumb also supports downloading photos from the site into " -"gThumb. See the FileImport From menu " -"for the available download options." -msgstr "" -"Pour certains sites, gThumb est aussi capable de télécharger les photos du " -"site dans gThumb. Examinez le menu FichierImporter " -"depuis pour connaître les options de téléchargement " -"disponibles." +#: C/attributes.page:87(item/p) +msgid "Exif::Photo::WhiteBalance" +msgstr "Exif::Photo::WhiteBalance" -#: C/sharing-disc.page:6(title) -msgid "Creating a CD/DVD/ISO" -msgstr "Création d'un CD/DVD/ISO" +#: C/attributes.page:90(item/p) +msgid "Exif::Photo::Flash" +msgstr "Exif::Photo::Flash" -#: C/sharing-disc.page:7(p) -msgid "" -"To write a series of files to an optical disk (CD or DVD), or to create an " -"ISO disk image file, use the FileExport ToOptical Disc menu item." -msgstr "" -"Pour enregistrer une série de fichiers sur un disque optique (CD ou DVD) ou " -"créer un fichier image de disque ISO, utilisez le menu FichierExporter versDisque optique." +#: C/attributes.page:93(item/p) +msgid "Exif::Photo::FocalLength" +msgstr "Exif::Photo::FocalLength" -#: C/sharing-disc.page:13(p) -msgid "" -"You will be offered the choice of writing the currently selected files, the " -"entire current folder, or the entire current folder and its subfolders. " -"Click OK when you have made the appropriate selection." -msgstr "" -"Il est alors possible d'enregistrer les fichiers actuellement sélectionnés, " -"le dossier actuel ou le dossier actuel et ses sous-dossiers. Cliquez sur " -"OK lorsque votre choix est fait." +#: C/attributes.page:96(item/p) +msgid "Exif::Photo::SubjectArea" +msgstr "Exif::Photo::SubjectArea" -#: C/sharing-disc.page:19(p) +#: C/attributes.page:99(item/p) +msgid "Exif::Photo::Contrast" +msgstr "Exif::Photo::Contrast" + +#: C/attributes.page:102(item/p) +msgid "Exif::Photo::Saturation" +msgstr "Exif::Photo::Saturation" + +#: C/attributes.page:105(item/p) +msgid "Exif::Photo::Sharpness" +msgstr "Exif::Photo::Sharpness" + +#: C/strftime.page:6(page/title) +msgid "Date/Time Format Codes" +msgstr "Codes des formats de date/heure" + +#: C/strftime.page:8(page/p) msgid "" -"The next dialog will select the destination disk, or the ISO file to save. " -"When you are ready to complete the process, click Create Image. " -"The optical disk writing process will then commence, or the ISO file will be " -"written, completing the process." +"This is a summary of standard date/time codes that may be used in format " +"strings:" msgstr "" -"La boîte de dialogue suivante permet la sélection du disque ou du fichier " -"ISO à enregistrer. Lorsque votre choix est fait, cliquez sur Créer " -"l'image. La gravure sur le disque optique commence alors ou le fichier " -"ISO est enregistré, complétant ainsi le processus." - -#: C/shortcuts.page:7(title) -msgid "Keyboard Shortcuts" -msgstr "Raccourcis clavier" +"Voici un résumé des codes standards de date et d'heure qui peuvent être " +"utilisés dans les chaînes de format :" -#: C/shortcuts.page:10(title) -msgid "Viewing and hiding parts of the user interface" -msgstr "Affichage et masquage de certaines parties de l'interface utilisateur" +#: C/strftime.page:12(table/title) +msgid "Valid format codes for custom subfolders" +msgstr "Codes de format valides pour les sous-dossiers personnalisés" -#: C/shortcuts.page:14(p) C/shortcuts.page:91(p) C/shortcuts.page:270(p) -#: C/shortcuts.page:495(p) -msgid "Keyboard Shortcut" -msgstr "Raccourci clavier" +#: C/strftime.page:15(td/p) +msgid "%a" +msgstr "%a" -#: C/shortcuts.page:17(p) C/shortcuts.page:94(p) C/shortcuts.page:189(p) -#: C/shortcuts.page:273(p) C/shortcuts.page:498(p) C/rename-series.page:27(p) -msgid "Description" -msgstr "Description" +#: C/strftime.page:18(td/p) +msgid "The abbreviated weekday name according to the current locale." +msgstr "" +"Le nom du jour de la semaine sous forme abrégée conformément à " +"l'environnement linguistique actuel." -#: C/shortcuts.page:23(key) -msgid "F9" -msgstr "F9" +#: C/strftime.page:24(td/p) +msgid "%A" +msgstr "%A" -#: C/shortcuts.page:27(p) -msgid "" -"Show/Hide the sidebar in the browser mode. The sidebar contains the folder " -"tree and the file properties summary (if enabled)." +#: C/strftime.page:27(td/p) +msgid "The full weekday name according to the current locale." msgstr "" -"Affiche/masque la barre latérale dans le navigateur. La barre latérale " -"contient l'arborescence des dossiers et le résumé des propriétés de fichier " -"(si activé)." +"Le nom complet du jour de la semaine conformément à l'environnement " +"linguistique actuel." -#: C/shortcuts.page:34(key) -msgid "i" -msgstr "i" +#: C/strftime.page:33(td/p) +msgid "%b" +msgstr "%b" -#: C/shortcuts.page:38(p) -msgid "Show the file properties summary." -msgstr "Affiche le résumé des propriétés du fichier." +#: C/strftime.page:36(td/p) +msgid "The abbreviated month name according to the current locale." +msgstr "" +"Le nom du mois sous forme abrégée conformément à l'environnement " +"linguistique actuel." -#: C/shortcuts.page:44(key) -msgid "F8" -msgstr "F8" +#: C/strftime.page:42(td/p) +msgid "%B" +msgstr "%B" -#: C/shortcuts.page:48(p) -msgid "Shows/hides the thumbnail pane in the viewer mode." -msgstr "Affiche/masque le volet des vignettes dans le mode visionneur." +#: C/strftime.page:45(td/p) +msgid "The full month name according to the current locale." +msgstr "" +"Le nom complet du mois conformément à l'environnement linguistique actuel." -#: C/shortcuts.page:53(p) -msgid "F11 or f" -msgstr "F11 ou f" +#: C/strftime.page:50(td/p) +msgid "%c" +msgstr "%c" -#: C/shortcuts.page:58(p) -msgid "Toggles the fullscreen mode." -msgstr "Bascule dans le mode plein écran." +#: C/strftime.page:53(td/p) +msgid "The preferred date and time representation for the current locale." +msgstr "" +"La représentation préférée de la date et de l'heure conformément à " +"l'environnement linguistique actuel." -#: C/shortcuts.page:64(key) C/shortcuts.page:320(key) -msgid "Ctrl" -msgstr "Ctrl" - -#: C/shortcuts.page:64(key) -msgid "t" -msgstr "t" +#: C/strftime.page:59(td/p) +msgid "%C" +msgstr "%C" -#: C/shortcuts.page:68(p) -msgid "Shows/hides the thumbnails in the browser mode." -msgstr "Affiche/masque les vignettes dans le navigateur." +#: C/strftime.page:62(td/p) +msgid "The century number (year/100) as a 2-digit integer." +msgstr "" +"Le numéro du siècle (année/100) sous la forme d'un entier à 2 chiffres." -#: C/shortcuts.page:74(key) C/shortcuts.page:524(key) -msgid "Esc" -msgstr "Échap" +#: C/strftime.page:67(td/p) +msgid "%d" +msgstr "%d" -#: C/shortcuts.page:78(p) -msgid "Closes the viewer or fullscreen mode." -msgstr "Quitte le visionneur ou le mode plein écran." +#: C/strftime.page:70(td/p) +msgid "The day of the month as a decimal number (range 01 to 31)." +msgstr "" +"Le jour du mois sous la forme d'un nombre décimal (compris entre 01 et 31)." -#: C/shortcuts.page:87(title) -msgid "Editing shortcuts for the browser and viewer" -msgstr "Raccourcis pour l'édition dans le navigateur et le visionneur" +#: C/strftime.page:76(td/p) +msgid "%D" +msgstr "%D" + +#: C/strftime.page:79(td/p) +msgid "" +"Equivalent to %m/%d/%y. (Yecch -- for Americans only. Americans should note " +"that in other countries %d/%m/%y is rather common. This means that in " +"international context this format is ambiguous and should not be used.)" +msgstr "" +"Équivalent à %m/%d/%y. (Note destinée uniquement aux américains : les " +"américains devraient remarquer que dans les autres pays %d/%m/%y est très " +"courant. Cela signifie que, dans un contexte international, ce format est " +"ambigu et ne devrait pas être utilisé.)" -#: C/shortcuts.page:100(key) -msgid "e" -msgstr "e" +#: C/strftime.page:87(td/p) +msgid "%e" +msgstr "%e" -#: C/shortcuts.page:104(p) -msgid "Edit the image. Opens the viewer and shows the editing tools." +#: C/strftime.page:90(td/p) +msgid "" +"Like %d, the day of the month as a decimal number, but a leading zero is " +"replaced by a space." msgstr "" -"Modifie l'image. Ouvre le visionneur et affiche les outils de modification." +"Comme pour %d, le jour du mois sous la forme d'un nombre décimal mais un " +"zéro à gauche est remplacé par un espace." -#: C/shortcuts.page:110(key) -msgid "g" -msgstr "g" +#: C/strftime.page:96(td/p) +msgid "%E" +msgstr "%E" -#: C/shortcuts.page:114(p) -msgid "Open the image with the GNU Image Manipulation Program (GIMP)." -msgstr "Ouvre l'image avec le logiciel de manipulation d'image (GIMP) de GNU." +#: C/strftime.page:99(td/p) C/strftime.page:208(td/p) +msgid "Modifier: use alternative format, see below." +msgstr "Modificateur : utilisez un format alternatif, voyez plus bas." -#: C/shortcuts.page:120(key) -msgid "F2" -msgstr "F2" +#: C/strftime.page:104(td/p) +msgid "%F" +msgstr "%F" -#: C/shortcuts.page:124(p) -msgid "Rename the image." -msgstr "Renomme une image." +#: C/strftime.page:107(td/p) +msgid "Equivalent to %Y-%m-%d (the ISO 8601 date format). (C99)" +msgstr "Équivalent à %Y-%m-%d (le format de date ISO 8601). (C99)" -#: C/shortcuts.page:129(p) -msgid "c or Ctrlm" -msgstr "c ou Ctrlm" +#: C/strftime.page:113(td/p) +msgid "%G" +msgstr "%G" -#: C/shortcuts.page:134(p) -msgid "Add comments or metadata to an image." -msgstr "Ajoute des commentaires ou des métadonnées à une image." +#: C/strftime.page:116(td/p) +msgid "" +"The ISO 8601 year with century as a decimal number. The 4-digit year " +"corresponding to the ISO week number (see %V). This has the same format and " +"value as %y, except that if the ISO week number belongs to the previous or " +"next year, that year is used instead." +msgstr "" +"L'année ISO 8601 avec le siècle sous la forme d'un nombre décimal. L'année à " +"4 chiffres correspond au nombre ISO de la semaine (voir %V). C'est le même " +"format et la même valeur que %y à part que, si le nombre ISO de la semaine " +"appartient à l'année précédente ou à l'année suivante, cette année est " +"utilisée à la place." -#: C/shortcuts.page:140(key) -msgid "]" -msgstr "]" +#: C/strftime.page:125(td/p) +msgid "%g" +msgstr "%g" -#: C/shortcuts.page:144(p) -msgid "Rotate right, losslessly if possible. The file is saved automatically." +#: C/strftime.page:128(td/p) +msgid "Like %G, but without century, i.e., with a 2-digit year (00-99)." msgstr "" -"Pivote vers la droite, sans perte de données si possible. Le fichier est " -"enregistré automatiquement." +"Comme %G mais sans le siècle, c.-à-d. avec une année à 2 chiffres (compris " +"entre 00 et 99)." -#: C/shortcuts.page:150(key) -msgid "[" -msgstr "[" +#: C/strftime.page:134(td/p) +msgid "%h" +msgstr "%h" -#: C/shortcuts.page:154(p) -msgid "Rotate left, losslessly if possible. The file is saved automatically." +#: C/strftime.page:137(td/p) +msgid "Equivalent to %b." +msgstr "Équivalent à %b." + +#: C/strftime.page:142(td/p) +msgid "%H" +msgstr "%H" + +#: C/strftime.page:145(td/p) +msgid "The hour as a decimal number using a 24-hour clock (range 00 to 23)." msgstr "" -"Pivote vers la gauche, sans perte de données si possible. Le fichier est " -"enregistré automatiquement." +"L'heure sous la forme d'un nombre décimal en utilisant une horloge à 24 " +"heures (compris entre 00 et 23)." -#: C/shortcuts.page:160(key) C/shortcuts.page:170(key) -msgid "Delete" -msgstr "Suppr" +#: C/strftime.page:151(td/p) +msgid "%I" +msgstr "%I" -#: C/shortcuts.page:164(p) -msgid "Move the selected files to the Trash." -msgstr "Déplace les images sélectionnées dans la corbeille." +#: C/strftime.page:154(td/p) +msgid "The hour as a decimal number using a 12-hour clock (range 01 to 12)." +msgstr "" +"L'heure sous la forme d'un nombre décimal en utilisant une horloge à 12 " +"heures (compris entre 01 et 12)." -#: C/shortcuts.page:170(key) C/shortcuts.page:374(key) -#: C/shortcuts.page:397(key) -msgid "Shift" -msgstr "Maj" +#: C/strftime.page:160(td/p) +msgid "%j" +msgstr "%j" -#: C/shortcuts.page:174(p) -msgid "Delete the selected files permanently." -msgstr "Supprime les images sélectionnées définitivement." +#: C/strftime.page:163(td/p) +msgid "The day of the year as a decimal number (range 001 to 366)." +msgstr "" +"Le jour de l'année sous la forme d'un nombre décimal (compris entre 001 et " +"366)." -#: C/shortcuts.page:182(title) -msgid "Editing shortcuts for the viewer mode only" -msgstr "Raccourcis pour l'édition dans le visionneur uniquement" +#: C/strftime.page:169(td/p) +msgid "%k" +msgstr "%k" + +#: C/strftime.page:172(td/p) +msgid "" +"The hour (24-hour clock) as a decimal number (range 0 to 23); single digits " +"are preceded by a blank. (See also %H.)" +msgstr "" +"L'heure (horloge à 24 heures) sous la forme d'un nombre décimal (compris " +"entre 0 et 23), un chiffre seul est précédé d'un espace (voir également %H)." -#: C/shortcuts.page:186(p) -msgid "Keyboard Shortcut (Case Sensitive)" -msgstr "Raccourci clavier (sensible à la casse)" +#: C/strftime.page:179(td/p) +msgid "%l" +msgstr "%l" -#: C/shortcuts.page:195(key) -msgid "h" -msgstr "h" +#: C/strftime.page:182(td/p) +msgid "" +"The hour (12-hour clock) as a decimal number (range 1 to 12); single digits " +"are preceded by a blank. (See also %I.)" +msgstr "" +"L'heure (horloge à 12 heures) sous la forme d'un nombre décimal (compris " +"entre 1 et 12), un chiffre seul est précédé d'un espace (voir également %I)." -#: C/shortcuts.page:199(p) -msgid "Enhance colors." -msgstr "Améliore les couleurs." +#: C/strftime.page:189(td/p) +msgid "%m" +msgstr "%m" -#: C/shortcuts.page:205(key) -msgid "l" -msgstr "l" +#: C/strftime.page:192(td/p) +msgid "The month as a decimal number (range 01 to 12)." +msgstr "Le mois sous la forme d'un nombre décimal (compris entre 01 et 12)." -#: C/shortcuts.page:209(p) -msgid "Flip image." -msgstr "Retourne l'image." +#: C/strftime.page:197(td/p) +msgid "%M" +msgstr "%M" -#: C/shortcuts.page:215(key) -msgid "m" -msgstr "m" +#: C/strftime.page:200(td/p) +msgid "The minute as a decimal number (range 00 to 59)." +msgstr "" +"Les minutes sous la forme d'un nombre décimal (compris entre 00 et 59)." -#: C/shortcuts.page:219(p) -msgid "Mirror image." -msgstr "Image en miroir." +#: C/strftime.page:205(td/p) +msgid "%O" +msgstr "%O" -#: C/shortcuts.page:225(key) -msgid "r" -msgstr "r" +#: C/strftime.page:213(td/p) +msgid "%p" +msgstr "%p" -#: C/shortcuts.page:229(p) -msgid "Rotate right." -msgstr "Pivote sur la droite." +#: C/strftime.page:216(td/p) +msgid "" +"Either 'AM' or 'PM' according to the given time value, or the corresponding " +"strings for the current locale. Noon is treated as 'pm' and midnight as 'am'." +msgstr "" +"Soit « AM » ou « PM » selon la valeur actuelle de l'heure ou une chaîne " +"correspondante conformément à l'environnement linguistique actuel. Midi est " +"vu comme « pm » et minuit comme « am »." -#: C/shortcuts.page:235(key) -msgid "R" -msgstr "R" +#: C/strftime.page:223(td/p) +msgid "%P" +msgstr "%P" -#: C/shortcuts.page:239(p) -msgid "Rotate left." -msgstr "Pivote sur la gauche." +#: C/strftime.page:226(td/p) +msgid "" +"Like %p but in lowercase: 'am' or 'pm' or a corresponding string for the " +"current locale." +msgstr "" +"Comme %p mais en minuscule : « am » ou « pm » ou une chaîne correspondante " +"conformément à l'environnement linguistique actuel." -#: C/shortcuts.page:245(key) -msgid "C" -msgstr "C" +#: C/strftime.page:232(td/p) +msgid "%r" +msgstr "%r" -#: C/shortcuts.page:249(p) -msgid "Crop image." -msgstr "Découpe l'image." +#: C/strftime.page:235(td/p) +msgid "" +"The time in a.m. or p.m. notation. In the POSIX locale this is equivalent to " +"'%I:%M:%S %p'." +msgstr "" +"L'heure en notation a.m. ou p.m. Dans l'environnement linguistique actuel " +"POSIX, c'est équivalent à « %I:%M:%S %p »." -#: C/shortcuts.page:255(key) -msgid "S" -msgstr "S" +#: C/strftime.page:241(td/p) +msgid "%R" +msgstr "%R" -#: C/shortcuts.page:259(p) -msgid "Resize image." -msgstr "Redimensionne l'image." +#: C/strftime.page:244(td/p) +msgid "" +"The time in 24-hour notation (%H:%M). For a version including the seconds, " +"see %T below." +msgstr "" +"L'heure en notation à 24 heures (%H:%M). Pour une version incluant les " +"secondes, consultez %T ci-dessous." -#: C/shortcuts.page:266(title) -msgid "Viewer shortcuts" -msgstr "Raccourcis clavier du visionneur" +#: C/strftime.page:250(td/p) +msgid "%s" +msgstr "%s" -#: C/shortcuts.page:278(p) -msgid "Space or Page Down" -msgstr "Espace ou Page bas" +#: C/strftime.page:253(td/p) +msgid "" +"The number of seconds since the Epoch, i.e., since 1970-01-01 00:00:00 UTC." +msgstr "" +"Le nombre de secondes depuis la date Epoch, c.-à-d. depuis le 01/01/1970 " +"00:00:00 UTC." -#: C/shortcuts.page:283(p) -msgid "View the next image." -msgstr "Affiche l'image suivante." +#: C/strftime.page:259(td/p) +msgid "%S" +msgstr "%S" -#: C/shortcuts.page:288(p) -msgid "Backspace or Page Up" -msgstr "Retour Arrière ou Page Haut" +#: C/strftime.page:262(td/p) +msgid "" +"The second as a decimal number (range 00 to 60). (The range is up to 60 to " +"allow for occasional leap seconds.)" +msgstr "" +"Les secondes en nombre décimal (compris entre 00 et 60) (la plage va jusqu'à " +"60 pour permettre des secondes intercalaires occasionnelles)." -#: C/shortcuts.page:293(p) -msgid "View the previous image." -msgstr "Affiche l'image précédente." +#: C/strftime.page:269(td/p) +msgid "%T" +msgstr "%T" -#: C/shortcuts.page:299(key) C/shortcuts.page:416(key) -msgid "Home" -msgstr "Origine" +#: C/strftime.page:272(td/p) +msgid "The time in 24-hour notation (%H:%M:%S)." +msgstr "L'heure en notation à 24 heures (%H:%M:%S)." -#: C/shortcuts.page:303(p) -msgid "View the first image." -msgstr "Affiche la première image." +#: C/strftime.page:277(td/p) +msgid "%u" +msgstr "%u" -#: C/shortcuts.page:309(key) C/shortcuts.page:426(key) -msgid "End" -msgstr "Fin" +#: C/strftime.page:280(td/p) +msgid "" +"The day of the week as a decimal number, range 1 to 7, Monday being 1. See " +"also %w." +msgstr "" +"Le jour de la semaine représenté par un chiffre compris entre 1 et 7, lundi " +"étant représenté par 1. Consultez aussi %w." -#: C/shortcuts.page:313(p) -msgid "View the last image." -msgstr "Affiche la dernière image." +#: C/strftime.page:286(td/p) +msgid "%U" +msgstr "%U" -#: C/shortcuts.page:321(key) -msgid "D" -msgstr "D" +#: C/strftime.page:289(td/p) +msgid "" +"The week number of the current year as a decimal number, range 00 to 53, " +"starting with the first Sunday as the first day of week 01. See also %V and " +"%W." +msgstr "" +"Le numéro de la semaine de l'année actuelle sous la forme d'un nombre " +"décimal compris entre 00 et 53, le premier dimanche est le premier jour de " +"la semaine 01. Consultez également %V et %W." -#: C/shortcuts.page:326(p) -msgid "Add the current location to the bookmarks." -msgstr "Ajoute l'emplacement actuel aux signets." +#: C/strftime.page:296(td/p) +msgid "%V" +msgstr "%V" -# note: missing space -#: C/shortcuts.page:331(p) -msgid "+ or =" -msgstr "+ ou =" +#: C/strftime.page:299(td/p) +msgid "" +"The ISO 8601:1988 week number of the current year as a decimal number, range " +"01 to 53, where week 1 is the first week that has at least 4 days in the " +"current year, and with Monday as the first day of the week. See also %U and " +"%W." +msgstr "" +"Le numéro ISO 8601:1988 de la semaine de l'année actuelle sous la forme d'un " +"nombre décimal, compris entre 01 et 53, où la semaine 1 est la première " +"semaine qui possède au moins 4 jours dans l'année actuelle, le lundi étant " +"le premier jour de la semaine. Consultez également %U et %W." -#: C/shortcuts.page:336(p) -msgid "Zoom in." -msgstr "Zoom avant." +#: C/strftime.page:308(td/p) +msgid "%w" +msgstr "%w" -#: C/shortcuts.page:342(key) -msgid "-" -msgstr "-" +#: C/strftime.page:311(td/p) +msgid "" +"The day of the week as a decimal, range 0 to 6, Sunday being 0. See also %u." +msgstr "" +"Le jour de la semaine sous la forme d'un nombre décimal, compris entre 0 et " +"6, le dimanche correspond à 0. Consultez également %u." -#: C/shortcuts.page:346(p) -msgid "Zoom out." -msgstr "Zoom arrière." +#: C/strftime.page:317(td/p) +msgid "%W" +msgstr "%W" -#: C/shortcuts.page:351(p) -msgid "1 or z or / (numeric keypad)" -msgstr "1 ou z ou / (pavé numérique)" +#: C/strftime.page:320(td/p) +msgid "" +"The week number of the current year as a decimal number, range 00 to 53, " +"starting with the first Monday as the first day of week 01." +msgstr "" +"Le numéro de la semaine de l'année actuelle sous la forme d'un nombre " +"décimal, compris entre 00 et 53, le premier lundi est le premier jour de la " +"semaine 01." -#: C/shortcuts.page:357(p) -msgid "Actual size." -msgstr "Taille réelle." +#: C/strftime.page:327(td/p) +msgid "%x" +msgstr "%x" -#: C/shortcuts.page:362(p) -msgid "x or * (numeric keypad)" -msgstr "x ou * (pavé numérique)" +#: C/strftime.page:330(td/p) +msgid "" +"The preferred date representation for the current locale without the time." +msgstr "" +"La représentation préférée de la date conformément à l'environnement " +"linguistique actuel, sans l'heure." -#: C/shortcuts.page:367(p) -msgid "Zoom to fit (scales down only, does not magnify)" -msgstr "Taille ajustée (uniquement en réduction, pas d'agrandissement)" +#: C/strftime.page:336(td/p) +msgid "%X" +msgstr "%X" -#: C/shortcuts.page:375(key) -msgid "x" -msgstr "x" +#: C/strftime.page:339(td/p) +msgid "" +"The preferred time representation for the current locale without the date." +msgstr "" +"La représentation préférée de l'heure conformément à l'environnement " +"linguistique actuel, sans la date." -#: C/shortcuts.page:380(p) -msgid "Zoom to fit (scale down or magnify, as required)" -msgstr "Taille ajustée (réduction ou agrandissement selon les besoins)" +#: C/strftime.page:345(td/p) +msgid "%y" +msgstr "%y" -#: C/shortcuts.page:386(key) C/shortcuts.page:398(key) -msgid "Arrows" -msgstr "Flèches" +#: C/strftime.page:348(td/p) +msgid "The year as a decimal number without a century (range 00 to 99)." +msgstr "" +"L'année sous la forme d'un nombre décimal sans le siècle (compris entre 00 " +"et 99)." -#: C/shortcuts.page:390(p) -msgid "Scroll the image." -msgstr "Fait défiler l'image." +#: C/strftime.page:354(td/p) +msgid "%Y" +msgstr "%Y" -#: C/shortcuts.page:403(p) -msgid "Scroll the image faster." -msgstr "Fait défiler l'image plus rapidement." +#: C/strftime.page:357(td/p) +msgid "The year as a decimal number including the century." +msgstr "L'année sous la forme d'un nombre décimal avec le siècle." -#: C/shortcuts.page:410(title) -msgid "Browser Navigation" -msgstr "Déplacement dans le navigateur" +#: C/strftime.page:362(td/p) +msgid "%z" +msgstr "%z" -#: C/shortcuts.page:420(p) -msgid "Go to the first file in the browser view." -msgstr "Va au premier fichier dans le navigateur." +#: C/strftime.page:365(td/p) +msgid "" +"The time-zone as hour offset from GMT. Required to emit RFC 822-conformant " +"dates (using \"%a, %d %b %Y %H:%M:%S %z\")." +msgstr "" +"Le fuseau horaire représenté par le décalage horaire par rapport à GMT. Ceci " +"est nécessaire pour émettre des dates conformes à RFC 822 (en utilisant " +"« %a, %d %b %Y %H:%M:%S %z »)." -#: C/shortcuts.page:431(p) -msgid "Go to the last file in the browser view." -msgstr "Va au dernier fichier dans le navigateur." +#: C/strftime.page:372(td/p) +msgid "%Z" +msgstr "%Z" -#: C/shortcuts.page:436(p) -msgid "Down Arrow or Page Down" -msgstr "Flèche bas ou Page bas" +#: C/strftime.page:375(td/p) +msgid "The time zone or name or abbreviation." +msgstr "Le fuseau horaire ou le nom ou l'abréviation." -#: C/shortcuts.page:441(p) -msgid "Scroll downwards through the thumbnails." -msgstr "Fait défiler les vignettes vers le bas." +#: C/strftime.page:380(page/p) +msgid "" +"Some conversion specifications can be modified by preceding the conversion " +"specifier character by the E or O modifier to indicate that an alternative " +"format should be used. If the alternative format or specification does not " +"exist for the current locale, the behaviour will be as if the unmodified " +"conversion specification were used. The Single Unix Specification mentions " +"%Ec, %EC, %Ex, %EX, %Ey, %EY, %Od, %Oe, %OH, %OI, %Om, %OM, %OS, %Ou, %OU, " +"%OV, %Ow, %OW, %Oy, where the effect of the O modifier is to use alternative " +"numeric symbols (say, roman numerals), and that of the E modifier is to use " +"a locale-dependent alternative representation." +msgstr "" +"Certaines spécifications de conversion peuvent être modifiées en faisant " +"précéder le caractère de spécification de la conversion par le modificateur " +"E ou O, pour indiquer qu'un format alternatif doit être utilisé. Si le " +"format alternatif ou la spécification n'existe pas dans l'environnement " +"linguistique actuel, le comportement reste le même que celui sans le " +"modificateur. Le « Single Unix Specification » mentionne %Ec, %EC, %Ex, %EX, " +"%Ey, %EY, %Od, %Oe, %OH, %OI, %Om, %OM, %OS, %Ou, %OU, %OV, %Ow, %OW, %Oy où " +"les effets de l'utilisation du préfixe O sont l'utilisation d'autres " +"symboles numériques (comme des chiffres romains, par exemple) et que ceux du " +"préfixe E sont l'usage d'une représentation alternative dépendante de " +"l'environnement linguistique." -#: C/shortcuts.page:446(p) -msgid "Up Arrow or Page Up" -msgstr "Flèche haut ou Page haut" +#: C/introduction.page:6(page/title) +msgid "About gThumb" +msgstr "À propos de gThumb" -#: C/shortcuts.page:451(p) -msgid "Scroll upwards through the thumbnails." -msgstr "Fait défiler les vignettes vers le haut." +#: C/introduction.page:8(page/p) +msgid "" +"gThumb is an image viewer and browser written for the GNOME " +"environment. It lets you browse your hard disk, showing you thumbnails of " +"image files and view single images of many different formats." +msgstr "" +"gThumb est un navigateur et visionneur d'images écrit pour " +"l'environnement GNOME. Il vous permet de naviguer sur votre disque dur en " +"affichant des vignettes des images et d'afficher des images seules dans de " +"nombreux formats." + +#: C/introduction.page:13(page/p) +msgid "" +"gThumb supports the most common graphics formats, including JPEG, " +"GIF, TIF, and PNG. gThumb will also display other less common " +"image types if the supporting libraries are installed, including TGA, ICO, " +"BMP, XPM, and others." +msgstr "" +"gThumb prend en charge les formats graphiques les plus courants " +"parmi JPEG, GIF, TIF et PNG. gThumb affiche aussi des types " +"d'images moins courants, si les bibliothèques de prise en charge sont " +"installées, parmi TGA, ICO, BMP, XPM et bien d'autres." -#: C/shortcuts.page:457(key) C/shortcuts.page:467(key) -#: C/shortcuts.page:478(key) -msgid "Alt" -msgstr "Alt" - -#: C/shortcuts.page:457(key) -msgid "Left Arrow" -msgstr "Flèche gauche" +#: C/introduction.page:18(page/p) +msgid "" +"Some support for RAW image types is included, especially if the dcraw " +"program is installed on your system." +msgstr "" +"La prise en charge de certains types d'images RAW est incluse, plus " +"particulièrement si le programme « dcraw » est installé sur votre système." -#: C/shortcuts.page:461(p) -msgid "Go back to the previously viewed folder." -msgstr "Retourne au précédent dossier visité." +#: C/introduction.page:21(page/p) +msgid "" +"gThumb not only lets you view image files but has many other " +"features such as adding comments to images, organizing images into catalogs, " +"printing images, slideshows, setting your desktop background, and more." +msgstr "" +"gThumb permet non seulement d'afficher des images, mais il " +"présente d'autres possibilités telles que l'ajout de commentaires aux " +"images, l'organisation des images dans des catalogues, l'impression des " +"images, l'affichage en diaporama, le paramétrage de l'arrière-plan du bureau " +"et bien d'autres." -#: C/shortcuts.page:467(key) -msgid "Right Arrow" -msgstr "Flèche droite" +#: C/introduction.page:26(page/p) +msgid "" +"gThumb includes a tool to import photos from attached cameras and " +"memory card readers." +msgstr "" +"gThumb inclut un outil d'importation de photos à partir des " +"appareils photos connectés et des lecteurs de cartes mémoire." -#: C/shortcuts.page:471(p) -msgid "Go forward (after going back to a folder)." -msgstr "Avance (après être revenu d'un dossier)." +#: C/introduction.page:29(page/p) +msgid "" +"gThumb can read EXIF, XMP, and IPTC metadata that is commonly " +"embedded in files." +msgstr "" +"gThumb peut lire les méta-données EXIF, XMP et IPTC qui sont très " +"souvent intégrées dans les fichiers." -#: C/shortcuts.page:479(key) -msgid "Up" -msgstr "Flèche haut" +#: C/introduction.page:32(page/p) +msgid "" +"gThumb provides a systems of extensions (or plug-ins), to allow " +"users to extend the functionality of gThumb." +msgstr "" +"gThumb fournit un système d'extensions (ou greffons) qui " +"permettent aux utilisateurs d'étendre les fonctionnalités de gThumb." -#: C/shortcuts.page:484(p) -msgid "Go up one level." -msgstr "Remonte d'un niveau." +#: C/introduction.page:34(page/p) +msgid "" +"More information about these extensions, and about gThumb " +"generally, is available at http://live.gnome.org/gthumb." +msgstr "" +"Plus d'informations à propos de ces extensions, et de gThumb en " +"général, sont disponibles sur cette page http://live.gnome.org/gthumb." -#: C/shortcuts.page:491(title) -msgid "Slideshow controls" -msgstr "Contrôles du diaporama" +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/browser.page:13(media) +msgctxt "_" +msgid "" +"external ref='figures/main-win.png' md5='93cf84bd05a153ab61951ae12bbe3f26'" +msgstr "" +"external ref='figures/main-win.png' md5='93cf84bd05a153ab61951ae12bbe3f26'" -#: C/shortcuts.page:504(key) -msgid "F5" -msgstr "F5" +#: C/browser.page:6(page/title) +msgid "Browsing Your Files" +msgstr "Navigation parmi vos fichiers" -#: C/shortcuts.page:508(p) -msgid "Start a slideshow." -msgstr "Démarre un diaporama." +#: C/browser.page:8(page/p) +msgid "When you start gThumb the following window is displayed:" +msgstr "Quand vous lancez gThumb la fenêtre suivante s'affiche :" -#: C/shortcuts.page:514(key) -msgid "Space" -msgstr "Espace" +#: C/browser.page:11(figure/title) +msgid "The main window" +msgstr "La fenêtre principale" -#: C/shortcuts.page:518(p) -msgid "Pause/Unpause the slideshow." -msgstr "Interrompt/reprend le diaporama." +#: C/browser.page:16(page/p) +msgid "The gThumb browser contains the following elements:" +msgstr "Le navigateur gThumb contient les éléments suivants :" -#: C/shortcuts.page:528(p) -msgid "Close the slideshow." -msgstr "Ferme le diaporama." +#: C/browser.page:20(item/title) +msgid "Menubar" +msgstr "Barre de menus" -#: C/shortcuts.page:533(p) -msgid "Down Arrow or Right Arrow or Page Down" +#: C/browser.page:21(item/p) +msgid "" +"The menus on the menubar contain all of the commands that you can use in " +"gThumb" msgstr "" -"Flèche bas ou Flèche droite ou Page bas" +"Les menus de la barre de menus contiennent toutes les commandes que vous " +"pouvez utiliser dans gThumb." -#: C/shortcuts.page:538(p) -msgid "Load the next image." -msgstr "Charge l'image suivante." +#: C/browser.page:25(item/title) +msgid "Toolbar" +msgstr "Barre d'outils" -#: C/shortcuts.page:543(p) -msgid "Up Arrow or Left Arrow or Page Up" +#: C/browser.page:26(item/p) +msgid "" +"The toolbar contains a subset of the commands that you can access from the " +"menubar. In particular, the Tools button contains functions for batch " +"processing multiple images." msgstr "" -"Flèche haut ou Flèche gauche ou Page haut" +"La barre d'outils contient un sous-ensemble des commandes accessibles à " +"partir de la barre de menus. En particulier, le bouton Outils contient " +"certaines fonctions de traitement par lot des images." -#: C/shortcuts.page:548(p) -msgid "Load the previous image." -msgstr "Charge l'image précédente." +#: C/browser.page:31(item/title) +msgid "Locationbar" +msgstr "Barre d'adresse" -#: C/printing.page:7(title) -msgid "Printing Images" -msgstr "Impression d'images" +#: C/browser.page:32(item/p) +msgid "The locationbar contains the current folder or catalog name." +msgstr "La barre d'adresse contient le nom du dossier ou du catalogue actuel." -#: C/printing.page:9(p) -msgid "" -"To print the current image in the viewer mode, use FilePrint or Ctrlp." -msgstr "" -"Pour imprimer l'image actuellement affichée dans le visionneur, utilisez " -"FichierImprimer ou Ctrlp." +#: C/browser.page:36(item/title) +msgid "Folder Tree" +msgstr "Arborescence des dossiers" -#: C/printing.page:13(p) +#: C/browser.page:37(item/p) msgid "" -"To print one or more images from the browser mode, select the desired images " -"and then use FilePrint or " -"Ctrlp." +"The folder tree allows you to navigate the filesystem. Single-clicking on a " +"folder will load its images in the browser view. Double-clicking a folder, " +"or clicking the expander arrow, will also list folder's subfolders in the " +"tree." msgstr "" -"Pour imprimer une ou plusieurs images depuis le navigateur, sélectionnez les " -"images souhaitées et utilisez FichierImprimer ou Ctrlp." +"L'arborescence des dossiers vous permet de parcourir le système de fichiers. " +"Cliquez sur un dossier pour charger les images qu'il contient dans la " +"fenêtre de navigation. Double-cliquez sur un dossier ou cliquez sur la " +"flèche d'extension pour afficher la liste des sous-dossiers qu'il contient " +"dans l'arborescence." -#: C/printing.page:18(p) +#: C/browser.page:44(item/title) +msgid "Browser View" +msgstr "Fenêtre de Navigation" + +#: C/browser.page:45(item/p) msgid "" -"The printer to use can be selected from the General tab of the " -"print dialog." +"The browser view shows the images in the current folder or catalog. Single-" +"clicking an image will enable the Information Sidebar for that image. Double-" +"clicking an image will open it in the viewer mode. Double-clicking with the " +"middle mouse button will load the image in fullscreen viewer mode." msgstr "" -"L'imprimante à utiliser peut être sélectionnée dans l'onglet Général de la boîte de dialogue d'impression." +"La fenêtre de navigation affiche les images contenues dans le dossier ou le " +"catalogue actuel. Cliquez sur une image pour activer la barre latérale " +"d'informations pour cette image. Double-cliquez sur une image pour l'ouvrir " +"en mode de visualisation. Double-cliquez avec le bouton central de la souris " +"pour charger l'image en mode d'affichage plein écran." -#: C/printing.page:21(p) +#: C/browser.page:52(item/title) +msgid "Organize Button" +msgstr "Bouton Organiser" + +#: C/browser.page:53(item/p) msgid "" -"The type of paper to use can be selected from the Page Setup tab." +"The Organize button, just above the browser view, allows you to group images " +"into catalogs." msgstr "" -"Le type de papier à utiliser peut être sélectionné dans l'onglet Mise " -"en page de la boîte de dialogue d'impression." +"Le bouton Organiser, juste au dessus de la fenêtre de navigation, vous " +"permet de regrouper les images dans des catalogues." -# note preview is separated window -#: C/printing.page:24(p) +#: C/browser.page:57(item/title) +msgid "Statusbar" +msgstr "Barre d'état" + +#: C/browser.page:58(item/p) +msgid "On the statusbar you can read:" +msgstr "Dans la barre d'état, vous pouvez lire :" + +#: C/browser.page:61(item/p) msgid "" -"The Layout tab provides some additional gThumb-" -"specific options. You can set the number of images to include on each page " -"here, and a preview pane is provided. Captions can also be added under the " -"image, in a configurable font. The captions can be chosen from a selection " -"of listed file attributes (like the file name, the date of the photo, camera " -"shutter speed, and others). Each image can be repositioned inside its print " -"area using the controls on this tab." +"the total number of images contained in the current folder or catalog and " +"their total size." msgstr "" -"L'onglet Agencement fournit des options supplémentaires " -"spécifiques à gThumb. Vous pouvez définir le nombre d'images à " -"inclure dans chaque page et un onglet de prévisualisation est disponible. Il " -"est possible d'ajouter une légende sous l'image, la police de caractère de " -"celle-ci est paramétrable. Les légendes peuvent être choisies parmi les " -"différents attributs de l'image (tel que le nom du fichier, la date de la " -"prise de vue, la vitesse d'obturation et bien d'autres). Chaque image peut " -"être repositionnée dans sa zone d'impression à l'aide des éléments de " -"contrôle de cet onglet." +"le nombre total d'images contenues dans le dossier ou le catalogue actuel et " +"la taille totale," -#: C/printing.page:34(p) -msgid "When you are ready to print, press the Print button." -msgstr "" -"Quand vous êtes prêt à imprimer, appuyez sur le bouton Imprimer." +#: C/browser.page:65(item/p) +msgid "the number of the selected images and their size." +msgstr "le nombre d'images sélectionnées et leur taille," + +#: C/browser.page:68(item/p) +msgid "some properties of the currently focused image." +msgstr "certaines propriétés de l'image actuellement sélectionnée." + +#: C/browser.page:73(item/title) +msgid "Information Sidebar" +msgstr "Barre latérale d'informations" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/filtering.page:17(None) +#: C/browser.page:74(item/p) msgid "" -"@@image: 'figures/general-filter.png'; md5=818fcb0f12da6496f3c72699f12beb28" +"If a single image is selected, the information sidebar (below the folder " +"tree) will display detailed information (such as EXIF or XMP tags) about the " +"selected image." msgstr "" -"@@image: 'figures/general-filter.png'; md5=818fcb0f12da6496f3c72699f12beb28" +"Si une seule image est sélectionnée, la barre latérale d'informations (sous " +"l'arborescence des dossiers) affiche les informations détaillées de l'image " +"sélectionnée (telles que les balises EXIF ou XMP)." + +#: C/browser.page:79(item/title) +msgid "Filter Bar" +msgstr "Barre de filtre" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/filtering.page:30(None) +#: C/browser.page:80(item/p) msgid "" -"@@image: 'figures/specific-filter.png'; md5=e7036e5b958301c6acb3ab5e4a618bbe" +"An image filtering tool is provided just below the browser view. This can be " +"used to filter the displayed images. For example, the browser view can be " +"limited to files of a certain size, date, or name pattern, or other " +"characteristics." msgstr "" -"@@image: 'figures/specific-filter.png'; md5=e7036e5b958301c6acb3ab5e4a618bbe" +"Un outil de filtrage des images est fourni en dessous de la fenêtre de " +"navigation. Il est utilisé pour filtrer les images affichées. Par exemple, " +"la fenêtre de navigation peut être limitée aux fichiers d'une certaine " +"taille, date, motif de nom ou d'autres caractéristiques." -#: C/filtering.page:7(title) -msgid "Filtering Files" -msgstr "Filtrage des fichiers" +#: C/batch-rotate.page:6(page/title) +msgid "Rotating Images Losslessly" +msgstr "Rotation d'images sans perte" -#: C/filtering.page:9(p) C/thumbnails.page:12(p) +#: C/batch-rotate.page:8(page/p) msgid "" -"You can select what types of files to show in the browser view using the " -"ViewFilter dialog. The default is to " -"show all media files (images, movies, audio), but this can be made more or " -"less restrictive." +"To rotate one or more images, select the images in the browser view. Then " +"click the Tools button on the main toolbar, and select either " +"ToolsRotate Right or " +"ToolsRotate Left. The images will be " +"rotated." msgstr "" -"Vous pouvez sélectionner les types de fichiers à afficher dans le navigateur " -"en utilisant la boîte de dialogue AffichageFiltres. Par défaut tous les fichiers multimédia (image, vidéo, audio) " -"sont affichés, mais cela peut être rendu plus ou moins strict." +"Pour faire pivoter une ou plusieurs images, sélectionnez les images dans le " +"navigateur. Cliquez ensuite sur le bouton Outils sur la barre " +"d'outils principale et choisissez ensuite soit OutilsPivoter vers la droite ou OutilsPivoter vers la gauche. Les images sont ensuite " +"tournées." -#: C/filtering.page:15(title) -msgid "Enabling Filters" -msgstr "Activation des filtres" +#: C/batch-rotate.page:14(page/p) +msgid "Lossless rotation is used for jpeg images, when possible." +msgstr "" +"La rotation sans perte est utilisée pour les images jpeg lorsque c'est " +"possible." + +#: C/batch-convert-format.page:6(page/title) +msgid "Converting File Formats" +msgstr "Conversion du format des fichiers" -#: C/filtering.page:20(p) +#: C/batch-convert-format.page:8(page/p) msgid "" -"The figure above shows how to configure gThumb to display media " -"files only, by setting the General Filter." +"To convert one or more images into a new file format, select the images in " +"the browser view. Then click the Tools button on the main " +"toolbar, and select ToolsConvert Format." msgstr "" -"La figure ci-dessus montre comment configurer gThumb pour que " -"seuls les fichiers multimédias s'affichent, en paramétrant le Filtre " -"général." +"Pour convertir une ou plusieurs images dans un nouveau format, sélectionnez " +"les images que vous voulez convertir dans le navigateur. Cliquez ensuite sur " +"le bouton Outils dans la barre d'outils principale et " +"sélectionnez OutilsConvertir le format." -#: C/filtering.page:23(p) +#: C/batch-convert-format.page:12(page/p) msgid "" -"Also, by enabling Filename in Other Filters, a filter-" -"by-filename ability is added to the filter bar at the bottom of the browser " -"view:" +"Select the desired output format and destination folder. Click Execute to complete the process." msgstr "" -"Si vous activez Nom du fichier dans Autres filtres, la " -"fonctionnalité de filtrage par nom est ajoutée à la barre de filtre en bas " -"de la fenêtre de visualisation :" +"Sélectionnez le format de sortie souhaité et le dossier de destination. " +"Cliquez sur Exécuter pour terminer le processus." -#: C/filtering.page:28(title) -msgid "Browser Filter Bar" -msgstr "Barre de filtre du navigateur" +#: C/batch-resize.page:6(page/title) +msgid "Resizing Images" +msgstr "Redimensionnement des images" -#: C/filtering.page:33(p) +#: C/batch-resize.page:8(page/p) msgid "" -"In the above figure, the filename filter has been configured to show only " -"files with \"gen\" in the filename. The matching is case-insensitive." +"To resize one or more images using the same dimensions or scaling factors, " +"select the images in the browser view. Then click the Tools " +"button on the main toolbar, and select ToolsResize " +"Images." msgstr "" -"Dans la figure ci-dessus, le filtre « Nom de fichier » est configuré pour " -"n'afficher que ceux qui contiennent « gen ». Le critère de recherche n'est " -"pas sensible à la casse." - -#: C/sorting.page:7(title) -msgid "Sorting Files" -msgstr "Tri des fichiers" +"Pour redimensionner une ou plusieurs images à la même taille ou avec le même " +"rapport d'échelle, sélectionnez les fichiers dans le navigateur. Cliquez " +"ensuite sur le bouton Outils dans la barre d'outils principale et " +"sélectionnez OutilsRedimensionner les images." -#: C/sorting.page:9(p) +#: C/batch-resize.page:12(page/p) msgid "" -"Use the ViewSort By menu to select " -"the desired file-sorting method for the browser view. Files can be sorted on " -"the basis of their name, the file size, the file modification date, or the " -"date the photo was taken." +"Then select the desired maximum output dimensions, or the desired percentage " +"scaling, and the destination folder. Click Execute to complete " +"the process." msgstr "" -"Utilisez le menu AffichageTrier par " -"pour sélectionner la méthode de tri des fichiers désirée dans la vue du " -"navigateur. Les fichiers peuvent être triés par nom, taille, date de " -"modification ou date de prise de vue." +"Sélectionnez alors les dimensions maximales de sortie souhaitées ou le " +"pourcentage de l'échelle et le dossier de destination. Cliquez sur " +"Exécuter pour terminer le processus." -#: C/fullscreen.page:8(title) -msgid "Manual Fullscreen Mode" -msgstr "Mode plein écran manuel" +#: C/batch-change-date.page:6(page/title) +msgid "Changing Dates" +msgstr "Modification de dates" -#: C/fullscreen.page:10(p) +#: C/batch-change-date.page:8(page/p) msgid "" -"Pressing f in the browser or viewer modes will display the " -"current image in fullscreen mode. (In the browser mode, you can also double-" -"click with the middle mouse button.)" +"To change the file modification times, the comment dates, or the Exif " +"DateTimeOriginal tags of multiple files, select the files in the browser " +"view. Then click the Tools button on the main toolbar, and select " +"ToolsChange Date." msgstr "" -"Lorsque vous appuyez sur la touche f dans le navigateur ou le " -"visionneur, l'image actuelle s'affiche alors plein écran (dans le " -"navigateur, vous pouvez aussi cliquer deux fois avec le bouton du milieu)." +"Pour changer la date de modification de fichiers, les dates des commentaires " +"ou l'étiquette Exif « DateTimeOriginal » de plusieurs fichiers, sélectionnez " +"les fichiers dans le navigateur, cliquez ensuite sur le bouton Outils dans la barre d'outils principale et sélectionnez OutilsModifier la date." -#: C/fullscreen.page:14(p) +#: C/batch-change-date.page:13(page/p) msgid "" -"Moving the mouse will activate a popup control panel briefly. This can be " -"used to navigate to the next or previous image, or change zoom levels." +"Select the desired date options, and click Execute to complete " +"the process." msgstr "" -"Lorsque que vous déplacez la souris vous activez brièvement un panneau de " -"contrôle. Il peut être utilisé pour naviguer vers l'image suivante ou " -"précédente ou pour modifier le niveau de zoom." +"Sélectionnez les options de dates souhaitées et cliquez sur Exécuter pour terminer le processus." -#: C/fullscreen.page:18(p) -msgid "" -"You can also advance to the next image by pressing PageDown or " -"Space." -msgstr "" -"Vous pouvez aussi appuyer sur Page bas ou Espace pour " -"aller à l'image suivante." +#: C/batch-scripts.page:6(page/title) +msgid "User-Defined Scripts" +msgstr "Scripts utilisateur" -#: C/fullscreen.page:21(p) +#: C/batch-scripts.page:8(page/p) msgid "" -"You can go back to the previous image by pressing PageUp or " -"Backspace." +"To define a script (a command-line sequence that gThumb will " +"execute on your files), click the Tools button on the main " +"toolbar, and select ToolsPersonalize." msgstr "" -"Vous pouvez appuyer sur la touche Page Haut ou Retour " -"arrière pour aller à l'image précédente." +"Pour définir un script (une succession de lignes de commandes que " +"gThumb exécute sur vos fichiers), cliquez sur le bouton " +"Outils dans la barre d'outils principale et sélectionnez " +"OutilsPersonnaliser." -#: C/fullscreen.page:24(p) -msgid "This can be used to implement a manually-controlled slideshow." -msgstr "" -"Vous pouvez utiliser ce mode pour préparer un diaporama contrôlé " -"manuellement." +#: C/batch-scripts.page:12(page/p) +msgid "TODO: further documentation is need here." +msgstr "TODO: la documentation doit être complétée ici." -#: C/fullscreen.page:27(p) -msgid "To exit the fullscreen mode, press f or Escape." -msgstr "" -"Pour quitter le mode d'affichage plein écran, appuyez sur f ou " -"Échap." +#: C/thumbnails.page:6(page/title) +msgid "Thumbnail Sources" +msgstr "Sources des vignettes" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/viewer.page:23(None) C/thumbnail-pane.page:21(None) +#: C/thumbnails.page:8(page/p) msgid "" -"@@image: 'figures/thumbnail-pane.png'; md5=af28541956094195dac6bc0e11624d64" +"The browser window normally shows the thumbnails of the images and movies in " +"the selected folder. Generic icons for other files (audio files, for " +"instance) may also be shown." msgstr "" -"@@image: 'figures/thumbnail-pane.png'; md5=af28541956094195dac6bc0e11624d64" - -#: C/viewer.page:6(title) -msgid "Opening an Image" -msgstr "Ouverture d'une image" +"La fenêtre de navigation affiche normalement les vignettes des images et " +"vidéos du dossier sélectionné. Les icônes génériques des autres fichiers " +"(audio par exemple) peuvent aussi être affichées." -#: C/viewer.page:8(p) +#: C/thumbnails.page:12(page/p) msgid "" -"The browser view shows the images in the current folder or catalog (see " -"). Double-clicking an image (or pressing " -"Return) in the browser will open it in the viewer mode." +"You can select what types of files to show in the browser view using the " +"ViewFilter dialog. The default is to " +"show all media files (images, movies, audio), but this can be made more or " +"less restrictive." msgstr "" -"Le navigateur affiche les images contenues dans le dossier ou le catalogue " -"actuel (voir la section ). Double-" -"cliquez sur une image (ou appuyez sur Entrée) dans le navigateur " -"pour ouvrir celle-ci dans le visionneur." +"Vous pouvez sélectionner les types de fichiers à afficher dans le navigateur " +"en utilisant la boîte de dialogue AffichageFiltres. Par défaut tous les fichiers multimédia (image, vidéo, audio) " +"sont affichés, mais cela peut être rendu plus ou moins strict." -#: C/viewer.page:13(p) +#: C/thumbnails.page:18(page/p) msgid "" -"Pressing Escape will exit the viewer mode, and return the user to " -"the browser mode. A toolbar button (View the folders) is also " -"provided for this purpose." +"The thumbnails may be generated by a number of different methods. " +"gThumb will first check for existing thumbnails in the system " +"cache." msgstr "" -"Appuyer sur Échap permet de quitter le visionneur et de retourner " -"dans le navigateur. Un bouton de la barre d'outils (Afficher les " -"dossiers) est aussi fourni dans ce but." +"Les vignettes peuvent être générées de plusieurs façons, gThumb " +"vérifie en premier si des vignettes n'existent pas déjà dans le cache du " +"système." -#: C/viewer.page:17(p) +#: C/thumbnails.page:22(page/p) msgid "" -"A may be displayed in the viewer " -"mode, if desired." +"If no cached thumbnail is found, and an image file contains an embedded " +"thumbnail (jpeg files generated by digital cameras normally do), " +"gThumb will attempt to use that. gThumb will confirm " +"that the aspect ratio of the thumbnail is similar to that of the main image, " +"and ignore thumbnails that do not appear to match the main image." msgstr "" -"Le peut être affiché dans le " -"visionneur, si vous le souhaitez." - -#: C/viewer.page:21(title) -msgid "Viewer Mode with Thumbnail Pane" -msgstr "Visionneur avec volet des vignettes" +"Si aucune vignette n'est trouvée dans le cache et que l'image contient une " +"vignette intégrée (généralement les images jpeg générées par les appareils " +"photo numériques en contiennent une), gThumb essaye alors " +"d'utiliser celle-ci. gThumb vérifie que les proportions de la " +"vignette correspondent à celle de l'image et ignore les vignettes qui ne " +"semblent pas correspondre à l'image principale." -#: C/viewer.page:26(p) +#: C/thumbnails.page:29(page/p) msgid "" -"In the viewer mode, you can advance to the next image by clicking the " -"Next button, or by pressing Space or Page Down. You can go back to the previous image by clicking the Previous button, or by pressing Backspace or Page Up. You " -"can go also click on thumbnails in the thumbnail pane to open a different " -"image." +"If that doesn't work, gThumb will attempt to load the entire file " +"and generate a scaled-down thumbnail." msgstr "" -"Dans le visionneur, cliquez sur le bouton Suivant ou appuyez sur " -"les touches Espace ou Page bas pour aller à l'image " -"suivante. Pour retourner à l'image précédente, cliquez sur le bouton " -"Précédent ou appuyez sur les touches Retour Arrière ou " -"Page haut. Vous pouvez aussi cliquer sur les vignettes dans le " -"volet des vignettes pour ouvrir une autre image." +"Si cela ne fonctionne pas, gThumb tente de charger le fichier " +"complet et de générer une vignette à l'échelle." -#: C/gimp.page:6(title) -msgid "Launching GIMP" -msgstr "Lancement de GIMP" +#: C/thumbnails.page:32(page/p) +msgid "" +"Lastly, gThumb will use any system-defined scripts for " +"thumbnailing particular media types. For example, some systems may use " +"mplayer or totem or other movie viewers to generate " +"movie thumbnails." +msgstr "" +"Enfin, gThumb utilise tous les scripts définis par le système " +"pour le vignettage des différents types de supports. Par exemple, certains " +"systèmes utilisent mplayer ou totem ou un autre " +"lecteur vidéo pour générer les vignettes de vidéos." -#: C/gimp.page:7(p) +#: C/thumbnails.page:37(page/p) msgid "" -"If you have files selected in the browser, or an image open in the viewer, " -"you can open them in the GNU Image Manipulation Program (GIMP) by " -"pressing g." +"gThumb will save thumbnails to a system cache, to share them with " +"other applications. By default, Gnome systems prune cached thumbnails when " +"they are older than 180 days, or when the thumbnail cache exceeds 512 MB. " +"Technically-inclined users can explore these settings with gconf-" +"editor. See the /desktop/gnome/thumbnail_cache/maximum_age and /" +"desktop/gnome/thumbnail_cache/maximum_size keys in particular. Certain " +"applications (like F-Spot) may automatically increase these " +"settings greatly." msgstr "" -"Si des fichiers sont sélectionnés dans le navigateur ou si une image est " -"ouverte dans le visionneur, vous pouvez les ouvrir dans l'Éditeur " -"d'images GIMP en appuyant sur la touche g." +"gThumb enregistre les vignettes dans un cache système pour les " +"partager avec les autres applications. Par défaut, les systèmes GNOME " +"effacent les vignettes dans le cache lorsqu'elles ont plus de 180 jours ou " +"que la taille du cache excède 512 Mio. Les utilisateurs plus techniques qui " +"peuvent examiner ces paramètres avec gconf-editor. Consultez plus " +"particulièrement les clés /desktop/gnome/thumbnail_cache/maximum_age et /" +"desktop/gnome/thumbnail_cache/maximum_size. Certaines applications (comme " +"F-Spot) peuvent augmenter automatiquement ces paramètres " +"drastiquement." -#: C/gimp.page:10(p) +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/thumbnail-pane.page:21(media) C/viewer.page:23(media) +msgctxt "_" msgid "" -"GIMP provides a more sophisticated set of editing tools than that " -"provided with gThumb." +"external ref='figures/thumbnail-pane.png' " +"md5='af28541956094195dac6bc0e11624d64'" msgstr "" -"GIMP fournit un ensemble d'outils de modification plus " -"sophistiqués que ceux fournis avec gThumb." +"external ref='figures/thumbnail-pane.png' " +"md5='af28541956094195dac6bc0e11624d64'" -#: C/extensions.page:6(title) -msgid "Extending gThumb" -msgstr "Extension de gThumb" +#: C/thumbnail-pane.page:6(page/title) +msgid "Thumbnail Pane" +msgstr "Volet des vignettes" -#: C/extensions.page:8(p) +#: C/thumbnail-pane.page:8(page/p) msgid "" -"gThumb has a plug-in system for extensions. Some standard " -"features are implemented as extensions and are supplied with the standard " -"distribution. Users may write (and share) additional extensions." +"When an image has been opened in the gThumb viewer, the user has " +"the option of enabling or disabling a thumbnail pane, which shows the other " +"images in the folder as thumbnails. This feature can be toggled with the " +"ViewThumbnail Pane command, or by " +"pressing F8." msgstr "" -"gThumb possède un système de greffons pour ses extensions. " -"Certaines fonctionnalités de base sont implémentées sous la forme " -"d'extensions et sont fournies avec la distribution standard. Les " -"utilisateurs peuvent écrire (et partager) des extensions supplémentaires." +"Lorsqu'une image est ouverte dans le visionneur gThumb, " +"l'utilisateur peut afficher ou masquer le volet des vignettes qui affiche " +"les autres images contenues dans le dossier sous forme de vignettes. Cette " +"fonction peut être activée/désactivée avec la commande " +"AffichagePanneau des vignettes ou " +"avec la toucheF8." -#: C/extensions.page:12(p) +#: C/thumbnail-pane.page:14(page/p) msgid "" -"You can enable or disable extensions using EditExtensions. Some extensions will have " -"Preferences that can be modified from this dialog." +"The thumbnail pane may be positioned along the bottom of the main image, or " +"along the side. This is controlled by the settings in EditPreferencesGeneralThumbnails in Viewer." msgstr "" -"Pour activer ou désactiver des extensions, utilisez le menu " -"ÉditionExtensions. Certaines " -"extensions possèdent des Préférences qui peuvent être configurées " -"dans cette boîte de dialogue." +"Le volet des vignettes peut être placé en bas de l'image principale ou sur " +"le coté. Vous pouvez modifier ce paramètre dans ÉditionPréférencesGénéralVignettes dans le " +"visionneur." -#: C/extensions.page:16(p) +#: C/thumbnail-pane.page:19(figure/title) +msgid "Thumbnail Pane, Along Bottom of Main Image" +msgstr "Volet des vignettes, en bas de l'image principale" + +#: C/rename-series.page:8(page/title) +msgid "Renaming Files" +msgstr "Renommage de fichiers" + +#: C/rename-series.page:10(page/p) msgid "" -"This manual is written with the assumption that the standard extensions are " -"enabled. If you seem to be missing a feature, check to see which extensions " -"are actually enabled." -msgstr "" -"Ce manuel est écrit en supposant que les extensions de base sont activées. " -"S'il vous semble qu'une fonction est manquante, vérifiez les extensions " -"activées." +"To rename one or more images using a name template, select the files in the " +"browser and choose EditRename, or " +"press F2." +msgstr "" +"Pour renommer une ou plusieurs images en spécifiant un modèle de nom, " +"choisissez ÉditionRenommer ou appuyez " +"sur F2." -#: C/extensions.page:20(p) +#: C/rename-series.page:15(page/p) msgid "" -"If you would like to write your own extension, please visit http://live.gnome.org/gthumb for " -"development information. An example extension is provided in the source " -"code, which you can base your own extension on." +"The name template is simply a pattern that is used for renaming all of the " +"selected images. You can use some special characters to make the new names " +"differ each other (this is essential if you are renaming more than one " +"image, and optional if you are renaming a single image):" msgstr "" -"Si vous souhaitez écrire votre propre extension, visitez http://live.gnome.org/gthumb pour obtenir des " -"informations sur le développement. Un exemple d'extension est fourni dans le " -"code source, il peut vous servir de point de départ pour votre extension." +"Le modèle de nom est simplement un motif qui est utilisé pour renommer " +"toutes les images sélectionnées. Vous pouvez utiliser des caractères " +"spéciaux afin que les noms de fichiers diffèrent entre eux (c'est essentiel " +"si vous renommez plus d'une image, et facultatif si vous renommez une seule " +"image) :" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/edit-redeye.page:7(None) C/edit-resize-crop.page:8(None) -#: C/edit-rotate.page:8(None) C/edit-colors.page:8(None) -#: C/edit-save-undo-redo.page:8(None) C/index.page:33(None) -msgid "@@image: 'figures/palette.png'; md5=32835e7d77efd9833244ca80a4adb48e" -msgstr "@@image: 'figures/palette.png'; md5=32835e7d77efd9833244ca80a4adb48e" +#: C/rename-series.page:24(td/p) +msgid "Symbol" +msgstr "Symbole" -#: C/edit-redeye.page:6(title) -msgid "Red Eye Removal" -msgstr "Correction des yeux rouges" +#: C/rename-series.page:27(td/p) C/shortcuts.page:17(td/p) +#: C/shortcuts.page:94(td/p) C/shortcuts.page:189(td/p) +#: C/shortcuts.page:273(td/p) C/shortcuts.page:498(td/p) +msgid "Description" +msgstr "Description" + +#: C/rename-series.page:32(td/p) +msgid "#" +msgstr "#" -#: C/edit-redeye.page:7(p) C/edit-resize-crop.page:8(p) -#: C/edit-rotate.page:8(p) C/edit-colors.page:8(p) -#: C/edit-save-undo-redo.page:8(p) +#: C/rename-series.page:37(td/p) msgid "" -" To " -"access the editing tools, open an image and then click the Edit File toolbar button (the palette icon)." +"This symbol will be replaced with the value of a counter that increments " +"itself by 1 passing from one image to another. If you specify this symbols " +"in sequence you'll get leading zeros if the counter value has a lesser " +"number of digits, for example ### will produce the sequence: 001, 002, 003, " +"etc.." msgstr "" -" Pour " -"accéder aux outils de modification, ouvrez une image et cliquez sur le " -"bouton Modifier le fichier de la barre d'outils (icône palette)." +"Ce symbole est remplacé par la valeur d'un compteur qui s'incrémente de 1 en " +"passant d'une image à une autre. Si vous spécifiez ce symbole plusieurs fois " +"à la suite, vous obtenez des zéros non significatifs si la valeur du " +"compteur possède moins de chiffres ; par exemple, ### produit la suite : " +"001, 002, 003, etc." -#: C/edit-redeye.page:11(p) -msgid "" -"gThumb provides a Red Eye Removal tool. To remove a " -"red eye, position the mouse pointer over the red eye and click on it. " -"gThumb will attempt to remove the red region and replace it with " -"a more natural-looking gray region. If the results do not look correct, " -"press Escape and click on the Undo item." +#: C/rename-series.page:47(td/p) +msgid "%F" msgstr "" -"gThumb fournit un outil de Correction des yeux rouges. " -"Pour corriger un œil rouge, positionnez le pointeur de la souris sur l'œil " -"et cliquez dessus. gThumb tente de supprimer la zone rouge et de " -"la remplacer par une zone grise plus naturelle. Si les résultats ne sont pas " -"satisfaisants, appuyez sur la touche Échap et cliquez sur le " -"bouton Annuler." -#: C/edit-redeye.page:18(p) +#: C/rename-series.page:52(td/p) msgid "" -"This tool works best when there is a high color contrast between the red eye " -"and the surrounding facial area. It does not work well for \"orange eye\" " -"sometimes seen in photos of children, or if the surrounding skin has a " -"reddish tinge. This tool could use improvement - if you are fiendishly " -"clever, love matrix algebra and open source software, please submit a patch!" +"This symbol will be replaced with the file's original name, excluding the " +"original extension." msgstr "" -"Cet outil fonctionne mieux lorsqu'il y a un contraste de couleur important " -"entre l'œil rouge et la zone du visage qui l'entoure. Il ne fonctionne pas " -"bien avec les « yeux orange » que l'on voit parfois sur les photos d'enfants, " -"ou si la peau autour de l'œil possède une teinte rouge. Cet outil peut être " -"amélioré ; si vous êtes très intelligent, aimez l'algèbre matricielle et le " -"logiciel libre, vous pouvez soumettre un correctif." +"Ce symbole est remplacé par le nom original du fichier, sans son extension." -#: C/edit-resize-crop.page:6(title) -msgid "Resizing and Cropping" -msgstr "Redimensionnement et découpe" +#: C/rename-series.page:58(td/p) +msgid "%E" +msgstr "" -#: C/edit-resize-crop.page:12(p) -msgid "Two tools are provided to resize and crop images." -msgstr "Il existe deux outils pour redimensionner et découper les images." +#: C/rename-series.page:63(td/p) +msgid "" +"This symbol will be replaced with the file's original filename extension." +msgstr "Ce symbole est remplacé par l'extension du nom de fichier original." -#: C/edit-resize-crop.page:15(gui) -msgid "Resize" -msgstr "Redimensionner" +#: C/rename-series.page:69(td/p) +msgid "%N" +msgstr "%N" -#: C/edit-resize-crop.page:16(p) +#: C/rename-series.page:74(td/p) msgid "" -"This allows you to resize the image. The image may be scaled to a certain " -"physical size, or to a certain percentage of the original size. The aspect " -"ratio may be locked to a specific value, or freely adjusted." +"This symbol will be replaced with original image enumerator. For instance, " +"if the original filename was IMG_9876.JPG, this extracts the \"9876\" " +"portion. If the filename has more than one group of digits embedded in it " +"(for example, IMG_123_456.JPG) only the first number will be used (\"123\" " +"in this example)." msgstr "" -"Cela vous permet de redimensionner une image. L'image peut être mise à " -"l'échelle à une taille physique donnée ou à un pourcentage de la taille " -"originale. Les proportions de l'image peuvent être conservées ou ajustées " -"librement." +"Ce symbole est remplacé par l'énumération de l'image originale. Par exemple, " +"si le nom de fichier original est IMG_9876.JPG, ceci extrait la partie " +"numérique « 9876 ». Si le nom du fichier contient plusieurs groupes de " +"nombres (par ex. IMG_123_456.JPG), seul le premier groupe est utilisé " +"(« 123 » dans cet exemple)." -#: C/edit-resize-crop.page:22(gui) -msgid "Crop" -msgstr "Découper" +#: C/rename-series.page:84(td/p) +msgid "%M{format}" +msgstr "%M{format}" -#: C/edit-resize-crop.page:23(p) +#: C/rename-series.page:89(td/p) msgid "" -"This allows you to crop the image. Click and drag the mouse over the desired " -"area of the image. The area may be locked to a specific aspect ratio, or it " -"may be freely adjusted. A rule-of-thirds grid or golden-sections grid may be " -"superimposed over the image for composition guidance." +"This symbol will be replaced with the file modification date. The formatting " +"of this date (and optionally time) can be specified by adding a standard " +"formatting code in curly braces. For example, \"%M{%Y-%m-%d, %T}\" would be " +"replaced with a date and time like \"2010-04-01, 15:02:01\"." msgstr "" -"Cela vous permet de découper l'image. Cliquez et déplacez la souris pour " -"entourer la zone de l'image que vous souhaitez conserver. Vous pouvez " -"choisir des proportions hauteur-largeurspécifiques ou ajuster librement la " -"zone sélectionnée. Vous pouvez aussi surimposer une grille respectant la " -"règle des tiers ou du nombre d'or pour vous aider dans la composition de " -"l'image." +"Ce symbole est remplacé par la date de modification de l'image originale. Le " +"format de la date (optionnellement de l'heure) peut être spécifié en " +"ajoutant le code de formatage standard entre accolades. Par exemple, « %M{%Y-" +"%m-%d, %T} » est remplacé par la date et l'heure suivante « 2010-04-01, " +"15:02:01 »." + +#: C/rename-series.page:98(td/p) +msgid "%D{format}" +msgstr "%D{format}" -#: C/edit-resize-crop.page:31(p) +#: C/rename-series.page:103(td/p) msgid "" -"gThumb also offers a batch-mode tool for resizing multiple images " -"simultaneously. See ." +"This symbol will be replaced with the date that the photo was original taken " +"(normally determined from the EXIF datestamps embedded inside the photo). " +"The formatting of this date (and optionally time) can be specified by adding " +"a standard formatting code in curly braces. For example, \"%D{%Y-%m-%d, " +"%T}\" would be replaced with a date and time like \"2010-04-01, 15:02:01\"." msgstr "" -"gThumb fournit aussi un utilitaire de traitement par lots pour " -"redimensionner plusieurs images à la fois. Consultez la section ." +"Ce symbole est remplacé par la date de prise de vue de l'image originale (en " +"général déterminée par l'horodatage Exif intégré dans la photo). Le format " +"de la date (optionnellement de l'heure) peut être spécifié en ajoutant le " +"code de formatage standard entre accolades. Par exemple, « %D{%Y-%m-%d, " +"%T} » est remplacé par la date et l'heure suivante « 2010-04-01, 15:02:01 »." -#: C/edit-rotate.page:6(title) -msgid "Rotations and Flips" -msgstr "Pivotement et retournement" +#: C/rename-series.page:114(td/p) +msgid "%A{identifier}" +msgstr "%A{identifier}" -#: C/edit-rotate.page:12(p) -msgid "Several tools are provided to manipulate the orientation of images." +#: C/rename-series.page:119(td/p) +msgid "" +"This symbol will be replaced with the data that has been specified by the " +"identifier. For example, \"%A{ general::dimensions }\" would be replaced " +"with a size like \"320 x 240\"." msgstr "" -"Plusieurs outils sont disponibles pour modifier l'orientation des images." +"Ce symbole est remplacé par les données spécifiées par l'identifiant. Par " +"exemple : « %A{ general::dimensions } » est remplacé par les dimensions " +"suivantes « 320 x 240 »." -#: C/edit-rotate.page:17(gui) -msgid "Mirror" -msgstr "Miroir" +#: C/rename-series.page:127(page/p) +msgid "" +"A summary of these special codes may be viewed by clicking on the Help icon " +"inside the template field." +msgstr "" +"Un résumé de ces codes spéciaux s'affiche si vous cliquez sur l'icône d'aide " +"dans le champ du modèle." -#: C/edit-rotate.page:18(p) +#: C/rename-series.page:130(page/p) msgid "" -"This flips the image horizontally. The left and right sides are swapped." +"The list at the bottom of the dialog displays how the filenames will be " +"renamed." msgstr "" -"Cela retourne l'image horizontalement. Les cotés droit et gauche sont " -"échangés." +"La liste en bas de la boîte de dialogue montre comment les noms de fichiers " +"sont renommés." -#: C/edit-rotate.page:22(gui) -msgid "Flip" -msgstr "Retourner" +#: C/rename-series.page:133(page/p) +msgid "To rename the images click on Rename." +msgstr "Pour renommer les images, cliquez sur Renommer." -#: C/edit-rotate.page:23(p) -msgid "This flips the image vertically. The top and bottom are swapped." -msgstr "Cela retourne l'image verticalement. Le haut et le bas sont échangés." +#: C/rename-series.page:135(page/p) +msgid "" +"If the renaming of an image can overwrite an already existing image you will " +"be asked how to proceed, five options are available: overwrite the image; do " +"not overwrite the image; always overwrite; never overwrite; specify a new " +"name." +msgstr "" +"Si le fait de renommer une image peut écraser une image déjà existante, cinq " +"manières de procéder vous sont proposées : écraser l'image, ne pas écraser " +"l'image, toujours écraser, ne jamais écraser ou spécifier un nouveau nom." -#: C/edit-rotate.page:27(gui) -msgid "Rotate Right" -msgstr "Pivoter sur la droite" +#: C/edit-save-undo-redo.page:6(page/title) +msgid "File Save, Undo, Redo" +msgstr "Enregistrement des fichiers, annulation, rétablissement" -#: C/edit-rotate.page:28(p) -msgid "This rotates the image clockwise." -msgstr "Cela tourne l'image dans le sens horaire." +#: C/edit-save-undo-redo.page:8(page/p) C/edit-colors.page:8(page/p) +#: C/edit-rotate.page:8(page/p) C/edit-resize-crop.page:8(page/p) +#: C/edit-redeye.page:7(page/p) +msgid "" +" To " +"access the editing tools, open an image and then click the Edit File toolbar button (the palette icon)." +msgstr "" +" Pour " +"accéder aux outils de modification, ouvrez une image et cliquez sur le " +"bouton Modifier le fichier de la barre d'outils (icône palette)." -#: C/edit-rotate.page:31(gui) -msgid "Rotate Left" -msgstr "Pivoter sur la gauche" +#: C/edit-save-undo-redo.page:12(page/p) +msgid "" +"Multiple changes may be made to an image before saving it. Undo " +"and Redo buttons are provided, and may be used up until the file " +"is saved." +msgstr "" +"Plusieurs modifications peuvent être effectuées sur une image avant de les " +"enregistrer. Des boutons Annuler et Rétablir sont " +"disponibles et peuvent être utilisés tant que le fichier n'est pas " +"enregistré." -#: C/edit-rotate.page:32(p) -msgid "This rotates the image counter-clockwise." -msgstr "Cela tourne l'image dans le sens anti-horaire." +#: C/edit-save-undo-redo.page:16(page/p) +msgid "" +"A modified image may be saved by pressing Save. To save the " +"modified image to a new location instead, leaving the original image " +"unchanged, use Save As." +msgstr "" +"Pour enregistrer une image modifiée, cliquez sur Enregistrer. " +"Pour enregistrer l'image modifiée dans un autre emplacement et conserver " +"l'image originale, utilisez Enregistrer sous." -#: C/edit-rotate.page:36(p) +#: C/edit-save-undo-redo.page:20(page/p) msgid "" -"The rotations offered in the edit mode act on the image in memory. They are " -"not direct file operations. For jpeg images, these means they are not " -"lossless operations - the image will degrade slightly when it it is re-" -"encoded and saved. However, gThumb does provide lossless rotation " -"tools. See ." +"If you exit the editing mode (by pressing Esc or the View " +"the Folders toolbar button), or navigate away from the current image, " +"you will be prompted to save or discard your changes." msgstr "" -"Les rotations proposées dans le mode édition agissent sur l'image en " -"mémoire. Il ne s'agit pas d'opérations directes sur les fichiers. Pour les " -"images jpeg, cela signifie que ce ne sont pas des opérations sans perte de " -"données ; l'image est légèrement dégradée lorsqu'elle est codée à nouveau et " -"enregistrée. gThumb fournit des outils de rotation sans perte. " -"Consultez la section ." +"Si vous quittez l'éditeur (en appuyant sur Échap ou sur le bouton " +"Afficher les dossiers de la barre d'outils) ou si vous changez " +"d'image, vous aurez alors la possibilité d'enregistrer ou d'abandonner vos " +"modifications." -#: C/edit-colors.page:6(title) +#: C/edit-colors.page:6(page/title) msgid "Color Adjustments" msgstr "Ajustements des couleur" -#: C/edit-colors.page:12(p) +#: C/edit-colors.page:12(page/p) msgid "Several tools are provided to manipulate the colors in images." msgstr "" "Il existe plusieurs outils pour manipuler les couleurs dans les images." -#: C/edit-colors.page:17(gui) -msgid "Enhance Colors" -msgstr "Améliorer les couleurs" +#: C/edit-colors.page:17(item/title) +msgid "Enhance Colors" +msgstr "Améliorer les couleurs" -#: C/edit-colors.page:18(p) +#: C/edit-colors.page:18(item/p) msgid "" "This tool provides automatic white balance correction. No user adjustments " "are required." @@ -1420,11 +1474,11 @@ "Cet outil fournit une correction automatique de la balance des blancs. " "L'utilisateur n'a pas besoin de faire d'ajustements." -#: C/edit-colors.page:22(gui) -msgid "Adjust Colors" -msgstr "Ajuster les couleurs" +#: C/edit-colors.page:22(item/title) +msgid "Adjust Colors" +msgstr "Ajuster les couleurs" -#: C/edit-colors.page:23(p) +#: C/edit-colors.page:23(item/p) msgid "" "This tool provides manual color adjustments. Adjustments to the gamma, " "brightness, contrast, saturation, and the cyan/red, magenta/green, and " @@ -1434,11 +1488,11 @@ "Les ajustements disponibles sont le gamma, la luminosité, le contraste, la " "saturation et les balances de couleur cyan/rouge, magenta/vert et jaune/bleu." -#: C/edit-colors.page:29(gui) -msgid "Equalize" -msgstr "Égaliser" +#: C/edit-colors.page:29(item/title) +msgid "Equalize" +msgstr "Égaliser" -#: C/edit-colors.page:30(p) +#: C/edit-colors.page:30(item/p) msgid "" "This tool provides automatic histogram equalization. No user adjustments are " "required." @@ -1446,11 +1500,11 @@ "Cet outil fournit une égalisation automatique de l'histogramme. " "L'utilisateur n'a pas besoin de faire d'ajustements." -#: C/edit-colors.page:34(gui) -msgid "Desaturate" -msgstr "Désaturer" +#: C/edit-colors.page:34(item/title) +msgid "Desaturate" +msgstr "Désaturer" -#: C/edit-colors.page:35(p) +#: C/edit-colors.page:35(item/p) msgid "" "This tool converts the image colors into shades of grey. (This does not " "change this image storage format.)" @@ -1458,1382 +1512,1392 @@ "Cet outil convertit les couleurs de l'image en niveaux de gris (cela ne " "modifie pas le format d'enregistrement de l'image)." -#: C/edit-colors.page:39(gui) -msgid "Negative" -msgstr "Négatif" +#: C/edit-colors.page:39(item/title) +msgid "Negative" +msgstr "Négatif" -#: C/edit-colors.page:40(p) +#: C/edit-colors.page:40(item/p) msgid "This tool inverts the color levels, providing an image negative." msgstr "" "Cet outil inverse les couleurs de l'image, fournissant un négatif de l'image." -#: C/edit-save-undo-redo.page:6(title) -msgid "File Save, Undo, Redo" -msgstr "Enregistrement des fichiers, annulation, rétablissement" +#: C/edit-rotate.page:6(page/title) +msgid "Rotations and Flips" +msgstr "Pivotement et retournement" + +#: C/edit-rotate.page:12(page/p) +msgid "Several tools are provided to manipulate the orientation of images." +msgstr "" +"Plusieurs outils sont disponibles pour modifier l'orientation des images." + +#: C/edit-rotate.page:17(item/title) +msgid "Mirror" +msgstr "Miroir" -#: C/edit-save-undo-redo.page:12(p) +#: C/edit-rotate.page:18(item/p) msgid "" -"Multiple changes may be made to an image before saving it. Undo " -"and Redo buttons are provided, and may be used up until the file " -"is saved." +"This flips the image horizontally. The left and right sides are swapped." msgstr "" -"Plusieurs modifications peuvent être effectuées sur une image avant de les " -"enregistrer. Des boutons Annuler et Rétablir sont " -"disponibles et peuvent être utilisés tant que le fichier n'est pas " -"enregistré." +"Cela retourne l'image horizontalement. Les cotés droit et gauche sont " +"échangés." + +#: C/edit-rotate.page:22(item/title) +msgid "Flip" +msgstr "Retourner" + +#: C/edit-rotate.page:23(item/p) +msgid "This flips the image vertically. The top and bottom are swapped." +msgstr "Cela retourne l'image verticalement. Le haut et le bas sont échangés." + +#: C/edit-rotate.page:27(item/title) +msgid "Rotate Right" +msgstr "Pivoter sur la droite" + +#: C/edit-rotate.page:28(item/p) +msgid "This rotates the image clockwise." +msgstr "Cela tourne l'image dans le sens horaire." + +#: C/edit-rotate.page:31(item/title) +msgid "Rotate Left" +msgstr "Pivoter sur la gauche" + +#: C/edit-rotate.page:32(item/p) +msgid "This rotates the image counter-clockwise." +msgstr "Cela tourne l'image dans le sens anti-horaire." -#: C/edit-save-undo-redo.page:16(p) +#: C/edit-rotate.page:36(page/p) msgid "" -"A modified image may be saved by pressing Save. To save the " -"modified image to a new location instead, leaving the original image " -"unchanged, use Save As." +"The rotations offered in the edit mode act on the image in memory. They are " +"not direct file operations. For jpeg images, these means they are not " +"lossless operations - the image will degrade slightly when it it is re-" +"encoded and saved. However, gThumb does provide lossless rotation " +"tools. See ." msgstr "" -"Pour enregistrer une image modifiée, cliquez sur Enregistrer. " -"Pour enregistrer l'image modifiée dans un autre emplacement et conserver " -"l'image originale, utilisez Enregistrer sous." +"Les rotations proposées dans le mode édition agissent sur l'image en " +"mémoire. Il ne s'agit pas d'opérations directes sur les fichiers. Pour les " +"images jpeg, cela signifie que ce ne sont pas des opérations sans perte de " +"données ; l'image est légèrement dégradée lorsqu'elle est codée à nouveau et " +"enregistrée. gThumb fournit des outils de rotation sans perte. " +"Consultez la section ." + +#: C/edit-resize-crop.page:6(page/title) +msgid "Resizing and Cropping" +msgstr "Redimensionnement et découpe" + +#: C/edit-resize-crop.page:12(page/p) +msgid "Two tools are provided to resize and crop images." +msgstr "Il existe deux outils pour redimensionner et découper les images." + +#: C/edit-resize-crop.page:15(item/title) +msgid "Resize" +msgstr "Redimensionner" -#: C/edit-save-undo-redo.page:20(p) +#: C/edit-resize-crop.page:16(item/p) msgid "" -"If you exit the editing mode (by pressing Esc or the View " -"the Folders toolbar button), or navigate away from the current image, " -"you will be prompted to save or discard your changes." +"This allows you to resize the image. The image may be scaled to a certain " +"physical size, or to a certain percentage of the original size. The aspect " +"ratio may be locked to a specific value, or freely adjusted." msgstr "" -"Si vous quittez l'éditeur (en appuyant sur Échap ou sur le bouton " -"Afficher les dossiers de la barre d'outils) ou si vous changez " -"d'image, vous aurez alors la possibilité d'enregistrer ou d'abandonner vos " -"modifications." +"Cela vous permet de redimensionner une image. L'image peut être mise à " +"l'échelle à une taille physique donnée ou à un pourcentage de la taille " +"originale. Les proportions de l'image peuvent être conservées ou ajustées " +"librement." -#: C/rename-series.page:8(title) -msgid "Renaming Files" -msgstr "Renommage de fichiers" +#: C/edit-resize-crop.page:22(item/title) +msgid "Crop" +msgstr "Découper" -#: C/rename-series.page:10(p) +#: C/edit-resize-crop.page:23(item/p) msgid "" -"To rename one or more images using a name template, select the files in the " -"browser and choose EditRename, or " -"press F2." +"This allows you to crop the image. Click and drag the mouse over the desired " +"area of the image. The area may be locked to a specific aspect ratio, or it " +"may be freely adjusted. A rule-of-thirds grid or golden-sections grid may be " +"superimposed over the image for composition guidance." msgstr "" -"Pour renommer une ou plusieurs images en spécifiant un modèle de nom, " -"choisissez ÉditionRenommer ou appuyez " -"sur F2." +"Cela vous permet de découper l'image. Cliquez et déplacez la souris pour " +"entourer la zone de l'image que vous souhaitez conserver. Vous pouvez " +"choisir des proportions hauteur-largeurspécifiques ou ajuster librement la " +"zone sélectionnée. Vous pouvez aussi surimposer une grille respectant la " +"règle des tiers ou du nombre d'or pour vous aider dans la composition de " +"l'image." -#: C/rename-series.page:15(p) +#: C/edit-resize-crop.page:31(page/p) msgid "" -"The name template is simply a pattern that is used for renaming all of the " -"selected images. You can use some special characters to make the new names " -"differ each other (this is essential if you are renaming more than one " -"image, and optional if you are renaming a single image):" +"gThumb also offers a batch-mode tool for resizing multiple images " +"simultaneously. See ." msgstr "" -"Le modèle de nom est simplement un motif qui est utilisé pour renommer " -"toutes les images sélectionnées. Vous pouvez utiliser des caractères " -"spéciaux afin que les noms de fichiers diffèrent entre eux (c'est essentiel " -"si vous renommez plus d'une image, et facultatif si vous renommez une seule " -"image) :" - -#: C/rename-series.page:24(p) -msgid "Symbol" -msgstr "Symbole" +"gThumb fournit aussi un utilitaire de traitement par lots pour " +"redimensionner plusieurs images à la fois. Consultez la section ." -#: C/rename-series.page:33(key) -msgid "#" -msgstr "#" +#: C/edit-redeye.page:6(page/title) +msgid "Red Eye Removal" +msgstr "Correction des yeux rouges" -#: C/rename-series.page:37(p) +#: C/edit-redeye.page:11(page/p) msgid "" -"This symbol will be replaced with the value of a counter that increments " -"itself by 1 passing from one image to another. If you specify this symbols " -"in sequence you'll get leading zeros if the counter value has a lesser " -"number of digits, for example ### will produce the sequence: 001, 002, 003, " -"etc.." +"gThumb provides a Red Eye Removal tool. To remove a " +"red eye, position the mouse pointer over the red eye and click on it. " +"gThumb will attempt to remove the red region and replace it with " +"a more natural-looking gray region. If the results do not look correct, " +"press Escape and click on the Undo item." msgstr "" -"Ce symbole est remplacé par la valeur d'un compteur qui s'incrémente de 1 en " -"passant d'une image à une autre. Si vous spécifiez ce symbole plusieurs fois " -"à la suite, vous obtenez des zéros non significatifs si la valeur du " -"compteur possède moins de chiffres ; par exemple, ### produit la suite : " -"001, 002, 003, etc." - -#: C/rename-series.page:48(key) C/strftime.page:104(p) -msgid "%F" -msgstr "%F" +"gThumb fournit un outil de Correction des yeux rouges. " +"Pour corriger un œil rouge, positionnez le pointeur de la souris sur l'œil " +"et cliquez dessus. gThumb tente de supprimer la zone rouge et de " +"la remplacer par une zone grise plus naturelle. Si les résultats ne sont pas " +"satisfaisants, appuyez sur la touche Échap et cliquez sur le " +"bouton Annuler." -#: C/rename-series.page:52(p) +#: C/edit-redeye.page:18(page/p) msgid "" -"This symbol will be replaced with the file's original name, excluding the " -"original extension." +"This tool works best when there is a high color contrast between the red eye " +"and the surrounding facial area. It does not work well for \"orange eye\" " +"sometimes seen in photos of children, or if the surrounding skin has a " +"reddish tinge. This tool could use improvement - if you are fiendishly " +"clever, love matrix algebra and open source software, please submit a patch!" msgstr "" -"Ce symbole est remplacé par le nom original du fichier, sans son extension." +"Cet outil fonctionne mieux lorsqu'il y a un contraste de couleur important " +"entre l'œil rouge et la zone du visage qui l'entoure. Il ne fonctionne pas " +"bien avec les « yeux orange » que l'on voit parfois sur les photos " +"d'enfants, ou si la peau autour de l'œil possède une teinte rouge. Cet outil " +"peut être amélioré ; si vous êtes très intelligent, aimez l'algèbre " +"matricielle et le logiciel libre, vous pouvez soumettre un correctif." -#: C/rename-series.page:59(key) C/strftime.page:96(p) -msgid "%E" -msgstr "%E" +#: C/extensions.page:6(page/title) +msgid "Extending gThumb" +msgstr "Extension de gThumb" -#: C/rename-series.page:63(p) +#: C/extensions.page:8(page/p) msgid "" -"This symbol will be replaced with the file's original filename extension." -msgstr "Ce symbole est remplacé par l'extension du nom de fichier original." - -#: C/rename-series.page:70(key) -msgid "%N" -msgstr "%N" +"gThumb has a plug-in system for extensions. Some standard " +"features are implemented as extensions and are supplied with the standard " +"distribution. Users may write (and share) additional extensions." +msgstr "" +"gThumb possède un système de greffons pour ses extensions. " +"Certaines fonctionnalités de base sont implémentées sous la forme " +"d'extensions et sont fournies avec la distribution standard. Les " +"utilisateurs peuvent écrire (et partager) des extensions supplémentaires." -#: C/rename-series.page:74(p) +#: C/extensions.page:12(page/p) msgid "" -"This symbol will be replaced with original image enumerator. For instance, " -"if the original filename was IMG_9876.JPG, this extracts the \"9876\" " -"portion. If the filename has more than one group of digits embedded in it " -"(for example, IMG_123_456.JPG) only the first number will be used (\"123\" " -"in this example)." +"You can enable or disable extensions using EditExtensions. Some extensions will have " +"Preferences that can be modified from this dialog." msgstr "" -"Ce symbole est remplacé par l'énumération de l'image originale. Par exemple, " -"si le nom de fichier original est IMG_9876.JPG, ceci extrait la partie " -"numérique « 9876 ». Si le nom du fichier contient plusieurs groupes de " -"nombres (par ex. IMG_123_456.JPG), seul le premier groupe est utilisé " -"(« 123 » dans cet exemple)." - -#: C/rename-series.page:85(key) -msgid "%M{format}" -msgstr "%M{format}" +"Pour activer ou désactiver des extensions, utilisez le menu " +"ÉditionExtensions. Certaines " +"extensions possèdent des Préférences qui peuvent être configurées " +"dans cette boîte de dialogue." -#: C/rename-series.page:89(p) +#: C/extensions.page:16(page/p) msgid "" -"This symbol will be replaced with the file modification date. The formatting " -"of this date (and optionally time) can be specified by adding a standard " -"formatting code in curly braces. For example, \"%M{%Y-%m-%d, %T}\" would be " -"replaced with a date and time like \"2010-04-01, 15:02:01\"." +"This manual is written with the assumption that the standard extensions are " +"enabled. If you seem to be missing a feature, check to see which extensions " +"are actually enabled." msgstr "" -"Ce symbole est remplacé par la date de modification de l'image originale. Le " -"format de la date (optionnellement de l'heure) peut être spécifié en " -"ajoutant le code de formatage standard entre accolades. Par exemple, « %M{%Y-%" -"m-%d, %T} » est remplacé par la date et l'heure suivante « 2010-04-01, " -"15:02:01 »." - -#: C/rename-series.page:99(key) -msgid "%D{format}" -msgstr "%D{format}" +"Ce manuel est écrit en supposant que les extensions de base sont activées. " +"S'il vous semble qu'une fonction est manquante, vérifiez les extensions " +"activées." -#: C/rename-series.page:103(p) +#: C/extensions.page:20(page/p) msgid "" -"This symbol will be replaced with the date that the photo was original taken " -"(normally determined from the EXIF datestamps embedded inside the photo). " -"The formatting of this date (and optionally time) can be specified by adding " -"a standard formatting code in curly braces. For example, \"%D{%Y-%m-%d, %T}" -"\" would be replaced with a date and time like \"2010-04-01, 15:02:01\"." +"If you would like to write your own extension, please visit http://live.gnome.org/gthumb for " +"development information. An example extension is provided in the source " +"code, which you can base your own extension on." msgstr "" -"Ce symbole est remplacé par la date de prise de vue de l'image originale (en " -"général déterminée par l'horodatage Exif intégré dans la photo). Le format " -"de la date (optionnellement de l'heure) peut être spécifié en ajoutant le " -"code de formatage standard entre accolades. Par exemple, « %D{%Y-%m-%d, %T} » " -"est remplacé par la date et l'heure suivante « 2010-04-01, 15:02:01 »." +"Si vous souhaitez écrire votre propre extension, visitez http://live.gnome.org/gthumb pour obtenir des " +"informations sur le développement. Un exemple d'extension est fourni dans le " +"code source, il peut vous servir de point de départ pour votre extension." -#: C/rename-series.page:115(key) -msgid "%A{identifier}" -msgstr "%A{identifiant}" +#: C/gimp.page:6(page/title) +msgid "Launching GIMP" +msgstr "Lancement de GIMP" -#: C/rename-series.page:119(p) +#: C/gimp.page:7(page/p) msgid "" -"This symbol will be replaced with the data that has been specified by the " -"identifier. For example, \"%A{ general::dimensions }\" would be replaced " -"with a size like \"320 x 240\"." +"If you have files selected in the browser, or an image open in the viewer, " +"you can open them in the GNU Image Manipulation Program (GIMP) by " +"pressing g." msgstr "" -"Ce symbole est remplacé par les données spécifiées par l'identifiant. Par " -"exemple : « %A{ general::dimensions } » est remplacé par les dimensions " -"suivantes « 320 x 240 »." +"Si des fichiers sont sélectionnés dans le navigateur ou si une image est " +"ouverte dans le visionneur, vous pouvez les ouvrir dans l'Éditeur " +"d'images GIMP en appuyant sur la touche g." -#: C/rename-series.page:127(p) +#: C/gimp.page:10(page/p) msgid "" -"A summary of these special codes may be viewed by clicking on the Help icon " -"inside the template field." +"GIMP provides a more sophisticated set of editing tools than that " +"provided with gThumb." msgstr "" -"Un résumé de ces codes spéciaux s'affiche si vous cliquez sur l'icône d'aide " -"dans le champ du modèle." +"GIMP fournit un ensemble d'outils de modification plus " +"sophistiqués que ceux fournis avec gThumb." + +#: C/viewer.page:6(page/title) +msgid "Opening an Image" +msgstr "Ouverture d'une image" -#: C/rename-series.page:130(p) +#: C/viewer.page:8(page/p) msgid "" -"The list at the bottom of the dialog displays how the filenames will be " -"renamed." +"The browser view shows the images in the current folder or catalog (see " +"). Double-clicking an image (or pressing " +"Return) in the browser will open it in the viewer mode." msgstr "" -"La liste en bas de la boîte de dialogue montre comment les noms de fichiers " -"sont renommés." - -#: C/rename-series.page:133(p) -msgid "To rename the images click on Rename." -msgstr "Pour renommer les images, cliquez sur Renommer." +"Le navigateur affiche les images contenues dans le dossier ou le catalogue " +"actuel (voir la section ). Double-" +"cliquez sur une image (ou appuyez sur Entrée) dans le navigateur " +"pour ouvrir celle-ci dans le visionneur." -#: C/rename-series.page:135(p) +#: C/viewer.page:13(page/p) msgid "" -"If the renaming of an image can overwrite an already existing image you will " -"be asked how to proceed, five options are available: overwrite the image; do " -"not overwrite the image; always overwrite; never overwrite; specify a new " -"name." +"Pressing Escape will exit the viewer mode, and return the user to " +"the browser mode. A toolbar button (View the folders) is also " +"provided for this purpose." msgstr "" -"Si le fait de renommer une image peut écraser une image déjà existante, cinq " -"manières de procéder vous sont proposées : écraser l'image, ne pas écraser " -"l'image, toujours écraser, ne jamais écraser ou spécifier un nouveau nom." - -#: C/thumbnail-pane.page:6(title) -msgid "Thumbnail Pane" -msgstr "Volet des vignettes" +"Appuyer sur Échap permet de quitter le visionneur et de retourner " +"dans le navigateur. Un bouton de la barre d'outils (Afficher les " +"dossiers) est aussi fourni dans ce but." -#: C/thumbnail-pane.page:8(p) +#: C/viewer.page:17(page/p) msgid "" -"When an image has been opened in the gThumb viewer, the user has " -"the option of enabling or disabling a thumbnail pane, which shows the other " -"images in the folder as thumbnails. This feature can be toggled with the " -"ViewThumbnail Pane command, or by " -"pressing F8." +"A may be displayed in the viewer " +"mode, if desired." msgstr "" -"Lorsqu'une image est ouverte dans le visionneur gThumb, " -"l'utilisateur peut afficher ou masquer le volet des vignettes qui affiche " -"les autres images contenues dans le dossier sous forme de vignettes. Cette " -"fonction peut être activée/désactivée avec la commande " -"AffichagePanneau des vignettes ou " -"avec la toucheF8." +"Le peut être affiché dans le " +"visionneur, si vous le souhaitez." + +#: C/viewer.page:21(figure/title) +msgid "Viewer Mode with Thumbnail Pane" +msgstr "Visionneur avec volet des vignettes" -#: C/thumbnail-pane.page:14(p) +#: C/viewer.page:26(page/p) msgid "" -"The thumbnail pane may be positioned along the bottom of the main image, or " -"along the side. This is controlled by the settings in EditPreferencesGeneralThumbnails in Viewer." +"In the viewer mode, you can advance to the next image by clicking the " +"Next button, or by pressing Space or Page Down. You can go back to the previous image by clicking the Previous button, or by pressing Backspace or Page Up. You " +"can go also click on thumbnails in the thumbnail pane to open a different " +"image." msgstr "" -"Le volet des vignettes peut être placé en bas de l'image principale ou sur " -"le coté. Vous pouvez modifier ce paramètre dans ÉditionPréférencesGénéralVignettes dans le " -"visionneur." +"Dans le visionneur, cliquez sur le bouton Suivant ou appuyez sur " +"les touches Espace ou Page bas pour aller à l'image " +"suivante. Pour retourner à l'image précédente, cliquez sur le bouton " +"Précédent ou appuyez sur les touches Retour Arrière ou " +"Page haut. Vous pouvez aussi cliquer sur les vignettes dans le " +"volet des vignettes pour ouvrir une autre image." -#: C/thumbnail-pane.page:19(title) -msgid "Thumbnail Pane, Along Bottom of Main Image" -msgstr "Volet des vignettes, en bas de l'image principale" +#: C/fullscreen.page:8(page/title) +msgid "Manual Fullscreen Mode" +msgstr "Mode plein écran manuel" -#: C/thumbnails.page:6(title) -msgid "Thumbnail Sources" -msgstr "Sources des vignettes" +#: C/fullscreen.page:10(page/p) +msgid "" +"Pressing f in the browser or viewer modes will display the " +"current image in fullscreen mode. (In the browser mode, you can also double-" +"click with the middle mouse button.)" +msgstr "" +"Lorsque vous appuyez sur la touche f dans le navigateur ou le " +"visionneur, l'image actuelle s'affiche alors plein écran (dans le " +"navigateur, vous pouvez aussi cliquer deux fois avec le bouton du milieu)." -#: C/thumbnails.page:8(p) +#: C/fullscreen.page:14(page/p) msgid "" -"The browser window normally shows the thumbnails of the images and movies in " -"the selected folder. Generic icons for other files (audio files, for " -"instance) may also be shown." +"Moving the mouse will activate a popup control panel briefly. This can be " +"used to navigate to the next or previous image, or change zoom levels." msgstr "" -"La fenêtre de navigation affiche normalement les vignettes des images et " -"vidéos du dossier sélectionné. Les icônes génériques des autres fichiers " -"(audio par exemple) peuvent aussi être affichées." +"Lorsque que vous déplacez la souris vous activez brièvement un panneau de " +"contrôle. Il peut être utilisé pour naviguer vers l'image suivante ou " +"précédente ou pour modifier le niveau de zoom." -#: C/thumbnails.page:18(p) +#: C/fullscreen.page:18(page/p) msgid "" -"The thumbnails may be generated by a number of different methods. " -"gThumb will first check for existing thumbnails in the system " -"cache." +"You can also advance to the next image by pressing PageDown or " +"Space." msgstr "" -"Les vignettes peuvent être générées de plusieurs façons, gThumb " -"vérifie en premier si des vignettes n'existent pas déjà dans le cache du " -"système." +"Vous pouvez aussi appuyer sur Page bas ou Espace pour " +"aller à l'image suivante." -#: C/thumbnails.page:22(p) +#: C/fullscreen.page:21(page/p) msgid "" -"If no cached thumbnail is found, and an image file contains an embedded " -"thumbnail (jpeg files generated by digital cameras normally do), " -"gThumb will attempt to use that. gThumb will confirm " -"that the aspect ratio of the thumbnail is similar to that of the main image, " -"and ignore thumbnails that do not appear to match the main image." +"You can go back to the previous image by pressing PageUp or " +"Backspace." msgstr "" -"Si aucune vignette n'est trouvée dans le cache et que l'image contient une " -"vignette intégrée (généralement les images jpeg générées par les appareils " -"photo numériques en contiennent une), gThumb essaye alors " -"d'utiliser celle-ci. gThumb vérifie que les proportions de la " -"vignette correspondent à celle de l'image et ignore les vignettes qui ne " -"semblent pas correspondre à l'image principale." +"Vous pouvez appuyer sur la touche Page Haut ou Retour " +"arrière pour aller à l'image précédente." -#: C/thumbnails.page:29(p) -msgid "" -"If that doesn't work, gThumb will attempt to load the entire file " -"and generate a scaled-down thumbnail." +#: C/fullscreen.page:24(page/p) +msgid "This can be used to implement a manually-controlled slideshow." msgstr "" -"Si cela ne fonctionne pas, gThumb tente de charger le fichier " -"complet et de générer une vignette à l'échelle." +"Vous pouvez utiliser ce mode pour préparer un diaporama contrôlé " +"manuellement." -#: C/thumbnails.page:32(p) +#: C/fullscreen.page:27(page/p) +msgid "To exit the fullscreen mode, press f or Escape." +msgstr "" +"Pour quitter le mode d'affichage plein écran, appuyez sur f ou " +"Échap." + +#: C/sorting.page:7(page/title) +msgid "Sorting Files" +msgstr "Tri des fichiers" + +#: C/sorting.page:9(page/p) msgid "" -"Lastly, gThumb will use any system-defined scripts for " -"thumbnailing particular media types. For example, some systems may use " -"mplayer or totem or other movie viewers to generate " -"movie thumbnails." +"Use the ViewSort By menu to select " +"the desired file-sorting method for the browser view. Files can be sorted on " +"the basis of their name, the file size, the file modification date, or the " +"date the photo was taken." msgstr "" -"Enfin, gThumb utilise tous les scripts définis par le système " -"pour le vignettage des différents types de supports. Par exemple, certains " -"systèmes utilisent mplayer ou totem ou un autre " -"lecteur vidéo pour générer les vignettes de vidéos." +"Utilisez le menu AffichageTrier par " +"pour sélectionner la méthode de tri des fichiers désirée dans la vue du " +"navigateur. Les fichiers peuvent être triés par nom, taille, date de " +"modification ou date de prise de vue." -#: C/thumbnails.page:37(p) +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/filtering.page:17(media) +msgctxt "_" +msgid "" +"external ref='figures/general-filter.png' " +"md5='818fcb0f12da6496f3c72699f12beb28'" +msgstr "" +"external ref='figures/general-filter.png' " +"md5='818fcb0f12da6496f3c72699f12beb28'" + +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/filtering.page:30(media) +msgctxt "_" msgid "" -"gThumb will save thumbnails to a system cache, to share them with " -"other applications. By default, Gnome systems prune cached thumbnails when " -"they are older than 180 days, or when the thumbnail cache exceeds 512 MB. " -"Technically-inclined users can explore these settings with gconf-" -"editor. See the /desktop/gnome/thumbnail_cache/maximum_age and /" -"desktop/gnome/thumbnail_cache/maximum_size keys in particular. Certain " -"applications (like F-Spot) may automatically increase these " -"settings greatly." +"external ref='figures/specific-filter.png' " +"md5='e7036e5b958301c6acb3ab5e4a618bbe'" msgstr "" -"gThumb enregistre les vignettes dans un cache système pour les " -"partager avec les autres applications. Par défaut, les systèmes GNOME " -"effacent les vignettes dans le cache lorsqu'elles ont plus de 180 jours ou " -"que la taille du cache excède 512 Mio. Les utilisateurs plus techniques qui " -"peuvent examiner ces paramètres avec gconf-editor. Consultez plus " -"particulièrement les clés /desktop/gnome/thumbnail_cache/maximum_age et /" -"desktop/gnome/thumbnail_cache/maximum_size. Certaines applications (comme " -"F-Spot) peuvent augmenter automatiquement ces paramètres " -"drastiquement." +"external ref='figures/specific-filter.png' " +"md5='e7036e5b958301c6acb3ab5e4a618bbe'" -#: C/batch-scripts.page:6(title) -msgid "User-Defined Scripts" -msgstr "Scripts utilisateur" +#: C/filtering.page:7(page/title) +msgid "Filtering Files" +msgstr "Filtrage des fichiers" -#: C/batch-scripts.page:8(p) +#: C/filtering.page:9(page/p) msgid "" -"To define a script (a command-line sequence that gThumb will " -"execute on your files), click the Tools button on the main " -"toolbar, and select ToolsPersonalize." +"You can select what types of files to show in the browser view using the " +"ViewFilter dialog. The default is to " +"show all media files (images, movies, audio), but this can be made more or " +"less restrictive." msgstr "" -"Pour définir un script (une succession de lignes de commandes que " -"gThumb exécute sur vos fichiers), cliquez sur le bouton " -"Outils dans la barre d'outils principale et sélectionnez " -"OutilsPersonnaliser." +"Vous pouvez sélectionner les types de fichiers à afficher dans le navigateur " +"en utilisant la boîte de dialogue AffichageFiltres. Par défaut tous les fichiers multimédia (image, vidéo, audio) " +"sont affichés, mais cela peut être rendu plus ou moins strict." -#: C/batch-scripts.page:12(p) -msgid "TODO: further documentation is need here." -msgstr "TODO: la documentation doit être complétée ici." +#: C/filtering.page:15(figure/title) +msgid "Enabling Filters" +msgstr "Activation des filtres" -#: C/batch-change-date.page:6(title) -msgid "Changing Dates" -msgstr "Modification de dates" +#: C/filtering.page:20(page/p) +msgid "" +"The figure above shows how to configure gThumb to display media " +"files only, by setting the General Filter." +msgstr "" +"La figure ci-dessus montre comment configurer gThumb pour que " +"seuls les fichiers multimédias s'affichent, en paramétrant le Filtre " +"général." -#: C/batch-change-date.page:8(p) +#: C/filtering.page:23(page/p) msgid "" -"To change the file modification times, the comment dates, or the Exif " -"DateTimeOriginal tags of multiple files, select the files in the browser " -"view. Then click the Tools button on the main toolbar, and select " -"ToolsChange Date." +"Also, by enabling Filename in Other Filters, a filter-" +"by-filename ability is added to the filter bar at the bottom of the browser " +"view:" msgstr "" -"Pour changer la date de modification de fichiers, les dates des commentaires " -"ou l'étiquette Exif « DateTimeOriginal » de plusieurs fichiers, sélectionnez " -"les fichiers dans le navigateur, cliquez ensuite sur le bouton Outils dans la barre d'outils principale et sélectionnez OutilsModifier la date." +"Si vous activez Nom du fichier dans Autres filtres, la " +"fonctionnalité de filtrage par nom est ajoutée à la barre de filtre en bas " +"de la fenêtre de visualisation :" -#: C/batch-change-date.page:13(p) +#: C/filtering.page:28(figure/title) +msgid "Browser Filter Bar" +msgstr "Barre de filtre du navigateur" + +#: C/filtering.page:33(page/p) msgid "" -"Select the desired date options, and click Execute to complete " -"the process." +"In the above figure, the filename filter has been configured to show only " +"files with \"gen\" in the filename. The matching is case-insensitive." msgstr "" -"Sélectionnez les options de dates souhaitées et cliquez sur Exécuter pour terminer le processus." +"Dans la figure ci-dessus, le filtre « Nom de fichier » est configuré pour " +"n'afficher que ceux qui contiennent « gen ». Le critère de recherche n'est " +"pas sensible à la casse." -#: C/batch-resize.page:6(title) -msgid "Resizing Images" -msgstr "Redimensionnement des images" +#: C/printing.page:7(page/title) +msgid "Printing Images" +msgstr "Impression d'images" -#: C/batch-resize.page:8(p) +#: C/printing.page:9(page/p) msgid "" -"To resize one or more images using the same dimensions or scaling factors, " -"select the images in the browser view. Then click the Tools " -"button on the main toolbar, and select ToolsResize " -"Images." +"To print the current image in the viewer mode, use FilePrint or Ctrlp." msgstr "" -"Pour redimensionner une ou plusieurs images à la même taille ou avec le même " -"rapport d'échelle, sélectionnez les fichiers dans le navigateur. Cliquez " -"ensuite sur le bouton Outils dans la barre d'outils principale et " -"sélectionnez OutilsRedimensionner les images." +"Pour imprimer l'image actuellement affichée dans le visionneur, utilisez " +"FichierImprimer ou Ctrlp." -#: C/batch-resize.page:12(p) +#: C/printing.page:13(page/p) msgid "" -"Then select the desired maximum output dimensions, or the desired percentage " -"scaling, and the destination folder. Click Execute to complete " -"the process." +"To print one or more images from the browser mode, select the desired images " +"and then use FilePrint or " +"Ctrlp." msgstr "" -"Sélectionnez alors les dimensions maximales de sortie souhaitées ou le " -"pourcentage de l'échelle et le dossier de destination. Cliquez sur " -"Exécuter pour terminer le processus." +"Pour imprimer une ou plusieurs images depuis le navigateur, sélectionnez les " +"images souhaitées et utilisez FichierImprimer ou Ctrlp." -#: C/batch-convert-format.page:6(title) -msgid "Converting File Formats" -msgstr "Conversion du format des fichiers" +#: C/printing.page:18(page/p) +msgid "" +"The printer to use can be selected from the General tab of the " +"print dialog." +msgstr "" +"L'imprimante à utiliser peut être sélectionnée dans l'onglet Général de la boîte de dialogue d'impression." -#: C/batch-convert-format.page:8(p) +#: C/printing.page:21(page/p) msgid "" -"To convert one or more images into a new file format, select the images in " -"the browser view. Then click the Tools button on the main " -"toolbar, and select ToolsConvert Format." +"The type of paper to use can be selected from the Page Setup tab." msgstr "" -"Pour convertir une ou plusieurs images dans un nouveau format, sélectionnez " -"les images que vous voulez convertir dans le navigateur. Cliquez ensuite sur " -"le bouton Outils dans la barre d'outils principale et " -"sélectionnez OutilsConvertir le format." +"Le type de papier à utiliser peut être sélectionné dans l'onglet Mise " +"en page de la boîte de dialogue d'impression." -#: C/batch-convert-format.page:12(p) +# note preview is separated window +#: C/printing.page:24(page/p) msgid "" -"Select the desired output format and destination folder. Click Execute to complete the process." +"The Layout tab provides some additional gThumb-" +"specific options. You can set the number of images to include on each page " +"here, and a preview pane is provided. Captions can also be added under the " +"image, in a configurable font. The captions can be chosen from a selection " +"of listed file attributes (like the file name, the date of the photo, camera " +"shutter speed, and others). Each image can be repositioned inside its print " +"area using the controls on this tab." msgstr "" -"Sélectionnez le format de sortie souhaité et le dossier de destination. " -"Cliquez sur Exécuter pour terminer le processus." +"L'onglet Agencement fournit des options supplémentaires " +"spécifiques à gThumb. Vous pouvez définir le nombre d'images à " +"inclure dans chaque page et un onglet de prévisualisation est disponible. Il " +"est possible d'ajouter une légende sous l'image, la police de caractère de " +"celle-ci est paramétrable. Les légendes peuvent être choisies parmi les " +"différents attributs de l'image (tel que le nom du fichier, la date de la " +"prise de vue, la vitesse d'obturation et bien d'autres). Chaque image peut " +"être repositionnée dans sa zone d'impression à l'aide des éléments de " +"contrôle de cet onglet." -#: C/batch-rotate.page:6(title) -msgid "Rotating Images Losslessly" -msgstr "Rotation d'images sans perte" +#: C/printing.page:34(page/p) +msgid "When you are ready to print, press the Print button." +msgstr "" +"Quand vous êtes prêt à imprimer, appuyez sur le bouton Imprimer." + +#: C/shortcuts.page:7(page/title) +msgid "Keyboard Shortcuts" +msgstr "Raccourcis clavier" + +#: C/shortcuts.page:10(section/title) +msgid "Viewing and hiding parts of the user interface" +msgstr "Affichage et masquage de certaines parties de l'interface utilisateur" + +#: C/shortcuts.page:14(td/p) C/shortcuts.page:91(td/p) +#: C/shortcuts.page:270(td/p) C/shortcuts.page:495(td/p) +msgid "Keyboard Shortcut" +msgstr "Raccourci clavier" -#: C/batch-rotate.page:8(p) +#: C/shortcuts.page:22(td/p) +msgid "F9" +msgstr "F9" + +#: C/shortcuts.page:27(td/p) msgid "" -"To rotate one or more images, select the images in the browser view. Then " -"click the Tools button on the main toolbar, and select either " -"ToolsRotate Right or " -"ToolsRotate Left. The images will be " -"rotated." +"Show/Hide the sidebar in the browser mode. The sidebar contains the folder " +"tree and the file properties summary (if enabled)." msgstr "" -"Pour faire pivoter une ou plusieurs images, sélectionnez les images dans le " -"navigateur. Cliquez ensuite sur le bouton Outils sur la barre " -"d'outils principale et choisissez ensuite soit OutilsPivoter vers la droite ou OutilsPivoter vers la gauche. Les images sont ensuite " -"tournées." +"Affiche/masque la barre latérale dans le navigateur. La barre latérale " +"contient l'arborescence des dossiers et le résumé des propriétés de fichier " +"(si activé)." + +#: C/shortcuts.page:33(td/p) +msgid "i" +msgstr "i" + +#: C/shortcuts.page:38(td/p) +msgid "Show the file properties summary." +msgstr "Affiche le résumé des propriétés du fichier." + +#: C/shortcuts.page:43(td/p) +msgid "F8" +msgstr "F8" -#: C/batch-rotate.page:14(p) -msgid "Lossless rotation is used for jpeg images, when possible." -msgstr "" -"La rotation sans perte est utilisée pour les images jpeg lorsque c'est " -"possible." +#: C/shortcuts.page:48(td/p) +msgid "Shows/hides the thumbnail pane in the viewer mode." +msgstr "Affiche/masque le volet des vignettes dans le mode visionneur." -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/browser.page:13(None) -msgid "@@image: 'figures/main-win.png'; md5=93cf84bd05a153ab61951ae12bbe3f26" -msgstr "@@image: 'figures/main-win.png'; md5=93cf84bd05a153ab61951ae12bbe3f26" +#: C/shortcuts.page:53(td/p) +msgid "F11 or f" +msgstr "F11 ou f" -#: C/browser.page:6(title) -msgid "Browsing Your Files" -msgstr "Navigation parmi vos fichiers" +#: C/shortcuts.page:58(td/p) +msgid "Toggles the fullscreen mode." +msgstr "Bascule dans le mode plein écran." -#: C/browser.page:8(p) -msgid "When you start gThumb the following window is displayed:" -msgstr "Quand vous lancez gThumb la fenêtre suivante s'affiche :" +#: C/shortcuts.page:63(td/p) +msgid "Ctrlt" +msgstr "Ctrlt" -#: C/browser.page:11(title) -msgid "The main window" -msgstr "La fenêtre principale" +#: C/shortcuts.page:68(td/p) +msgid "Shows/hides the thumbnails in the browser mode." +msgstr "Affiche/masque les vignettes dans le navigateur." -#: C/browser.page:16(p) -msgid "The gThumb browser contains the following elements:" -msgstr "Le navigateur gThumb contient les éléments suivants :" +#: C/shortcuts.page:73(td/p) C/shortcuts.page:523(td/p) +msgid "Esc" +msgstr "Échap" -#: C/browser.page:20(title) -msgid "Menubar" -msgstr "Barre de menus" +#: C/shortcuts.page:78(td/p) +msgid "Closes the viewer or fullscreen mode." +msgstr "Quitte le visionneur ou le mode plein écran." -#: C/browser.page:21(p) -msgid "" -"The menus on the menubar contain all of the commands that you can use in " -"gThumb" -msgstr "" -"Les menus de la barre de menus contiennent toutes les commandes que vous " -"pouvez utiliser dans gThumb." +#: C/shortcuts.page:87(section/title) +msgid "Editing shortcuts for the browser and viewer" +msgstr "Raccourcis pour l'édition dans le navigateur et le visionneur" -#: C/browser.page:25(title) -msgid "Toolbar" -msgstr "Barre d'outils" +# note: missing space +#: C/shortcuts.page:99(td/p) +msgid "e" +msgstr "e" -#: C/browser.page:26(p) -msgid "" -"The toolbar contains a subset of the commands that you can access from the " -"menubar. In particular, the Tools button contains functions for batch " -"processing multiple images." +#: C/shortcuts.page:104(td/p) +msgid "Edit the image. Opens the viewer and shows the editing tools." msgstr "" -"La barre d'outils contient un sous-ensemble des commandes accessibles à " -"partir de la barre de menus. En particulier, le bouton Outils contient " -"certaines fonctions de traitement par lot des images." +"Modifie l'image. Ouvre le visionneur et affiche les outils de modification." -#: C/browser.page:31(title) -msgid "Locationbar" -msgstr "Barre d'adresse" +#: C/shortcuts.page:109(td/p) +msgid "g" +msgstr "g" -#: C/browser.page:32(p) -msgid "The locationbar contains the current folder or catalog name." -msgstr "La barre d'adresse contient le nom du dossier ou du catalogue actuel." +#: C/shortcuts.page:114(td/p) +msgid "Open the image with the GNU Image Manipulation Program (GIMP)." +msgstr "Ouvre l'image avec le logiciel de manipulation d'image (GIMP) de GNU." -#: C/browser.page:36(title) -msgid "Folder Tree" -msgstr "Arborescence des dossiers" +#: C/shortcuts.page:119(td/p) +msgid "F2" +msgstr "F2" -#: C/browser.page:37(p) -msgid "" -"The folder tree allows you to navigate the filesystem. Single-clicking on a " -"folder will load its images in the browser view. Double-clicking a folder, " -"or clicking the expander arrow, will also list folder's subfolders in the " -"tree." -msgstr "" -"L'arborescence des dossiers vous permet de parcourir le système de fichiers. " -"Cliquez sur un dossier pour charger les images qu'il contient dans la " -"fenêtre de navigation. Double-cliquez sur un dossier ou cliquez sur la " -"flèche d'extension pour afficher la liste des sous-dossiers qu'il contient " -"dans l'arborescence." +#: C/shortcuts.page:124(td/p) +msgid "Rename the image." +msgstr "Renomme une image." -#: C/browser.page:44(title) -msgid "Browser View" -msgstr "Fenêtre de Navigation" +#: C/shortcuts.page:129(td/p) +msgid "c or Ctrlm" +msgstr "c ou Ctrlm" -#: C/browser.page:45(p) -msgid "" -"The browser view shows the images in the current folder or catalog. Single-" -"clicking an image will enable the Information Sidebar for that image. Double-" -"clicking an image will open it in the viewer mode. Double-clicking with the " -"middle mouse button will load the image in fullscreen viewer mode." +#: C/shortcuts.page:134(td/p) +msgid "Add comments or metadata to an image." +msgstr "Ajoute des commentaires ou des métadonnées à une image." + +#: C/shortcuts.page:139(td/p) +msgid "]" +msgstr "]" + +#: C/shortcuts.page:144(td/p) +msgid "Rotate right, losslessly if possible. The file is saved automatically." msgstr "" -"La fenêtre de navigation affiche les images contenues dans le dossier ou le " -"catalogue actuel. Cliquez sur une image pour activer la barre latérale " -"d'informations pour cette image. Double-cliquez sur une image pour l'ouvrir " -"en mode de visualisation. Double-cliquez avec le bouton central de la souris " -"pour charger l'image en mode d'affichage plein écran." +"Pivote vers la droite, sans perte de données si possible. Le fichier est " +"enregistré automatiquement." -#: C/browser.page:52(title) -msgid "Organize Button" -msgstr "Bouton Organiser" +#: C/shortcuts.page:149(td/p) +msgid "[" +msgstr "[" -#: C/browser.page:53(p) -msgid "" -"The Organize button, just above the browser view, allows you to group images " -"into catalogs." +#: C/shortcuts.page:154(td/p) +msgid "Rotate left, losslessly if possible. The file is saved automatically." msgstr "" -"Le bouton Organiser, juste au dessus de la fenêtre de navigation, vous " -"permet de regrouper les images dans des catalogues." +"Pivote vers la gauche, sans perte de données si possible. Le fichier est " +"enregistré automatiquement." -#: C/browser.page:57(title) -msgid "Statusbar" -msgstr "Barre d'état" +#: C/shortcuts.page:159(td/p) +msgid "Delete" +msgstr "Suppr" -#: C/browser.page:58(p) -msgid "On the statusbar you can read:" -msgstr "Dans la barre d'état, vous pouvez lire :" +#: C/shortcuts.page:164(td/p) +msgid "Move the selected files to the Trash." +msgstr "Déplace les images sélectionnées dans la corbeille." -#: C/browser.page:61(p) -msgid "" -"the total number of images contained in the current folder or catalog and " -"their total size." -msgstr "" -"le nombre total d'images contenues dans le dossier ou le catalogue actuel et " -"la taille totale," +#: C/shortcuts.page:169(td/p) +msgid "ShiftDelete" +msgstr "MajSuppr" -#: C/browser.page:65(p) -msgid "the number of the selected images and their size." -msgstr "le nombre d'images sélectionnées et leur taille," +#: C/shortcuts.page:174(td/p) +msgid "Delete the selected files permanently." +msgstr "Supprime les images sélectionnées définitivement." -#: C/browser.page:68(p) -msgid "some properties of the currently focused image." -msgstr "certaines propriétés de l'image actuellement sélectionnée." +#: C/shortcuts.page:182(section/title) +msgid "Editing shortcuts for the viewer mode only" +msgstr "Raccourcis pour l'édition dans le visionneur uniquement" -#: C/browser.page:73(title) -msgid "Information Sidebar" -msgstr "Barre latérale d'informations" +#: C/shortcuts.page:186(td/p) +msgid "Keyboard Shortcut (Case Sensitive)" +msgstr "Raccourci clavier (sensible à la casse)" -#: C/browser.page:74(p) -msgid "" -"If a single image is selected, the information sidebar (below the folder " -"tree) will display detailed information (such as EXIF or XMP tags) about the " -"selected image." -msgstr "" -"Si une seule image est sélectionnée, la barre latérale d'informations (sous " -"l'arborescence des dossiers) affiche les informations détaillées de l'image " -"sélectionnée (telles que les balises EXIF ou XMP)." +#: C/shortcuts.page:194(td/p) +msgid "h" +msgstr "h" -#: C/browser.page:79(title) -msgid "Filter Bar" -msgstr "Barre de filtre" +#: C/shortcuts.page:199(td/p) +msgid "Enhance colors." +msgstr "Améliore les couleurs." -#: C/browser.page:80(p) -msgid "" -"An image filtering tool is provided just below the browser view. This can be " -"used to filter the displayed images. For example, the browser view can be " -"limited to files of a certain size, date, or name pattern, or other " -"characteristics." -msgstr "" -"Un outil de filtrage des images est fourni en dessous de la fenêtre de " -"navigation. Il est utilisé pour filtrer les images affichées. Par exemple, " -"la fenêtre de navigation peut être limitée aux fichiers d'une certaine " -"taille, date, motif de nom ou d'autres caractéristiques." +#: C/shortcuts.page:204(td/p) +msgid "l" +msgstr "l" -#: C/introduction.page:6(title) -msgid "About gThumb" -msgstr "À propos de gThumb" +#: C/shortcuts.page:209(td/p) +msgid "Flip image." +msgstr "Retourne l'image." -#: C/introduction.page:8(p) -msgid "" -"gThumb is an image viewer and browser written for the GNOME " -"environment. It lets you browse your hard disk, showing you thumbnails of " -"image files and view single images of many different formats." -msgstr "" -"gThumb est un navigateur et visionneur d'images écrit pour " -"l'environnement GNOME. Il vous permet de naviguer sur votre disque dur en " -"affichant des vignettes des images et d'afficher des images seules dans de " -"nombreux formats." +#: C/shortcuts.page:214(td/p) +msgid "m" +msgstr "m" -#: C/introduction.page:13(p) -msgid "" -"gThumb supports the most common graphics formats, including JPEG, " -"GIF, TIF, and PNG. gThumb will also display other less common " -"image types if the supporting libraries are installed, including TGA, ICO, " -"BMP, XPM, and others." -msgstr "" -"gThumb prend en charge les formats graphiques les plus courants " -"parmi JPEG, GIF, TIF et PNG. gThumb affiche aussi des types " -"d'images moins courants, si les bibliothèques de prise en charge sont " -"installées, parmi TGA, ICO, BMP, XPM et bien d'autres." +#: C/shortcuts.page:219(td/p) +msgid "Mirror image." +msgstr "Image en miroir." -#: C/introduction.page:18(p) -msgid "" -"Some support for RAW image types is included, especially if the dcraw " -"program is installed on your system." -msgstr "" -"La prise en charge de certains types d'images RAW est incluse, plus " -"particulièrement si le programme « dcraw » est installé sur votre système." +# note: missing space +#: C/shortcuts.page:224(td/p) +msgid "r" +msgstr "r" -#: C/introduction.page:21(p) -msgid "" -"gThumb not only lets you view image files but has many other " -"features such as adding comments to images, organizing images into catalogs, " -"printing images, slideshows, setting your desktop background, and more." -msgstr "" -"gThumb permet non seulement d'afficher des images, mais il " -"présente d'autres possibilités telles que l'ajout de commentaires aux " -"images, l'organisation des images dans des catalogues, l'impression des " -"images, l'affichage en diaporama, le paramétrage de l'arrière-plan du bureau " -"et bien d'autres." +#: C/shortcuts.page:229(td/p) +msgid "Rotate right." +msgstr "Pivote sur la droite." -#: C/introduction.page:26(p) -msgid "" -"gThumb includes a tool to import photos from attached cameras and " -"memory card readers." -msgstr "" -"gThumb inclut un outil d'importation de photos à partir des " -"appareils photos connectés et des lecteurs de cartes mémoire." +#: C/shortcuts.page:234(td/p) +msgid "R" +msgstr "R" -#: C/introduction.page:29(p) -msgid "" -"gThumb can read EXIF, XMP, and IPTC metadata that is commonly " -"embedded in files." -msgstr "" -"gThumb peut lire les méta-données EXIF, XMP et IPTC qui sont très " -"souvent intégrées dans les fichiers." +#: C/shortcuts.page:239(td/p) +msgid "Rotate left." +msgstr "Pivote sur la gauche." -#: C/introduction.page:32(p) -msgid "" -"gThumb provides a systems of extensions (or plug-ins), to allow " -"users to extend the functionality of gThumb." -msgstr "" -"gThumb fournit un système d'extensions (ou greffons) qui " -"permettent aux utilisateurs d'étendre les fonctionnalités de gThumb." +#: C/shortcuts.page:244(td/p) +msgid "C" +msgstr "C" -#: C/introduction.page:34(p) -msgid "" -"More information about these extensions, and about gThumb " -"generally, is available at http://live.gnome.org/gthumb." -msgstr "" -"Plus d'informations à propos de ces extensions, et de gThumb en " -"général, sont disponibles sur cette page http://live.gnome.org/gthumb." +#: C/shortcuts.page:249(td/p) +msgid "Crop image." +msgstr "Découpe l'image." -#: C/strftime.page:6(title) -msgid "Date/Time Format Codes" -msgstr "Codes des formats de date/heure" +#: C/shortcuts.page:254(td/p) +msgid "S" +msgstr "S" -#: C/strftime.page:8(p) -msgid "" -"This is a summary of standard date/time codes that may be used in format " -"strings:" -msgstr "" -"Voici un résumé des codes standards de date et d'heure qui peuvent être " -"utilisés dans les chaînes de format :" +#: C/shortcuts.page:259(td/p) +msgid "Resize image." +msgstr "Redimensionne l'image." -#: C/strftime.page:12(title) -msgid "Valid format codes for custom subfolders" -msgstr "Codes de format valides pour les sous-dossiers personnalisés" +#: C/shortcuts.page:266(section/title) +msgid "Viewer shortcuts" +msgstr "Raccourcis clavier du visionneur" -#: C/strftime.page:15(p) -msgid "%a" -msgstr "%a" +#: C/shortcuts.page:278(td/p) +msgid "Space or Page Down" +msgstr "Espace ou Page bas" -#: C/strftime.page:18(p) -msgid "The abbreviated weekday name according to the current locale." -msgstr "" -"Le nom du jour de la semaine sous forme abrégée conformément à " -"l'environnement linguistique actuel." +#: C/shortcuts.page:283(td/p) +msgid "View the next image." +msgstr "Affiche l'image suivante." -#: C/strftime.page:24(p) -msgid "%A" -msgstr "%A" +#: C/shortcuts.page:288(td/p) +msgid "Backspace or Page Up" +msgstr "Retour Arrière ou Page Haut" -#: C/strftime.page:27(p) -msgid "The full weekday name according to the current locale." -msgstr "" -"Le nom complet du jour de la semaine conformément à l'environnement " -"linguistique actuel." +#: C/shortcuts.page:293(td/p) +msgid "View the previous image." +msgstr "Affiche l'image précédente." -#: C/strftime.page:33(p) -msgid "%b" -msgstr "%b" +# note: missing space +#: C/shortcuts.page:298(td/p) C/shortcuts.page:415(td/p) +msgid "Home" +msgstr "Origine" + +#: C/shortcuts.page:303(td/p) +msgid "View the first image." +msgstr "Affiche la première image." -#: C/strftime.page:36(p) -msgid "The abbreviated month name according to the current locale." -msgstr "" -"Le nom du mois sous forme abrégée conformément à l'environnement " -"linguistique actuel." +#: C/shortcuts.page:308(td/p) C/shortcuts.page:425(td/p) +msgid "End" +msgstr "Fin" -#: C/strftime.page:42(p) -msgid "%B" -msgstr "%B" +#: C/shortcuts.page:313(td/p) +msgid "View the last image." +msgstr "Affiche la dernière image." -#: C/strftime.page:45(p) -msgid "The full month name according to the current locale." -msgstr "" -"Le nom complet du mois conformément à l'environnement linguistique actuel." +#: C/shortcuts.page:318(td/p) +msgid " Ctrl D " +msgstr " Ctrl D " -#: C/strftime.page:50(p) -msgid "%c" -msgstr "%c" +#: C/shortcuts.page:326(td/p) +msgid "Add the current location to the bookmarks." +msgstr "Ajoute l'emplacement actuel aux signets." -#: C/strftime.page:53(p) -msgid "The preferred date and time representation for the current locale." -msgstr "" -"La représentation préférée de la date et de l'heure conformément à " -"l'environnement linguistique actuel." +# note: missing space +#: C/shortcuts.page:331(td/p) +msgid "+ or =" +msgstr "+ ou =" -#: C/strftime.page:59(p) -msgid "%C" -msgstr "%C" +#: C/shortcuts.page:336(td/p) +msgid "Zoom in." +msgstr "Zoom avant." -#: C/strftime.page:62(p) -msgid "The century number (year/100) as a 2-digit integer." -msgstr "" -"Le numéro du siècle (année/100) sous la forme d'un entier à 2 chiffres." +#: C/shortcuts.page:341(td/p) +msgid "-" +msgstr "-" -#: C/strftime.page:67(p) -msgid "%d" -msgstr "%d" +#: C/shortcuts.page:346(td/p) +msgid "Zoom out." +msgstr "Zoom arrière." -#: C/strftime.page:70(p) -msgid "The day of the month as a decimal number (range 01 to 31)." -msgstr "" -"Le jour du mois sous la forme d'un nombre décimal (compris entre 01 et 31)." +#: C/shortcuts.page:351(td/p) +msgid "1 or z or / (numeric keypad)" +msgstr "1 ou z ou / (pavé numérique)" -#: C/strftime.page:76(p) -msgid "%D" -msgstr "%D" +#: C/shortcuts.page:357(td/p) +msgid "Actual size." +msgstr "Taille réelle." -#: C/strftime.page:79(p) -msgid "" -"Equivalent to %m/%d/%y. (Yecch -- for Americans only. Americans should note " -"that in other countries %d/%m/%y is rather common. This means that in " -"international context this format is ambiguous and should not be used.)" -msgstr "" -"Équivalent à %m/%d/%y. (Note destinée uniquement aux américains : les " -"américains devraient remarquer que dans les autres pays %d/%m/%y est très " -"courant. Cela signifie que, dans un contexte international, ce format est " -"ambigu et ne devrait pas être utilisé.)" +#: C/shortcuts.page:362(td/p) +msgid "x or * (numeric keypad)" +msgstr "x ou * (pavé numérique)" -#: C/strftime.page:87(p) -msgid "%e" -msgstr "%e" +#: C/shortcuts.page:367(td/p) +msgid "Zoom to fit (scales down only, does not magnify)" +msgstr "Taille ajustée (uniquement en réduction, pas d'agrandissement)" -#: C/strftime.page:90(p) -msgid "" -"Like %d, the day of the month as a decimal number, but a leading zero is " -"replaced by a space." -msgstr "" -"Comme pour %d, le jour du mois sous la forme d'un nombre décimal mais un " -"zéro à gauche est remplacé par un espace." +#: C/shortcuts.page:372(td/p) +msgid " Shift x " +msgstr " Maj x " -#: C/strftime.page:99(p) C/strftime.page:208(p) -msgid "Modifier: use alternative format, see below." -msgstr "Modificateur : utilisez un format alternatif, voyez plus bas." +#: C/shortcuts.page:380(td/p) +msgid "Zoom to fit (scale down or magnify, as required)" +msgstr "Taille ajustée (réduction ou agrandissement selon les besoins)" -#: C/strftime.page:107(p) -msgid "Equivalent to %Y-%m-%d (the ISO 8601 date format). (C99)" -msgstr "Équivalent à %Y-%m-%d (le format de date ISO 8601). (C99)" +#: C/shortcuts.page:385(td/p) +msgid "Arrows" +msgstr "Flèches" -#: C/strftime.page:113(p) -msgid "%G" -msgstr "%G" +#: C/shortcuts.page:390(td/p) +msgid "Scroll the image." +msgstr "Fait défiler l'image." -#: C/strftime.page:116(p) -msgid "" -"The ISO 8601 year with century as a decimal number. The 4-digit year " -"corresponding to the ISO week number (see %V). This has the same format and " -"value as %y, except that if the ISO week number belongs to the previous or " -"next year, that year is used instead." -msgstr "" -"L'année ISO 8601 avec le siècle sous la forme d'un nombre décimal. L'année à " -"4 chiffres correspond au nombre ISO de la semaine (voir %V). C'est le même " -"format et la même valeur que %y à part que, si le nombre ISO de la semaine " -"appartient à l'année précédente ou à l'année suivante, cette année est " -"utilisée à la place." +#: C/shortcuts.page:395(td/p) +msgid " Shift Arrows " +msgstr " Maj Flèches " -#: C/strftime.page:125(p) -msgid "%g" -msgstr "%g" +#: C/shortcuts.page:403(td/p) +msgid "Scroll the image faster." +msgstr "Fait défiler l'image plus rapidement." -#: C/strftime.page:128(p) -msgid "Like %G, but without century, i.e., with a 2-digit year (00-99)." -msgstr "" -"Comme %G mais sans le siècle, c.-à-d. avec une année à 2 chiffres (compris " -"entre 00 et 99)." +#: C/shortcuts.page:410(section/title) +msgid "Browser Navigation" +msgstr "Déplacement dans le navigateur" -#: C/strftime.page:134(p) -msgid "%h" -msgstr "%h" +#: C/shortcuts.page:420(td/p) +msgid "Go to the first file in the browser view." +msgstr "Va au premier fichier dans le navigateur." -#: C/strftime.page:137(p) -msgid "Equivalent to %b." -msgstr "Équivalent à %b." +#: C/shortcuts.page:431(td/p) +msgid "Go to the last file in the browser view." +msgstr "Va au dernier fichier dans le navigateur." -#: C/strftime.page:142(p) -msgid "%H" -msgstr "%H" +#: C/shortcuts.page:436(td/p) +msgid "Down Arrow or Page Down" +msgstr "Flèche bas ou Page bas" -#: C/strftime.page:145(p) -msgid "The hour as a decimal number using a 24-hour clock (range 00 to 23)." -msgstr "" -"L'heure sous la forme d'un nombre décimal en utilisant une horloge à 24 " -"heures (compris entre 00 et 23)." +#: C/shortcuts.page:441(td/p) +msgid "Scroll downwards through the thumbnails." +msgstr "Fait défiler les vignettes vers le bas." -#: C/strftime.page:151(p) -msgid "%I" -msgstr "%I" +#: C/shortcuts.page:446(td/p) +msgid "Up Arrow or Page Up" +msgstr "Flèche haut ou Page haut" -#: C/strftime.page:154(p) -msgid "The hour as a decimal number using a 12-hour clock (range 01 to 12)." -msgstr "" -"L'heure sous la forme d'un nombre décimal en utilisant une horloge à 12 " -"heures (compris entre 01 et 12)." +#: C/shortcuts.page:451(td/p) +msgid "Scroll upwards through the thumbnails." +msgstr "Fait défiler les vignettes vers le haut." -#: C/strftime.page:160(p) -msgid "%j" -msgstr "%j" +#: C/shortcuts.page:456(td/p) +msgid "AltLeft Arrow" +msgstr "AltFlèche gauche" -#: C/strftime.page:163(p) -msgid "The day of the year as a decimal number (range 001 to 366)." -msgstr "" -"Le jour de l'année sous la forme d'un nombre décimal (compris entre 001 et " -"366)." +#: C/shortcuts.page:461(td/p) +msgid "Go back to the previously viewed folder." +msgstr "Retourne au précédent dossier visité." -#: C/strftime.page:169(p) -msgid "%k" -msgstr "%k" +#: C/shortcuts.page:466(td/p) +msgid "AltRight Arrow" +msgstr "AltFlèche droite" -#: C/strftime.page:172(p) -msgid "" -"The hour (24-hour clock) as a decimal number (range 0 to 23); single digits " -"are preceded by a blank. (See also %H.)" -msgstr "" -"L'heure (horloge à 24 heures) sous la forme d'un nombre décimal (compris " -"entre 0 et 23), un chiffre seul est précédé d'un espace (voir également %H)." +#: C/shortcuts.page:471(td/p) +msgid "Go forward (after going back to a folder)." +msgstr "Avance (après être revenu d'un dossier)." -#: C/strftime.page:179(p) -msgid "%l" -msgstr "%l" +#: C/shortcuts.page:476(td/p) +msgid " Alt Up " +msgstr " Alt Flèche haut " -#: C/strftime.page:182(p) -msgid "" -"The hour (12-hour clock) as a decimal number (range 1 to 12); single digits " -"are preceded by a blank. (See also %I.)" -msgstr "" -"L'heure (horloge à 12 heures) sous la forme d'un nombre décimal (compris " -"entre 1 et 12), un chiffre seul est précédé d'un espace (voir également %I)." +#: C/shortcuts.page:484(td/p) +msgid "Go up one level." +msgstr "Remonte d'un niveau." -#: C/strftime.page:189(p) -msgid "%m" -msgstr "%m" +#: C/shortcuts.page:491(section/title) +msgid "Slideshow controls" +msgstr "Contrôles du diaporama" -#: C/strftime.page:192(p) -msgid "The month as a decimal number (range 01 to 12)." -msgstr "Le mois sous la forme d'un nombre décimal (compris entre 01 et 12)." +#: C/shortcuts.page:503(td/p) +msgid "F5" +msgstr "F5" -#: C/strftime.page:197(p) -msgid "%M" -msgstr "%M" +#: C/shortcuts.page:508(td/p) +msgid "Start a slideshow." +msgstr "Démarre un diaporama." -#: C/strftime.page:200(p) -msgid "The minute as a decimal number (range 00 to 59)." -msgstr "" -"Les minutes sous la forme d'un nombre décimal (compris entre 00 et 59)." +#: C/shortcuts.page:513(td/p) +msgid "Space" +msgstr "Espace" -#: C/strftime.page:205(p) -msgid "%O" -msgstr "%O" +#: C/shortcuts.page:518(td/p) +msgid "Pause/Unpause the slideshow." +msgstr "Interrompt/reprend le diaporama." -#: C/strftime.page:213(p) -msgid "%p" -msgstr "%p" +#: C/shortcuts.page:528(td/p) +msgid "Close the slideshow." +msgstr "Ferme le diaporama." -#: C/strftime.page:216(p) -msgid "" -"Either 'AM' or 'PM' according to the given time value, or the corresponding " -"strings for the current locale. Noon is treated as 'pm' and midnight as 'am'." +#: C/shortcuts.page:533(td/p) +msgid "Down Arrow or Right Arrow or Page Down" msgstr "" -"Soit « AM » ou « PM » selon la valeur actuelle de l'heure ou une chaîne " -"correspondante conformément à l'environnement linguistique actuel. Midi est " -"vu comme « pm » et minuit comme « am »." +"Flèche bas ou Flèche droite ou Page bas" -#: C/strftime.page:223(p) -msgid "%P" -msgstr "%P" +#: C/shortcuts.page:538(td/p) +msgid "Load the next image." +msgstr "Charge l'image suivante." -#: C/strftime.page:226(p) -msgid "" -"Like %p but in lowercase: 'am' or 'pm' or a corresponding string for the " -"current locale." +#: C/shortcuts.page:543(td/p) +msgid "Up Arrow or Left Arrow or Page Up" msgstr "" -"Comme %p mais en minuscule : « am » ou « pm » ou une chaîne correspondante " -"conformément à l'environnement linguistique actuel." +"Flèche haut ou Flèche gauche ou Page haut" -#: C/strftime.page:232(p) -msgid "%r" -msgstr "%r" +#: C/shortcuts.page:548(td/p) +msgid "Load the previous image." +msgstr "Charge l'image précédente." + +#: C/sharing-disc.page:6(page/title) +msgid "Creating a CD/DVD/ISO" +msgstr "Création d'un CD/DVD/ISO" -#: C/strftime.page:235(p) +#: C/sharing-disc.page:7(page/p) msgid "" -"The time in a.m. or p.m. notation. In the POSIX locale this is equivalent to " -"'%I:%M:%S %p'." +"To write a series of files to an optical disk (CD or DVD), or to create an " +"ISO disk image file, use the File Export ToOptical Disc menu item." msgstr "" -"L'heure en notation a.m. ou p.m. Dans l'environnement linguistique actuel " -"POSIX, c'est équivalent à « %I:%M:%S %p »." - -#: C/strftime.page:241(p) -msgid "%R" -msgstr "%R" +"Pour enregistrer une série de fichiers sur un disque optique (CD ou DVD) ou " +"créer un fichier image de disque ISO, utilisez le menu FichierExporter versDisque optique." -#: C/strftime.page:244(p) +#: C/sharing-disc.page:13(page/p) msgid "" -"The time in 24-hour notation (%H:%M). For a version including the seconds, " -"see %T below." +"You will be offered the choice of writing the currently selected files, the " +"entire current folder, or the entire current folder and its subfolders. " +"Click OK when you have made the appropriate selection." msgstr "" -"L'heure en notation à 24 heures (%H:%M). Pour une version incluant les " -"secondes, consultez %T ci-dessous." - -#: C/strftime.page:250(p) -msgid "%s" -msgstr "%s" +"Il est alors possible d'enregistrer les fichiers actuellement sélectionnés, " +"le dossier actuel ou le dossier actuel et ses sous-dossiers. Cliquez sur " +"OK lorsque votre choix est fait." -#: C/strftime.page:253(p) +#: C/sharing-disc.page:19(page/p) msgid "" -"The number of seconds since the Epoch, i.e., since 1970-01-01 00:00:00 UTC." +"The next dialog will select the destination disk, or the ISO file to save. " +"When you are ready to complete the process, click Create Image. " +"The optical disk writing process will then commence, or the ISO file will be " +"written, completing the process." msgstr "" -"Le nombre de secondes depuis la date Epoch, c.-à-d. depuis le 01/01/1970 " -"00:00:00 UTC." +"La boîte de dialogue suivante permet la sélection du disque ou du fichier " +"ISO à enregistrer. Lorsque votre choix est fait, cliquez sur Créer " +"l'image. La gravure sur le disque optique commence alors ou le fichier " +"ISO est enregistré, complétant ainsi le processus." -#: C/strftime.page:259(p) -msgid "%S" -msgstr "%S" +#: C/sharing-social.page:6(page/title) +msgid "Uploading to Photo-Sharing Web Sites" +msgstr "Envoi de photos sur des sites Web de partage" -#: C/strftime.page:262(p) +#: C/sharing-social.page:7(page/p) msgid "" -"The second as a decimal number (range 00 to 60). (The range is up to 60 to " -"allow for occasional leap seconds.)" +"gThumb is provided with a number of extensions for uploading photos to " +"various \"social media\" web sites. By default, uploaders for Facebook, " +"Flickr, Picasa, and Photobucket are enabled." msgstr "" -"Les secondes en nombre décimal (compris entre 00 et 60) (la plage va jusqu'à " -"60 pour permettre des secondes intercalaires occasionnelles)." - -#: C/strftime.page:269(p) -msgid "%T" -msgstr "%T" - -#: C/strftime.page:272(p) -msgid "The time in 24-hour notation (%H:%M:%S)." -msgstr "L'heure en notation à 24 heures (%H:%M:%S)." - -#: C/strftime.page:277(p) -msgid "%u" -msgstr "%u" +"gThumb possède un certain nombre d'extensions pour envoyer des photos sur " +"divers sites Web de réseaux sociaux. Par défaut, les extensions pour " +"Facebook, Flickr, Picasa et Photobucket sont activés." -#: C/strftime.page:280(p) +#: C/sharing-social.page:13(page/p) msgid "" -"The day of the week as a decimal number, range 1 to 7, Monday being 1. See " -"also %w." +"To upload a series of photos, select the images in the browser view, and " +"click the Share button in the toolbar. Select the appropriate web " +"site from the menu that appears." msgstr "" -"Le jour de la semaine représenté par un chiffre compris entre 1 et 7, lundi " -"étant représenté par 1. Consultez aussi %w." - -#: C/strftime.page:286(p) -msgid "%U" -msgstr "%U" +"Pour envoyer une série de photos, choisissez les images dans le navigateur " +"et cliquez sur le bouton Partager de la barre d'outils. " +"Choisissez le site Web souhaité dans le menu qui apparaît." -#: C/strftime.page:289(p) +#: C/sharing-social.page:17(page/p) msgid "" -"The week number of the current year as a decimal number, range 00 to 53, " -"starting with the first Sunday as the first day of week 01. See also %V and %" -"W." +"You may be prompted for additional information specific to the destination " +"site, like an album name. You may also be prompted for your user name and " +"password for the site. It may be necessary for gThumb to open a web browser, " +"where you complete the required authentication steps. Once you have " +"completed the required authentication steps in the browser, return to gThumb " +"and continue the upload." msgstr "" -"Le numéro de la semaine de l'année actuelle sous la forme d'un nombre " -"décimal compris entre 00 et 53, le premier dimanche est le premier jour de " -"la semaine 01. Consultez également %V et %W." - -#: C/strftime.page:296(p) -msgid "%V" -msgstr "%V" +"Il se peut que vous deviez renseigner des informations supplémentaires " +"spécifiques au site de destination, comme par exemple un nom d'album ou vos " +"nom d'utilisateur et mot de passe pour se connecter au site. Il peut arriver " +"que gThumb doive ouvrir un navigateur Web pour que vous puissiez effectuer " +"la phase d'authentification. Lorsque celle-ci est terminée, revenez dans " +"gThumb pour continuer l'envoi des photos." -#: C/strftime.page:299(p) +#: C/sharing-social.page:26(page/p) msgid "" -"The ISO 8601:1988 week number of the current year as a decimal number, range " -"01 to 53, where week 1 is the first week that has at least 4 days in the " -"current year, and with Monday as the first day of the week. See also %U and %" -"W." +"If you do not see the expected upload sites in the Share menu, " +"check that the appropriate exporter extensions are enabled in " +"EditExtensions." msgstr "" -"Le numéro ISO 8601:1988 de la semaine de l'année actuelle sous la forme d'un " -"nombre décimal, compris entre 01 et 53, où la semaine 1 est la première " -"semaine qui possède au moins 4 jours dans l'année actuelle, le lundi étant " -"le premier jour de la semaine. Consultez également %U et %W." - -#: C/strftime.page:308(p) -msgid "%w" -msgstr "%w" +"Si le site souhaité ne se trouve pas dans le menu Partager, " +"vérifiez que l'extension correspondante est bien activée dans " +"ÉditionExtensions." -#: C/strftime.page:311(p) +#: C/sharing-social.page:31(page/p) msgid "" -"The day of the week as a decimal, range 0 to 6, Sunday being 0. See also %u." +"For some sites, gThumb also supports downloading photos from the site into " +"gThumb. See the FileImport From menu " +"for the available download options." msgstr "" -"Le jour de la semaine sous la forme d'un nombre décimal, compris entre 0 et " -"6, le dimanche correspond à 0. Consultez également %u." +"Pour certains sites, gThumb est aussi capable de télécharger les photos du " +"site dans gThumb. Examinez le menu FichierImporter " +"depuis pour connaître les options de téléchargement " +"disponibles." -#: C/strftime.page:317(p) -msgid "%W" -msgstr "%W" +#: C/wallpaper.page:6(page/title) +msgid "Desktop Wallpaper" +msgstr "Papier peint du bureau" -#: C/strftime.page:320(p) +#: C/wallpaper.page:7(page/p) msgid "" -"The week number of the current year as a decimal number, range 00 to 53, " -"starting with the first Monday as the first day of week 01." +"To set an image as the system desktop wallpaper, right-click on the image " +"and select Set as Desktop Background from the " +"pop-up menu. The desktop background will change, and the Gnome Appearance " +"Preferences dialog will appear. You can use this dialog to make adjustments " +"to the background settings (positioning, stretching, tiling, et cetera.)." msgstr "" -"Le numéro de la semaine de l'année actuelle sous la forme d'un nombre " -"décimal, compris entre 00 et 53, le premier lundi est le premier jour de la " -"semaine 01." +"Pour définir une image comme fond d'écran, faites un clic droit sur l'image " +"et sélectionnez dans le menu contextuel Définir comme arrière-" +"plan du bureau. Le fond d'écran change et la boîte de " +"dialogue des préférences Apparence de GNOME s'affiche. Vous pouvez utiliser " +"cette boîte de dialogue pour faire des ajustements aux paramètres du fond " +"d'écran (positionnement, étirement, mosaïque, etc)." -#: C/strftime.page:327(p) -msgid "%x" -msgstr "%x" +#: C/bookmarks.page:6(page/title) +msgid "Using Bookmarks" +msgstr "Utilisation des signets" -#: C/strftime.page:330(p) +#: C/bookmarks.page:8(page/p) msgid "" -"The preferred date representation for the current locale without the time." +"Frequently-used folders can be added to the bookmark list for rapid access. " +"To add the current folder to the bookmark list, press CtrlD or use the command BookmarksAdd Bookmark." msgstr "" -"La représentation préférée de la date conformément à l'environnement " -"linguistique actuel, sans l'heure." - -#: C/strftime.page:336(p) -msgid "%X" -msgstr "%X" +"Les dossiers fréquemment utilisés peuvent être ajoutés à la liste des " +"signets pour un accès rapide. Pour ajouter le dossier actuel dans la liste " +"des signets, appuyez sur CtrlD ou " +"utilisez la commande SignetsAjouter un signet." -#: C/strftime.page:339(p) +#: C/bookmarks.page:13(page/p) msgid "" -"The preferred time representation for the current locale without the date." +"To remove or rearrange bookmarks in a different order use the " +"BookmarksEdit Bookmarks command." msgstr "" -"La représentation préférée de l'heure conformément à l'environnement " -"linguistique actuel, sans la date." - -#: C/strftime.page:345(p) -msgid "%y" -msgstr "%y" +"Pour supprimer ou modifier l'ordre des signets, utilisez la commande " +"SignetsÉditer les signets." -#: C/strftime.page:348(p) -msgid "The year as a decimal number without a century (range 00 to 99)." +#: C/bookmarks.page:16(page/p) +msgid "" +"BookmarksSystem Bookmarks provides " +"access to the system bookmarks that have been defined in Nautilus " +"or the file-chooser dialog used in most Gnome applications." msgstr "" -"L'année sous la forme d'un nombre décimal sans le siècle (compris entre 00 " -"et 99)." - -#: C/strftime.page:354(p) -msgid "%Y" -msgstr "%Y" - -#: C/strftime.page:357(p) -msgid "The year as a decimal number including the century." -msgstr "L'année sous la forme d'un nombre décimal avec le siècle." - -#: C/strftime.page:362(p) -msgid "%z" -msgstr "%z" +"Le menu SignetsSignets du système " +"donne accès aux signets du système qui ont été définis dans Nautilus ou la boîte de dialogue de sélection de fichiers utilisée dans de " +"nombreuses applications GNOME." -#: C/strftime.page:365(p) +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/import.page:21(media) +msgctxt "_" +msgid "" +"external ref='figures/import.png' md5='aab2ba4d889d170b219c554294d69b0f'" +msgstr "" +"external ref='figures/import.png' md5='aab2ba4d889d170b219c554294d69b0f'" + +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/import.page:43(media) +msgctxt "_" +msgid "" +"external ref='figures/import-pref-auto-folder.png' " +"md5='0a41de83da83b762e37f3962a7e4c042'" +msgstr "" +"external ref='figures/import-pref-auto-folder.png' " +"md5='0a41de83da83b762e37f3962a7e4c042'" + +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/import.page:75(media) +msgctxt "_" msgid "" -"The time-zone as hour offset from GMT. Required to emit RFC 822-conformant " -"dates (using \"%a, %d %b %Y %H:%M:%S %z\")." +"external ref='figures/import-pref-custom-format.png' " +"md5='989ca536c873ec926a4a71c876004b9f'" msgstr "" -"Le fuseau horaire représenté par le décalage horaire par rapport à GMT. Ceci " -"est nécessaire pour émettre des dates conformes à RFC 822 (en utilisant « %a, " -"%d %b %Y %H:%M:%S %z »)." - -#: C/strftime.page:372(p) -msgid "%Z" -msgstr "%Z" +"external ref='figures/import-pref-custom-format.png' " +"md5='989ca536c873ec926a4a71c876004b9f'" -#: C/strftime.page:375(p) -msgid "The time zone or name or abbreviation." -msgstr "Le fuseau horaire ou le nom ou l'abréviation." +#: C/import.page:8(page/title) +msgid "Importing From a Camera" +msgstr "Importation depuis un appareil photo" -#: C/strftime.page:380(p) +#: C/import.page:10(page/p) msgid "" -"Some conversion specifications can be modified by preceding the conversion " -"specifier character by the E or O modifier to indicate that an alternative " -"format should be used. If the alternative format or specification does not " -"exist for the current locale, the behaviour will be as if the unmodified " -"conversion specification were used. The Single Unix Specification mentions %" -"Ec, %EC, %Ex, %EX, %Ey, %EY, %Od, %Oe, %OH, %OI, %Om, %OM, %OS, %Ou, %OU, %" -"OV, %Ow, %OW, %Oy, where the effect of the O modifier is to use alternative " -"numeric symbols (say, roman numerals), and that of the E modifier is to use " -"a locale-dependent alternative representation." +"On most systems, gThumb will automatically launch the import " +"dialog when a digital camera is connected to the computer, or a memory card " +"with photos is plugged into a card reader. (It does this because it is " +"registered as the default handler for x-content/image-dcf and x-content/" +"image-picturecd mime types.)" msgstr "" -"Certaines spécifications de conversion peuvent être modifiées en faisant " -"précéder le caractère de spécification de la conversion par le modificateur " -"E ou O, pour indiquer qu'un format alternatif doit être utilisé. Si le " -"format alternatif ou la spécification n'existe pas dans l'environnement " -"linguistique actuel, le comportement reste le même que celui sans le " -"modificateur. Le « Single Unix Specification » mentionne %Ec, %EC, %Ex, %EX, %" -"Ey, %EY, %Od, %Oe, %OH, %OI, %Om, %OM, %OS, %Ou, %OU, %OV, %Ow, %OW, %Oy où " -"les effets de l'utilisation du préfixe O sont l'utilisation d'autres " -"symboles numériques (comme des chiffres romains, par exemple) et que ceux du " -"préfixe E sont l'usage d'une représentation alternative dépendante de " -"l'environnement linguistique." - -#: C/attributes.page:6(title) -msgid "Attribute Codes" -msgstr "Codes d'attributs" +"Sur la plupart des systèmes, gThumb ouvre automatiquement la " +"boîte de dialogue d'importation quand un appareil photo numérique est " +"connecté à l'ordinateur, ou si une carte mémoire contenant des photos est " +"insérée dans un lecteur de carte car gThumb est déclaré comme " +"gestionnaire par défaut des types MIME x-content/image-dcf et x-content/" +"image-picturecd." -#: C/attributes.page:7(p) +#: C/import.page:16(page/p) msgid "" -"gThumb stores many different attributes for each file. Extensions " -"may add more. The list below is a summary of some of the more common " -"attributes:" +"To manually launch the import dialog, use FileImport " +"FromRemovable Device." msgstr "" -"gThumb enregistre de nombreux attributs pour chaque fichier. Les " -"extensions en ajoutent encore plus. La liste qui suit est un résumé d'une " -"partie des attributs les plus courants :" - -#: C/attributes.page:12(p) -msgid "gth::file::display-size" -msgstr "gth::file::display-size" - -#: C/attributes.page:15(p) -msgid "standard::fast-content-type" -msgstr "standard::fast-content-type" - -#: C/attributes.page:18(p) -msgid "general::dimensions" -msgstr "general::dimensions" - -#: C/attributes.page:21(p) -msgid "general::format" -msgstr "general::format" - -#: C/attributes.page:24(p) -msgid "general::location" -msgstr "general::location" - -#: C/attributes.page:27(p) -msgid "general::datetime" -msgstr "general::datetime" - -#: C/attributes.page:30(p) -msgid "general::rating" -msgstr "general::rating" - -#: C/attributes.page:33(p) -msgid "Exif::Image::Make" -msgstr "Exif::Image::Make" - -#: C/attributes.page:36(p) -msgid "Exif::Image::Model" -msgstr "Exif::Image::Model" - -#: C/attributes.page:39(p) -msgid "Exif::Image::Software" -msgstr "Exif::Image::Software" - -#: C/attributes.page:42(p) -msgid "Exif::Image::Artist" -msgstr "Exif::Image::Artist" - -#: C/attributes.page:45(p) -msgid "Exif::Image::Copyright" -msgstr "Exif::Image::Copyright" - -#: C/attributes.page:48(p) -msgid "Exif::Photo::ISOSpeedRatings" -msgstr "Exif::Photo::ISOSpeedRatings" - -#: C/attributes.page:51(p) -msgid "Exif::Photo::BrightnessValue" -msgstr "Exif::Photo::BrightnessValue" - -#: C/attributes.page:54(p) -msgid "Exif::Photo::FNumber" -msgstr "Exif::Photo::FNumber" - -#: C/attributes.page:57(p) -msgid "Exif::Photo::ApertureValue" -msgstr "Exif::Photo::ApertureValue" - -#: C/attributes.page:60(p) -msgid "Exif::Photo::MaxApertureValue" -msgstr "Exif::Photo::MaxApertureValue" +"Pour lancer la boîte de dialogue d'importation manuellement, utilisez le " +"menu FichierImporter depuisPériphérique " +"amovible." -#: C/attributes.page:63(p) -msgid "Exif::Photo::ExposureTime" -msgstr "Exif::Photo::ExposureTime" +#: C/import.page:20(figure/title) +msgid "The Import Dialog" +msgstr "Boîte de dialogue d'importation" -#: C/attributes.page:66(p) -msgid "Exif::Photo::ExposureProgram" -msgstr "Exif::Photo::ExposureProgram" +#: C/import.page:24(page/p) +msgid "" +"The import dialog shows thumbnails of the photos available on the selected " +"device. The user can select one of more photos using normal keyboard or " +"mouse techniques (for example, Ctrl+click to add a photo to the selection, " +"or click and drag the mouse over the desired photos.) If no photos are " +"explicitly selected, all will be imported." +msgstr "" +"La boîte de dialogue d'importation affiche les vignettes des photos " +"disponibles sur le périphérique sélectionné. L'utilisateur peut sélectionner " +"une ou plusieurs photos avec les méthodes standards au clavier ou à la " +"souris (par exemple : Ctrl + clic pour ajouter une photo à la sélection, ou " +"clic et déplacement de la souris sur les photos souhaitées). Si aucune photo " +"n'est sélectionnée explicitement alors elles sont toutes importées." -#: C/attributes.page:69(p) -msgid "Exif::Photo::ExposureIndex" -msgstr "Exif::Photo::ExposureIndex" +#: C/import.page:30(page/p) +msgid "" +"Tags may optionally be associated with the imported photos, using the " +"Tags control below the thumbnail window. Click the drop-down " +"control to see the predefined tags." +msgstr "" +"Des étiquettes peuvent être associées aux photos importées, à l'aide du " +"contrôle Étiquettes en dessous de la fenêtres des vignettes. " +"Cliquez sur la liste déroulante pour visualiser les étiquettes prédéfinies." -#: C/attributes.page:72(p) -msgid "Exif::Photo::ExposureBiasValue" -msgstr "Exif::Photo::ExposureBiasValue" +#: C/import.page:34(page/p) +msgid "" +"An event name may also be optionally associated with the photos. This event " +"name can be used to generate an automatic subfolder name (possibly " +"incorporating a date) as described below. For example, if the base " +"destination folder is \"/photos\", and you enter \"Wedding-Jennifer\" in the " +"Event field, you can configure generation of automatic subfolders " +"like \"/photos/2010-07-31, Wedding-Jennifer\"." +msgstr "" +"Le nom d'un évènement peut être associé aux photos. Le nom de cet évènement " +"peut être utilisé pour générer un sous-dossier automatique (avec la " +"possibilité d'ajouter la date) tel que décrit ci-dessous. Par exemple : si " +"le dossier de destination est « /photos », et que vous saisissez « Mariage-" +"Magalie » dans le champ Évènement, vous pouvez configurer la " +"génération automatique des sous-dossiers comme cela « /photos/2010-07-31, " +"Mariage-Magalie »." -#: C/attributes.page:75(p) -msgid "Exif::Photo::ExposureMode" -msgstr "Exif::Photo::ExposureMode" +#: C/import.page:42(figure/title) +msgid "Standard Date-Based Subfolders" +msgstr "Sous-dossiers standards basés sur la date" -#: C/attributes.page:78(p) -msgid "Exif::Photo::ShutterSpeedValue" -msgstr "Exif::Photo::ShutterSpeedValue" +#: C/import.page:46(page/p) +msgid "" +"As mentioned above, subfolders for imported photos can be automatically " +"generated based on event names and dates. This is enabled or disabled by " +"clicking on the destination foldername in the import dialog. This opens a " +"second dialog, where the base folder for imports may be selected (the " +"Destination folder). To generate automatic subfolders, select " +"Automatic subfolder." +msgstr "" +"Comme mentionné ci-dessus, les sous-dossiers pour les photos importées " +"peuvent être créés automatiquement et nommés en fonction des évènements et " +"de la date. Cette action est activée en cliquant sur le nom de dossier cible " +"dans la boîte de dialogue d'importation. Une seconde boîte de dialogue " +"s'ouvre, où le dossier de base pour les importations peut être sélectionné " +"(le dossier Destination). Pour générer des sous-dossiers " +"automatiquement, sélectionnez Sous-dossier automatique." -#: C/attributes.page:81(p) -msgid "Exif::Photo::MeteringMode" -msgstr "Exif::Photo::MeteringMode" +#: C/import.page:52(page/p) +msgid "" +"You can select either the File Date or the Current Date to use as the basis for subfolder naming. (The File Date " +"examines the dates embedded in the file metadata to determine when the photo " +"was taken.) A variety of standard date formats are available (year-" +"month for example). The as single subfolder checkbox " +"controls whether a \"deep\" or \"shallow\" hierarchy of files is made (for " +"example, with year-month, you can have year subfolders with month " +"subfolders under them, or all subfolders can be at the same level in the " +"filesystem, with the year and name both the folder name." +msgstr "" +"Vous pouvez sélectionner soit la Date du fichier soit la " +"Date actuelle comme base pour le nom du dossier. L'option " +"Date du fichier lit la date intégrée dans les méta-données du " +"fichier pour déterminer quand la photo a été prise. Divers formats standards " +"de date sont disponibles (par exemple Mois-année). La case à " +"cocher comme sous-dossier unique contrôle la profondeur de " +"l'arborescence des fichiers (par exemple, avec l'option Année-mois, vous pouvez avoir des sous-dossiers « année » contenant des sous-" +"dossiers « mois » ou bien tous les sous-dossiers au même niveau dans le " +"système de fichiers, contenant l'année et le mois dans leur nom." -#: C/attributes.page:84(p) -msgid "Exif::Photo::LightSource" -msgstr "Exif::Photo::LightSource" +#: C/import.page:61(page/p) +msgid "" +"It is not necessary to use the predefined date formats. If you select " +"custom format, standard date codes can be used. Click on the help " +"icon to the right of the custom format field for a list of format codes. \"%E" +"\" is a special code that will embed the Event name defined in " +"the main import dialog." +msgstr "" +"Il n'est pas obligatoire d'utiliser les formats de date prédéfinis. Si vous " +"sélectionnez Format personnalisé, les codes de date standards " +"peuvent être utilisés. Cliquez sur l'icône d'aide à droite du champ de " +"format personnalisé pour obtenir une liste des codes disponibles. Le code " +"« %E » est un code spécial qui permet d'inclure le nom de l'Évènement défini dans la boîte de dialogue d'importation principale." -#: C/attributes.page:87(p) -msgid "Exif::Photo::WhiteBalance" -msgstr "Exif::Photo::WhiteBalance" +#: C/import.page:67(page/p) +msgid "See for more date format codes." +msgstr "" +"Pour plus d'informations sur les codes de format de date, consultez la " +"section ." -#: C/attributes.page:90(p) -msgid "Exif::Photo::Flash" -msgstr "Exif::Photo::Flash" +#: C/import.page:69(page/p) +msgid "" +"If you use automatic subfolder naming, the Destination field in " +"the main import dialog will show the automatic portion of the folder in red. " +"(For date-based formats, dummy data may be shown in the red portion.)" +msgstr "" +"Si vous utilisez l'attribution automatique de nom de sous-dossier, le champ " +"Destination de la boîte de dialogue d'importation principale " +"affiche la partie automatique du nom de dossier en rouge (pour les formats " +"de date, une valeur fictive peut être affichée dans la partie en rouge)." -#: C/attributes.page:93(p) -msgid "Exif::Photo::FocalLength" -msgstr "Exif::Photo::FocalLength" +#: C/import.page:74(figure/title) +msgid "Using Custom Formats" +msgstr "Utilisation des formats personnalisés" -#: C/attributes.page:96(p) -msgid "Exif::Photo::SubjectArea" -msgstr "Exif::Photo::SubjectArea" +#: C/slideshow.page:7(page/title) +msgid "Automatic Slideshow" +msgstr "Diaporama automatique" -#: C/attributes.page:99(p) -msgid "Exif::Photo::Contrast" -msgstr "Exif::Photo::Contrast" +#: C/slideshow.page:9(page/p) +msgid "" +"A slideshow of the currently selected images can be started from the image " +"browser by pressing F5, by clicking the slideshow toolbar icon, " +"or by clicking ViewSlideshow. If no " +"images are selected, all images in the folder will be included." +msgstr "" +"Pour lancer un diaporama des images sélectionnées depuis le navigateur " +"appuyez sur F5, cliquez sur l'icône de diaporama de la barre " +"d'outils ou cliquez AffichageDiaporama. Si aucune image n'est sélectionnée, toutes les images du dossier " +"sont inclues." -#: C/attributes.page:102(p) -msgid "Exif::Photo::Saturation" -msgstr "Exif::Photo::Saturation" +#: C/slideshow.page:15(page/p) +msgid "" +"The transition effects and the time each image is shown can be modified from " +"the EditPreferencesSlideshow dialog." +msgstr "" +"Les effets de transition et la durée pendant laquelle chaque image est " +"affichée peuvent être modifiés dans la boîte de dialogue " +"ÉditionPréférencesDiaporama." -#: C/attributes.page:105(p) -msgid "Exif::Photo::Sharpness" -msgstr "Exif::Photo::Sharpness" +#: C/slideshow.page:19(page/p) +msgid "" +"Some graphics cards and drivers may experience problems (crashes) if " +"transition effects are enabled. If you experience such difficulties, set the " +"Transition effect preference to None." +msgstr "" +"Certaines cartes graphiques et leur pilote peuvent présenter des problèmes " +"(arrêt brutal) si les effets de transition sont activés. Si vous rencontrez " +"ce type de problèmes, configurez les préférences Effet de transition à Aucun." -#: C/index.page:7(name) -msgid "Paolo Bacchilega" -msgstr "Paolo Bacchilega" +#: C/slideshow.page:23(page/p) +msgid "" +"You can advance manually to the next image by pressing Down Arrow, Right Arrow, Page Down or Space." +msgstr "" +"Pour aller à l'image suivante, appuyez sur la touche Flèche bas, " +"Flèche droite, Page bas ou Espace." -#: C/index.page:8(email) -msgid "paobac@src.gnome.org" -msgstr "paobac@src.gnome.org" +#: C/slideshow.page:27(page/p) +msgid "" +"You can go back to the previous image by pressing Up Arrow, " +"Left Arrow or Page Up." +msgstr "" +"Pour retourner à l'image précédente, appuyez sur la touche Flèche haut, Flèche gauche ou Page haut." -#: C/index.page:12(name) -msgid "Michael J. Chudobiak" -msgstr "Michael J. Chudobiak" +#: C/slideshow.page:30(page/p) +msgid "You can pause or un-pause the slideshow by pressing p." +msgstr "Pour interrompre ou reprendre un diaporama, appuyez sur p." -#: C/index.page:13(email) -msgid "mjc@avtechpulse.com" -msgstr "mjc@avtechpulse.com" - -#: C/index.page:20(title) -msgid "gThumbHelp" -msgstr "Manuel de gThumb" +#: C/slideshow.page:32(page/p) +msgid "To exit the slideshow, press Escape or F5." +msgstr "" +"Pour quitter le diaporama, appuyez sur Échap ou F5." -#: C/index.page:23(title) -msgid "Welcome" -msgstr "Bienvenue" +#: C/file-copy-move.page:6(page/title) +msgid "Copying and Moving Files" +msgstr "Copie et déplacement de fichiers" -#: C/index.page:27(title) -msgid "File Management" -msgstr "Gestion des fichiers" +#: C/file-copy-move.page:8(page/p) +msgid "There are three ways to copy or move files in gThumb." +msgstr "" +"Il y a trois façons de copier ou de déplacer des fichiers dans gThumb." -#: C/index.page:31(title) -msgid "Editing Mode" -msgstr "Mode Édition" +#: C/file-copy-move.page:12(item/title) +msgid "Cut and Paste" +msgstr "Couper et coller" -#: C/index.page:32(p) +#: C/file-copy-move.page:13(item/p) msgid "" -" " -"Numerous editing tools are provided for touching-up individual photos. Undo " -"and redo functions are provided, up until the photo is saved. To access the " -"editing tools, open an image and then click the Edit File toolbar " -"button (the palette icon), or press e." +"To copy a file in the browser view, use EditCopy, or press CtrlC. To " +"move a file, use EditCut, or press " +"CtrlX. Then navigate to the " +"destination folder using the folder tree. Use EditPaste, or press CtrlV, to complete the file transfer." msgstr "" -" De " -"nombreux outils d'édition sont fournis pour modifier les photos " -"individuellement. Des fonctions annuler et rétablir sont fournies tant que " -"la photo n'est pas enregistrée. Pour accéder aux outils d'édition, ouvrez " -"une image et cliquez sur le bouton Modifier le fichier de la " -"barre d'outils (l'icône palette) ou appuyez sur la touche e." +"Pour copier un fichier dans le navigateur, choisissez ÉditionCopier ou appuyez sur CtrlC. Pour déplacer un fichier, choisissez ÉditionCouper ou appuyez sur CtrlX. Placez-vous ensuite dans le dossier de destination dans " +"l'arborescence. Choisissez ÉditionColler ou appuyez sur CtrlV pour " +"terminer le transfert du fichier." -#: C/index.page:42(title) -msgid "Batch Tools" -msgstr "Outils de traitement par lot" +#: C/file-copy-move.page:26(item/title) +msgid "Drag and Drop" +msgstr "Glisser-déposer" -#: C/index.page:43(p) +#: C/file-copy-move.page:27(item/p) msgid "" -"Batch tools are provided to modify multiple images simultaneously. Changes " -"are written immediately, and are not undoable." +"To copy a file to another folder, simply drag the file (with a sustained " +"left-mouse click) to the destination folder visible in the folder tree. To " +"move a file, hold down the Shift key while dragging." msgstr "" -"Des outils de traitement par lot sont fournis pour traiter plusieurs images " -"en même temps. Les modifications sont enregistrées immédiatement et ne sont " -"pas réversibles." - -#: C/index.page:49(title) -msgid "Slideshows" -msgstr "Diaporamas" +"Pour copier un fichier vers un autre dossier, faites simplement glisser le " +"fichier (par un clic gauche non relâché) vers le dossier de destination " +"visible dans l'arborescence des dossiers. Pour déplacer un fichier, appuyez " +"sur la touche Maj tout en effectuant le glisser-déposer." -#: C/index.page:53(title) -msgid "Importing" -msgstr "Importation" +#: C/file-copy-move.page:31(item/p) +msgid "" +"You can also use the middle mouse button to drag files. In this case, " +"gThumb will ask you if you wish to copy the files, move the " +"files, or cancel the operation." +msgstr "" +"Il est aussi possible d'utiliser le bouton central de la souris pour faire " +"glisser des fichiers. Dans ce cas, gThumb demande si vous voulez " +"copier les fichiers, les déplacer ou annuler l'opération." -#: C/index.page:57(title) -msgid "Sharing" -msgstr "Partage" +#: C/file-copy-move.page:37(item/title) +msgid "File Copy / Move Dialog" +msgstr "Boîte de dialogue de copie/déplacement de fichier" -#: C/index.page:61(title) -msgid "Organizing" -msgstr "Organisation" +#: C/file-copy-move.page:38(item/p) +msgid "" +"Select the files to be transferred, right-click on the selection, and choose " +"Copy to... or Move to.... This will open a folder-selection dialog, where you can choose the " +"destination folder. At the bottom of the dialog, you can enable the " +"View the destination option if you want to go to " +"the destination folder after the file transfer is complete." +msgstr "" +"Choisissez les fichiers à transférer, faites un clic droit sur la sélection " +"puis choisissez Copier vers… ou " +"Déplacer vers…. Cela ouvre une boîte de dialogue " +"de sélection de dossier qui permet de choisir le dossier de destination. Au " +"bas de cette boîte de dialogue, vous pouvez activer l'option " +"Afficher la destination si vous souhaitez aller " +"dans le dossier de destination après la fin du transfert de fichier." -#: C/index.page:65(title) -msgid "Other Tools" -msgstr "Autres outils" +#: C/legal.xml:4(p/link) +msgid "Creative Commons Attribution-Share Alike 3.0 Unported License" +msgstr "" -#: C/index.page:69(title) -msgid "Reference" -msgstr "Référence" +#: C/legal.xml:3(license/p) +msgid "This work is licensed under a <_:link-1/>." +msgstr "" -#. Put one translator per line, in the form of NAME , YEAR1, YEAR2 -#: C/index.page:0(None) -msgid "translator-credits" +#: C/legal.xml:6(license/p) +msgid "" +"As a special exception, the copyright holders give you permission to copy, " +"modify, and distribute the example code contained in this document under the " +"terms of your choosing, without restriction." msgstr "" -"Bruno Brouard , 2007,2010\n" -"Claude Paroz , 2007,2011\n" -"Laurent Coudeur , 2010" + diff -Nru gthumb-3.0.2/help/fr/fullscreen.page gthumb-3.2.3/help/fr/fullscreen.page --- gthumb-3.0.2/help/fr/fullscreen.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/fullscreen.page 2013-06-18 17:54:25.000000000 +0000 @@ -3,6 +3,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Mode plein écran manuel diff -Nru gthumb-3.0.2/help/fr/gimp.page gthumb-3.2.3/help/fr/gimp.page --- gthumb-3.0.2/help/fr/gimp.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/gimp.page 2013-06-18 17:54:25.000000000 +0000 @@ -2,6 +2,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Lancement de GIMP

Si des fichiers sont sélectionnés dans le navigateur ou si une image est ouverte dans le visionneur, vous pouvez les ouvrir dans l'Éditeur d'images GIMP en appuyant sur la touche g.

diff -Nru gthumb-3.0.2/help/fr/import.page gthumb-3.2.3/help/fr/import.page --- gthumb-3.0.2/help/fr/import.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/import.page 2013-06-18 17:54:25.000000000 +0000 @@ -3,6 +3,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Importation depuis un appareil photo diff -Nru gthumb-3.0.2/help/fr/index.page gthumb-3.2.3/help/fr/index.page --- gthumb-3.0.2/help/fr/index.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/index.page 2013-06-18 17:54:24.000000000 +0000 @@ -15,9 +15,27 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + - gThumb Help + Manuel de gThumb
Bienvenue diff -Nru gthumb-3.0.2/help/fr/introduction.page gthumb-3.2.3/help/fr/introduction.page --- gthumb-3.0.2/help/fr/introduction.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/introduction.page 2013-06-18 17:54:24.000000000 +0000 @@ -2,6 +2,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + À propos de gThumb diff -Nru gthumb-3.0.2/help/fr/printing.page gthumb-3.2.3/help/fr/printing.page --- gthumb-3.0.2/help/fr/printing.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/printing.page 2013-06-18 17:54:25.000000000 +0000 @@ -2,6 +2,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Impression d'images diff -Nru gthumb-3.0.2/help/fr/rename-series.page gthumb-3.2.3/help/fr/rename-series.page --- gthumb-3.0.2/help/fr/rename-series.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/rename-series.page 2013-06-18 17:54:25.000000000 +0000 @@ -4,6 +4,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Renommage de fichiers @@ -22,9 +40,7 @@
-

- # -

+

#

Ce symbole est remplacé par la valeur d'un compteur qui s'incrémente de 1 en passant d'une image à une autre. Si vous spécifiez ce symbole plusieurs fois à la suite, vous obtenez des zéros non significatifs si la valeur du compteur possède moins de chiffres ; par exemple, ### produit la suite : 001, 002, 003, etc.

@@ -52,9 +68,7 @@
-

- %N -

+

%N

Ce symbole est remplacé par l'énumération de l'image originale. Par exemple, si le nom de fichier original est IMG_9876.JPG, ceci extrait la partie numérique « 9876 ». Si le nom du fichier contient plusieurs groupes de nombres (par ex. IMG_123_456.JPG), seul le premier groupe est utilisé (« 123 » dans cet exemple).

@@ -62,9 +76,7 @@
-

- %M{format} -

+

%M{format}

Ce symbole est remplacé par la date de modification de l'image originale. Le format de la date (optionnellement de l'heure) peut être spécifié en ajoutant le code de formatage standard entre accolades. Par exemple, « %M{%Y-%m-%d, %T} » est remplacé par la date et l'heure suivante « 2010-04-01, 15:02:01 ».

@@ -72,9 +84,7 @@
-

- %D{format} -

+

%D{format}

Ce symbole est remplacé par la date de prise de vue de l'image originale (en général déterminée par l'horodatage Exif intégré dans la photo). Le format de la date (optionnellement de l'heure) peut être spécifié en ajoutant le code de formatage standard entre accolades. Par exemple, « %D{%Y-%m-%d, %T} » est remplacé par la date et l'heure suivante « 2010-04-01, 15:02:01 ».

@@ -82,9 +92,7 @@
-

- %A{identifiant} -

+

%A{identifier}

Ce symbole est remplacé par les données spécifiées par l'identifiant. Par exemple : « %A{ general::dimensions } » est remplacé par les dimensions suivantes « 320 x 240 ».

diff -Nru gthumb-3.0.2/help/fr/sharing-disc.page gthumb-3.2.3/help/fr/sharing-disc.page --- gthumb-3.0.2/help/fr/sharing-disc.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/sharing-disc.page 2013-06-18 17:54:25.000000000 +0000 @@ -2,6 +2,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Création d'un CD/DVD/ISO

Pour enregistrer une série de fichiers sur un disque optique (CD ou DVD) ou créer un fichier image de disque ISO, utilisez le menu FichierExporter versDisque optique.

diff -Nru gthumb-3.0.2/help/fr/sharing-social.page gthumb-3.2.3/help/fr/sharing-social.page --- gthumb-3.0.2/help/fr/sharing-social.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/sharing-social.page 2013-06-18 17:54:25.000000000 +0000 @@ -2,6 +2,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Envoi de photos sur des sites Web de partage

gThumb possède un certain nombre d'extensions pour envoyer des photos sur divers sites Web de réseaux sociaux. Par défaut, les extensions pour Facebook, Flickr, Picasa et Photobucket sont activés.

diff -Nru gthumb-3.0.2/help/fr/shortcuts.page gthumb-3.2.3/help/fr/shortcuts.page --- gthumb-3.0.2/help/fr/shortcuts.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/shortcuts.page 2013-06-18 17:54:25.000000000 +0000 @@ -2,6 +2,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Raccourcis clavier @@ -19,9 +37,7 @@
-

- F9 -

+

F9

Affiche/masque la barre latérale dans le navigateur. La barre latérale contient l'arborescence des dossiers et le résumé des propriétés de fichier (si activé).

@@ -29,9 +45,7 @@
-

- i -

+

i

Affiche le résumé des propriétés du fichier.

@@ -39,9 +53,7 @@
-

- F8 -

+

F8

Affiche/masque le volet des vignettes dans le mode visionneur.

@@ -57,9 +69,7 @@
-

- Ctrlt -

+

Ctrlt

Affiche/masque les vignettes dans le navigateur.

@@ -67,9 +77,7 @@
-

- Échap -

+

Échap

Quitte le visionneur ou le mode plein écran.

@@ -93,9 +101,7 @@
-

- e -

+

e

Modifie l'image. Ouvre le visionneur et affiche les outils de modification.

@@ -103,9 +109,7 @@
-

- g -

+

g

Ouvre l'image avec le logiciel de manipulation d'image (GIMP) de GNU.

@@ -113,9 +117,7 @@
-

- F2 -

+

F2

Renomme une image.

@@ -131,9 +133,7 @@
-

- ] -

+

]

Pivote vers la droite, sans perte de données si possible. Le fichier est enregistré automatiquement.

@@ -141,9 +141,7 @@
-

- [ -

+

[

Pivote vers la gauche, sans perte de données si possible. Le fichier est enregistré automatiquement.

@@ -151,9 +149,7 @@
-

- Suppr -

+

Suppr

Déplace les images sélectionnées dans la corbeille.

@@ -161,9 +157,7 @@
-

- MajSuppr -

+

MajSuppr

Supprime les images sélectionnées définitivement.

@@ -186,9 +180,7 @@
-

- h -

+

h

Améliore les couleurs.

@@ -196,9 +188,7 @@
-

- l -

+

l

Retourne l'image.

@@ -206,9 +196,7 @@
-

- m -

+

m

Image en miroir.

@@ -216,9 +204,7 @@
-

- r -

+

r

Pivote sur la droite.

@@ -226,9 +212,7 @@
-

- R -

+

R

Pivote sur la gauche.

@@ -236,9 +220,7 @@
-

- C -

+

C

Découpe l'image.

@@ -246,9 +228,7 @@
-

- S -

+

S

Redimensionne l'image.

@@ -286,9 +266,7 @@
-

- Origine -

+

Origine

Affiche la première image.

@@ -296,9 +274,7 @@
-

- Fin -

+

Fin

Affiche la dernière image.

@@ -306,12 +282,7 @@
-

- - Ctrl - D - -

+

Ctrl D

Ajoute l'emplacement actuel aux signets.

@@ -327,9 +298,7 @@
-

- - -

+

-

Zoom arrière.

@@ -353,12 +322,7 @@
-

- - Maj - x - -

+

Maj x

Taille ajustée (réduction ou agrandissement selon les besoins)

@@ -366,9 +330,7 @@
-

- Flèches -

+

Flèches

Fait défiler l'image.

@@ -376,12 +338,7 @@
-

- - Maj - Flèches - -

+

Maj Flèches

Fait défiler l'image plus rapidement.

@@ -396,9 +353,7 @@
-

- Origine -

+

Origine

Va au premier fichier dans le navigateur.

@@ -406,9 +361,7 @@
-

- Fin -

+

Fin

 @@ -433,9 +386,7 @@
-

- AltFlèche gauche -

+

AltFlèche gauche

Retourne au précédent dossier visité.

@@ -443,9 +394,7 @@
-

- AltFlèche droite -

+

AltFlèche droite

Avance (après être revenu d'un dossier).

@@ -453,12 +402,7 @@
-

- - Alt - Flèche haut - -

+

Alt Flèche haut

Remonte d'un niveau.

@@ -480,9 +424,7 @@
-

- F5 -

+

F5

Démarre un diaporama.

@@ -490,9 +432,7 @@
-

- Espace -

+

Espace

Interrompt/reprend le diaporama.

@@ -500,9 +440,7 @@
-

- Échap -

+

Échap

Ferme le diaporama.

diff -Nru gthumb-3.0.2/help/fr/slideshow.page gthumb-3.2.3/help/fr/slideshow.page --- gthumb-3.0.2/help/fr/slideshow.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/slideshow.page 2013-06-18 17:54:25.000000000 +0000 @@ -2,11 +2,29 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Diaporama automatique -

Pour lancer un diaporama des images sélectionnées depuis le navigateur appuyez sur F5, cliquez sur l'icône de diaporama de la barre d'outils ou cliquez AffichageDiaporama. Si aucune image n'est sélectionnée, toutes les images du dossier sont inclues.

+

Pour lancer un diaporama des images sélectionnées depuis le navigateur appuyez sur F5, cliquez sur l'icône de diaporama de la barre d'outils ou cliquez AffichageDiaporama. Si aucune image n'est sélectionnée, toutes les images du dossier sont inclues.

Les effets de transition et la durée pendant laquelle chaque image est affichée peuvent être modifiés dans la boîte de dialogue ÉditionPréférencesDiaporama.

diff -Nru gthumb-3.0.2/help/fr/sorting.page gthumb-3.2.3/help/fr/sorting.page --- gthumb-3.0.2/help/fr/sorting.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/sorting.page 2013-06-18 17:54:25.000000000 +0000 @@ -2,6 +2,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Tri des fichiers diff -Nru gthumb-3.0.2/help/fr/strftime.page gthumb-3.2.3/help/fr/strftime.page --- gthumb-3.0.2/help/fr/strftime.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/strftime.page 2013-06-18 17:54:24.000000000 +0000 @@ -2,6 +2,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Codes des formats de date/heure diff -Nru gthumb-3.0.2/help/fr/thumbnail-pane.page gthumb-3.2.3/help/fr/thumbnail-pane.page --- gthumb-3.0.2/help/fr/thumbnail-pane.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/thumbnail-pane.page 2013-06-18 17:54:25.000000000 +0000 @@ -2,6 +2,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Volet des vignettes diff -Nru gthumb-3.0.2/help/fr/thumbnails.page gthumb-3.2.3/help/fr/thumbnails.page --- gthumb-3.0.2/help/fr/thumbnails.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/thumbnails.page 2013-06-18 17:54:24.000000000 +0000 @@ -2,6 +2,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Sources des vignettes diff -Nru gthumb-3.0.2/help/fr/viewer.page gthumb-3.2.3/help/fr/viewer.page --- gthumb-3.0.2/help/fr/viewer.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/viewer.page 2013-06-18 17:54:25.000000000 +0000 @@ -2,6 +2,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Ouverture d'une image diff -Nru gthumb-3.0.2/help/fr/wallpaper.page gthumb-3.2.3/help/fr/wallpaper.page --- gthumb-3.0.2/help/fr/wallpaper.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/fr/wallpaper.page 2013-06-18 17:54:25.000000000 +0000 @@ -2,6 +2,24 @@ + + + Bruno Brouard + annoa.b@gmail.com + 2007,2010 + + + + Claude Paroz + claude@2xlibre.net + 2007,2011 + + + + Laurent Coudeur + laurentc@iol.ie + 2010 + Papier peint du bureau

Pour définir une image comme fond d'écran, faites un clic droit sur l'image et sélectionnez dans le menu contextuel Définir comme arrière-plan du bureau. Le fond d'écran change et la boîte de dialogue des préférences Apparence de GNOME s'affiche. Vous pouvez utiliser cette boîte de dialogue pour faire des ajustements aux paramètres du fond d'écran (positionnement, étirement, mosaïque, etc).

diff -Nru gthumb-3.0.2/help/oc/edit-resize-crop.page gthumb-3.2.3/help/oc/edit-resize-crop.page --- gthumb-3.0.2/help/oc/edit-resize-crop.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/oc/edit-resize-crop.page 2013-06-18 17:54:26.000000000 +0000 @@ -12,14 +12,14 @@

Two tools are provided to resize and crop images.

- <gui>Redimensionar</gui> + <gui>Resize</gui>

This allows you to resize the image. The image may be scaled to a certain physical size, or to a certain percentage of the original size. The aspect ratio may be locked to a specific value, or freely adjusted.

 - <gui>Rosegar</gui> + <gui>Crop</gui>

This allows you to crop the image. Click and drag the mouse over the desired area of the image. The area may be locked to a specific aspect ratio, or it may be freely adjusted. A rule-of-thirds diff -Nru gthumb-3.0.2/help/oc/edit-rotate.page gthumb-3.2.3/help/oc/edit-rotate.page --- gthumb-3.0.2/help/oc/edit-rotate.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/oc/edit-rotate.page 2013-06-18 17:54:26.000000000 +0000 @@ -14,12 +14,12 @@ - <gui>Miralh</gui> + <gui>Mirror</gui>

This flips the image horizontally. The left and right sides are swapped.

 - <gui>Coalevar</gui> + <gui>Flip</gui>

This flips the image vertically. The top and bottom are swapped.

 diff -Nru gthumb-3.0.2/help/oc/oc.po gthumb-3.2.3/help/oc/oc.po --- gthumb-3.0.2/help/oc/oc.po 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/oc/oc.po 2013-04-30 16:56:13.000000000 +0000 @@ -61,7 +61,7 @@ "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any " "later version published by the Free Software Foundation with no Invariant " "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy " -"of the GFDL at this link or " +"of the GFDL at this link or " "in the file COPYING-DOCS distributed with this manual." msgstr "" diff -Nru gthumb-3.0.2/help/oc/shortcuts.page gthumb-3.2.3/help/oc/shortcuts.page --- gthumb-3.0.2/help/oc/shortcuts.page 2012-08-20 20:25:45.000000000 +0000 +++ gthumb-3.2.3/help/oc/shortcuts.page 2013-06-18 17:54:27.000000000 +0000 @@ -117,7 +117,7 @@

- F 2 + F2

@@ -157,7 +157,7 @@

- Suprimir + Delete

@@ -167,7 +167,7 @@

- ShiftSuprimir + ShiftDelete

@@ -296,7 +296,7 @@

- Ostal + Home

@@ -306,7 +306,7 @@

- Fin + End

@@ -383,7 +383,7 @@

- Flèchas + Arrows

@@ -395,7 +395,7 @@

Shift - Flèchas + Arrows

- Ostal + Home

@@ -423,7 +423,7 @@

- Fin + End

- %M{oblika} + %M{format}

@@ -73,7 +73,7 @@

- %D{oblika} + %D{format}

@@ -83,7 +83,7 @@

- %A{določilo} + %A{identifier}

diff -Nru gthumb-3.0.2/help/sl/sharing-disc.page gthumb-3.2.3/help/sl/sharing-disc.page --- gthumb-3.0.2/help/sl/sharing-disc.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/sl/sharing-disc.page 2013-06-18 17:54:27.000000000 +0000 @@ -4,7 +4,12 @@ Ustvarjanje CD-jev/DVD-jev/ISO-jev -

Za zapis datotek na optični disk (CD ali DVD) ali za ustvarjanje datoteke odtisa diska ISO uporabite predmet menija DatotekaIzvozi vOptični disk.

+

+ To write a series of files to an optical disk (CD or DVD), or to create + an ISO disk image file, use the File + Export ToOptical Disc + menu item. +

Ponujena vam bo izbira med zapisom trenutno izbranih datotek, celotne trenutne mape ali celotne trenutne mape in njenih podmap. Ko boste izbrali primerno možnost, kliknite V redu.

V naslednjem pogovornem oknu boste lahko izbrali cilj disk ali datoteko ISO za shranjevanje. Ko boste pripravljeni za dokončanje opravila, kliknite Ustvari odtis. Nato se bo začelo opravilo zapisovanja optičnega diska ali pa bo zapisana datoteka ISO.

diff -Nru gthumb-3.0.2/help/sl/shortcuts.page gthumb-3.2.3/help/sl/shortcuts.page --- gthumb-3.0.2/help/sl/shortcuts.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/sl/shortcuts.page 2013-06-18 17:54:26.000000000 +0000 @@ -152,7 +152,7 @@

- Izbriši + Delete

@@ -162,7 +162,7 @@

- DvigalkaIzbriši + ShiftDelete

@@ -287,7 +287,7 @@

- Domov + Home

@@ -297,7 +297,7 @@

- Konec + End

@@ -355,7 +355,7 @@

- Dvigalka + Shift x

@@ -367,7 +367,7 @@

- Puščice + Arrows

@@ -378,8 +378,8 @@

- Dvigalka - Puščice + Shift + Arrows

- Domov + Home

@@ -407,7 +407,7 @@

- Konec + End

- AltLeva puščica + AltLeft Arrow

@@ -444,7 +444,7 @@

- AltPuščica desno + AltRight Arrow

@@ -456,7 +456,7 @@

Alt - Navzgor + Up

- Presledek + Space

diff -Nru gthumb-3.0.2/help/sl/sl.po gthumb-3.2.3/help/sl/sl.po --- gthumb-3.0.2/help/sl/sl.po 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/sl/sl.po 2013-04-30 16:56:13.000000000 +0000 @@ -1872,14 +1872,14 @@ #~ "under the terms of the GNU Free Documentation License (GFDL), Version 1.1 " #~ "or any later version published by the Free Software Foundation with no " #~ "Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You " -#~ "can find a copy of the GFDL at this link or in the file COPYING-DOCS distributed with this manual." #~ msgstr "" #~ "Dano je dovoljenje za kopiranje, distribuiranje in/ali spreminjanje tega " #~ "dokumenta pod pogoji GNU Free Documentaction Licence (GFDL) različice 1.1 " #~ "ali katerekoli kasnejše različice, ki jo je objavila Free Software " #~ "Foundation brez stalnih odsekov, besedila naslovnice in zadnje strani. " -#~ "Kopijo GFDL lahko najdete na tej povezavi ali v COPYING-DOCS distribuiranim s tem priročnikom." #~ msgid "" diff -Nru gthumb-3.0.2/help/sl/thumbnails.page gthumb-3.2.3/help/sl/thumbnails.page --- gthumb-3.0.2/help/sl/thumbnails.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/sl/thumbnails.page 2013-06-18 17:54:26.000000000 +0000 @@ -7,7 +7,11 @@

Okno brskalnika običajno prikaže sličice slik in filmov v izbrani mapi. Prikazati je mogoče tudi splošne ikone za druge datoteke (na primer zvočne datoteke).

-

Vrste datotek za prikaz v pogledu brskalnika lahko izberete s pogovornim oknom PogledFilter. Privzeto so prikazane vse večpredstavnostne datoteke (slike, filmi, zvok), vendar je to mogoče spremeniti v bolj ali manj omejen prikaz.

+

You can select what types of files to show in the browser view + using the ViewFilter + dialog. The default is to show all media files (images, + movies, audio), but this can be made more or less + restrictive.

Sličice je mogoče ustvariti na več različnih načinov. gThumb bo najprej preveril, če sličice obstajajo v sistemskem predpomnilniku.

diff -Nru gthumb-3.0.2/help/sv/edit-colors.page gthumb-3.2.3/help/sv/edit-colors.page --- gthumb-3.0.2/help/sv/edit-colors.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/sv/edit-colors.page 2013-06-18 17:54:27.000000000 +0000 @@ -31,12 +31,12 @@ user adjustments are required.

- <gui>Avmätta</gui> + <gui>Desaturate</gui>

This tool converts the image colors into shades of grey. (This does not change this image storage format.)

 - <gui>Negativ</gui> + <gui>Negative</gui>

This tool inverts the color levels, providing an image negative.

 diff -Nru gthumb-3.0.2/help/sv/edit-resize-crop.page gthumb-3.2.3/help/sv/edit-resize-crop.page --- gthumb-3.0.2/help/sv/edit-resize-crop.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/sv/edit-resize-crop.page 2013-06-18 17:54:27.000000000 +0000 @@ -12,14 +12,14 @@

Two tools are provided to resize and crop images.

- <gui>Ändra storlek</gui> + <gui>Resize</gui>

This allows you to resize the image. The image may be scaled to a certain physical size, or to a certain percentage of the original size. The aspect ratio may be locked to a specific value, or freely adjusted.

 - <gui>Beskär</gui> + <gui>Crop</gui>

This allows you to crop the image. Click and drag the mouse over the desired area of the image. The area may be locked to a specific aspect ratio, or it may be freely adjusted. A rule-of-thirds diff -Nru gthumb-3.0.2/help/sv/edit-rotate.page gthumb-3.2.3/help/sv/edit-rotate.page --- gthumb-3.0.2/help/sv/edit-rotate.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/sv/edit-rotate.page 2013-06-18 17:54:27.000000000 +0000 @@ -14,21 +14,21 @@ - <gui>Spegla</gui> + <gui>Mirror</gui>

This flips the image horizontally. The left and right sides are swapped.

 - <gui>Vänd</gui> + <gui>Flip</gui>

This flips the image vertically. The top and bottom are swapped.

 - <gui>Rotera åt höger</gui> + <gui>Rotate Right</gui>

This rotates the image clockwise.

 - <gui>Rotera åt vänster</gui> + <gui>Rotate Left</gui>

This rotates the image counter-clockwise.

 Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/help/sv/figures/comment.png and /tmp/43kzZNuclK/gthumb-3.2.3/help/sv/figures/comment.png differ Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/help/sv/figures/main-win.png and /tmp/43kzZNuclK/gthumb-3.2.3/help/sv/figures/main-win.png differ Binary files /tmp/qmRRUE7DVY/gthumb-3.0.2/help/sv/figures/preferences.png and /tmp/43kzZNuclK/gthumb-3.2.3/help/sv/figures/preferences.png differ diff -Nru gthumb-3.0.2/help/sv/shortcuts.page gthumb-3.2.3/help/sv/shortcuts.page --- gthumb-3.0.2/help/sv/shortcuts.page 2012-08-20 20:25:46.000000000 +0000 +++ gthumb-3.2.3/help/sv/shortcuts.page 2013-06-18 17:54:28.000000000 +0000 @@ -167,7 +167,7 @@

- SkiftDelete + ShiftDelete

@@ -371,7 +371,7 @@

- Skift + Shift x

@@ -383,7 +383,7 @@

- Piltangenter + Arrows

@@ -394,8 +394,8 @@

- Skift - Piltangenter + Shift + Arrows

- 删除键 + Delete

@@ -167,7 +167,7 @@

- Shift删除键 + ShiftDelete

@@ -383,7 +383,7 @@

- 方向键 + Arrows

@@ -395,7 +395,7 @@

Shift - 方向键 + Arrows